Merge pull request #1027 from DLR-SC/1013_update_cpacs_3_4

Update CPACS to version 3.4
DLR-SC · Oct 16, 2024 · e4b77e9 · e4b77e9
2 parents f6f1e4c + eb6f4ef
commit e4b77e9
Show file tree

Hide file tree

Showing 87 changed files with 14,057 additions and 3,004 deletions.
diff --git a/cpacs_gen_input/CustomTypes.txt b/cpacs_gen_input/CustomTypes.txt
@@ -2,7 +2,7 @@
 // maps generated types to actual tigl types
 
 // enums
-CPACSSymmetry                      TiglSymmetryAxis
+CPACSSymmetryXyXzYz                TiglSymmetryAxis
 CPACSPointAbsRelType_refType       ECPACSTranslationType
 CPACSFarField_type                 TiglFarFieldType
 CPACSRotorHub_type                 TiglRotorHubType

diff --git a/cpacs_gen_input/cpacs_schema.xsd b/cpacs_gen_input/cpacs_schema.xsd
diff --git a/cpacs_gen_input/cpacs_schema.xsd.orig b/cpacs_gen_input/cpacs_schema.xsd.orig
diff --git a/src/CCPACSPoint.cpp b/src/CCPACSPoint.cpp
@@ -36,7 +36,12 @@ CCPACSPoint::CCPACSPoint(CCPACSPointList* parent, CTiglUIDManager* uidMgr)
 {
 }
 
-CCPACSPoint::CCPACSPoint(CCPACSSeatModule* parent, CTiglUIDManager* uidMgr)
+CCPACSPoint::CCPACSPoint(CCPACSBoundingBox* parent, CTiglUIDManager* uidMgr)
+    : generated::CPACSPoint(parent, uidMgr)
+{
+}
+
+CCPACSPoint::CCPACSPoint(CCPACSDeckElementMass* parent, CTiglUIDManager* uidMgr)
     : generated::CPACSPoint(parent, uidMgr)
 {
 }

diff --git a/src/CCPACSPoint.h b/src/CCPACSPoint.h
@@ -27,7 +27,8 @@ class CCPACSPoint : public generated::CPACSPoint
     TIGL_EXPORT CCPACSPoint(CCPACSControlSurfaceStep* parent, CTiglUIDManager* uidMgr);
     TIGL_EXPORT CCPACSPoint(CCPACSControlSurfaceHingePoint* parent, CTiglUIDManager* uidMgr);
     TIGL_EXPORT CCPACSPoint(CCPACSPointList* parent, CTiglUIDManager* uidMgr);
-    TIGL_EXPORT CCPACSPoint(CCPACSSeatModule* parent, CTiglUIDManager* uidMgr);
+    TIGL_EXPORT CCPACSPoint(CCPACSBoundingBox* parent, CTiglUIDManager* uidMgr);
+    TIGL_EXPORT CCPACSPoint(CCPACSDeckElementMass* parent, CTiglUIDManager* uidMgr);
     TIGL_EXPORT CCPACSPoint(CCPACSTransformation* parent, CTiglUIDManager* uidMgr);
 
     TIGL_EXPORT CCPACSPoint(const CCPACSPoint& p);

diff --git a/src/generated/CPACSBoundingBox.cpp b/src/generated/CPACSBoundingBox.cpp
diff --git a/src/generated/CPACSBoundingBox.h b/src/generated/CPACSBoundingBox.h