refactor to simplify and avoid slicing risk

Circleoutline.h

@@ -18,82 +18,34 @@
 #ifndef CIRCLEOUTLINE_H
 #define CIRCLEOUTLINE_H
 
-
-#include "boundary.h"
-#include "gplus.h"
-#include <QVector>
+#include <QJsonObject>
+#include <QPainter>
 #include <QPointF>
+#include <QVector>
 #include <opencv2/opencv.hpp>
-#include <QJsonObject>
-void fillCircle(cv::Mat &m, double cx, double cy, double rad, void *color);
-class CircleOutline: public boundary
-{
-    public:
-        CircleOutline();
-        CircleOutline(QPointF center, double rad);
-        CircleOutline(QPointF p1, QPointF p2);
-        CircleOutline(const QJsonObject &obj);
-        void toJson(QJsonObject &obj);
 
-        virtual ~CircleOutline();
-        void draw(QPainter& painter, double scale, double scale2 = -1.);
-        bool isInside(QPointF& p , int offset = 0);
-        bool isInside(double x, double y, int offset=0);
-        void enlarge(int del);
-        void translate(QPointF del);
-        void scale(double factor);
-        QVector<QPointF> makeCircleofPoints(int cnt);
-        bool isValid();
-        QPointF m_center;
-        double m_radius;
-        gPlus m_p1;
-        gPlus m_p2;
-    protected:
+void fillCircle(cv::Mat &m, double cx, double cy, double rad, void *color);
 
-    private:
-};
+class CircleOutline {
+  public:
+    CircleOutline();
+    CircleOutline(QPointF center, double rad);
+    CircleOutline(QPointF p1, QPointF p2);
+    CircleOutline(const QJsonObject &obj);
+    ~CircleOutline() = default;
 
-class ellipseOutline: public boundary
-{
-public:
-    ellipseOutline();
-    ellipseOutline(QPointF center, double minorAxis, double majorAxis);
-    ellipseOutline(QPointF left, QPointF right, double ecc);
-    bool isInside(QPointF& p , int offset = 0);
-    void enlarge(int del);
     void translate(QPointF del);
     void scale(double factor);
-
-
     bool isValid();
-    QPointF m_center;
-    double m_minor;
-    double m_major;
-    double m_left;
-    double m_right;
-    double e;
-    gPlus m_p1;
-    gPlus m_p2;
-};
-
-class rectangleOutline: public boundary
-{
-public:
-    rectangleOutline();
-    rectangleOutline(QPointF upperLeft, QPointF lowerRight);
-    bool isInside(QPointF& p , int offset = 0);
+    void draw(QPainter &painter, double scale, double scale2 = -1.);
+    QVector<QPointF> makeCircleofPoints(int cnt);
     void enlarge(int del);
-    void translate(QPointF del);
-    void scale(double factor);
-    bool isValid();
-    QPointF m_upperLeft;
-    QPointF m_lowerRight;
-    gPlus m_p1;
-    gPlus m_p2;
-};
-QDataStream & operator<<(QDataStream & stream, const ellipseOutline &outline);
-QDataStream & operator<<(QDataStream & stream, const CircleOutline &outline);
-QDataStream & operator<<(QDataStream & stream, const rectangleOutline &outline);
+    void toJson(QJsonObject &obj);
 
+    QPointF m_center;
+    double m_radius;
+    QPointF m_p1;
+    QPointF m_p2;
+};
 
 #endif // CIRCLEOUTLINE_H

DFTFringe.pro

@@ -181,7 +181,6 @@ SOURCES += SingleApplication/singleapplication.cpp \
     filteroutlinesdlg.cpp \
     foucaultview.cpp \
     generatetargetdlg.cpp \
-    gplus.cpp \
     graphicsutilities.cpp \
     helpdlg.cpp \
     hotkeysdlg.cpp \
@@ -282,7 +281,6 @@ HEADERS += bezier/bezier.h \
     averagewavefrontfilesdlg.h \
     batchigramwizard.h \
     bathastigdlg.h \
-    boundary.h \
     camcalibrationreviewdlg.h \
     cameracalibwizard.h \
     camwizardpage1.h \
@@ -308,7 +306,6 @@ HEADERS += bezier/bezier.h \
     filteroutlinesdlg.h \
     foucaultview.h \
     generatetargetdlg.h \
-    gplus.h \
     graphicsutilities.h \
     helpdlg.h \
     hotkeysdlg.h \

DFTFringe_Dale.pro

@@ -38,7 +38,6 @@ SOURCES += main.cpp \
     mainwindow.cpp \
     igramarea.cpp \
     circleoutline.cpp \
-    gplus.cpp \
     graphicsutilities.cpp \
     dfttools.cpp \
     dftarea.cpp \
@@ -160,7 +159,6 @@ HEADERS  += mainwindow.h \
     edgeplot.h \
     IgramArea.h \
     circleoutline.h \
-    gplus.h \
     graphicsutilities.h \
     dfttools.h \
     dftarea.h \
@@ -243,7 +241,6 @@ HEADERS  += mainwindow.h \
     unwraperrorsview.h \
     lensdialog.h \
     messagereceiver.h \
-    boundary.h \
     myutils.h \
     pixelstats.h \
     utils.h \

DFTFringe_QT5.pro

@@ -180,7 +180,6 @@ SOURCES += SingleApplication/singleapplication.cpp \
     filteroutlinesdlg.cpp \
     foucaultview.cpp \
     generatetargetdlg.cpp \
-    gplus.cpp \
     graphicsutilities.cpp \
     helpdlg.cpp \
     hotkeysdlg.cpp \
@@ -281,7 +280,6 @@ HEADERS += bezier/bezier.h \
     averagewavefrontfilesdlg.h \
     batchigramwizard.h \
     bathastigdlg.h \
-    boundary.h \
     camcalibrationreviewdlg.h \
     cameracalibwizard.h \
     camwizardpage1.h \
@@ -307,7 +305,6 @@ HEADERS += bezier/bezier.h \
     filteroutlinesdlg.h \
     foucaultview.h \
     generatetargetdlg.h \
-    gplus.h \
     graphicsutilities.h \
     helpdlg.h \
     hotkeysdlg.h \