Add an option to disable the subtraction of IfcOpeningElements from relating building elements to the IfcGeomObject settings

aothms · aothms · commit e729795da277 · 2012-10-19T08:20:43.000Z
diff --git a/src/ifcgeom/IfcGeomObjects.cpp b/src/ifcgeom/IfcGeomObjects.cpp
@@ -47,8 +47,10 @@
 
 // Welds vertices that belong to different faces
 bool weld_vertices = true;
+
 bool convert_back_units = false;
 bool use_faster_booleans = false;
+bool disable_subtractions = false;
 
 int IfcGeomObjects::IfcMesh::addvert(const gp_XYZ& p) {
 	const float X = convert_back_units ? (float) (p.X() / IfcGeom::GetValue(IfcGeom::GV_LENGTH_UNIT)) : (float)p.X();
@@ -386,7 +388,7 @@ IfcGeomObjects::IfcGeomObject* _get() {
 			}
 		}
 
-		if ( openings && openings->Size() ) {
+		if ( !disable_subtractions && openings && openings->Size() ) {
 			IfcGeom::ShapeList opened_shapes;
 			try {
 				if ( use_faster_booleans ) {
@@ -628,9 +630,12 @@ void IfcGeomObjects::Settings(int setting, bool value) {
 	case SEW_SHELLS:
 		IfcGeom::SetValue(IfcGeom::GV_MAX_FACES_TO_SEW,value ? 1000 : -1);
 		break;
-	case IfcGeomObjects::FORCE_CCW_FACE_ORIENTATION:
+	case FORCE_CCW_FACE_ORIENTATION:
 		IfcGeom::SetValue(IfcGeom::GV_FORCE_CCW_FACE_ORIENTATION,value ? 1 : -1);
 		break;
+    case DISABLE_OPENING_SUBTRACTIONS:
+        disable_subtractions = value;
+        break;
 	}
 }
 int IfcGeomObjects::Progress() {
diff --git a/src/ifcgeom/IfcGeomObjects.h b/src/ifcgeom/IfcGeomObjects.h
@@ -97,6 +97,9 @@ namespace IfcGeomObjects {
 	// By default singular faces have no explicitly defined orientation, to
 	// force faces to be defined CounterClockWise set this to true.
 	const int FORCE_CCW_FACE_ORIENTATION = 7;
+    // Disables the subtraction of IfcOpeningElement representations from
+    // the related building element representations.
+    const int DISABLE_OPENING_SUBTRACTIONS = 8;
 
 	// End of settings enumeration.
 
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -685,7 +685,7 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* f) {
 			// Update the status after every 1000 instances parsed
 			if ( !((++x)%1000) ) {
 				std::stringstream ss; ss << "\r#" << currentId;
-				Logger::Status(ss.str());
+				Logger::Status(ss.str(), false);
 			}
 			if ( entity->is(Ifc2x3::Type::IfcRoot) ) {
 				Ifc2x3::IfcRoot::ptr ifc_root = (Ifc2x3::IfcRoot::ptr) entity;
diff --git a/src/ifcwrap/Interface.h b/src/ifcwrap/Interface.h
@@ -26,6 +26,7 @@ namespace IfcGeomObjects {
 	const int SEW_SHELLS = 5;
 	const int FASTER_BOOLEANS = 6;
 	const int FORCE_CCW_FACE_ORIENTATION = 7;
+    const int DISABLE_OPENING_SUBTRACTIONS = 8;
 
 	class IfcMesh {
 	public:

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ bool IfcFile::Init(IfcParse::IfcSpfStream* f) {`
`685`	`685`	`// Update the status after every 1000 instances parsed`
`686`	`686`	`if ( !((++x)%1000) ) {`
`687`	`687`	`std::stringstream ss; ss << "\r#" << currentId;`
`688`		`- Logger::Status(ss.str());`
	`688`	`+ Logger::Status(ss.str(), false);`
`689`	`689`	`}`
`690`	`690`	`if ( entity->is(Ifc2x3::Type::IfcRoot) ) {`
`691`	`691`	`Ifc2x3::IfcRoot::ptr ifc_root = (Ifc2x3::IfcRoot::ptr) entity;`