Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CPACS to version 3.4 #1027

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Update CPACS to version 3.4 #1027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e25b1e
Update CPACS to version 3.4
svengoldberg Oct 15, 2024
eb6f4ef
Use aliases within the CCPACSPoint constructor definition
svengoldberg Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpacs_gen_input/CustomTypes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4,292 changes: 3,082 additions & 1,210 deletions cpacs_gen_input/cpacs_schema.xsd
View file
Open in desktop

Large diffs are not rendered by default.

4,129 changes: 3,011 additions & 1,118 deletions cpacs_gen_input/cpacs_schema.xsd.orig
100644 → 100755
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions src/CCPACSPoint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,27 @@
namespace tigl
{

CCPACSPoint::CCPACSPoint(CCPACSControlSurfaceStep* parent, CTiglUIDManager* uidMgr)
CCPACSPoint::CCPACSPoint(generated::CPACSBoundingBox* parent, CTiglUIDManager* uidMgr)

Check warning on line 24 in src/CCPACSPoint.cpp

View check run for this annotation

Codecov / codecov/patch

src/CCPACSPoint.cpp#L24 

Added line #L24 was not covered by tests
: generated::CPACSPoint(parent, uidMgr)
{
}

CCPACSPoint::CCPACSPoint(CCPACSControlSurfaceHingePoint* parent, CTiglUIDManager* uidMgr)
CCPACSPoint::CCPACSPoint(generated::CPACSControlSurfaceHingePoint* parent, CTiglUIDManager* uidMgr)

Check warning on line 29 in src/CCPACSPoint.cpp

View check run for this annotation

Codecov / codecov/patch

src/CCPACSPoint.cpp#L29 

Added line #L29 was not covered by tests
: generated::CPACSPoint(parent, uidMgr)
{
}

CCPACSPoint::CCPACSPoint(CCPACSPointList* parent, CTiglUIDManager* uidMgr)
CCPACSPoint::CCPACSPoint(generated::CPACSControlSurfaceStep* parent, CTiglUIDManager* uidMgr)
: generated::CPACSPoint(parent, uidMgr)
{
}

CCPACSPoint::CCPACSPoint(CCPACSSeatModule* parent, CTiglUIDManager* uidMgr)
CCPACSPoint::CCPACSPoint(generated::CPACSDeckElementMass* parent, CTiglUIDManager* uidMgr)
: generated::CPACSPoint(parent, uidMgr)

Check warning on line 40 in src/CCPACSPoint.cpp

View check run for this annotation

Codecov / codecov/patch

src/CCPACSPoint.cpp#L39-L40 

Added lines #L39 - L40 were not covered by tests
{
}

CCPACSPoint::CCPACSPoint(generated::CPACSPointList* parent, CTiglUIDManager* uidMgr)

Check warning on line 44 in src/CCPACSPoint.cpp

View check run for this annotation

Codecov / codecov/patch

src/CCPACSPoint.cpp#L44 

Added line #L44 was not covered by tests
: generated::CPACSPoint(parent, uidMgr)
{
}
Expand Down
10 changes: 6 additions & 4 deletions src/CCPACSPoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ namespace tigl
class CCPACSPoint : public generated::CPACSPoint
{
public:
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(generated::CPACSBoundingBox* parent, CTiglUIDManager* uidMgr);
TIGL_EXPORT CCPACSPoint(generated::CPACSControlSurfaceHingePoint* parent, CTiglUIDManager* uidMgr);
TIGL_EXPORT CCPACSPoint(generated::CPACSControlSurfaceStep* parent, CTiglUIDManager* uidMgr);
TIGL_EXPORT CCPACSPoint(generated::CPACSDeckElementMass* parent, CTiglUIDManager* uidMgr);
TIGL_EXPORT CCPACSPoint(generated::CPACSPointList* parent, CTiglUIDManager* uidMgr);
joergbrech marked this conversation as resolved.
Show resolved Hide resolved
TIGL_EXPORT CCPACSPoint(CCPACSTransformation* parent, CTiglUIDManager* uidMgr);

TIGL_EXPORT CCPACSPoint(const CCPACSPoint& p);
Expand Down
206 changes: 206 additions & 0 deletions src/generated/CPACSBoundingBox.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

107 changes: 107 additions & 0 deletions src/generated/CPACSBoundingBox.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading