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.

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

Add CCPACSSkin to Python bindings #1041

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Changes since last release

- Fixes:
- In #1026, the tolerance for creating cells via contourCoordinate was reduced for cells in spanwise direction. That fixed a bug that caused cells to overlap potentially. The same reduction was missed in chordwise direction and is added now to avoid the cell overlap in chordwise direction, as well. (#1034)
- Added `CCPACSSkin` to python bindings (#1037).


Version 3.4.0
Expand Down
5 changes: 5 additions & 0 deletions bindings/python_internal/configuration.i
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
#include "CCPACSWingSparSegment.h"
#include "CCPACSWingRibsDefinition.h"
#include "CCPACSSkinSegment.h"
#include "CCPACSDuctStructure.h"
#include "CCPACSSkin.h"
#include "CTiglWingChordface.h"
#include "CCPACSCrossBeamAssemblyPosition.h"
#include "CCPACSCrossBeamStrutAssemblyPosition.h"
Expand Down Expand Up @@ -300,6 +302,9 @@ namespace tigl
%include "CTiglStringerFrameBorderedObject.h"
%include "generated/CPACSSkinSegment.h"
%include "CCPACSSkinSegment.h"
%boost_optional(tigl::CCPACSSkin)
%include "generated/CPACSSkin.h"
%include "CCPACSSkin.h"
%include "generated/CPACSCargoDoorsAssembly.h"
%include "generated/CPACSPressureBulkheadAssembly.h"
%include "CCPACSPressureBulkheadAssembly.h"
Expand Down
16 changes: 15 additions & 1 deletion src/fuselage/CTiglStringerFrameBorderedObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,21 @@
{
CTiglStringerFrameBorderedObject::CTiglStringerFrameBorderedObject(
const CTiglUIDManager& uidMgr, const CTiglRelativelyPositionedComponent* parent, std::string& startFrameUID, std::string& endFrameUID,
std::string& startStringerUID, boost::variant<std::string&, boost::optional<std::string>&> endStringerUID)
std::string& startStringerUID, std::string& endStringerUID)
: m_uidMgr(uidMgr)
, m_parent(parent)
, m_startFrameUID(startFrameUID)
, m_endFrameUID(endFrameUID)
, m_startStringerUID(startStringerUID)
, m_endStringerUID(endStringerUID)
, m_borderCache(*this, &CTiglStringerFrameBorderedObject::UpdateBorders)
, m_geometry(*this, &CTiglStringerFrameBorderedObject::BuildGeometry)

Check warning on line 50 in src/fuselage/CTiglStringerFrameBorderedObject.cpp

View check run for this annotation

Codecov / codecov/patch

src/fuselage/CTiglStringerFrameBorderedObject.cpp#L42-L50

Added lines #L42 - L50 were not covered by tests
{
}

Check warning on line 52 in src/fuselage/CTiglStringerFrameBorderedObject.cpp

View check run for this annotation

Codecov / codecov/patch

src/fuselage/CTiglStringerFrameBorderedObject.cpp#L52

Added line #L52 was not covered by tests

CTiglStringerFrameBorderedObject::CTiglStringerFrameBorderedObject(

Check warning on line 54 in src/fuselage/CTiglStringerFrameBorderedObject.cpp

View check run for this annotation

Codecov / codecov/patch

src/fuselage/CTiglStringerFrameBorderedObject.cpp#L54

Added line #L54 was not covered by tests
const CTiglUIDManager& uidMgr, const CTiglRelativelyPositionedComponent* parent, std::string& startFrameUID, std::string& endFrameUID,
std::string& startStringerUID, boost::optional<std::string>& endStringerUID)

Check warning on line 56 in src/fuselage/CTiglStringerFrameBorderedObject.cpp

View check run for this annotation

Codecov / codecov/patch

src/fuselage/CTiglStringerFrameBorderedObject.cpp#L56

Added line #L56 was not covered by tests
: m_uidMgr(uidMgr)
, m_parent(parent)
, m_startFrameUID(startFrameUID)
Expand Down
7 changes: 6 additions & 1 deletion src/fuselage/CTiglStringerFrameBorderedObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ class CTiglStringerFrameBorderedObject
TIGL_EXPORT CTiglStringerFrameBorderedObject(const CTiglUIDManager& uidMgr, const CTiglRelativelyPositionedComponent* parent,
std::string& startFrameUID, std::string& endFrameUID,
std::string& startStringerUID,
boost::variant<std::string&, boost::optional<std::string>&> endStringerUID);
std::string& endStringerUID);

TIGL_EXPORT CTiglStringerFrameBorderedObject(const CTiglUIDManager& uidMgr, const CTiglRelativelyPositionedComponent* parent,
std::string& startFrameUID, std::string& endFrameUID,
std::string& startStringerUID,
boost::optional<std::string>& endStringerUID);

TIGL_EXPORT TopoDS_Shape GetGeometry(TiglCoordinateSystem referenceCS = GLOBAL_COORDINATE_SYSTEM) const;

Expand Down
Loading