Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-19 19:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed assert, added Logger::Warning and Logger::Error. Made treatment of unexpected data more permissive

Browse Source
This commit is contained in:
Richard Brice
2023-10-23 08:22:03 -07:00
parent 3913849635
commit 1920a6427d
2 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/IfcLinearPlacement.cpp
+35 -21
View File
@@ -25,23 +25,15 @@ using namespace ifcopenshell::geometry;
taxonomy::ptr mapping::map_impl(const IfcSchema::IfcLinearPlacement* inst) {
// The IFC specification does not provided a description of the optional
// CartesianPosition attribute. It is assumed to be a pre-computed IfcAxis2Placement3D
// to be used by software that don't support IfcLinearPlacement. In this case,
// we will simply use the intended CartesianPosition provided by the IFC model
if (inst->CartesianPosition()) {
return map(inst->CartesianPosition());
}
// the following is taken from IfcLocalPlacement and tweaked a little
// assumes that PlacementRelTo is relative to another IfcLinearPlacement
IfcSchema::IfcLinearPlacement* current = (IfcSchema::IfcLinearPlacement*)inst;
auto m4 = taxonomy::make<taxonomy::matrix4>();
// IfcLinearPlacement was added in IFC 4.1 but it had an Orientation attribute of type IfcOrientationExpression, which when combined with other
// attributes was similar to IfcAxis2PlacementLinear. IFC 4.1 and IFC 4.2 have been withdrawn so I'm not going to try to implement linear placement for them.
// For this reason the preprocessor skips this code if SCHEMA_HAS_IfcAxis2PlacementLinear is not defined
#if defined SCHEMA_HAS_IfcAxis2PlacementLinear
// IfcLinearPlacement was added in IFC 4.1 but it had an Orientation attribute of type IfcOrientationExpression, which when combined with other
// attributes was similar to IfcAxis2PlacementLinear. IFC 4.1 and IFC 4.2 have been withdrawn so I'm not going to try to implement linear placement for them.
// For this reason the preprocessor skips this code if SCHEMA_HAS_IfcAxix2PlacementLinear is not defined
// the following is taken from IfcLocalPlacement and tweaked a little
// assumes that PlacementRelTo is relative to another IfcLinearPlacement
IfcSchema::IfcLinearPlacement* current = (IfcSchema::IfcLinearPlacement*)inst;
auto m4 = taxonomy::make<taxonomy::matrix4>();
for (;;) {
IfcSchema::IfcAxis2PlacementLinear* relplacement = current->RelativePlacement();
@@ -76,12 +68,34 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcLinearPlacement* inst) {
break;
}
}
// The IFC specification does not provided a description of the optional
// CartesianPosition attribute. It is assumed to be a pre-computed IfcAxis2Placement3D
// to be used by software that don't support IfcLinearPlacement. Check that the
// provided cartesian position is the same as the one determined by linear placement
if (inst->CartesianPosition()) {
auto m_fallback = taxonomy::cast<taxonomy::matrix4>(map(inst->CartesianPosition()));
if (m4 != m_fallback) {
Logger::Warning("IfcLinearPlacement.CartesianPosition is different than the computed placement", inst);
}
}
// @todo: rb - not sure what this means... it came from IfcLocalPlacement
// m4->components() = offset_and_rotation_ * m4->components();
return m4;
#else
// The IFC specification does not provided a description of the optional
// CartesianPosition attribute. It is assumed to be a pre-computed IfcAxis2Placement3D
// to be used by software that don't support IfcLinearPlacement. In this case,
// we will simply use the intended CartesianPosition provided by the IFC model
if (inst->CartesianPosition()) {
return map(inst->CartesianPosition());
} else {
Logger::Error("Unsupported");
}
#endif // SCHEMA_HAS_IfcAxis2PlacementLinear
// @todo: rb - not sure what this means... it came from IfcLocalPlacement
// m4->components() = offset_and_rotation_ * m4->components();
return m4;
}
#endif