moved duct-cutting-logic including exclusion-list to CCPACSDucts

cpacs_gen_input/CustomTypes.txt

@@ -148,3 +148,4 @@ CPACSNacelleCenterCowl                   CCPACSNacelleCenterCowl
 CPACSDuct                                CCPACSDuct
 CPACSDuctStructure                       CCPACSDuctStructure
 CPACSDuctAssembly                        CCPACSDuctAssembly
+CPACSDucts                               CCPACSDucts

cpacs_gen_input/cpacs_schema.xsd

@@ -33164,7 +33164,7 @@ The fuel tank volume type should also be used for the wing fuel tank</xsd:docume
                         </xsd:annotation>
                     </xsd:element>
                     <xsd:element name="transformation" minOccurs="0" type="transformationType"/>
-                    <xsd:element name="excludeObjectUIs" minOccurs="0" type="uIDSequenceType"/>
+                    <xsd:element name="excludeObjectUIDs" minOccurs="0" type="uIDSequenceType"/>
                     <xsd:element name="duct" maxOccurs="unbounded" type="ductType"/>
                 </xsd:sequence>
                 <xsd:attribute name="uID" type="xsd:ID" use="required"/>

src/ducts/CCPACSDuctAssembly.cpp

@@ -135,26 +135,4 @@ PNamedShape CCPACSDuctAssembly::BuildLoft() const
 #endif
 }
 
-PNamedShape CCPACSDuctAssembly::LoftWithDuctCutouts(PNamedShape const& cleanLoft) const
-{
-    if (m_ducts.size() == 0) {
-        return cleanLoft;
-    }
-    auto loft = CCutShape(cleanLoft, GetLoft()).NamedShape();
-
-    // Mark the clean loft as parent, rather than the duct loft
-    for (int iFace = 0; iFace < static_cast<int>(loft->GetFaceCount()); ++iFace) {
-        CFaceTraits ft = loft->GetFaceTraits(iFace);
-        ft.SetOrigin(cleanLoft);
-        loft->SetFaceTraits(iFace, ft);
-    }
-
-#ifdef DEBUG
-    dumpShape(GetLoft()->Shape(), "debugShapes", "ductTool");
-    dumpShape(loft->Shape(), "debugShapes", "loftWithoutDucts");
-#endif
-
-    return loft;
-}
-
 } //namespace tigl

src/ducts/CCPACSDuctAssembly.h

@@ -35,9 +35,6 @@ class CCPACSDuctAssembly : public generated::CPACSDuctAssembly, public CTiglRela
 
     TIGL_EXPORT CCPACSDuctAssembly(CCPACSDucts* parent, CTiglUIDManager* uidMgr);
 
-    // Given an input loft, create a new loft where all ducts have been cut away.
-    TIGL_EXPORT PNamedShape LoftWithDuctCutouts(PNamedShape const&) const;
-
     TIGL_EXPORT std::string GetDefaultedUID() const override;
     TIGL_EXPORT TiglGeometricComponentType GetComponentType() const override;
     TIGL_EXPORT TiglGeometricComponentIntent GetComponentIntent() const override;

src/fuselage/CCPACSFuselage.cpp

@@ -261,17 +261,12 @@ PNamedShape CCPACSFuselage::BuildLoft() const
         return *cleanLoft;
     }
 
-    auto& ducts = GetConfiguration().GetDucts();
+    auto const & ducts = GetConfiguration().GetDucts();
     if (!ducts) {
         return *cleanLoft;
     }
 
-    PNamedShape result = *cleanLoft;
-    for (auto& ductAssembly: ducts->GetDuctAssemblys()) {
-        result = ductAssembly->LoftWithDuctCutouts(result);
-    }
-
-    return result;
+    return ducts->LoftWithDuctCutouts(*cleanLoft, GetUID());
 }
 
 void CCPACSFuselage::BuildCleanLoft(PNamedShape& cache) const