Merge pull request #614 from tigercosmos/follow_up_1027

Use `mirror` function in SVG GUI and fix the SVG classes docstrings format

Author: yungyuc

cpp/modmesh/universe/bezier.hpp

@@ -181,9 +181,21 @@ class Point3d
     value_type calc_length2() const { return m_coord[0] * m_coord[0] + m_coord[1] * m_coord[1] + m_coord[2] * m_coord[2]; }
     value_type calc_length() const { return std::sqrt(calc_length2()); }
 
-    void mirror_x() { m_coord[0] = -m_coord[0]; }
-    void mirror_y() { m_coord[1] = -m_coord[1]; }
-    void mirror_z() { m_coord[2] = -m_coord[2]; }
+    void mirror_x()
+    {
+        m_coord[1] = -m_coord[1];
+        m_coord[2] = -m_coord[2];
+    }
+    void mirror_y()
+    {
+        m_coord[0] = -m_coord[0];
+        m_coord[2] = -m_coord[2];
+    }
+    void mirror_z()
+    {
+        m_coord[0] = -m_coord[0];
+        m_coord[1] = -m_coord[1];
+    }
 
     void mirror(Axis axis)
     {
@@ -546,17 +558,31 @@ class PointPad
 
     void mirror_x()
     {
-        for (size_t i = 0; i < m_x.size(); ++i)
+        for (size_t i = 0; i < m_y.size(); ++i)
         {
-            m_x[i] = -m_x[i];
+            m_y[i] = -m_y[i];
+        }
+        if (m_ndim == 3)
+        {
+            for (size_t i = 0; i < m_z.size(); ++i)
+            {
+                m_z[i] = -m_z[i];
+            }
         }
     }
 
     void mirror_y()
     {
-        for (size_t i = 0; i < m_y.size(); ++i)
+        for (size_t i = 0; i < m_x.size(); ++i)
         {
-            m_y[i] = -m_y[i];
+            m_x[i] = -m_x[i];
+        }
+        if (m_ndim == 3)
+        {
+            for (size_t i = 0; i < m_z.size(); ++i)
+            {
+                m_z[i] = -m_z[i];
+            }
         }
     }
 
@@ -566,9 +592,13 @@ class PointPad
         {
             throw std::out_of_range(Formatter() << "PointPad::mirror_z: ndim must be 3 but is " << int(m_ndim));
         }
-        for (size_t i = 0; i < m_z.size(); ++i)
+        for (size_t i = 0; i < m_x.size(); ++i)
+        {
+            m_x[i] = -m_x[i];
+        }
+        for (size_t i = 0; i < m_y.size(); ++i)
         {
-            m_z[i] = -m_z[i];
+            m_y[i] = -m_y[i];
         }
     }
 
@@ -714,20 +744,26 @@ class Segment3d
 
     void mirror_x()
     {
-        m_data.f.x0 = -m_data.f.x0;
-        m_data.f.x1 = -m_data.f.x1;
+        m_data.f.y0 = -m_data.f.y0;
+        m_data.f.y1 = -m_data.f.y1;
+        m_data.f.z0 = -m_data.f.z0;
+        m_data.f.z1 = -m_data.f.z1;
     }
 
     void mirror_y()
     {
-        m_data.f.y0 = -m_data.f.y0;
-        m_data.f.y1 = -m_data.f.y1;
+        m_data.f.x0 = -m_data.f.x0;
+        m_data.f.x1 = -m_data.f.x1;
+        m_data.f.z0 = -m_data.f.z0;
+        m_data.f.z1 = -m_data.f.z1;
     }
 
     void mirror_z()
     {
-        m_data.f.z0 = -m_data.f.z0;
-        m_data.f.z1 = -m_data.f.z1;
+        m_data.f.x0 = -m_data.f.x0;
+        m_data.f.x1 = -m_data.f.x1;
+        m_data.f.y0 = -m_data.f.y0;
+        m_data.f.y1 = -m_data.f.y1;
     }
 
     void mirror(Axis axis)
@@ -1121,8 +1157,13 @@ class SegmentPad
         size_t const nseg = size();
         for (size_t i = 0; i < nseg; ++i)
         {
-            x0(i) = -x0(i);
-            x1(i) = -x1(i);
+            y0(i) = -y0(i);
+            y1(i) = -y1(i);
+            if (ndim() == 3)
+            {
+                z0(i) = -z0(i);
+                z1(i) = -z1(i);
+            }
         }
     }
 
