Update TiGL to work with cpacs_tigl_gen Update

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "thirdparty/cpacs_gen"]
 	path = thirdparty/cpacs_gen
-	url = https://github.com/RISCSoftware/cpacs_tigl_gen.git
+	url = https://github.com/DLR_SC/cpacs_tigl_gen.git
 	branch = master
 	ignore = dirty

TIGLViewer/src/TIGLViewerDocument.cpp

@@ -88,6 +88,7 @@
 #include "CCPACSEnginePylon.h"
 #include "generated/CPACSTrailingEdgeDevices.h"
 #include "CCPACSTrailingEdgeDevice.h"
+#include "CCPACSFuselage.h"
 
 #define max(a,b) ((a) > (b) ? (a) : (b))
 
@@ -600,7 +601,7 @@ QString TIGLViewerDocument::dlgGetFuselageSelection()
     tigl::CCPACSConfiguration& config = GetConfiguration();
     int fuselageCount = config.GetFuselageCount();
     for (int i = 1; i <= fuselageCount; i++) {
-        tigl::CCPACSFuselage& fuselage = config.GetFuselage(i);
+        auto& fuselage = config.GetFuselage(i);
         std::string name = fuselage.GetUID();
         if (name.empty()) {
             name = "Unknown fuselage";
@@ -626,7 +627,7 @@ QString TIGLViewerDocument::dlgGetFuselageSegmentSelection()
     tigl::CCPACSConfiguration& config = GetConfiguration();
     int fuselageCount = config.GetFuselageCount();
     for (int i = 1; i <= fuselageCount; i++) {
-        tigl::CCPACSFuselage& fuselage = config.GetFuselage(i);
+        auto& fuselage = config.GetFuselage(i);
         for (int j = 1; j <= fuselage.GetSegmentCount(); ++j) {
             tigl::CCPACSFuselageSegment& segment = fuselage.GetSegment(j);
             std::string name = segment.GetUID();
@@ -874,7 +875,7 @@ void TIGLViewerDocument::drawFuselageGuideCurves()
     }
 
     START_COMMAND()
-    const tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
+    const auto& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
     const TopoDS_Compound& guideCurves = fuselage.GetSegments().GetGuideCurveWires();
 
     TopoDS_Iterator anIter(guideCurves);
@@ -1027,7 +1028,7 @@ void TIGLViewerDocument::drawFuselage()
     }
 
     START_COMMAND()
-    tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
+    auto& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
 
     app->getScene()->deleteAllObjects();
 
@@ -1059,7 +1060,7 @@ void TIGLViewerDocument::drawFuselageTriangulation()
     }
 
     START_COMMAND()
-    tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
+    auto& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
 
     //clear screen
     app->getScene()->deleteAllObjects();
@@ -1093,7 +1094,7 @@ void TIGLViewerDocument::drawFuselageSamplePoints()
     }
 
     START_COMMAND()
-    tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
+    auto& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
 
     for (int segmentIndex = 1; segmentIndex <= fuselage.GetSegmentCount(); segmentIndex++) {
 
@@ -1132,7 +1133,7 @@ void TIGLViewerDocument::drawFuselageSamplePointsAngle()
     double x, y, z;
 
     app->getScene()->deleteAllObjects();
-    tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageIndex);
+    auto& fuselage = GetConfiguration().GetFuselage(fuselageIndex);
 
     // Draw the fuselage
     for (int i = 1; i <= fuselage.GetSegmentCount(); i++) {
@@ -1199,7 +1200,7 @@ void TIGLViewerDocument::drawAllFuselagesAndWingsSurfacePoints()
 
     // Draw all fuselages
     for (int fuselageIndex = 1; fuselageIndex <= GetConfiguration().GetFuselageCount(); fuselageIndex++) {
-        tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageIndex);
+        auto& fuselage = GetConfiguration().GetFuselage(fuselageIndex);
 
         app->getScene()->displayShape(fuselage.GetLoft(), true, getDefaultShapeColor());
 
@@ -1749,7 +1750,7 @@ void TIGLViewerDocument::exportFuselageCurvesBRep()
     }
 
     START_COMMAND()
-    tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
+    auto& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
     QString baseName = QDir(std::string(dirname.toStdString() + "/" + fuselage.GetUID()).c_str()).absolutePath();
 
     TopoDS_Compound profiles;
@@ -1788,7 +1789,7 @@ void TIGLViewerDocument::drawFusedFuselage()
 
     START_COMMAND()
     app->getScene()->deleteAllObjects();
-    tigl::CCPACSFuselage& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
+    auto& fuselage = GetConfiguration().GetFuselage(fuselageUid.toStdString());
     app->getScene()->displayShape(fuselage.GetLoft(), true, getDefaultShapeColor());
 }
 

