IPath: expose bezier items

hrobeers · Apr 3, 2020 · c28ec6f · c28ec6f
1 parent f8b4f81
commit c28ec6f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git a/include/patheditor/ipath.hpp b/include/patheditor/ipath.hpp
@@ -26,6 +26,8 @@
 #include "hrlib/fwd/qtfwd.hpp"
 #include "patheditor/fwd/patheditorfwd.hpp"
 
+#include <vector>
+
 namespace patheditor
 {
     class IPath
@@ -38,6 +40,8 @@ namespace patheditor
         virtual qreal minY(qreal *t_top = 0) const = 0;
         virtual qreal maxY(qreal *t_top = 0) const = 0;
 
+        virtual std::vector<std::vector<QPointF>> bezierItems() const = 0;
+
         virtual ~IPath() {};
     };
 }

diff --git a/include/patheditor/path.hpp b/include/patheditor/path.hpp
@@ -60,6 +60,8 @@ namespace patheditor
         virtual qreal minY(qreal *t_top = 0) const override;
         virtual qreal maxY(qreal *t_top = 0) const override;
 
+        virtual std::vector<std::vector<QPointF>> bezierItems() const override;
+
         void paint(QPainter *painter, bool editable = false, const PathSettings *settings = 0);
 
         void disconnectAll();

diff --git a/include/patheditor/pathdecorators.hpp b/include/patheditor/pathdecorators.hpp
@@ -50,6 +50,8 @@ namespace patheditor
         virtual qreal minY(qreal *t_top = 0) const override;
         virtual qreal maxY(qreal *t_top = 0) const override;
 
+        virtual std::vector<std::vector<QPointF>> bezierItems() const override;
+
         virtual ~PathScaleDecorator() {}
     };
 }

diff --git a/include/patheditor/pathitem.hpp b/include/patheditor/pathitem.hpp
@@ -44,7 +44,7 @@ namespace patheditor
         void setEndPoint(std::shared_ptr<PathPoint> endPoint);
 
         virtual QList<std::shared_ptr<ControlPoint> > controlPoints() = 0;
-        QList<QPointF> points();
+        QList<QPointF> points() const;
 
         // const getters
         const PathPoint* constStartPoint() const;

diff --git a/src/patheditor/path.cpp b/src/patheditor/path.cpp
@@ -123,6 +123,18 @@ qreal Path::maxY(qreal *t_top) const
     return extreme<Y, Max>(this, t_top);
 }
 
+std::vector<std::vector<QPointF>> Path::bezierItems() const
+{
+  std::vector<std::vector<QPointF>> retVal;
+  for (auto pi : _pathItemList) {
+    std::vector<QPointF> i;
+    for (auto p : pi->points())
+      i.push_back({p.x(), p.y()});
+    retVal.push_back(i);
+  }
+  return retVal;
+}
+
 void Path::disconnectAll()
 {
   disconnect();

diff --git a/src/patheditor/pathdecorators.cpp b/src/patheditor/pathdecorators.cpp
@@ -55,3 +55,15 @@ qreal PathScaleDecorator::maxY(qreal *t_top) const
 {
     return (_sy>0 ? _target->maxY(t_top) : _target->minY(t_top)) * _sy;
 }
+
+std::vector<std::vector<QPointF>> PathScaleDecorator::bezierItems() const
+{
+  std::vector<std::vector<QPointF>> retVal;
+  for (auto pi : _target->bezierItems()) {
+    std::vector<QPointF> i;
+    for (auto p : pi)
+      i.push_back({p.x()*_sx, p.y()*_sy});
+    retVal.push_back(i);
+  }
+  return retVal;
+}
diff --git a/src/patheditor/pathitem.cpp b/src/patheditor/pathitem.cpp
@@ -118,12 +118,12 @@ void PathItem::paintPathItem(QPainterPath *totalPainterPath, QPainter *painter,
     paintPathItemImpl(totalPainterPath, painter, editable, settings);
 }
 
-QList<QPointF> PathItem::points()
+QList<QPointF> PathItem::points() const
 {
   QList<QPointF> pnts;
-  pnts.append(QPointF(startPoint()->x(), startPoint()->y()));
-  for (auto p : controlPoints())
+  pnts.append(QPointF(constStartPoint()->x(), constStartPoint()->y()));
+  for (auto p : constControlPoints())
     pnts.append(QPointF(p->x(), p->y()));
-  pnts.append(QPointF(endPoint()->x(), endPoint()->y()));
+  pnts.append(QPointF(constEndPoint()->x(), constEndPoint()->y()));
   return pnts;
 }
diff --git a/src/version_autogen.hpp b/src/version_autogen.hpp
@@ -11,7 +11,7 @@
 #define MINOR_VERSION 2
 #define REVISION 0
 
-#define BUILD_NUMBER 609
-#define COMMIT_HASH "4e1ccb8d49b32609bbff02a31c34aa3f4fcc88bb"
+#define BUILD_NUMBER 614
+#define COMMIT_HASH "f8b4f812ef8dacf47203d9f4f296c6581ff835c0"
 
 #endif // VERSION_AUTOGEN_H