@@ -1131,8 +1172,13 @@ class SegmentPad
         size_t const nseg = size();
         for (size_t i = 0; i < nseg; ++i)
         {
-            y0(i) = -y0(i);
-            y1(i) = -y1(i);
+            x0(i) = -x0(i);
+            x1(i) = -x1(i);
+            if (ndim() == 3)
+            {
+                z0(i) = -z0(i);
+                z1(i) = -z1(i);
+            }
         }
     }
 
@@ -1146,8 +1192,10 @@ class SegmentPad
         size_t const nseg = size();
         for (size_t i = 0; i < nseg; ++i)
         {
-            z0(i) = -z0(i);
-            z1(i) = -z1(i);
+            x0(i) = -x0(i);
+            x1(i) = -x1(i);
+            y0(i) = -y0(i);
+            y1(i) = -y1(i);
         }
     }
 
@@ -1272,29 +1320,41 @@ class Bezier3d
     std::shared_ptr<SegmentPad<T>> sample(size_t nlocus) const;
 
     void mirror_x()
-    {
-        x0() = -x0();
-        x1() = -x1();
-        x2() = -x2();
-        x3() = -x3();
-    }
-
-    void mirror_y()
     {
         y0() = -y0();
         y1() = -y1();
         y2() = -y2();
         y3() = -y3();
+        z0() = -z0();
+        z1() = -z1();
+        z2() = -z2();
+        z3() = -z3();
     }
 
-    void mirror_z()
+    void mirror_y()
     {
+        x0() = -x0();
+        x1() = -x1();
+        x2() = -x2();
+        x3() = -x3();
         z0() = -z0();
         z1() = -z1();
         z2() = -z2();
         z3() = -z3();
     }
 
+    void mirror_z()
+    {
+        x0() = -x0();
+        x1() = -x1();
+        x2() = -x2();
+        x3() = -x3();
+        y0() = -y0();
+        y1() = -y1();
+        y2() = -y2();
+        y3() = -y3();
+    }
+
     void mirror(Axis axis)
     {
         switch (axis)

modmesh/pilot/_svg_gui.py

@@ -99,17 +99,13 @@ def _load_svg_file(self, filename):
         world = core.WorldFp64()
 
         for spad in spads:
-            # mirror with respect to x-axis: (x, y) -> (x, -y)
-            spad.y0.ndarray[:] = -spad.y0.ndarray
-            spad.y1.ndarray[:] = -spad.y1.ndarray
+            # Flip against the X axis for GUI coordinate system
+            spad.mirror(axis='x')
             world.add_segments(pad=spad)
 
         for cpad in cpads:
-            # mirror with respect to x-axis: (x, y) -> (x, -y)
-            cpad.y0.ndarray[:] = -cpad.y0.ndarray
-            cpad.y1.ndarray[:] = -cpad.y1.ndarray
-            cpad.y2.ndarray[:] = -cpad.y2.ndarray
-            cpad.y3.ndarray[:] = -cpad.y3.ndarray
+            # Flip against the X axis for GUI coordinate system
+            cpad.mirror(axis='x')
             world.add_beziers(pad=cpad)
 
         wid = self._mgr.add3DWidget()

modmesh/plot/svg.py

@@ -43,7 +43,8 @@
 
 
 class SvgParser(object):
-    """The SVG parser to extract SegmentPad and CurvePad from SVG file.
+    """
+    The SVG parser to extract SegmentPad and CurvePad from SVG file.
 
     Internally uses PathParser and ShapeParser to parse <path> and
     shape elements respectively.
@@ -464,7 +465,8 @@ def get_cmds(self):
 
 
 class PathParser(object):
-    """The SVG <path> element parser to extract SegmentPad and CurvePad.
+    """
+    The SVG <path> element parser to extract SegmentPad and CurvePad.
 
     Parse <path> elements from the SVG file and convert them into
     SegmentPad and CurvePad objects.
@@ -700,7 +702,8 @@ def _calculate(self):
 
 
 class ShapeParser(object):
-    """Parse basic shapes from an SVG file to extract SegmentPad and CurvePad.
+    """
+    Parse basic shapes from an SVG file to extract SegmentPad and CurvePad.
 
     Parses the basic shapes, including <circle>, <rect>, <ellipse>,
     <line>, <polyline>, and <polygon>, but excludes <path>.