bindings/python_internal/CMakeLists.txt

@@ -17,6 +17,15 @@ if (TIGL_BINDINGS_PYTHON_INTERNAL)
     endif()
 
     include(tiglmacros)
+
+     # Ensure the correct Python version is picked up by specifying the Python_EXECUTABLE
+    if (DEFINED ENV{CONDA_PREFIX})
+        if (WIN32)
+            set(Python3_EXECUTABLE "$ENV{CONDA_PREFIX}/python.exe")
+        else()
+            set(Python3_EXECUTABLE "$ENV{CONDA_PREFIX}/bin/python")
+        endif()
+    endif()
 
     # Ensure the correct Python version is picked up by specifying the Python_EXECUTABLE
     if (DEFINED ENV{CONDA_PREFIX})

bindings/python_internal/configuration.i

@@ -34,6 +34,9 @@
 #include "CCPACSConfiguration.h"
 #include "CCPACSConfigurationManager.h"
 #include "CTiglFusePlane.h"
+#include "CCPACSFuselage.h"
+#include "generated/CPACSFuselageProfiles.h"
+#include "CCPACSFuselageProfiles.h"
 #include "CCPACSWingProfile.h"
 #include "generated/CPACSStandardProfile.h" //TODO: Replace with CCPACSStandardProfile, once it exists.
 #include "CCPACSFuselageSection.h"
@@ -81,7 +84,7 @@
 #include "generated/CPACSTrailingEdgeDevice.h"
 #include "CTiglControlSurfaceTransformation.h"
 #include "CCPACSTrailingEdgeDevice.h"
-#include "CCPACSEnginePylons.h"
+#include "generated/CPACSTrailingEdgeDevices.h"
 #include "CCPACSEnginePylon.h"
 #include "CCPACSEnginePosition.h"
 #include "generated/CPACSLateralCap_placement.h"
@@ -100,6 +103,17 @@
 #include "CCPACSDucts.h"
 #include "CCPACSDuctAssembly.h"
 #include "CCPACSDuct.h"
+#include "CCPACSNacelleSections.h"
+#include "CCPACSRotationCurve.h"
+#include "CCPACSNacelleCenterCowl.h"
+#include "generated/CPACSNacelleCowl.h"
+#include "CCPACSNacelleCowl.h"
+#include "generated/CPACSEngine.h"
+#include "generated/CPACSEngineNacelle.h"
+#include "generated/CPACSNacelleGuideCurves.h"
+#include "CCPACSNacelleGuideCurves.h"
+#include "CCPACSPositionings.h"
+#include "generated/CPACSProfiles.h"
 #include "generated/CPACSFuelTanks.h"
 #include "generated/CPACSFuelTank.h"
 #include "generated/CPACSFuelTankVolume.h"
@@ -112,6 +126,7 @@
 #include "generated/CPACSVesselStructure.h"
 #include "CCPACSVesselStructure.h"
 #include "CCPACSFrame.h"
+
 %}
 
 %feature("autodoc", "3");
@@ -159,10 +174,10 @@
 %boost_optional(tigl::CCPACSWingCells)
 %boost_optional(tigl::generated::CPACSAlignmentCrossBeam)
 %boost_optional(tigl::generated::CPACSDoorAssemblyPosition_doorType)
-%boost_optional(tigl::CCPACSWingSections)
+%boost_optional(tigl::generated::CPACSWingSections)
 %boost_optional(tigl::CCPACSWingSegments)
 %boost_optional(tigl::CCPACSPositionings)
-%boost_optional(tigl::CCPACSEnginePylons)
+%boost_optional(tigl::generated::CPACSEnginePylons)
 %boost_optional(tigl::CCPACSWingProfiles)
 %boost_optional(tigl::CCPACSFuselageProfiles)
 %boost_optional(tigl::CCPACSRotorProfiles)
@@ -213,7 +228,7 @@
 %include "CCPACSWallSegment.h"
 
 // ----------------- Engines ---------------------------//
-%boost_optional(tigl::CCPACSEngines)
+%boost_optional(tigl::generated::CPACSEngines)
 %boost_optional(tigl::generated::CPACSEngineNacelle)
 %boost_optional(tigl::CCPACSNacelleCowl)
 %boost_optional(tigl::CCPACSNacelleCenterCowl)
