Generate Code for Ducts and adapt existing code base to it

.github/workflows/pull_request.yml

@@ -2,6 +2,7 @@ name: Pull Request CI workflow
 
 on:
   pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

cpacs_gen_input/CustomTypes.txt

@@ -114,6 +114,7 @@ CPACSFuselageStructure                    CCPACSFuselageStructure
 CPACSStringer                             CCPACSFuselageStringer
 CPACSPointXY                              CCPACSPointXY
 CPACSStringerFramePosition                CCPACSFuselageStringerFramePosition
+CPACSSkin                                 CCPACSSkin
 CPACSSkinSegment                          CCPACSSkinSegment
 CPACSWallSegment                          CCPACSFuselageWallSegment
 CPACSWallPosition                         CCPACSWallPosition
@@ -142,3 +143,7 @@ CPACSProfileGeometry2D                   CCPACSNacelleProfile
 CPACSNacelleGuideCurves                  CCPACSNacelleGuideCurves
 CPACSRotationCurve                       CCPACSRotationCurve
 CPACSNacelleCenterCowl                   CCPACSNacelleCenterCowl
+
+// Ducts
+CPACSDuct                                CCPACSDuct
+CPACSDuctStructure                       CCPACSDuctStructure

cpacs_gen_input/cpacs_schema.xsd

@@ -6,7 +6,7 @@ you may not use this file except in compliance with
 the License. You may obtain a copy of the License at
 
 http://www.apache.org/licenses/LICENSE-2.0
-
+f
 Unless required by applicable law or agreed to in writing,
 software distributed under the License is distributed on
 an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
@@ -2916,6 +2916,7 @@ marko.alder@dlr.de
                     <xsd:element minOccurs="0" name="engines" type="enginePositionsType"/>
                     <xsd:element minOccurs="0" name="enginePylons" type="enginePylonsType"/>
                     <xsd:element minOccurs="0" name="landingGear" type="landingGearType"/>
+                    <xsd:element minOccurs="0" name="ducts" type="ductsType"/>
                     <xsd:element minOccurs="0" name="systems" type="systemsType"/>
                     <xsd:element minOccurs="0" name="genericGeometryComponents" type="genericGeometryComponentsType"/>
                     <xsd:element minOccurs="0" name="global" type="aircraftGlobalType"/>
@@ -33083,5 +33084,102 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
         </xsd:complexContent>
     </xsd:complexType>
 
+    <xsd:complexType name="ductsType">
+        <xsd:annotation>
+            <xsd:appinfo>
+                <sd:schemaDoc>
+                    <ddue:summary>
+                        <ddue:para>Ducts</ddue:para>
+                    </ddue:summary>
+                </sd:schemaDoc>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="complexBaseType">
+                <xsd:sequence>
+                    <xsd:element name="duct" maxOccurs="unbounded" type="ductType"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ductType">
+        <xsd:annotation>
+            <xsd:appinfo>
+                <sd:schemaDoc>
+                    <ddue:summary>
+                        <ddue:para>Duct</ddue:para>
+                    </ddue:summary>
+                </sd:schemaDoc>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="complexBaseType">
+                <xsd:all>
+                    <xsd:element name="name" type="stringBaseType">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Name
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="description" type="stringBaseType">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Description
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element minOccurs="0" name="parentUID" type="stringUIDBaseType">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                UID of part to which the duct is
+                                mounted (if any)
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="transformation" type="transformationType"/>
+                    <xsd:element name="sections" type="fuselageSectionsType"/>
+                    <xsd:element name="positionings" minOccurs="0" type="positioningsType"/>
+                    <xsd:element name="segments" type="fuselageSegmentsType"/>
+                    <xsd:element minOccurs="0" name="structure" type="ductStructureType"/>
+                </xsd:all>
+                <xsd:attribute name="uID" type="xsd:ID" use="required"/>
+				<xsd:attribute name="symmetry">
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:string">
+                            <xsd:enumeration value="x-y-plane"/>
+                            <xsd:enumeration value="x-z-plane"/>
+                            <xsd:enumeration value="y-z-plane"/>
+                            <xsd:enumeration value="none"/>
+                            <xsd:enumeration value="inherit"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ductStructureType">
+        <xsd:annotation>
+            <xsd:appinfo>
+                <sd:schemaDoc>
+                    <ddue:summary>
+                        <ddue:para>Duct structure</ddue:para>
+                    </ddue:summary>
+                </sd:schemaDoc>
+            </xsd:appinfo>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="complexBaseType">
+                <xsd:all>
+                    <xsd:element minOccurs="0" name="skin" type="skinType"/>
+                    <xsd:element minOccurs="0" name="stringers" type="stringersAssemblyType"/>
+                    <xsd:element minOccurs="0" name="frames" type="framesAssemblyType"/>
+                </xsd:all>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
 </xsd:schema>
 

src/CCPACSPositionings.cpp

