From c43564782094216d2e14b025c952de167b3191c7 Mon Sep 17 00:00:00 2001 From: merakulix Date: Tue, 26 Nov 2024 13:52:55 +0100 Subject: [PATCH 1/3] add includes for CCPACSWalls --- bindings/python_internal/configuration.i | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bindings/python_internal/configuration.i b/bindings/python_internal/configuration.i index d7049d34a..b438b9e08 100644 --- a/bindings/python_internal/configuration.i +++ b/bindings/python_internal/configuration.i @@ -40,7 +40,9 @@ #include "CCPACSExternalObject.h" #include "CTiglShapeCache.h" #include "CTiglError.h" +#include "CCPACSWalls.h" #include "CCPACSWallPosition.h" +#include "CCPACSFuselageWallSegment.h" #include "CCPACSWingSegment.h" #include "CCPACSFuselageSegment.h" #include "CTiglWingConnection.h" @@ -87,6 +89,7 @@ #include "generated/CPACSBoundingElementUIDs.h" #include "generated/CPACSStructuralWallElement.h" #include "generated/CPACSStructuralWallElements.h" +#include "generated/CPACSWalls.h" #include "generated/CPACSWallPositionUIDs.h" #include "generated/CPACSWallPosition.h" #include "generated/CPACSWallPositions.h" @@ -177,7 +180,6 @@ %include "generated/CPACSLateralCap_placement.h" %boost_optional(tigl::generated::CPACSLateralCap) %include "generated/CPACSLateralCap.h" - %boost_optional(tigl::generated::CPACSBoundingElementUIDs) %include "generated/CPACSBoundingElementUIDs.h" %include "generated/CPACSStructuralWallElement.h" @@ -187,8 +189,14 @@ %include "generated/CPACSWallPositions.h" %include "generated/CPACSWallSegment.h" %include "generated/CPACSWallSegments.h" +%boost_optional(tigl::CCPACSWalls) %boost_optional(tigl::generated::CPACSWalls) +%boost_optional(tigl::CCPACSWallPosition) +%boost_optional(tigl::CCPACSFuselageWallSegment) %include "generated/CPACSWalls.h" +%include "CCPACSWalls.h" +%include "CCPACSWallPosition.h" +%include "CCPACSFuselageWallSegment.h" // ----------------- Engines ---------------------------// %boost_optional(tigl::CCPACSEngines) @@ -516,6 +524,7 @@ class CCPACSWingRibsPositioning; %factory(tigl::ITiglGeometricComponent& tigl::CTiglUIDManager::GetGeometricComponent, tigl::CCPACSFuselage, tigl::CCPACSFuselageSegment, + tigl::CCPACSFuselageWallSegment, tigl::CCPACSWing, tigl::CCPACSWingSegment, tigl::CCPACSWingComponentSegment, From 0c6165c47093a654daabf1c5fa3f96876ed7390c Mon Sep 17 00:00:00 2001 From: merakulix Date: Thu, 28 Nov 2024 10:16:20 +0100 Subject: [PATCH 2/3] add missing macros --- src/structural_elements/CCPACSFuselageWallSegment.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/structural_elements/CCPACSFuselageWallSegment.h b/src/structural_elements/CCPACSFuselageWallSegment.h index 9c0b6961c..8cf8bdbee 100644 --- a/src/structural_elements/CCPACSFuselageWallSegment.h +++ b/src/structural_elements/CCPACSFuselageWallSegment.h @@ -36,22 +36,22 @@ class CCPACSFuselageWallSegment : public generated::CPACSWallSegment, public CTi public: TIGL_EXPORT CCPACSFuselageWallSegment(CCPACSWallSegments* parent, CTiglUIDManager* uidMgr); - std::string GetDefaultedUID() const override + TIGL_EXPORT std::string GetDefaultedUID() const override { return GetUID().value_or("UnknownWallSegment"); } - TiglGeometricComponentIntent GetComponentIntent() const override + TIGL_EXPORT TiglGeometricComponentIntent GetComponentIntent() const override { return TIGL_INTENT_INNER_STRUCTURE | TIGL_INTENT_PHYSICAL; } - TiglGeometricComponentType GetComponentType() const override + TIGL_EXPORT TiglGeometricComponentType GetComponentType() const override { return TIGL_COMPONENT_FUSELAGE_WALL; } - TopoDS_Compound GetCutPlanes() const; + TIGL_EXPORT TopoDS_Compound GetCutPlanes() const; TIGL_EXPORT void SetPhi(const double& value) override; TIGL_EXPORT void SetDoubleSidedExtrusion(const boost::optional& value) override; From bc1edbfaff2bc4f6319ce506711acbd7a6ff3436 Mon Sep 17 00:00:00 2001 From: merakulix Date: Thu, 28 Nov 2024 11:00:22 +0100 Subject: [PATCH 3/3] add missing macros --- src/structural_elements/CCPACSWalls.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/structural_elements/CCPACSWalls.h b/src/structural_elements/CCPACSWalls.h index 8f685b579..533591776 100644 --- a/src/structural_elements/CCPACSWalls.h +++ b/src/structural_elements/CCPACSWalls.h @@ -32,12 +32,12 @@ namespace tigl class CCPACSWalls : public generated::CPACSWalls { public: - CCPACSWalls(CCPACSFuselageStructure* parent, CTiglUIDManager* uidMgr); + TIGL_EXPORT CCPACSWalls(CCPACSFuselageStructure* parent, CTiglUIDManager* uidMgr); - const CCPACSFuselageWallSegment& GetWallSegment(const std::string& uid) const; - const CCPACSWallPosition& GetWallPosition(const std::string& uid) const; + TIGL_EXPORT const CCPACSFuselageWallSegment& GetWallSegment(const std::string& uid) const; + TIGL_EXPORT const CCPACSWallPosition& GetWallPosition(const std::string& uid) const; - void Invalidate(const boost::optional& source = boost::none) const; + TIGL_EXPORT void Invalidate(const boost::optional& source = boost::none) const; }; } // namespace tigl