Mercurial > ldforge / file diff

--- a/src/editmodes/circleMode.cpp	Sun Feb 14 03:19:28 2016 +0200
+++ b/src/editmodes/circleMode.cpp	Tue Feb 16 00:59:50 2016 +0200
@@ -91,14 +91,14 @@
 	if (dist0 == dist1)
 	{
 		// If the radii are the same, there's no ring space to fill. Use a circle.
-		refFile = GetPrimitive (::Circle, segments, divisions, 0);
+		refFile = primitives()->getPrimitive(::Circle, segments, divisions, 0);
 		transform = getCircleDrawMatrix (dist0);
 		circleOrDisc = true;
 	}
 	else if (dist0 == 0 or dist1 == 0)
 	{
 		// If either radii is 0, use a disc.
-		refFile = GetPrimitive (::Disc, segments, divisions, 0);
+		refFile = primitives()->getPrimitive(::Disc, segments, divisions, 0);
 		transform = getCircleDrawMatrix ((dist0 != 0) ? dist0 : dist1);
 		circleOrDisc = true;
 	}
@@ -107,7 +107,7 @@
 		// The ring finder found a solution, use that. Add the component rings to the file.
 		for (const RingFinder::Component& cmp : g_RingFinder.bestSolution()->getComponents())
 		{
-			refFile = GetPrimitive (::Ring, segments, divisions, cmp.num);
+			refFile = primitives()->getPrimitive(::Ring, segments, divisions, cmp.num);
 			LDSubfileReference* ref = LDSpawn<LDSubfileReference>();
 			ref->setFileInfo (refFile);
 			ref->setTransform (getCircleDrawMatrix (cmp.scale));
@@ -132,8 +132,8 @@
 		templ.setCoordinate (localz, renderer()->getDepthValue());
 
 		// Calculate circle coords
-		MakeCircle (segments, divisions, dist0, c0);
-		MakeCircle (segments, divisions, dist1, c1);
+		primitives()->makeCircle(segments, divisions, dist0, c0);
+		primitives()->makeCircle(segments, divisions, dist1, c1);
 
 		for (int i = 0; i < segments; ++i)
 		{