Mercurial > ldforge2 / file diff

--- a/src/model.cpp	Mon Apr 10 14:46:36 2023 +0300
+++ b/src/model.cpp	Tue Apr 11 11:11:28 2023 +0300
@@ -115,44 +115,44 @@
 			QString result;
 			result += QStringLiteral("1 %1 %2 %3")
 				.arg(ref.color.index)
-				.arg(transformToString(ref.transformation))
-				.arg(ref.name);
+				.arg(transformToString(ref.element.transformation))
+				.arg(ref.element.name);
 			return result;
 		},
 		[](const Colored<LineSegment>& seg) {
 			return QStringLiteral("2 %1 %2 %3")
 				.arg(seg.color.index)
-				.arg(vertexToString(seg.p1))
-				.arg(vertexToString(seg.p2));
+				.arg(vertexToString(seg.element.p1))
+				.arg(vertexToString(seg.element.p2));
 		},
 		[](const Colored<Triangle>& triangle) {
 			return QStringLiteral("3 %1 %2 %3 %4")
 				.arg(triangle.color.index)
-				.arg(vertexToString(triangle.p1))
-				.arg(vertexToString(triangle.p2))
-				.arg(vertexToString(triangle.p3));
+				.arg(vertexToString(triangle.element.p1))
+				.arg(vertexToString(triangle.element.p2))
+				.arg(vertexToString(triangle.element.p3));
 		},
 		[](const Colored<Quadrilateral>& quad) {
 			return QStringLiteral("4 %1 %2 %3 %4 %5")
 				.arg(quad.color.index)
-				.arg(vertexToString(quad.p1))
-				.arg(vertexToString(quad.p2))
-				.arg(vertexToString(quad.p3))
-				.arg(vertexToString(quad.p4));
+				.arg(vertexToString(quad.element.p1))
+				.arg(vertexToString(quad.element.p2))
+				.arg(vertexToString(quad.element.p3))
+				.arg(vertexToString(quad.element.p4));
 		},
 		[](const Colored<ConditionalEdge>& cedge) {
 			return QStringLiteral("5 %1 %2 %3 %4 %5")
 				.arg(cedge.color.index)
-				.arg(vertexToString(cedge.p1))
-				.arg(vertexToString(cedge.p2))
-				.arg(vertexToString(cedge.c1))
-				.arg(vertexToString(cedge.c2));
+				.arg(vertexToString(cedge.element.p1))
+				.arg(vertexToString(cedge.element.p2))
+				.arg(vertexToString(cedge.element.c1))
+				.arg(vertexToString(cedge.element.c2));
 		},
 		[](const Colored<CircularPrimitive>& circ) {
 			return QStringLiteral("1 %1 %2 %3")
 				.arg(circ.color.index)
-				.arg(transformToString(circ.transformation))
-				.arg(circularPrimitiveFilePath(circ));
+				.arg(transformToString(circ.element.transformation))
+				.arg(circularPrimitiveFilePath(circ.element));
 		},
 		[](const Comment& comment) {
 			return "0 " + comment.text;