Decks

ChangeLog.md

@@ -8,6 +8,7 @@ Changes since last release
   - TiGL is now able to approximate profile point lists. The user can define an index list refering to points that should still be interpolated [#1276](https://github.com/DLR-SC/tigl/issues/1276).
   - Add `Color` class and `setObjectsColor`/`setObjectsColorRGB` functions to the TiGLCreator scripting console to set object colors without needing a native QColor object ([#1222](https://github.com/DLR-SC/tigl/issues/1222))
   - CPACS Export: Choose more meaningful marker for mirrored objects uIDs [#1289](https://github.com/DLR-SC/tigl/issues/1289)
+  - Add fuselage decks
   - Add leading edge devices (LED) to TiGL and TiGLcreator [#1101](https://github.com/DLR-SC/tigl/issues/1101)
   - Always display the borders of the control surfaces on the wing
   - Add funtionality to add user-defined spotlights to the TiGLCreator ([#1245](https://github.com/DLR-SC/tigl/issues/1245))

TIGLCreator/filefilter.txt

@@ -0,0 +1,24 @@
+~ RULE_10_1_A_do_not_use_bufferoverflow_risky_function_for_unix
+~ RULE_10_1_B_do_not_use_bufferoverflow_risky_function_for_windows
+~ RULE_3_2_B_do_not_use_same_filename_more_than_once
+~ RULE_3_2_CD_do_not_use_special_characters_in_filename
+~ RULE_3_2_F_use_representitive_classname_for_cpp_filename
+~ RULE_3_2_H_do_not_use_uppercase_for_c_filename
+~ RULE_4_1_A_B_use_space_for_indentation
+~ RULE_4_1_B_indent_each_enum_item_in_enum_block
+~ RULE_4_1_B_locate_each_enum_item_in_seperate_line
+~ RULE_4_1_C_align_long_function_parameter_list
+~ RULE_4_1_E_align_conditions
+~ RULE_4_2_A_B_space_around_word
+~ RULE_4_5_A_brace_for_namespace_should_be_located_in_seperate_line
+~ RULE_4_5_A_braces_for_function_definition_should_be_located_in_seperate_line
+~ RULE_4_5_A_braces_for_type_definition_should_be_located_in_seperate_line
+~ RULE_4_5_A_braces_inside_of_function_should_be_located_in_end_of_line
+~ RULE_4_5_A_indent_blocks_inside_of_function
+~ RULE_4_5_B_use_braces_even_for_one_statement
+~ RULE_6_5_B_do_not_use_lowercase_for_macro_constants
+~ RULE_7_2_B_do_not_use_goto_statement
+~ RULE_8_1_A_provide_file_info_comment
+~ RULE_9_1_A_do_not_use_hardcorded_include_path
+~ RULE_9_2_D_use_reentrant_function
+~ RULE_A_3_avoid_too_deep_blocks

bindings/python_internal/configuration.i

@@ -157,7 +157,10 @@
 #include "generated/CPACSNacaProfile.h"
 #include "CTiglNACA4Calculator.h"
 #include "CPACSNacaProfile.h"
-
+#include "CCPACSDeck.h"
+#include "generated/CPACSDecks.h"
+#include "generated/CPACSCabinGeometryContour.h"
+#include "CCPACSDeckComponentBase.h"
 %}
 
 %feature("autodoc", "3");
@@ -216,6 +219,8 @@
 %boost_optional(tigl::CCPACSRotorProfiles)
 %boost_optional(tigl::CCPACSCurveParamPointMap)
 %boost_optional(tigl::CCPACSCurvePointListXYZ)
+%boost_optional(tigl::CTiglMassInertia)
+%boost_optional(tigl::CTiglPoint)
 
 // ---------------- Other ------------------------------//
 %boost_optional(tigl::CCPACSEtaIsoLine)
@@ -236,6 +241,11 @@
 %include "CCPACSMaterialDefinition.h"
 %include "generated/CPACSCap.h"
 
+%include "CTiglMassInertia.h"
+%include "CTiglPoint.h"
+
+%include "generated/CPACSDoubleVectorBase.h"
+
 // -------------- Fuselage Walls, Compartments -------------//
 %boost_optional(tigl::generated::CPACSCompartments)
 %include "generated/CPACSCompartments.h"
@@ -412,6 +422,61 @@ namespace tigl
 %include "CTiglAttachedRotorBlade.h"
 %include "CPACSRotorHubHinge_type.h"
 
+
+//  ---------------- Decks ------------------ //
+
+%boost_optional(tigl::CCPACSDecks)
+%boost_optional(tigl::CCPACSCabinGeometry)
+%boost_optional(tigl::CCPACSSeatModules)
+%boost_optional(tigl::CCPACSCabinAisles)
+%boost_optional(tigl::CCPACSCabinSpaces)
+%boost_optional(tigl::CCPACSSidewallPanels)
+%boost_optional(tigl::CCPACSLuggageCompartments)
+%boost_optional(tigl::CCPACSCeilingPanels)
+%boost_optional(tigl::CCPACSGalleys)
+%boost_optional(tigl::CCPACSGenericFloorModules)
+%boost_optional(tigl::CCPACSLavatories)
+%boost_optional(tigl::CCPACSClassDividers)
+%boost_optional(tigl::CCPACSCargoContainers)
+%boost_optional(tigl::CCPACSDeckDoors)
+
+%include "generated/CPACSDecks.h"
+
+%include "generated/CPACSCabinGeometryContour.h"
+%include "generated/CPACSCabinGeometryContours.h"
+%include "generated/CPACSCabinGeometry.h"
+%include "generated/CPACSDeck_deckType.h"
+
+%ignore tigl::generated::CPACSSeatModules::GetSeatModules;
+%ignore tigl::generated::CPACSCabinAisles::GetCabinAisles;
+%ignore tigl::generated::CPACSCabinSpaces::GetCabinSpaces;
+%ignore tigl::generated::CPACSSidewallPanels::GetSidewallPanels;
+%ignore tigl::generated::CPACSLuggageCompartments::GetLuggageCompartments;
+%ignore tigl::generated::CPACSCeilingPanels::GetCeilingPanels;
+%ignore tigl::generated::CPACSGalleys::GetGalleys;
+%ignore tigl::generated::CPACSGenericFloorModules::GetGenericFloorModules;
+%ignore tigl::generated::CPACSLavatories::GetLavatorys;
+%ignore tigl::generated::CPACSClassDividers::GetClassDividers;
+%ignore tigl::generated::CPACSCargoContainers::GetCargoContainers;
+%ignore tigl::generated::CPACSDeckDoors::GetDeckDoors;
+
+%include "generated/CPACSSeatModules.h"
+%include "generated/CPACSCabinAisles.h"
+%include "generated/CPACSCabinSpaces.h"
+%include "generated/CPACSSidewallPanels.h"
+%include "generated/CPACSLuggageCompartments.h"
+%include "generated/CPACSCeilingPanels.h"
+%include "generated/CPACSGalleys.h"
+%include "generated/CPACSGenericFloorModules.h"
+%include "generated/CPACSLavatories.h"
+%include "generated/CPACSClassDividers.h"
+%include "generated/CPACSCargoContainers.h"
+%include "generated/CPACSDeckDoors.h"
+%include "CCPACSDeckComponentBase.h"
+
+%include "generated/CPACSDeck.h"
+%include "CCPACSDeck.h"
+
 // --------------- Fuselage tanks -----------------//
 %boost_optional(tigl::generated::CPACSVessels)
 %boost_optional(tigl::CCPACSVessels)
@@ -653,7 +718,6 @@ class CCPACSSystemElements;
 %boost_optional(tigl::CCPACSSystemControlDevices)
 %boost_optional_enum(tigl::ECPACSSourceTarget_externalElement)
 
-%include "CTiglMassInertia.h"
 %include "generated/CPACSUIDSequence.h"
 %include "generated/CPACSComponent.h"
 %include "CCPACSComponent.h"
@@ -670,7 +734,6 @@ class CCPACSSystemElements;
 %include "CCPACSSystemConnection.h"
 %include "generated/CPACSSystemConnections.h"
 
-%include "CTiglPoint.h"
 %include "generated/CPACSComponents.h"
 %include "generated/CPACSGenericSystem.h"
 %include "CCPACSGenericSystem.h"
@@ -721,7 +784,9 @@ class CCPACSSystemElements;
          tigl::CCPACSDuctAssembly,
          tigl::CCPACSFuelTank,
          tigl::CCPACSVessel,
-         tigl::CCPACSComponent
+         tigl::CCPACSComponent,
+         tigl::CCPACSDeck,
+         tigl::CCPACSDeckComponentBase
 );
 
 namespace tigl

cpacs_gen_input/CustomTypes.txt

@@ -50,6 +50,10 @@ CPACSFuselageSections              CCPACSFuselageSections
 CPACSFuselageElement               CCPACSFuselageSectionElement
 CPACSFuselageElements              CCPACSFuselageSectionElements
 
+CPACSDeck                          CCPACSDeck
+CPACSDeckComponentBase             CCPACSDeckComponentBase
+CPACSDeckComponent2DBase           CCPACSDeckComponent2DBase
+
 CPACSComponentSegment              CCPACSWingComponentSegment
 CPACSComponentSegments             CCPACSWingComponentSegments
 CPACSWing                          CCPACSWing

cpacs_gen_input/PruneList.txt

@@ -44,7 +44,6 @@ CPACSControlLaws
 CPACSReference
 
 // in fuselage
-CPACSDecks
 CPACSFuselageCutOuts
 CPACSFuselageFuelTanks
 CPACSCenterFuselageAreasAssembly