Bezier v0.4.0 release

CMakeLists.txt

@@ -3,22 +3,17 @@ project(bezier
   LANGUAGES CXX
   VERSION 0.3.2)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-add_compile_options(-fPIC -O2)
-
 find_package(Eigen3 REQUIRED)
-include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR} include)
 
 set(Bezier_SRC
+  ${PROJECT_SOURCE_DIR}/src/utils.cpp
   ${PROJECT_SOURCE_DIR}/src/bezier.cpp
   ${PROJECT_SOURCE_DIR}/src/polycurve.cpp
   )
 
 set(Bezier_INC
   ${PROJECT_SOURCE_DIR}/include/Bezier/declarations.h
+  ${PROJECT_SOURCE_DIR}/include/Bezier/utils.h
   ${PROJECT_SOURCE_DIR}/include/Bezier/bezier.h
   ${PROJECT_SOURCE_DIR}/include/Bezier/polycurve.h
   )
@@ -35,15 +30,23 @@ else()
 endif()
 
 target_include_directories(bezier PUBLIC
-  $<BUILD_INTERFACE:${Bezier_SOURCE_DIR}/include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
 )
+target_link_libraries(bezier PUBLIC Eigen3::Eigen)
 
-set_target_properties(bezier PROPERTIES VERSION ${PROJECT_VERSION})
-set_target_properties(bezier PROPERTIES PUBLIC_HEADER "${Bezier_INC}")
+set_target_properties(bezier PROPERTIES
+  VERSION ${PROJECT_VERSION}  
+  CXX_EXTENSIONS OFF  
+  POSITION_INDEPENDENT_CODE ON  
+  PUBLIC_HEADER "${Bezier_INC}"
+)
+target_compile_features(bezier PUBLIC cxx_std_17)
 
 # install rules
 install(TARGETS bezier
   EXPORT bezier-export DESTINATION "lib"
   PUBLIC_HEADER DESTINATION "include/Bezier")
 install(EXPORT bezier-export DESTINATION "lib/cmake/Bezier" FILE BezierConfig.cmake)
+
+add_library(bezier::bezier ALIAS bezier)

example/bezier_example.pro

@@ -35,6 +35,7 @@ SOURCES += \
         customscene.cpp \
         qcurve.cpp \
         qpolycurve.cpp \
+        ../src/utils.cpp \
         ../src/bezier.cpp \
         ../src/polycurve.cpp \
 
@@ -44,6 +45,7 @@ HEADERS += \
         customscene.h \
         qcurve.h \
         qpolycurve.h \
+        ../include/Bezier/utils.h \
         ../include/Bezier/bezier.h \
         ../include/Bezier/polycurve.h \
         ../include/Bezier/declarations.h

example/customscene.cpp

@@ -77,7 +77,8 @@ void CustomScene::mousePressEvent(QGraphicsSceneMouseEvent* mouseEvent)
                                   QPen(Qt::blue)));
         auto t2 = c_curve->iterateByLength(t1, 50);
         auto a = c_curve->valueAt(t2);
-        byLength.insert(curve, addEllipse(QRectF(QPointF(a.x() - 3, a.y() - 3), QSizeF(6, 6)), QPen(Qt::yellow), QBrush(Qt::red, Qt::SolidPattern)));
+        byLength.insert(curve, addEllipse(QRectF(QPointF(a.x() - 3, a.y() - 3), QSizeF(6, 6)), QPen(Qt::yellow),
+                                          QBrush(Qt::red, Qt::SolidPattern)));
       }
       if (is_poly)
       {
@@ -90,7 +91,8 @@ void CustomScene::mousePressEvent(QGraphicsSceneMouseEvent* mouseEvent)
                                   QPen(Qt::blue)));
         auto t2 = c_poly->iterateByLength(t1, 50);
         auto a = c_poly->valueAt(t2);
-        byLength.insert(curve, addEllipse(QRectF(QPointF(a.x() - 3, a.y() - 3), QSizeF(6, 6)), QPen(Qt::yellow), QBrush(Qt::red, Qt::SolidPattern)));
+        byLength.insert(curve, addEllipse(QRectF(QPointF(a.x() - 3, a.y() - 3), QSizeF(6, 6)), QPen(Qt::yellow),
+                                          QBrush(Qt::red, Qt::SolidPattern)));
       }
     }
     show_projection = true;
@@ -145,18 +147,6 @@ void CustomScene::mousePressEvent(QGraphicsSceneMouseEvent* mouseEvent)
         }
         if (update_cp)
           break;
-        if (is_curve)
-        {
-          double t = c_curve->projectPoint(p);
-          auto pt = c_curve->valueAt(t);
-          auto ep = c_curve->endPoints();
-          if ((pt - p).norm() < 10 && (pt - ep.first).norm() > 20 && (pt - ep.second).norm() > 20)
-          {
-            update_curvature = true;
-            t_to_update = std::make_pair(c_curve, t);
-            break;
-          }
-        }
       }
     }
   }
