Mercurial > ldforge2 / file diff

--- a/src/objecttypes/conditionaledge.cpp	Sat Oct 05 23:47:03 2019 +0300
+++ b/src/objecttypes/conditionaledge.cpp	Sun Nov 03 12:17:41 2019 +0200
@@ -12,6 +12,13 @@
 {
 }
 
+modelobjects::ConditionalEdge::ConditionalEdge(const QVector<Vertex>& vertices, const Color color) :
+	Edge{vertices[0], vertices[1], color},
+	controlPoint_1{vertices[2]},
+	controlPoint_2{vertices[3]}
+{
+}
+
 QVariant modelobjects::ConditionalEdge::getProperty(Property property) const
 {
 	switch (property)
@@ -43,7 +50,7 @@
 
 QString modelobjects::ConditionalEdge::textRepresentation() const
 {
-	return Edge::textRepresentation() + format("%1 %2",
+	return Edge::textRepresentation() + utility::format("%1 %2",
 		vertexToStringParens(controlPoint_1),
 		vertexToStringParens(controlPoint_2));
 }