ldforge: comparison src/editmodes/circleMode.cc

-:6d68840fcb26
+:4951b737f8cb
 }
 void CircleMode::buildCircle()
 {
 	LDObjectList objs;
-	const int segs (g_win->ringToolHiRes() ? HighResolution : LowResolution);
+	const int segments (g_win->ringToolSegments());
-	const int divs (segs); // TODO: make customizable
+	const int divisions (g_win->ringToolHiRes() ? HighResolution : LowResolution);
 	double dist0 (getCircleDrawDist (0));
 	double dist1 (getCircleDrawDist (1));
 	LDDocumentPtr refFile;
 	Matrix transform;
 	bool circleOrDisc = false;
 		qSwap (dist0, dist1);
 	if (dist0 == dist1)
 	{
 		// If the radii are the same, there's no ring space to fill. Use a circle.
-		refFile = GetDocument (MakeRadialFileName (::Circle, segs, segs, 0));
+		refFile = GetPrimitive (::Circle, segments, divisions, 0);
 		transform = getCircleDrawMatrix (dist0);
 		circleOrDisc = true;
 	}
 	elif (dist0 == 0 or dist1 == 0)
 	{
 		// If either radii is 0, use a disc.
-		refFile = GetDocument (MakeRadialFileName (::Disc, segs, segs, 0));
+		refFile = GetPrimitive (::Disc, segments, divisions, 0);
 		transform = getCircleDrawMatrix ((dist0 != 0) ? dist0 : dist1);
 		circleOrDisc = true;
 	}
 	elif (g_RingFinder.findRings (dist0, dist1))
 	{
 		// The ring finder found a solution, use that. Add the component rings to the file.
 		for (const RingFinder::Component& cmp : g_RingFinder.bestSolution()->getComponents())
 		{
-			// Get a ref file for this primitive. If we cannot find it in the
+			refFile = GetPrimitive (::Ring, segments, divisions, cmp.num);
-			// LDraw library, generate it.
-			if ((refFile = ::GetDocument (MakeRadialFileName (::Ring, segs, segs, cmp.num))) == null)
-			{
-				refFile = GeneratePrimitive (::Ring, segs, segs, cmp.num);
-				refFile->setImplicit (false);
-			}
 			LDSubfilePtr ref = LDSpawn<LDSubfile>();
 			ref->setFileInfo (refFile);
 			ref->setTransform (getCircleDrawMatrix (cmp.scale));
 			ref->setPosition (m_drawedVerts[0]);
 			ref->setColor (MainColor());
 		templ.setCoordinate (localx, x0);
 		templ.setCoordinate (localy, y0);
 		templ.setCoordinate (localz, renderer()->getDepthValue());
 		// Calculate circle coords
-		MakeCircle (segs, divs, dist0, c0);
+		MakeCircle (segments, divisions, dist0, c0);
-		MakeCircle (segs, divs, dist1, c1);
+		MakeCircle (segments, divisions, dist1, c1);
-		for (int i = 0; i < segs; ++i)
+		for (int i = 0; i < segments; ++i)
 		{
 			Vertex v0, v1, v2, v3;
 			v0 = v1 = v2 = v3 = templ;
 			v0.setCoordinate (localx, v0[localx] + c0[i].x1());
 			v0.setCoordinate (localy, v0[localy] + c0[i].y1());
 	{
 		renderer()->drawBlip (painter, renderer()->coordconv3_2 (renderer()->position3D()));
 		return;
 	}
-	QVector<Vertex> verts, verts2;
+	QVector<Vertex> innerverts, outerverts;
-	const double dist0 = getCircleDrawDist (0),
+	QVector<QPointF> innerverts2d, outerverts2d;
-		dist1 = (m_drawedVerts.size() >= 2) ? getCircleDrawDist (1) : -1;
+	const double innerdistance (getCircleDrawDist (0));
-	const int segs (g_win->ringToolHiRes() ? HighResolution : LowResolution);
+	const double outerdistance (m_drawedVerts.size() >= 2 ? getCircleDrawDist (1) : -1);
-	const double angleUnit = (2 * Pi) / segs;
+	const int divisions (g_win->ringToolHiRes() ? HighResolution : LowResolution);
+	const int segments (g_win->ringToolSegments());
+	const double angleUnit (2 * Pi / divisions);
 	Axis relX, relY;
-	QVector<QPoint> ringpoints, circlepoints, circle2points;
 	renderer()->getRelativeAxes (relX, relY);
 	// Calculate the preview positions of vertices
-	for (int i = 0; i < segs; ++i)
+	for (int i = 0; i < segments + 1; ++i)
 	{
 		Vertex v (Origin);
-		v.setCoordinate (relX, m_drawedVerts[0][relX] + (cos (i * angleUnit) * dist0));
+		v.setCoordinate (relX, m_drawedVerts[0][relX] + (cos (i * angleUnit) * innerdistance));
-		v.setCoordinate (relY, m_drawedVerts[0][relY] + (sin (i * angleUnit) * dist0));
+		v.setCoordinate (relY, m_drawedVerts[0][relY] + (sin (i * angleUnit) * innerdistance));
-		verts << v;
+		innerverts << v;
+		innerverts2d << renderer()->coordconv3_2 (v);
-		if (dist1 != -1)
-		{
+		if (outerdistance != -1)
-			v.setCoordinate (relX, m_drawedVerts[0][relX] + (cos (i * angleUnit) * dist1));
+		{
-			v.setCoordinate (relY, m_drawedVerts[0][relY] + (sin (i * angleUnit) * dist1));
+			v.setCoordinate (relX, m_drawedVerts[0][relX] + (cos (i * angleUnit) * outerdistance));
-			verts2 << v;
+			v.setCoordinate (relY, m_drawedVerts[0][relY] + (sin (i * angleUnit) * outerdistance));
-		}
+			outerverts << v;
-	}
+			outerverts2d << renderer()->coordconv3_2 (v);
+		}
-	int i = 0;
+	}
-	for (const Vertex& v : verts + verts2)
-	{
+	QVector<QLineF> lines (segments);
-		// Calculate the 2D point of the vertex
-		QPoint point (renderer()->coordconv3_2 (v));
+	if (outerdistance != -1 and outerdistance != innerdistance)
+	{
-		// Draw a green blip at where it is
+		painter.setBrush (m_polybrush);
+		painter.setPen (Qt::NoPen);
+		// Compile polygons
+		for (int i = 0; i < segments; ++i)
+		{
+			QVector<QPointF> points;
+			points << innerverts2d[i]
+				<< innerverts2d[i + 1]
+				<< outerverts2d[i + 1]
+				<< outerverts2d[i];
+			painter.drawPolygon (QPolygonF (points));
+			lines << QLineF (innerverts2d[i], innerverts2d[i + 1]);
+			lines << QLineF (outerverts2d[i], outerverts2d[i + 1]);
+		}
+		// Add bordering edges for unclosed rings/discs
+		if (segments != divisions)
+		{
+			lines << QLineF (innerverts2d.first(), outerverts2d.first());
+			lines << QLineF (innerverts2d.last(), outerverts2d.last());
+		}
+	}
+	else
+	{
+		for (int i = 0; i < segments; ++i)
+			lines << QLineF (innerverts2d[i], innerverts2d[i + 1]);
+	}
+	// Draw a green blips at where the points are
+	for (QPointF const& point : innerverts2d + outerverts2d)
 		renderer()->drawBlip (painter, point);
-		// Add it to the list of points for the green ring fill.
+	// Draw edge lines
-		ringpoints << point;
-		// Also add the circle points to separate lists
-		if (i < verts.size())
-			circlepoints << point;
-		else
-			circle2points << point;
-		++i;
-	}
-	// Insert the first point as the seventeenth one so that
-	// the ring polygon is closed properly.
-	if (ringpoints.size() >= segs)
-		ringpoints.insert (segs, ringpoints[0]);
-	// Same for the outer ring. Note that the indices are offset by 1
-	// because of the insertion done above bumps the values.
-	if (ringpoints.size() >= segs * 2 + 1)
-		ringpoints.insert (segs * 2 + 1, ringpoints[segs + 1]);
-	// Draw the ring
-	painter.setBrush ((m_drawedVerts.size() >= 2) ? m_polybrush : Qt::NoBrush);
-	painter.setPen (Qt::NoPen);
-	painter.drawPolygon (QPolygon (ringpoints));
-	// Draw the circles
-	painter.setBrush (Qt::NoBrush);
 	painter.setPen (renderer()->linePen());
-	painter.drawPolygon (QPolygon (circlepoints));
+	painter.drawLines (lines);
-	painter.drawPolygon (QPolygon (circle2points));
 	// Draw the current radius in the middle of the circle.
 	QPoint origin = renderer()->coordconv3_2 (m_drawedVerts[0]);
-	QString label = QString::number (dist0);
+	QString label = QString::number (innerdistance);
 	painter.setPen (renderer()->textPen());
 	painter.drawText (origin.x() - (metrics.width (label) / 2), origin.y(), label);
 	if (m_drawedVerts.size() >= 2)
 	{
 		painter.drawText (origin.x() - (metrics.width (label) / 2),
-			origin.y() + metrics.height(), QString::number (dist1));
+			origin.y() + metrics.height(), QString::number (outerdistance));
 	}
 }
 bool CircleMode::mouseReleased (MouseEventData const& data)
 {

Mercurial > ldforge / file comparison

comparison: src/editmodes/circleMode.cc

src/editmodes/circleMode.cc