Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-25 17:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Presentation style handling for 4.3

Browse Source
This commit is contained in:
Thomas Krijnen
2023-03-27 14:02:21 +02:00
parent b957e629b5
commit 1adcce509f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/mapping.cpp
+11 -2
View File
@@ -324,12 +324,19 @@ namespace {
continue; continue;
} }
IfcSchema::IfcPresentationStyleAssignment* style_assignment = (IfcSchema::IfcPresentationStyleAssignment*) *kt; IfcSchema::IfcPresentationStyleAssignment* style_assignment = (IfcSchema::IfcPresentationStyleAssignment*) *kt;
#else
// Only in case of 2x3 or old style IfcPresentationStyleAssignment
auto styles = style_assignment->Styles();
#elif defined(SCHEMA_HAS_IfcPresentationStyleAssignment)
IfcSchema::IfcPresentationStyleAssignment::list::ptr style_assignments = si->Styles(); IfcSchema::IfcPresentationStyleAssignment::list::ptr style_assignments = si->Styles();
for (IfcSchema::IfcPresentationStyleAssignment::list::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) { for (IfcSchema::IfcPresentationStyleAssignment::list::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
IfcSchema::IfcPresentationStyleAssignment* style_assignment = *kt; IfcSchema::IfcPresentationStyleAssignment* style_assignment = *kt;
// Only in case of 2x3 or old style IfcPresentationStyleAssignment
auto styles = style_assignment->Styles();
#else
auto styles = si->Styles();
#endif #endif
aggregate_of_instance::ptr styles = style_assignment->Styles();
for (aggregate_of_instance::it lt = styles->begin(); lt != styles->end(); ++lt) { for (aggregate_of_instance::it lt = styles->begin(); lt != styles->end(); ++lt) {
IfcUtil::IfcBaseClass* style = *lt; IfcUtil::IfcBaseClass* style = *lt;
if (style->declaration().is(IfcSchema::IfcSurfaceStyle::Class())) { if (style->declaration().is(IfcSchema::IfcSurfaceStyle::Class())) {
@@ -344,7 +351,9 @@ namespace {
} }
} }
} }
#if defined(SCHEMA_HAS_IfcStyleAssignmentSelect) || defined(SCHEMA_HAS_IfcPresentationStyleAssignment)
} }
#endif
return std::make_pair<IfcSchema::IfcSurfaceStyle*, T*>(0, 0); return std::make_pair<IfcSchema::IfcSurfaceStyle*, T*>(0, 0);
} }