DISABLE_OPENING_SUBTRACTIONS and DISABLE_OBJECT_PLACEMENT settings for create_shape() / create_brep_data()

aothms · aothms · commit d91e5d31f690 · 2014-04-17T10:50:42.000+02:00
diff --git a/src/ifcgeom/IfcGeom.h b/src/ifcgeom/IfcGeom.h
@@ -79,6 +79,9 @@ namespace IfcGeom {
 		GV_PRECISION
 	};
 
+	const int DISABLE_OPENING_SUBTRACTIONS = 1 << 0;
+	const int DISABLE_OBJECT_PLACEMENT     = 1 << 1;
+	
 	bool convert_wire_to_face(const TopoDS_Wire& wire, TopoDS_Face& face);
 	bool convert_curve_to_wire(const Handle(Geom_Curve)& curve, TopoDS_Wire& wire);
 	bool convert_shapes(const IfcUtil::IfcBaseClass* L, IfcRepresentationShapeItems& result);
@@ -103,7 +106,7 @@ namespace IfcGeom {
 	void apply_tolerance(TopoDS_Shape& s, double t);
 	void SetValue(GeomValue var, double value);
 	double GetValue(GeomValue var);
-	std::string create_brep_data(Ifc2x3::IfcProduct* s);
+	std::string create_brep_data(Ifc2x3::IfcProduct* s, unsigned int settings);
     bool fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape);
 	IfcSchema::IfcProductDefinitionShape* tesselate(TopoDS_Shape& shape, double deflection, IfcEntities es);
 
diff --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/IfcGeomFunctions.cpp
@@ -689,7 +689,10 @@ bool IfcGeom::fill_nonmanifold_wires_with_planar_faces(TopoDS_Shape& shape) {
 	return true;
 }
 
-std::string IfcGeom::create_brep_data(Ifc2x3::IfcProduct* ifc_product) {
+std::string IfcGeom::create_brep_data(Ifc2x3::IfcProduct* ifc_product, unsigned int settings) {
+	const bool no_openings = !!(settings & DISABLE_OPENING_SUBTRACTIONS);
+	const bool no_placement = !!(settings & DISABLE_OBJECT_PLACEMENT);
+
 	if (!ifc_product->hasRepresentation()) return "";
 
 	Ifc2x3::IfcProductRepresentation* prod_rep = ifc_product->Representation();
@@ -740,23 +743,20 @@ std::string IfcGeom::create_brep_data(Ifc2x3::IfcProduct* ifc_product) {
 		}
 	}
 
-	if ( openings && openings->Size() ) {
+	if (openings && openings->Size() && !no_openings) {
 		IfcGeom::IfcRepresentationShapeItems opened_shapes;
 		try {
 			IfcGeom::convert_openings(ifc_product,openings,shapes,trsf,opened_shapes);
 		} catch(...) { 
 			Logger::Message(Logger::LOG_ERROR,"Error processing openings for:",ifc_product->entity); 
 		}
-		for ( IfcGeom::IfcRepresentationShapeItems::iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
-			it->prepend(trsf);
-		}
-		trsf = gp_Trsf();
 		shapes = opened_shapes;
-	} else {
+	}
+
+	if (!no_placement) {
 		for ( IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
 			it->prepend(trsf);
 		}
-		trsf = gp_Trsf();
 	}
 
 	TopoDS_Compound compound;
diff --git a/src/ifcwrap/Interface.h b/src/ifcwrap/Interface.h
@@ -91,15 +91,18 @@ namespace IfcParse {
 		return f;
 	}
 
-	std::string create_shape(IfcParse::IfcUntypedEntity* e) {
+	std::string create_shape(IfcParse::IfcUntypedEntity* e, unsigned int settings = 0) {
 		if (!e->is(IfcSchema::Type::IfcProduct)) throw IfcException("Entity is not an IfcProduct");
 		IfcSchema::IfcProduct* ifc_product = (IfcSchema::IfcProduct*) e;
-		return IfcGeom::create_brep_data(ifc_product);
+		return IfcGeom::create_brep_data(ifc_product, settings);
 	}
 
 	void clean() { 
 		IfcGeom::Cache::Purge(); 
 	}
+
+	const int DISABLE_OPENING_SUBTRACTIONS = 1 << 0;
+	const int DISABLE_OBJECT_PLACEMENT     = 1 << 1;
 }
 
 std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f);

Original file line number	Diff line number	Diff line change
`@@ -91,15 +91,18 @@ namespace IfcParse {`
`91`	`91`	`return f;`
`92`	`92`	`}`
`93`	`93`
`94`		`- std::string create_shape(IfcParse::IfcUntypedEntity* e) {`
	`94`	`+ std::string create_shape(IfcParse::IfcUntypedEntity* e, unsigned int settings = 0) {`
`95`	`95`	`if (!e->is(IfcSchema::Type::IfcProduct)) throw IfcException("Entity is not an IfcProduct");`
`96`	`96`	`IfcSchema::IfcProduct* ifc_product = (IfcSchema::IfcProduct*) e;`
`97`		`- return IfcGeom::create_brep_data(ifc_product);`
	`97`	`+ return IfcGeom::create_brep_data(ifc_product, settings);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`void clean() {`
`101`	`101`	`IfcGeom::Cache::Purge();`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ const int DISABLE_OPENING_SUBTRACTIONS = 1 << 0;`
	`105`	`+ const int DISABLE_OBJECT_PLACEMENT = 1 << 1;`
`103`	`106`	`}`
`104`	`107`
`105`	`108`	`std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f);`