Make Geometry::fromExpression() freestanding

The new name is parseGeometry() for symmetry with loadGeometry().

Author: hasselmm

qtcsg/qtcsg.cpp

@@ -316,7 +316,7 @@ QVariant parseArgument(const QString &primitive,
 
 } // namespace
 
-Geometry Geometry::fromExpression(QString expression)
+Geometry parseGeometry(QString expression)
 {
     static const auto s_callPattern = QRegularExpression{R"(^(?<name>[a-z]+)\((?<args>[^)]*\))$)"};
     static const auto s_argPattern  = QRegularExpression{R"(\s*(?<name>[a-z]+)\s*=\s*(?:)"

qtcsg/qtcsg.h

@@ -189,8 +189,6 @@ class Geometry
     /// by `matrix` applied to all the polygons of this geometry.
     [[nodiscard]] Geometry transformed(const QMatrix4x4 &matrix) const;
 
-    [[nodiscard]] static Geometry fromExpression(QString expression);
-
 private:
     QList<Polygon> m_polygons;
     Error m_error;
@@ -261,6 +259,14 @@ class Node
 [[nodiscard]] Geometry cylinder(QVector3D start, QVector3D end, float radius = 1, float slices = 16);
 [[nodiscard]] Geometry cylinder(QVector3D center = {}, float height = 2, float radius = 1, float slices = 16);
 
+/// Constructs a single geometry from simple expression:
+///
+/// "cube()" produces a simple cube.
+/// "sphere(r=1.3)" produces a sphere of radius 1.3.
+///
+/// See `testParseGeometry()` for more examples.
+[[nodiscard]] Geometry parseGeometry(QString expression);
+
 /// Return a new CSG solid representing space in either this solid or in the
 /// solid `csg`. Neither this solid nor the solid `csg` are modified.
 ///

tests/qtcsgtest.cpp

@@ -327,7 +327,7 @@ private slots:
         QCOMPARE(transformed,            expectedResult);
     }
 
-    void testFromExpression_data()
+    void testParseGeometry_data()
     {
         QTest::addColumn<QString>("expression");
         QTest::addColumn<Geometry>("expectedGeometry");
@@ -419,7 +419,7 @@ private slots:
                R"*("start" and "end" of cylinder primitive)*";
     }
 
-    void testFromExpression()
+    void testParseGeometry()
     {
         const QFETCH(QString, expression);
         const QFETCH(Geometry, expectedGeometry);
@@ -428,7 +428,7 @@ private slots:
         if (!expectedWarning.isEmpty())
             QTest::ignoreMessage(QtWarningMsg, qUtf8Printable(expectedWarning));
 
-        const auto parsedGeometry = Geometry::fromExpression(expression);
+        const auto parsedGeometry = parseGeometry(expression);
 
         QCOMPARE(expectedGeometry.error(), expectedGeometry.error());
         QCOMPARE(parsedGeometry.polygons(), expectedGeometry.polygons());