src/parser.cpp

changeset 1407
22bc5862cb56
parent 1405
d2bf2e59a3ef
child 1408
0d6162662040
--- a/src/parser.cpp	Sun Jun 17 16:13:24 2018 +0300
+++ b/src/parser.cpp	Sun Jun 17 17:07:29 2018 +0300
@@ -391,7 +391,9 @@
 					matrix(i / 3, i % 3) = tokens[i + 5].toDouble(); // 5 - 13
 
 				matrix.optimize();
-				static const QRegExp circularPrimitiveRegexp {R"((?:(\d+)\\)?(\d+)-(\d+)(cyli|edge|disc|ndis)\.dat)"};
+				static const QRegExp circularPrimitiveRegexp {
+					R"((?:(\d+)\\)?(\d+)-(\d+)(cyli|edge|disc|ndis|cylc|cylo)\.dat)"
+				};
 				LDObject* obj;
 
 				if (circularPrimitiveRegexp.exactMatch(referenceName))
@@ -413,6 +415,10 @@
 						type = PrimitiveModel::Disc;
 					else if (stem == "ndis")
 						type = PrimitiveModel::DiscNegative;
+					else if (stem == "cylc")
+						type = PrimitiveModel::CylinderClosed;
+					else if (stem == "cylo")
+						type = PrimitiveModel::CylinderOpen;
 
 					obj = model.emplaceAt<LDCircularPrimitive>(
 						position,

mercurial