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

#2036 check for null curve in IfcIndexedPolyCurve

Browse Source
This commit is contained in:
Thomas Krijnen
2022-02-10 14:04:08 +01:00
parent 5317746a82
commit 2c2954b11a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomWires.cpp
+6 -4
View File
@@ -1003,6 +1003,9 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcIndexedPolyCurve* l, TopoDS_Wi
BRepBuilderAPI_MakeWire w; BRepBuilderAPI_MakeWire w;
// ignored, just for capturing the curve parameters on the null check
double u, v;
if(l->Segments()) { if(l->Segments()) {
aggregate_of_instance::ptr segments = *l->Segments(); aggregate_of_instance::ptr segments = *l->Segments();
for (aggregate_of_instance::it it = segments->begin(); it != segments->end(); ++it) { for (aggregate_of_instance::it it = segments->begin(); it != segments->end(); ++it) {
@@ -1018,11 +1021,11 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcIndexedPolyCurve* l, TopoDS_Wi
const gp_Pnt& current = points[*jt - 1]; const gp_Pnt& current = points[*jt - 1];
if (jt != indices.begin()) { if (jt != indices.begin()) {
BRepBuilderAPI_MakeEdge me(previous, current); BRepBuilderAPI_MakeEdge me(previous, current);
if (me.IsDone()) { if (me.IsDone() && !BRep_Tool::Curve(me.Edge(), u, v).IsNull()) {
w.Add(me.Edge()); w.Add(me.Edge());
} else { } else {
Logger::Warning("Ignoring segment on", l); Logger::Warning("Ignoring segment on", l);
} }
} }
previous = current; previous = current;
} }
@@ -1043,7 +1046,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcIndexedPolyCurve* l, TopoDS_Wi
const gp_Pnt& c = points[indices[2] - 1]; const gp_Pnt& c = points[indices[2] - 1];
Handle(Geom_Circle) circ = GC_MakeCircle(a, b, c).Value(); Handle(Geom_Circle) circ = GC_MakeCircle(a, b, c).Value();
BRepBuilderAPI_MakeEdge me(circ, a, c); BRepBuilderAPI_MakeEdge me(circ, a, c);
if (me.IsDone()) { if (me.IsDone() && !BRep_Tool::Curve(me.Edge(), u, v).IsNull()) {
w.Add(me.Edge()); w.Add(me.Edge());
} else { } else {
Logger::Warning("Ignoring segment on", l); Logger::Warning("Ignoring segment on", l);
@@ -1056,7 +1059,6 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcIndexedPolyCurve* l, TopoDS_Wi
std::vector<gp_Pnt>::const_iterator previous = points.begin(); std::vector<gp_Pnt>::const_iterator previous = points.begin();
for (std::vector<gp_Pnt>::const_iterator current = previous+1; current < points.end(); ++current){ for (std::vector<gp_Pnt>::const_iterator current = previous+1; current < points.end(); ++current){
BRepBuilderAPI_MakeEdge me(*previous, *current); BRepBuilderAPI_MakeEdge me(*previous, *current);
double u, v;
if (me.IsDone() && !BRep_Tool::Curve(me.Edge(), u, v).IsNull()) { if (me.IsDone() && !BRep_Tool::Curve(me.Edge(), u, v).IsNull()) {
w.Add(me.Edge()); w.Add(me.Edge());
previous = current; previous = current;