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

Check for null result and handle some bop alerts

Browse Source
This commit is contained in:
Thomas Krijnen
2021-11-19 10:39:14 +01:00
parent 0504556e7a
commit 71c1cd6a9e
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFunctions.cpp
+14 -1
View File
@@ -154,6 +154,10 @@
#include <ShapeAnalysis_Edge.hxx> #include <ShapeAnalysis_Edge.hxx>
#include <BRepExtrema_DistShapeShape.hxx> #include <BRepExtrema_DistShapeShape.hxx>
#if OCC_VERSION_HEX >= 0x70200
#include <BOPAlgo_Alerts.hxx>
#endif
#include "../ifcparse/macros.h" #include "../ifcparse/macros.h"
#include "../ifcparse/IfcSIPrefix.h" #include "../ifcparse/IfcSIPrefix.h"
#include "../ifcparse/IfcFile.h" #include "../ifcparse/IfcFile.h"
@@ -4438,6 +4442,15 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a_, const TopTools_L
} }
} else { } else {
std::stringstream str; std::stringstream str;
#if OCC_VERSION_HEX >= 0x70200
if (builder->HasError(STANDARD_TYPE(BOPAlgo_AlertBOPNotAllowed))) {
Logger::Error("Invalid operands using first operand");
result = a;
success = true;
}
#endif
#if OCC_VERSION_HEX >= 0x70000 #if OCC_VERSION_HEX >= 0x70000
builder->DumpErrors(str); builder->DumpErrors(str);
#else #else
@@ -4457,7 +4470,7 @@ bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a_, const TopTools_L
Logger::Notice("No longer attempting boolean operation with higher fuzziness"); Logger::Notice("No longer attempting boolean operation with higher fuzziness");
} }
} }
return success; return success && !result.IsNull();
} }
bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopoDS_Shape& b, BOPAlgo_Operation op, TopoDS_Shape& result, double fuzziness) { bool IfcGeom::Kernel::boolean_operation(const TopoDS_Shape& a, const TopoDS_Shape& b, BOPAlgo_Operation op, TopoDS_Shape& result, double fuzziness) {