@@ -238,7 +253,6 @@ namespace tigl {
 %include "CCPACSNacelleCowl.h"
 %include "generated/CPACSEngine.h"
 %include "generated/CPACSEngines.h"
-%include "CCPACSEngines.h"
 
 // ---------------- Control surfaces ------------------ //
 %boost_optional(tigl::generated::CPACSControlSurfaceTrackType_trackSubType)
@@ -256,7 +270,7 @@ namespace tigl {
 %boost_optional(tigl::generated::CPACSLeadingEdgeHollow)
 %boost_optional(tigl::generated::CPACSCutOutControlPoints)
 %boost_optional(tigl::generated::CPACSControlSurfaceSkinCutOutBorder)
-%boost_optional(tigl::CCPACSTrailingEdgeDevices)
+%boost_optional(tigl::generated::CPACSTrailingEdgeDevices)
 %boost_optional(tigl::CCPACSControlSurfaces)
 %boost_optional(tigl::CPACSControlSurfaceWingCutOut)
 %boost_optional(tigl::generated::CPACSControlSurfaceTracks)
@@ -303,7 +317,6 @@ namespace tigl
 %ignore ComponentSegment(CCPACSTrailingEdgeDevice&);
 %include "CCPACSTrailingEdgeDevice.h"
 %include "generated/CPACSTrailingEdgeDevices.h"
-%include "CCPACSTrailingEdgeDevices.h"
 %include "generated/CPACSControlSurfaces.h"
 %include "CCPACSControlSurfaces.h"
 
@@ -482,9 +495,7 @@ class CCPACSWingRibsPositioning;
 %include "generated/CPACSFuselageSection.h"
 %include "CCPACSFuselageSection.h"
 %include "generated/CPACSWingSections.h"
-%include "CCPACSWingSections.h"
 %include "generated/CPACSFuselageSections.h"
-%include "CCPACSFuselageSections.h"
 %include "generated/CPACSWingElements.h"
 %include "CCPACSWingSectionElements.h"
 %include "generated/CPACSFuselageElements.h"
@@ -525,11 +536,9 @@ class CCPACSWingRibsPositioning;
 %include "generated/CPACSRotors.h"
 %include "CCPACSRotors.h"
 %include "generated/CPACSFuselageProfiles.h"
-%include "CCPACSFuselageProfiles.h"
 %include "generated/CPACSFuselage.h"
 %include "CCPACSFuselage.h"
 %include "generated/CPACSFuselages.h"
-%include "CCPACSFuselages.h"
 %include "TiglFarFieldType.h"
 %include "generated/CPACSCellPositioningSpanwise.h"
 %include "generated/CPACSCellPositioningChordwise.h"
@@ -553,7 +562,6 @@ class CCPACSWingRibsPositioning;
 %include "generated/CPACSEnginePylon.h"
 %include "CCPACSEnginePylon.h"
 %include "generated/CPACSEnginePylons.h"
-%include "CCPACSEnginePylons.h"
 
 //  ---------------- Ducts ------------------ //
 

cpacs_gen_input/CustomTypes.txt

@@ -10,13 +10,11 @@ CPACSRotorHub_type                 TiglRotorHubType
 // classes
 CPACSAircraftModel                 CCPACSAircraftModel
 CPACSRotorcraftModel               CCPACSRotorcraftModel
-CPACSProfiles                      CCPACSProfiles
 CPACSMaterialDefinition            CCPACSMaterialDefinition
 CPACSFarField                      CCPACSFarField
 CPACSGuideCurve                    CCPACSGuideCurve
 CPACSGuideCurves                   CCPACSGuideCurves
 CPACSGuideCurveProfileGeometry     CCPACSGuideCurveProfile
-CPACSGuideCurveProfiles            CCPACSGuideCurveProfiles
 CPACSPositioning                   CCPACSPositioning
 CPACSPositionings                  CCPACSPositionings
 CPACSPoint                         CCPACSPoint
@@ -39,12 +37,10 @@ CPACSGenericSystems                CCPACSGenericSystems
 CPACSGenericSystem                 CCPACSGenericSystem
 
 CPACSFuselage                      CCPACSFuselage
-CPACSFuselages                     CCPACSFuselages
 CPACSFuselageProfiles              CCPACSFuselageProfiles
 CPACSFuselageSegment               CCPACSFuselageSegment
 CPACSFuselageSegments              CCPACSFuselageSegments
 CPACSFuselageSection               CCPACSFuselageSection
-CPACSFuselageSections              CCPACSFuselageSections
 CPACSFuselageElement               CCPACSFuselageSectionElement
 CPACSFuselageElements              CCPACSFuselageSectionElements
 
@@ -64,7 +60,6 @@ CPACSWingRibsPositioning           CCPACSWingRibsPositioning
 CPACSWingElement                   CCPACSWingSectionElement
 CPACSWingElements                  CCPACSWingSectionElements
 CPACSWingSection                   CCPACSWingSection
-CPACSWingSections                  CCPACSWingSections
 CPACSWingComponentSegmentStructure CCPACSWingCSStructure
 CPACSWingShell                     CCPACSWingShell
 CPACSWingSegment                   CCPACSWingSegment
@@ -92,14 +87,11 @@ CPACSRotorHubHinges                CCPACSRotorHinges
 
 // fuselage structure
 CPACSDoorAssemblyPosition                 CCPACSDoorAssemblyPosition
-CPACSDoors                                CCPACSDoors
 CPACSPressureBulkhead                     CCPACSPressureBulkhead
 CPACSPressureBulkheadAssembly             CCPACSPressureBulkheadAssembly
 CPACSPressureBulkheadAssemblyPosition     CCPACSPressureBulkheadAssemblyPosition
-CPACSPressureBulkheads                    CCPACSPressureBulkheads
 CPACSProfileBasedStructuralElement        CCPACSProfileBasedStructuralElement
 CPACSSheetList                            CCPACSSheetList
-CPACSStructuralProfiles                   CCPACSStructuralProfiles
 CPACSCrossBeamAssemblyPosition            CCPACSCrossBeamAssemblyPosition
 CPACSCargoCrossBeamsAssembly              CCPACSCargoCrossBeamsAssembly
 CPACSCrossBeamStrutAssemblyPosition       CCPACSCrossBeamStrutAssemblyPosition
@@ -123,19 +115,16 @@ CPACSWalls                                CCPACSWalls
 // control surfaces
 CPACSControlSurfaces                      CCPACSControlSurfaces
 CPACSControlSurfaceBorderTrailingEdge     CCPACSControlSurfaceBorderTrailingEdge
-CPACSTrailingEdgeDevices                  CCPACSTrailingEdgeDevices
 CPACSTrailingEdgeDevice                   CCPACSTrailingEdgeDevice
 CPACSControlSurfaceOuterShapeTrailingEdge CCPACSControlSurfaceOuterShapeTrailingEdge
 CPACSControlSurfaceWingCutOut             CCPACSControlSurfaceWingCutOut
 
 // Pylons
 CPACSEnginePylon                         CCPACSEnginePylon
-CPACSEnginePylons                        CCPACSEnginePylons
 
 // Engines
 CPACSEnginePositions                     CCPACSEnginePositions
 CPACSEnginePosition                      CCPACSEnginePosition
-CPACSEngines                             CCPACSEngines
 CPACSNacelleCowl                         CCPACSNacelleCowl
 CPACSNacelleSections                     CCPACSNacelleSections
 CPACSNacelleSection                      CCPACSNacelleSection
@@ -152,7 +141,5 @@ CPACSDucts                               CCPACSDucts
 
 // Tanks
 CPACSVessel                              CCPACSVessel
-CPACSVessels                             CCPACSVessels
 CPACSFuelTank                            CCPACSFuelTank
-CPACSFuelTanks                           CCPACSFuelTanks
-CPACSVesselStructure                     CCPACSVesselStructure
+CPACSVesselStructure                     CCPACSVesselStructure

src/CCPACSPositionings.cpp

@@ -73,22 +73,6 @@ CTiglTransformation CCPACSPositionings::GetPositioningTransformation(const std::
     return CTiglTransformation();
 }
 
-int CCPACSPositionings::GetPositioningCount() const
-{
-    return CPACSPositionings::m_positionings.size();
-}
-
-CCPACSPositioning& CCPACSPositionings::GetPositioning(int index)
-{
-    {
-        index --;
-        if (index < 0 || index >= GetPositioningCount()) {
-            throw CTiglError("Invalid index in CCPACSPositionings::GetPositioning", TIGL_INDEX_ERROR);
-        }
-        return *m_positionings[index];
-    }
-}
-
 namespace
 {
 void UpdateNextPositioning(CCPACSPositioning* currPos, int depth)

src/CCPACSPositionings.h

@@ -60,19 +60,6 @@ class CCPACSPositionings : public generated::CPACSPositionings
      */
     TIGL_EXPORT CTiglTransformation GetPositioningTransformation(const std::string& sectionIndex);
 
-    /**
-     * @brief GetPositioningCount returns the total count of positionings in a configuration per element (e.g. wing)
-     * @return int Return total count of positionings
-     */
-    TIGL_EXPORT int GetPositioningCount() const;
-
-    /**
-     * @brief GetPositioning
-     * @param index Note that index starts at 1
-     * @return Returns CCPACSPositioning& by index
-     */
-    TIGL_EXPORT CCPACSPositioning& GetPositioning(int index);
-
     // Cleanup routine
     TIGL_EXPORT void Cleanup();
 

src/api/tigl.cpp

@@ -35,6 +35,7 @@
 #include "CCPACSConfiguration.h"
 #include "CCPACSConfigurationManager.h"
 #include "CTiglUIDManager.h"
+#include "CCPACSFuselage.h"
 #include "CCPACSWing.h"
 #include "CCPACSWingSection.h"
 #include "CCPACSWingSegment.h"