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

Only convert faces once if sewing shell fails

Browse Source
This commit is contained in:
Thomas Krijnen
2016-04-16 14:47:34 +02:00
parent 884b3fe850
commit 1c1097c8a4
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomShapes.cpp
+8 -12
View File
@@ -98,6 +98,8 @@
#include <Standard_Version.hxx> #include <Standard_Version.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include "../ifcgeom/IfcGeom.h" #include "../ifcgeom/IfcGeom.h"
bool IfcGeom::Kernel::convert(const IfcSchema::IfcExtrudedAreaSolid* l, TopoDS_Shape& shape) { bool IfcGeom::Kernel::convert(const IfcSchema::IfcExtrudedAreaSolid* l, TopoDS_Shape& shape) {
@@ -445,6 +447,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcConnectedFaceSet* l, TopoDS_Sh
bool facesAdded = false; bool facesAdded = false;
const unsigned int num_faces = (unsigned)faces->size(); const unsigned int num_faces = (unsigned)faces->size();
bool valid_shell = false; bool valid_shell = false;
TopTools_ListOfShape face_list;
if ( num_faces < getValue(GV_MAX_FACES_TO_SEW) ) { if ( num_faces < getValue(GV_MAX_FACES_TO_SEW) ) {
BRepOffsetAPI_Sewing builder; BRepOffsetAPI_Sewing builder;
builder.SetTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE)); builder.SetTolerance(getValue(GV_POINT_EQUALITY_TOLERANCE));
@@ -458,6 +461,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcConnectedFaceSet* l, TopoDS_Sh
} catch (...) {} } catch (...) {}
if ( converted_face && face_area(face) > getValue(GV_MINIMAL_FACE_AREA) ) { if ( converted_face && face_area(face) > getValue(GV_MINIMAL_FACE_AREA) ) {
builder.Add(face); builder.Add(face);
face_list.Append(face);
facesAdded = true; facesAdded = true;
} else { } else {
Logger::Message(Logger::LOG_WARNING,"Invalid face:",(*it)->entity); Logger::Message(Logger::LOG_WARNING,"Invalid face:",(*it)->entity);
@@ -489,18 +493,10 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcConnectedFaceSet* l, TopoDS_Sh
TopoDS_Compound compound; TopoDS_Compound compound;
BRep_Builder builder; BRep_Builder builder;
builder.MakeCompound(compound); builder.MakeCompound(compound);
for( IfcSchema::IfcFace::list::it it = faces->begin(); it != faces->end(); ++ it ) { TopTools_ListIteratorOfListOfShape face_iterator;
TopoDS_Face face; for (face_iterator.Initialize(face_list); face_iterator.More(); face_iterator.Next()) {
bool converted_face = false; builder.Add(compound, face_iterator.Value());
try { facesAdded = true;
converted_face = convert_face(*it,face);
} catch (...) {}
if ( converted_face && face_area(face) > getValue(GV_MINIMAL_FACE_AREA) ) {
builder.Add(compound,face);
facesAdded = true;
} else {
Logger::Message(Logger::LOG_WARNING,"Invalid face:",(*it)->entity);
}
} }
if ( ! facesAdded ) return false; if ( ! facesAdded ) return false;
shape = compound; shape = compound;