@@ -173,8 +163,8 @@ void CustomScene::mousePressEvent(QGraphicsSceneMouseEvent* mouseEvent)
           auto split = c_curve->splitCurve(t);
           delete curve;
           qCurve *c1, *c2;
-          c1 = new qCurve(split.first);
-          c2 = new qCurve(split.second);
+          c1 = new qCurve(split[0]);
+          c2 = new qCurve(split[1]);
           this->addItem(c1);
           this->addItem(c2);
           update();
@@ -235,20 +225,6 @@ void CustomScene::mouseMoveEvent(QGraphicsSceneMouseEvent* mouseEvent)
     }
     update();
   }
-  if (update_curvature)
-  {
-    try
-    {
-      t_to_update.first->prepareGeometryChange();
-      t_to_update.first->manipulateCurvature(t_to_update.second, p);
-      update();
-    }
-    catch (char const* err)
-    {
-      update_curvature = false;
-      QMessageBox::warning(nullptr, "Warning", QString().sprintf("%s", err));
-    }
-  }
   QGraphicsScene::mouseMoveEvent(mouseEvent);
 }
 
@@ -273,10 +249,7 @@ void CustomScene::mouseReleaseEvent(QGraphicsSceneMouseEvent* mouseEvent)
     }
   }
   if (mouseEvent->button() == Qt::LeftButton)
-  {
     update_cp = false;
-    update_curvature = false;
-  }
 }
 
 void CustomScene::keyPressEvent(QKeyEvent* keyEvent)
@@ -290,7 +263,6 @@ Ctrl + Scroll - zoom in/out\n\
 Ctrl + Left click - select curves\n\
 Left click - deselect curves\n\
 Left click + drag control point - manipulate control point\n\
-Left click + drag curve - manipulate curve (only for 2nd and 3rd order)\n\
 \n\
 Keyboard shortcuts:\n\
 H - display help\n\
@@ -377,43 +349,53 @@ Delete - delete curve/polycurve");
     }
     update();
   }
