From 6356459ab6e4dcfdf4467487bae01f88aedee84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= <benj5378@outlook.com>
Date: Sat, 16 Jul 2022 14:17:20 +0200
Subject: [PATCH] [TechDraw] Refactor CosmeticEdge constructors

Use constructor delegation and default parameters for CosmeticEdge
---
 src/Mod/TechDraw/App/Cosmetic.cpp | 75 +++++++++++--------------------
 src/Mod/TechDraw/App/Cosmetic.h   | 20 ++++++---
 2 files changed, 39 insertions(+), 56 deletions(-)

diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
index fc3df648ca..47d842b321 100644
--- a/src/Mod/TechDraw/App/Cosmetic.cpp
+++ b/src/Mod/TechDraw/App/Cosmetic.cpp
@@ -622,54 +622,15 @@ CenterLine::CenterLine(TechDraw::CenterLine* cl)
     initialize();
 }
 
-CenterLine::CenterLine(TechDraw::BaseGeomPtr bg)
-{
-    m_start = bg->getStartPoint();
-    m_end = bg->getEndPoint();
-    m_mode = CLMODE::VERTICAL;
-    m_hShift = 0.0;
-    m_vShift = 0.0;
-    m_rotate = 0.0;
-    m_extendBy = 0.0;
-    m_type = CLTYPE::FACE;
-    m_flip2Line = false;
-
-    m_geometry = bg;
-
-    initialize();
-}
-
-CenterLine::CenterLine(Base::Vector3d pt1, Base::Vector3d pt2)
-{
-    m_start = pt1;
-    m_end = pt2;
-    m_mode = CLMODE::VERTICAL;
-    m_hShift = 0.0;
-    m_vShift = 0.0;
-    m_rotate = 0.0;
-    m_extendBy = 0.0;
-    m_type = CLTYPE::FACE;
-    m_flip2Line = false;
-
-    Base::Vector3d p1 = DrawUtil::invertY(pt1);
-    Base::Vector3d p2 = DrawUtil::invertY(pt2);
-    gp_Pnt gp1(p1.x,p1.y,p1.z);
-    gp_Pnt gp2(p2.x,p2.y,p2.z);
-    TopoDS_Edge e = BRepBuilderAPI_MakeEdge(gp1, gp2);
-    m_geometry = TechDraw::BaseGeom::baseFactory(e);
-
-    initialize();
-}
-
-CenterLine::CenterLine(Base::Vector3d pt1, Base::Vector3d pt2,
+CenterLine::CenterLine(TechDraw::BaseGeomPtr bg,
                        int m, 
                        double h,
                        double v,
                        double r,
                        double x)
 {
-    m_start = pt1;
-    m_end = pt2;
+    m_start = bg->getStartPoint();
+    m_end = bg->getEndPoint();
     m_mode = m;
     m_hShift = h;
     m_vShift = v;
@@ -678,17 +639,21 @@ CenterLine::CenterLine(Base::Vector3d pt1, Base::Vector3d pt2,
     m_type = CLTYPE::FACE;
     m_flip2Line = false;
 
-    //not sure this is right?
-    Base::Vector3d p1 = DrawUtil::invertY(pt1);
-    Base::Vector3d p2 = DrawUtil::invertY(pt2);
-    gp_Pnt gp1(p1.x,p1.y,p1.z);
-    gp_Pnt gp2(p2.x,p2.y,p2.z);
-    TopoDS_Edge e = BRepBuilderAPI_MakeEdge(gp1, gp2);
-    m_geometry = TechDraw::BaseGeom::baseFactory(e);
+    m_geometry = bg;
 
     initialize();
 }
 
+CenterLine::CenterLine(Base::Vector3d pt1,
+                       Base::Vector3d pt2,
+                       int m,
+                       double h,
+                       double v,
+                       double r,
+                       double x) : CenterLine(BaseGeomPtrFromVectors(pt1, pt2), m, h, v, r, x)
+{
+}
+
 CenterLine::~CenterLine()
 {
 }
@@ -704,6 +669,18 @@ void CenterLine::initialize()
     m_geometry->setCosmeticTag(getTagAsString());
 }
 
+TechDraw::BaseGeomPtr CenterLine::BaseGeomPtrFromVectors(Base::Vector3d pt1, Base::Vector3d pt2)
+{
+    // Base::Console().Message("CE::CE(p1,p2)\n");
+    Base::Vector3d p1 = DrawUtil::invertY(pt1);
+    Base::Vector3d p2 = DrawUtil::invertY(pt2);
+    gp_Pnt gp1(p1.x,p1.y,p1.z);
+    gp_Pnt gp2(p2.x,p2.y,p2.z);
+    TopoDS_Edge e = BRepBuilderAPI_MakeEdge(gp1, gp2);
+    TechDraw::BaseGeomPtr bg = TechDraw::BaseGeom::baseFactory(e);
+    return bg;
+}
+
 CenterLine* CenterLine::CenterLineBuilder(DrawViewPart* partFeat, 
                                           std::vector<std::string> subNames, 
                                           int mode,
diff --git a/src/Mod/TechDraw/App/Cosmetic.h b/src/Mod/TechDraw/App/Cosmetic.h
index 0ed4cd73ca..401b9155b6 100644
--- a/src/Mod/TechDraw/App/Cosmetic.h
+++ b/src/Mod/TechDraw/App/Cosmetic.h
@@ -173,16 +173,22 @@ public:
     CenterLine();
     CenterLine(CenterLine* cl);
     //set m_faces after using next 3 ctors
-    CenterLine(TechDraw::BaseGeomPtr bg);
-    CenterLine(Base::Vector3d p1, Base::Vector3d p2);
+    CenterLine(TechDraw::BaseGeomPtr bg,
+               int m = CLMODE::VERTICAL, 
+               double h = 0.0,
+               double v = 0.0,
+               double r = 0.0,
+               double x = 0.0);
     CenterLine(Base::Vector3d p1, Base::Vector3d p2,
-               int m, 
-               double h,
-               double v,
-               double r,
-               double x);
+               int m = CLMODE::VERTICAL, 
+               double h = 0.0,
+               double v = 0.0,
+               double r = 0.0,
+               double x = 0.0);
     virtual ~CenterLine();
 
+    TechDraw::BaseGeomPtr BaseGeomPtrFromVectors(Base::Vector3d pt1, Base::Vector3d pt2);
+
     enum CLMODE {
         VERTICAL,
         HORIZONTAL,