@@ -39,6 +39,11 @@ CCPACSPositionings::CCPACSPositionings(CCPACSFuselage* parent, CTiglUIDManager*
 {
 }
 
+CCPACSPositionings::CCPACSPositionings(CCPACSDuct* parent, CTiglUIDManager* uidMgr)
+    : generated::CPACSPositionings(parent, uidMgr), invalidated(true)
+{
+}
+
 CCPACSPositionings::CCPACSPositionings(CCPACSWing* parent, CTiglUIDManager* uidMgr)
     : generated::CPACSPositionings(parent, uidMgr), invalidated(true)
 {

src/CCPACSPositionings.h

@@ -44,6 +44,7 @@ class CCPACSPositionings : public generated::CPACSPositionings
     // Constructor
     TIGL_EXPORT CCPACSPositionings(CCPACSEnginePylon* parent, CTiglUIDManager* uidMgr);
     TIGL_EXPORT CCPACSPositionings(CCPACSFuselage* parent, CTiglUIDManager* uidMgr);
+    TIGL_EXPORT CCPACSPositionings(CCPACSDuct* parent, CTiglUIDManager* uidMgr);
     TIGL_EXPORT CCPACSPositionings(CCPACSWing* parent, CTiglUIDManager* uidMgr);
 
     // Virtual Destructor

src/Version.h

@@ -124,9 +124,9 @@ class Version
         auto results = std::match_results<std::string::const_iterator>();
 
         if (std::regex_search(str, results, expr)) {
-            m_major = atof(results[1].str().c_str());
-            m_minor = atof(results[2].str().c_str());
-            m_patch = atof(results[4].str().c_str());
+            m_major = (int)atof(results[1].str().c_str());
+            m_minor = (int)atof(results[2].str().c_str());
+            m_patch = (int)atof(results[4].str().c_str());
             m_label = results[5];
             m_build = results[6];
         }

src/api/tigl.cpp

@@ -2439,7 +2439,7 @@ TIGL_COMMON_EXPORT TiglReturnCode tiglGetControlSurfaceUID(TiglCPACSConfiguratio
         const auto& config = tigl::CCPACSConfigurationManager::GetInstance().GetConfiguration(cpacsHandle);
         const auto& uidMgr = config.GetUIDManager();
         const auto& compSeg = uidMgr.ResolveObject<tigl::CCPACSWingComponentSegment>(componentSegmentUID);
-        if (!compSeg.GetControlSurfaces() || controlSurfaceIndex > compSeg.GetControlSurfaces()->ControlSurfaceCount())
+        if (!compSeg.GetControlSurfaces() || controlSurfaceIndex > (int)compSeg.GetControlSurfaces()->ControlSurfaceCount())
             return TIGL_INDEX_ERROR;
 
         *controlSurfaceUID = const_cast<char*>(compSeg.GetControlSurfaces()->GetTrailingEdgeDevices() \
@@ -3757,7 +3757,12 @@ TIGL_COMMON_EXPORT TiglReturnCode tiglFuselageGetSegmentIndex(TiglCPACSConfigura
 
         const tigl::CCPACSFuselageSegment& segment = uidMgr.ResolveObject<tigl::CCPACSFuselageSegment>(segmentUID);
 
-        const auto& pfuselage  = segment.GetParent()->GetParent();
+        if (!segment.GetParent()->IsParent<tigl::CCPACSFuselage>()){
+            LOG(ERROR) << "Error in tiglFuselageGetSegmentIndex: The segment with given uid \"" << segmentUID << "\" is not part of a fuselage.";
+            return TIGL_NOT_FOUND;
+        }
+
+        const auto& pfuselage  = segment.GetParent()->GetParent<tigl::CCPACSFuselage>();
         const auto& pfuselages = pfuselage->GetParent();
 
         *fuselageIndex = static_cast<int>(IndexFromUid(pfuselages->GetFuselages(), pfuselage->GetUID())) + 1;

src/api/tigl.h

@@ -232,6 +232,7 @@ TIGL_COMPONENT_ENGINE_PYLON,     /**< The Component is a engine pylon */
 TIGL_COMPONENT_ENGINE_NACELLE,   /**< The Component is a engine nacelle */
 TIGL_COMPONENT_FUSELAGE_WALL,    /**< The Component is a fuselage wall */
 TIGL_COMPONENT_CONTROL_SURFACE_DEVICE, /**< The component is a control surface device (flap) */
+TIGL_COMPONENT_DUCT,              /**< The Component belongs to a duct */
 TIGL_COMPONENT_OTHER
 };
 
@@ -2622,7 +2623,9 @@ TIGL_COMMON_EXPORT TiglReturnCode tiglFuselageGetSegmentUID(TiglCPACSConfigurati
 *
 * @return
 *   - TIGL_SUCCESS if no error occurred
-*   - TIGL_NOT_FOUND if no configuration was found for the given handle
+*   - TIGL_NOT_FOUND if no configuration was found for the given handle, or if the segmentUID is not
+*                    part of any fuselage. This could be the case if the segment is part of a duct
+*                    for instance.
 *   - TIGL_INDEX_ERROR if fuselageIndex is not valid
 *   - TIGL_UID_ERROR if the segmentUID does not exist
 *   - TIGL_NULL_POINTER if segmentUID is a null pointer

src/ducts/CCPACSDuct.cpp

@@ -0,0 +1,57 @@
+/*
+* Copyright (C) 2007-2022 German Aerospace Center (DLR/SC)
+*
+* Created: 2022-03-15 Anton Reiswich <Anton.Reiswich@dlr.de>
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
+* @file
+* @brief  Implementation of CPACS duct handling routines.
+*/
+
+#include "CCPACSDuct.h"
+#include "generated/CPACSDucts.h"
+
+namespace tigl {
+
+CCPACSDuct::CCPACSDuct(CCPACSDucts* parent, CTiglUIDManager* uidMgr)
+  : generated::CPACSDuct(parent, uidMgr)
+  , CTiglRelativelyPositionedComponent(&m_parentUID, &m_transformation, &m_symmetry)
+{}
+
+CCPACSConfiguration& CCPACSDuct::GetConfiguration() const
+{
+    return GetParent()->GetParent()->GetConfiguration();
+}
+
+std::string CCPACSDuct::GetDefaultedUID() const
+{
+    return generated::CPACSDuct::GetUID();
+}
+
+TiglGeometricComponentType CCPACSDuct::GetComponentType() const
+{
+    return TIGL_COMPONENT_DUCT;
+}
+
+TiglGeometricComponentIntent CCPACSDuct::GetComponentIntent() const
+{
+    return TIGL_INTENT_LOGICAL;
+}
+
+PNamedShape CCPACSDuct::BuildLoft() const
+{
+    throw CTiglError("Not implemented yet");
+}
+
+} //namespace tigl

src/ducts/CCPACSDuct.h

@@ -0,0 +1,48 @@
+/*
+* Copyright (C) 2007-2022 German Aerospace Center (DLR/SC)
+*
+* Created: 2022-03-15 Anton Reiswich <Anton.Reiswich@dlr.de>
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
+* @file
+* @brief  Implementation of CPACS duct handling routines.
+*/
+
+#pragma once
+
+#include "generated/CPACSDuct.h"
+#include "CTiglRelativelyPositionedComponent.h"
+#include "CCPACSConfiguration.h"
+
+namespace tigl
+{
+
+class CCPACSDuct : public generated::CPACSDuct, public CTiglRelativelyPositionedComponent
+{
+public:
+
+    TIGL_EXPORT CCPACSDuct(CCPACSDucts* parent, CTiglUIDManager* uidMgr);
+
+    TIGL_EXPORT CCPACSConfiguration& GetConfiguration() const;
+
+    TIGL_EXPORT std::string GetDefaultedUID() const override;
+    // Returns the Component Type TIGL_COMPONENT_DUCT
+    TIGL_EXPORT TiglGeometricComponentType GetComponentType() const override;
+    TIGL_EXPORT TiglGeometricComponentIntent GetComponentIntent() const override;
+
+protected:
+    PNamedShape BuildLoft() const override;
+};
+
+}

src/ducts/CCPACSDuctStructure.cpp

@@ -0,0 +1,33 @@
+/*
+* Copyright (C) 2007-2022 German Aerospace Center (DLR/SC)
+*
+* Created: 2022-03-15 Anton Reiswich <Anton.Reiswich@dlr.de>
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
+* @file
+* @brief  Implementation of CPACS duct structure handling routines.
+*/
+
+#include "CCPACSDuctStructure.h"
+#include "CCPACSDuct.h"
+
+
+namespace tigl {
+
+CCPACSDuctStructure::CCPACSDuctStructure(CCPACSDuct* parent, CTiglUIDManager* uidMgr)
+  : generated::CPACSDuctStructure(parent, uidMgr)
+  , ITiglFuselageDuctStructure(parent)
+{}
+
+} //namespace tigl

src/ducts/CCPACSDuctStructure.h

@@ -0,0 +1,37 @@
+/*
+* Copyright (C) 2007-2022 German Aerospace Center (DLR/SC)
+*
+* Created: 2022-03-15 Anton Reiswich <Anton.Reiswich@dlr.de>
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+/**
+* @file
+* @brief  Implementation of CPACS duct structure handling routines.
+*/
+
+#pragma once
+
+#include "generated/CPACSDuctStructure.h"
+#include "CTiglRelativelyPositionedComponent.h"
+#include "ITiglFuselageDuctStructure.h"
+
+namespace tigl
+{
+
+class CCPACSDuctStructure : public generated::CPACSDuctStructure, public ITiglFuselageDuctStructure
+{
+public:
+    TIGL_EXPORT CCPACSDuctStructure(CCPACSDuct* parent, CTiglUIDManager* uidMgr);
+};
+
+} //namespace tigl