Skip to content

Commit

Permalink
Merge pull request #980 from DLR-SC/update-generated-classes
Browse files Browse the repository at this point in the history
Update generated classes
  • Loading branch information
joergbrech authored Dec 18, 2023
2 parents 900f64a + dad59d4 commit 6998865
Show file tree
Hide file tree
Showing 32 changed files with 408 additions and 835 deletions.
4 changes: 0 additions & 4 deletions bindings/python_internal/configuration.i
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
#include "generated/CPACSWallPositionUIDs.h"
#include "generated/CPACSWallPosition.h"
#include "generated/CPACSWallPositions.h"
#include "generated/CPACSWallSegment_phi.h"
#include "generated/CPACSWallSegment.h"
#include "generated/CPACSWallSegments.h"
#include "generated/CPACSUIDSequence.h"
Expand Down Expand Up @@ -130,7 +129,6 @@
%boost_optional(tigl::CCPACSWingRibsDefinitions)
%boost_optional(tigl::CCPACSWingSpars)
%boost_optional(tigl::generated::CPACSGuideCurve_continuity)
%boost_optional(tigl::CCPACSRectangleProfile_cornerRadius)
%boost_optional(tigl::CCPACSRectangleProfile)
%boost_optional(tigl::CCPACSStandardProfile)
%boost_optional(tigl::CCPACSWingProfileCST)
Expand Down Expand Up @@ -187,7 +185,6 @@
%include "generated/CPACSWallPositionUIDs.h"
%include "generated/CPACSWallPosition.h"
%include "generated/CPACSWallPositions.h"
%include "generated/CPACSWallSegment_phi.h"
%include "generated/CPACSWallSegment.h"
%include "generated/CPACSWallSegments.h"
%boost_optional(tigl::generated::CPACSWalls)
Expand Down Expand Up @@ -405,7 +402,6 @@ class CCPACSWingRibsPositioning;
%include "generated/CPACSCst2D.h"
%include "ITiglWingProfileAlgo.h"
%include "generated/CPACSPosExcl0DoubleBase.h"
%include "generated/CPACSRectangleProfile_cornerRadius.h"
%include "generated/CPACSRectangleProfile.h"
%include "generated/CPACSStandardProfile.h" //TODO: Need to replace with implementation CCPACSStandardProfile.h, once it exists.
%include "CCPACSWingProfileCST.h"
Expand Down
2 changes: 1 addition & 1 deletion cpacs_gen_input/cpacs_schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
f

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
Expand Down
2 changes: 1 addition & 1 deletion cpacs_gen_input/cpacs_schema.xsd.orig
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ [email protected]
</ddue:definition>
<ddue:definedTerm>Date</ddue:definedTerm>
<ddue:definition>
<ddue:para>2020-06-03</ddue:para>
<ddue:para>2020-11-27</ddue:para>
</ddue:definition>
</ddue:definitionTable>
<ddue:section>
Expand Down
4 changes: 2 additions & 2 deletions src/CCPACSStringVector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ CCPACSStringVector::CCPACSStringVector(CCPACSTrackJointPosition* parent)
void CCPACSStringVector::ReadCPACS(const TixiDocumentHandle& tixiHandle, const std::string& xpath)
{
generated::CPACSStringVectorBase::ReadCPACS(tixiHandle, xpath);
m_vec = stringToDoubleVec(m_simpleContent);
m_vec = stringToDoubleVec(m_value);
}

void CCPACSStringVector::WriteCPACS(const TixiDocumentHandle& tixiHandle, const std::string& xpath) const
{
const_cast<std::string&>(m_simpleContent) =
const_cast<std::string&>(m_value) =
vecToString(std::begin(m_vec), std::end(m_vec), sep); // TODO: this is a terrible hack, but WriteCPACS() has to be const
generated::CPACSStringVectorBase::WriteCPACS(tixiHandle, xpath);
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpacs_other/CCPACSExternalObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ void CCPACSExternalObject::ReadCPACS(const TixiDocumentHandle& tixiHandle, const

char* cCPACSPath = NULL;
tixiGetDocumentPath(tixiHandle, &cCPACSPath);
_filePath = getPathRelativeToApp(cCPACSPath ? cCPACSPath : "", m_linkToFile.GetSimpleContent());
_filePath = getPathRelativeToApp(cCPACSPath ? cCPACSPath : "", m_linkToFile.GetValue());

// test if file can be read
if (!IsFileReadable(_filePath)) {
Expand Down
28 changes: 5 additions & 23 deletions src/generated/CPACSCompartment.cpp

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

19 changes: 7 additions & 12 deletions src/generated/CPACSCompartment.h

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

103 changes: 0 additions & 103 deletions src/generated/CPACSCompartment_designVolume.cpp

This file was deleted.

72 changes: 0 additions & 72 deletions src/generated/CPACSCompartment_designVolume.h

This file was deleted.

14 changes: 7 additions & 7 deletions src/generated/CPACSDoubleConstraintBase.cpp

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

Loading

0 comments on commit 6998865

Please sign in to comment.