Refactor the abstract class CreateConnectedElementI

TIGLViewer/src/ModificatorContainerWidget.cpp

@@ -137,10 +137,10 @@ void ModificatorContainerWidget::setSectionModificator(QList<tigl::CTiglSectionE
 }
 
 
-void ModificatorContainerWidget::setSectionsModificator(tigl::CreateConnectedElementI& element)
-{
+void ModificatorContainerWidget::setSectionsModificator(Ui::ElementModificatorInterface& element)
+ {
     hideAllSpecializedWidgets();
-    ui->sectionsModificator->setCreateConnectedElementI(element);
+    ui->sectionsModificator->setCreateConnectedElement(element);
     ui->sectionsModificator->setVisible(true);
     currentModificator = ui->sectionModificator;
 }

TIGLViewer/src/ModificatorContainerWidget.h

@@ -24,6 +24,7 @@
 #include "modificators/ModificatorWingWidget.h"
 #include "modificators/ModificatorFuselageWidget.h"
 #include "modificators/ModificatorTransformationWidget.h"
+#include "modificators/ModificatorSectionsWidget.h"
 #include "CCPACSFuselages.h"
 #include "CPACSWing.h"
 #include "CCPACSWings.h"
@@ -78,7 +79,7 @@ public slots:
     void setFuselagesModificator(tigl::CCPACSFuselages& fuselages);
     void setElementModificator(tigl::CTiglSectionElement& element);
     void setSectionModificator(QList<tigl::CTiglSectionElement*> elements);
-    void setSectionsModificator(tigl::CreateConnectedElementI& conntedElementI);
+    void setSectionsModificator(Ui::ElementModificatorInterface& conntedElementI);
     // for positioning, we need two different calls for wing and for fuselage. Otherwise, we miss to invalidate the
     // associated wing or fuselage
     void setPositioningModificator(tigl::CCPACSWing& wing, tigl::CCPACSPositioning& positioning);

TIGLViewer/src/ModificatorManager.cpp

@@ -24,7 +24,6 @@
 #include "CTiglSectionElement.h"
 #include "CCPACSFuselageSection.h"
 #include "CCPACSWingSection.h"
-#include "CreateConnectedElementI.h"
 #include "CCPACSPositioning.h"
 #include "CTiglStandardizer.h"
 #include "TIGLViewerContext.h"
@@ -150,21 +149,17 @@ void ModificatorManager::dispatch(cpcr::CPACSTreeItem* item)
         std::string bodyUID = item->getParent()->getUid(); // return the fuselage or wing uid
         tigl::CTiglUIDManager& uidManager = doc->GetConfiguration().GetUIDManager();
         tigl::CTiglUIDManager::TypedPtr typePtr = uidManager.ResolveObject(bodyUID);
-        tigl::CreateConnectedElementI * elementI = nullptr;
 
-        if (typePtr.type == &typeid(tigl::CCPACSWing)) {
-            tigl::CCPACSWing &wing = *reinterpret_cast<tigl::CCPACSWing *>(typePtr.ptr);
-            elementI = dynamic_cast<tigl::CreateConnectedElementI* >(&wing);
-        }
-        else if (typePtr.type == &typeid(tigl::CCPACSFuselage)) {
-            tigl::CCPACSFuselage &fuselage = *reinterpret_cast<tigl::CCPACSFuselage *>(typePtr.ptr);
-            elementI = dynamic_cast<tigl::CreateConnectedElementI* >(&fuselage);
+        Ui::ElementModificatorInterface* element;
+        try {
+            element = reinterpret_cast<Ui::ElementModificatorInterface* >(typePtr.ptr);
         }
-        else {
+        catch (...) {
+            element = nullptr;
             LOG(ERROR) << "ModificatorManager:: Unexpected sections type!";
         }
 
-        modificatorContainerWidget->setSectionsModificator(*elementI);
+        modificatorContainerWidget->setSectionsModificator(*element);
     }
     else if (item->getType() == "positioning" ) {
         tigl::CTiglUIDManager& uidManager = doc->GetConfiguration().GetUIDManager();

TIGLViewer/src/modificators/ModificatorSectionsWidget.cpp

@@ -30,7 +30,7 @@ ModificatorSectionsWidget::ModificatorSectionsWidget(QWidget* parent)
     , ui(new Ui::ModificatorSectionsWidget)
 {
     ui->setupUi(this);
-    createConnectedElementI = nullptr;
+    createConnectedElement = nullptr;
     connect(ui->addConnectedElementBtn, SIGNAL(pressed()), this, SLOT(execNewConnectedElementDialog()));
     connect(ui->deleteConnectedElementBtn, SIGNAL(pressed()), this, SLOT(execDeleteConnectedElementDialog()));
 }
@@ -40,19 +40,27 @@ ModificatorSectionsWidget::~ModificatorSectionsWidget()
     delete ui;
 }
 
-void ModificatorSectionsWidget::setCreateConnectedElementI(tigl::CreateConnectedElementI& elementI)
+void ModificatorSectionsWidget::setCreateConnectedElement(Ui::ElementModificatorInterface& element)
 {
-    createConnectedElementI = &elementI;
+    createConnectedElement = &element;
 }
 
 void ModificatorSectionsWidget::execNewConnectedElementDialog()
 {
-    if (createConnectedElementI == nullptr) {
+    if (createConnectedElement == nullptr) {
         LOG(ERROR) << "ModificatorSectionsWidget:: is not correctly set!";
         return;
     }
 
-    std::vector<std::string> elementUIDs = createConnectedElementI->GetOrderedConnectedElement();
+    std::vector<std::string> elementUIDs;
+    // Construction to 'unwrap' the std::variant createConnectedElement and apply the defined function from the correct class (which is part of the std::variant)
+    std::visit(
+        [&elementUIDs](auto& element){
+            elementUIDs = element.GetOrderedConnectedElement();
+        },
+        *createConnectedElement
+    );
+
     QStringList elementUIDsQList;
     for (int i = 0; i < elementUIDs.size(); i++) {
         elementUIDsQList.push_back(elementUIDs.at(i).c_str());
@@ -64,10 +72,22 @@ void ModificatorSectionsWidget::execNewConnectedElementDialog()
         NewConnectedElementDialog::Where where = newElementDialog.getWhere();
         try {
             if (where == NewConnectedElementDialog::Before) {
-                createConnectedElementI->CreateNewConnectedElementBefore(startUID);
+                // Construction to 'unwrap' the std::variant createConnectedElement and apply the defined function from the correct class (which is part of the std::variant)
+                std::visit(
+                    [startUID](auto& element){
+                        element.CreateNewConnectedElementBefore(startUID);
+                    },
+                    *createConnectedElement
+                );
             }
             else if (where == NewConnectedElementDialog::After) {
-                createConnectedElementI->CreateNewConnectedElementAfter(startUID);
+                // Construction to 'unwrap' the std::variant createConnectedElement and apply the defined function from the correct class (which is part of the std::variant)
+                std::visit(
+                    [startUID](auto& element){
+                        element.CreateNewConnectedElementAfter(startUID);
+                    },
+                    *createConnectedElement
+                );
             }
         }
         catch (const tigl::CTiglError& err) {
@@ -87,12 +107,20 @@ void ModificatorSectionsWidget::execNewConnectedElementDialog()
 void ModificatorSectionsWidget::execDeleteConnectedElementDialog()
 {
 
-    if (createConnectedElementI == nullptr) {
+    if (createConnectedElement == nullptr) {
         LOG(ERROR) << "ModificatorWingsWidget::execDeleteWingDialog: wings is not set!";
         return;
     }
 
-    std::vector<std::string> elementUIDs = createConnectedElementI->GetOrderedConnectedElement();
+    std::vector<std::string> elementUIDs;
+    // Construction to 'unwrap' the std::variant createConnectedElement and apply the defined function from the correct class (which is part of the std::variant)
+    std::visit(
+        [&elementUIDs](auto& element){
+           elementUIDs = element.GetOrderedConnectedElement();
+        },
+        *createConnectedElement
+    );
+
     QStringList elementUIDsQList;
     for (int i = 0; i < elementUIDs.size(); i++) {
         elementUIDsQList.push_back(elementUIDs.at(i).c_str());
@@ -102,7 +130,13 @@ void ModificatorSectionsWidget::execDeleteConnectedElementDialog()
     if (deleteDialog.exec() == QDialog::Accepted) {
         QString uid = deleteDialog.getUIDToDelete();
         try {
-            createConnectedElementI->DeleteConnectedElement(uid.toStdString());
+            // Construction to 'unwrap' the std::variant createConnectedElement and apply the defined function from the correct class (which is part of the std::variant)
+            std::visit(
+                [uid](auto& element){
+                    element.DeleteConnectedElement(uid.toStdString());
+                },
+                *createConnectedElement
+            );
         }
         catch (const tigl::CTiglError& err) {
             TIGLViewerErrorDialog errDialog(this);

TIGLViewer/src/modificators/ModificatorSectionsWidget.h

@@ -20,10 +20,13 @@
 #define MODIFICATORSECTIONSWIDGET_H
 
 #include <QWidget>
-#include "CreateConnectedElementI.h"
+#include <variant>
+#include "CCPACSFuselage.h"
+#include "CCPACSWing.h"
 
 namespace Ui
 {
+using ElementModificatorInterface = std::variant<tigl::CCPACSFuselage, tigl::CCPACSWing>; // could be extended by Duct, Pylon, Tank in the future
 class ModificatorSectionsWidget;
 }
 
@@ -42,11 +45,13 @@ public slots:
     explicit ModificatorSectionsWidget(QWidget* parent = nullptr);
     ~ModificatorSectionsWidget();
 
-    void setCreateConnectedElementI(tigl::CreateConnectedElementI& elementI);
+    void setCreateConnectedElement(Ui::ElementModificatorInterface& element);
 
 private:
     Ui::ModificatorSectionsWidget* ui;
-    tigl::CreateConnectedElementI* createConnectedElementI;
+    // Defined as std::variant
+    // Construction is used to avoid an abstract basis class from which all possible variant types had to be inherited
+    Ui::ElementModificatorInterface* createConnectedElement;
 };
 
 #endif // MODIFICATORSECTIONSWIDGET_H

src/fuselage/CCPACSFuselage.h

@@ -35,7 +35,6 @@
 #include "CCPACSGuideCurve.h"
 #include "CTiglFuselageConnection.h"
 #include "Cache.h"
-#include "CreateConnectedElementI.h"
 
 #include "TopoDS_Shape.hxx"
 #include "TopoDS_Compound.hxx"
@@ -48,7 +47,7 @@ namespace tigl
 class CCPACSConfiguration;
 class CCPACSFuselageStringerFramePosition;
 
-class CCPACSFuselage : public generated::CPACSFuselage, public CTiglRelativelyPositionedComponent, public CreateConnectedElementI
+class CCPACSFuselage : public generated::CPACSFuselage, public CTiglRelativelyPositionedComponent
 {
 public:
     // Constructor
@@ -171,7 +170,7 @@ class CCPACSFuselage : public generated::CPACSFuselage, public CTiglRelativelyPo
      *
      * @param startElementUID
      */
-    TIGL_EXPORT void CreateNewConnectedElementAfter(std::string startElementUID) override;
+    TIGL_EXPORT void CreateNewConnectedElementAfter(std::string startElementUID);
 
     /**
      * Create a new section, a new element and connect the element to the "startElement".
@@ -181,20 +180,20 @@ class CCPACSFuselage : public generated::CPACSFuselage, public CTiglRelativelyPo
      *
      * @param startElementUID
      */
-    TIGL_EXPORT void CreateNewConnectedElementBefore(std::string startElementUID) override;
+    TIGL_EXPORT void CreateNewConnectedElementBefore(std::string startElementUID);
 
     /**
       *Create a new section, a new element and place the new element between the startElement and the endElement.
      * @remark The startElement and endElement must be connected by a segment.
      * @param startElementUID
      * @param endElementUID
      */
-    TIGL_EXPORT void CreateNewConnectedElementBetween(std::string startElementUID, std::string endElementUID) override;
+    TIGL_EXPORT void CreateNewConnectedElementBetween(std::string startElementUID, std::string endElementUID);
 
 
-    TIGL_EXPORT void DeleteConnectedElement(std::string elementUID) override;
+    TIGL_EXPORT void DeleteConnectedElement(std::string elementUID);
 
-    TIGL_EXPORT std::vector<std::string> GetOrderedConnectedElement() override;
+    TIGL_EXPORT std::vector<std::string> GetOrderedConnectedElement();
 
     TIGL_EXPORT std::vector<tigl::CTiglSectionElement*> GetCTiglElements() ;
 

src/wing/CCPACSWing.h

@@ -35,7 +35,6 @@
 #include "CTiglAbstractSegment.h"
 #include "CCPACSGuideCurve.h"
 #include "Cache.h"
-#include "CreateConnectedElementI.h"
 
 #include "TopoDS_Shape.hxx"
 #include "TopoDS_Compound.hxx"
@@ -47,7 +46,7 @@ namespace tigl
 {
 class CCPACSConfiguration;
 
-class CCPACSWing : public generated::CPACSWing, public CTiglRelativelyPositionedComponent, public CreateConnectedElementI
+class CCPACSWing : public generated::CPACSWing, public CTiglRelativelyPositionedComponent
 {
 friend class CTiglWingBuilder;
 
@@ -486,7 +485,7 @@ friend class CTiglWingBuilder;
      *
      * @param startElementUID
      */
-    TIGL_EXPORT void CreateNewConnectedElementAfter(std::string startElementUID) override;
+    TIGL_EXPORT void CreateNewConnectedElementAfter(std::string startElementUID);
 
     /**
      * Create a new section, a new element and connect the element to the "startElement".
@@ -496,15 +495,15 @@ friend class CTiglWingBuilder;
      *
      * @param startElementUID
      */
-    TIGL_EXPORT void CreateNewConnectedElementBefore(std::string startElementUID) override;
+    TIGL_EXPORT void CreateNewConnectedElementBefore(std::string startElementUID);
 
     /**
       *Create a new section, a new element and place the new element between the startElement and the endElement.
      * @remark The startElement and endElement must be connected by a segment.
      * @param startElementUID
      * @param endElementUID
      */
-    TIGL_EXPORT void CreateNewConnectedElementBetween(std::string startElementUID, std::string endElementUID) override;
+    TIGL_EXPORT void CreateNewConnectedElementBetween(std::string startElementUID, std::string endElementUID);
 
 
     /**
@@ -513,10 +512,10 @@ friend class CTiglWingBuilder;
      * are either deleted or updated.
      * @param ElementUID
      */
-    TIGL_EXPORT void DeleteConnectedElement(std::string ElementUID) override;
+    TIGL_EXPORT void DeleteConnectedElement(std::string ElementUID);
 
 
-    TIGL_EXPORT std::vector<std::string> GetOrderedConnectedElement() override;
+    TIGL_EXPORT std::vector<std::string> GetOrderedConnectedElement();
 
     TIGL_EXPORT  std::vector<CTiglSectionElement* > GetCTiglElements() const;