-  if (keyEvent->key() == Qt::Key_L) {
-      for (auto&& curve : selectedItems()) {
-          if (is_curve) {
-              c_curve->setLocked(!c_curve->getLocked());
-          }
+  if (keyEvent->key() == Qt::Key_L)
+  {
+    for (auto&& curve : selectedItems())
+    {
+      if (is_curve)
+      {
+        c_curve->setLocked(!c_curve->getLocked());
       }
-      update();
+    }
+    update();
   }
-  if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return) {
-      if (selectedItems().size() != 2) {
-          return;
-      }
+  if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return)
+  {
+    if (selectedItems().size() != 2)
+    {
+      return;
+    }
 
-      qCurve* curve_locked = nullptr;
-      qCurve* curve_unlocked = nullptr;
+    qCurve* curve_locked = nullptr;
+    qCurve* curve_unlocked = nullptr;
 
-      if (c_curve_item(selectedItems().first())->getLocked()) {
-          curve_locked = c_curve_item(selectedItems().first());
-          curve_unlocked = c_curve_item(selectedItems().last());
+    if (c_curve_item(selectedItems().first())->getLocked())
+    {
+      curve_locked = c_curve_item(selectedItems().first());
+      curve_unlocked = c_curve_item(selectedItems().last());
+    }
+    else if (c_curve_item(selectedItems().last())->getLocked())
+    {
+      curve_locked = c_curve_item(selectedItems().last());
+      curve_unlocked = c_curve_item(selectedItems().first());
+    }
+
+    if (curve_locked != nullptr && curve_unlocked != nullptr)
+    {
+      while (curve_locked->order() < 5)
+      {
+        curve_locked->elevateOrder();
       }
-      else if (c_curve_item(selectedItems().last())->getLocked()) {
-          curve_locked = c_curve_item(selectedItems().last());
-          curve_unlocked = c_curve_item(selectedItems().first());
+      while (curve_unlocked->order() < 5)
+      {
+        curve_unlocked->elevateOrder();
       }
 
-      if (curve_locked != nullptr && curve_unlocked != nullptr) {
-          while (curve_locked->order() < 5) {
-              curve_locked->elevateOrder();
-          }
-          while (curve_unlocked->order() < 5) {
-              curve_unlocked->elevateOrder();
-          }
-
-          std::vector<double> beta_coeffs = {1, 0, 0};
-          curve_unlocked->applyContinuity(*dynamic_cast<Bezier::Curve*>(curve_locked), beta_coeffs);
-          update();
-      }
+      std::vector<double> beta_coeffs = {1, 0, 0};
+      curve_unlocked->applyContinuity(*dynamic_cast<Bezier::Curve*>(curve_locked), beta_coeffs);
+      update();
+    }
   }
 
   //  if (keyEvent->key() >= 48 && keyEvent->key() <= 59) // num keys

example/customscene.h

@@ -4,8 +4,8 @@
 #include <QGraphicsScene>
 
 #include "qcurve.h"
-#include "qpolycurve.h"
 #include "qgraphicsviewzoom.h"
+#include "qpolycurve.h"
 
 namespace Ui
 {
@@ -28,8 +28,6 @@ class CustomScene : public QGraphicsScene
   bool draw_box_ = false;
   bool draw_inter_ = false;
   bool show_projection = false;
-  bool update_curvature = false;
-  std::pair<qCurve*, double> t_to_update;
   bool update_cp = false;
   std::pair<QGraphicsItem*, uint> cp_to_update;
 

example/mainwindow.cpp

@@ -13,16 +13,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
   Eigen::MatrixX2d cp1, cp2;
   cp1.resize(4, 2);
   cp2.resize(5, 2);
-  cp1 << 84, 162,
-      246, 30,
-      48, 236,
-      180, 110;
-
-  cp2 << 180, 110,
-      175, 160,
-      60, 48,
-      164, 165,
-      124, 134;
+  cp1 << 84, 162, 246, 30, 48, 236, 180, 110;
+
+  cp2 << 180, 110, 175, 160, 60, 48, 164, 165, 124, 134;
 
   scene->addItem(new qCurve(cp1 * 5));
   scene->addItem(new qCurve(cp2 * 5));

example/qcurve.cpp

@@ -11,15 +11,9 @@ bool qCurve::getDraw_control_points() const { return draw_control_points; }
 
 bool qCurve::getDraw_curvature_radious() const { return draw_curvature_radious; }
 
-bool qCurve::getLocked() const
-{
-    return locked;
-}
+bool qCurve::getLocked() const { return locked; }
 
-void qCurve::setLocked(bool value)
-{
-    locked = value;
-}
+void qCurve::setLocked(bool value) { locked = value; }
 
 int qCurve::type() const { return QGraphicsItem::UserType + 1; }
 

example/qcurve.h

@@ -3,8 +3,8 @@
 
 #include <QGraphicsItem>
 
-#include "Bezier/declarations.h"
 #include "Bezier/bezier.h"
+#include "Bezier/declarations.h"
 
 class qCurve : public QGraphicsItem, public Bezier::Curve
 {

example/qgraphicsviewzoom.cpp

@@ -1,7 +1,7 @@
 #include "qgraphicsviewzoom.h"
 
-#include <QMouseEvent>
 #include <QApplication>
+#include <QMouseEvent>
 #include <QScrollBar>
 #include <qmath.h>
 

example/qgraphicsviewzoom.h

@@ -1,9 +1,9 @@
 #ifndef QGRAPHICSVIEWZOOM_H
 #define QGRAPHICSVIEWZOOM_H
 
-#include <QObject>
 #include <QDebug>
 #include <QGraphicsView>
+#include <QObject>
 
 /*!
  * \brief This class adds ability to zoom QGraphicsView using mouse wheel. The point under cursor

example/qpolycurve.cpp

@@ -55,8 +55,8 @@ void qPolyCurve::paint(QPainter* painter, const QStyleOptionGraphicsItem* option
     painter->setPen(Qt::green);
     for (double t = 0; t <= size(); t += 1.0 / 500)
     {
-      painter->setPen(QColor(static_cast<int>(std::fabs(255 * (0.5 - t / size()))),
-                             static_cast<int>(255 * t / size()), static_cast<int>(255 * (1 - t / size()))));
+      painter->setPen(QColor(static_cast<int>(std::fabs(255 * (0.5 - t / size()))), static_cast<int>(255 * t / size()),
+                             static_cast<int>(255 * (1 - t / size()))));
       auto p = valueAt(t);
       auto n1 = p + normalAt(t, false) * curvatureDerivativeAt(t);
       auto n2 = p - normalAt(t, false) * curvatureDerivativeAt(t);

example/qpolycurve.h

@@ -3,15 +3,16 @@
 
 #include <QGraphicsItem>
 
+#include "Bezier/bezier.h"
 #include "Bezier/declarations.h"
 #include "Bezier/polycurve.h"
-#include "Bezier/bezier.h"
 
 class qPolyCurve : public QGraphicsItem, public Bezier::PolyCurve
 {
 private:
   bool draw_control_points = false;
   bool draw_curvature_radious = false;
+
 public:
   qPolyCurve(const std::deque<Bezier::Curve>& curve_list) : QGraphicsItem(), Bezier::PolyCurve(curve_list) {}
   qPolyCurve(const Bezier::Curve& curve) : QGraphicsItem(), Bezier::PolyCurve(std::deque<Bezier::Curve>{curve}) {}