Initial attempt at new python wrapper

src/ifcgeom/IfcGeom.h

@@ -96,6 +96,7 @@ namespace IfcGeom {
 	double face_area(const TopoDS_Face& f);
 	void SetValue(GeomValue var, double value);
 	double GetValue(GeomValue var);
+	std::string create_brep_data(Ifc2x3::IfcProduct* s);
 	
 	namespace Cache {
 		void Purge();

src/ifcgeom/IfcGeomFunctions.cpp

@@ -86,6 +86,8 @@
 
 #include <BRepGProp_Face.hxx>
 
+#include <BRepTools.hxx>
+
 #include "../ifcgeom/IfcGeom.h"
 
 bool IfcGeom::create_solid_from_compound(const TopoDS_Shape& compound, TopoDS_Shape& shape) {
@@ -489,4 +491,91 @@ double IfcGeom::GetValue(GeomValue var) {
 	}
 	assert(!"never reach here");
 	return 0;
+}
+
+std::string IfcGeom::create_brep_data(Ifc2x3::IfcProduct* ifc_product) {
+	if (!ifc_product->hasRepresentation()) return "";
+
+	Ifc2x3::IfcProductRepresentation* prod_rep = ifc_product->Representation();
+	Ifc2x3::IfcRepresentation::list li = prod_rep->Representations();
+	Ifc2x3::IfcShapeRepresentation* shape_rep;
+	for (Ifc2x3::IfcRepresentation::it i = li->begin(); i != li->end(); ++i) {
+		const std::string representation_identifier = (*i)->RepresentationIdentifier();
+		if ((*i)->is(Ifc2x3::Type::IfcShapeRepresentation) && (representation_identifier == "Body" || representation_identifier == "Facetation")) {
+			shape_rep = (Ifc2x3::IfcShapeRepresentation*) *i;
+			break;
+		}
+	}
+
+	IfcGeom::ShapeList shapes;
+	if (!IfcGeom::convert_shapes(shape_rep,shapes)) {
+		return "";
+	}
+
+	gp_Trsf trsf;
+	try {
+		IfcGeom::convert(ifc_product->ObjectPlacement(),trsf);
+	} catch (...) {}
+
+	// Does the IfcElement have any IfcOpenings?
+	// Note that openings for IfcOpeningElements are not processed
+	Ifc2x3::IfcRelVoidsElement::list openings = Ifc2x3::IfcRelVoidsElement::list();
+	if ( ifc_product->is(Ifc2x3::Type::IfcElement) && !ifc_product->is(Ifc2x3::Type::IfcOpeningElement) ) {
+		Ifc2x3::IfcElement::ptr element = reinterpret_pointer_cast<Ifc2x3::IfcProduct,Ifc2x3::IfcElement>(ifc_product);
+		openings = element->HasOpenings();
+	}
+	// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
+	if ( ifc_product->is(Ifc2x3::Type::IfcBuildingElementPart ) ) {
+		Ifc2x3::IfcBuildingElementPart::ptr part = reinterpret_pointer_cast<Ifc2x3::IfcProduct,Ifc2x3::IfcBuildingElementPart>(ifc_product);
+		Ifc2x3::IfcRelDecomposes::list decomposes = part->Decomposes();
+		for ( Ifc2x3::IfcRelDecomposes::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
+			Ifc2x3::IfcObjectDefinition::ptr obdef = (*it)->RelatingObject();
+			if ( obdef->is(Ifc2x3::Type::IfcElement) ) {
+				Ifc2x3::IfcElement::ptr element = reinterpret_pointer_cast<Ifc2x3::IfcObjectDefinition,Ifc2x3::IfcElement>(obdef);
+				openings->push(element->HasOpenings());
+			}
+		}
+	}
+
+	if ( openings && openings->Size() ) {
+		IfcGeom::ShapeList 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::ShapeList::const_iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
+			it->first->PreMultiply(trsf);
+		}
+		trsf = gp_Trsf();
+		for ( IfcGeom::ShapeList::const_iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
+			delete it->first;
+			delete it->second;
+		}
+	} else {
+		for ( IfcGeom::ShapeList::const_iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
+			it->first->PreMultiply(trsf);
+		}
+		trsf = gp_Trsf();
+	}
+
+	TopoDS_Compound compound;
+	BRep_Builder builder;
+	builder.MakeCompound(compound);
+	for ( IfcGeom::ShapeList::const_iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
+		const TopoDS_Shape& s = *(*it).second;
+		const gp_GTrsf& trsf = *(*it).first;
+		bool trsf_valid = false;
+		gp_Trsf _trsf;
+		try {
+			_trsf = trsf.Trsf();
+			trsf_valid = true;
+		} catch (...) {}
+		const TopoDS_Shape moved_shape = trsf_valid ? s.Moved(_trsf) :
+			BRepBuilderAPI_GTransform(s,trsf,true).Shape();
+		builder.Add(compound,moved_shape);
+	}
+	std::stringstream sstream;
+	BRepTools::Write(compound,sstream);
+	return sstream.str();
 }

src/ifcgeom/IfcGeomObjects.cpp

@@ -42,6 +42,7 @@
 #include <BRepBuilderAPI_GTransform.hxx>
 
 #include "../ifcparse/IfcException.h"
+#include "../ifcparse/IfcFile.h"
 #include "../ifcgeom/IfcGeomObjects.h"
 #include "../ifcgeom/IfcGeom.h"
 

src/ifcgeom/IfcGeomWires.cpp

@@ -180,53 +180,73 @@ bool IfcGeom::convert(const Ifc2x3::IfcTrimmedCurve::ptr l, TopoDS_Wire& wire) {
 	IfcUtil::IfcAbstractSelect::list trims2 = l->Trim2();
 	bool trimmed1 = false;
 	bool trimmed2 = false;
-	bool sense_agreement = l->SenseAgreement();
-	double flt1;
-	gp_Pnt pnt1;
+	unsigned sense_agreement = l->SenseAgreement() ? 0 : 1;
+	double flts[2];
+	gp_Pnt pnts[2];
+	bool has_flts[2] = {false,false};
+	bool has_pnts[2] = {false,false};
 	BRepBuilderAPI_MakeWire w;
 	for ( IfcUtil::IfcAbstractSelect::it it = trims1->begin(); it != trims1->end(); it ++ ) {
 		const IfcUtil::IfcAbstractSelect::ptr i = *it;
-		if ( i->is(Ifc2x3::Type::IfcCartesianPoint) && trim_cartesian ) {
-			IfcGeom::convert(reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,Ifc2x3::IfcCartesianPoint>(i), pnt1 );
-			trimmed1 = true;
-		} else if ( i->is(Ifc2x3::Type::IfcParameterValue) && !trim_cartesian ) {
+		if ( i->is(Ifc2x3::Type::IfcCartesianPoint) ) {
+			IfcGeom::convert(reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,Ifc2x3::IfcCartesianPoint>(i), pnts[sense_agreement] );
+			has_pnts[sense_agreement] = true;
+		} else if ( i->is(Ifc2x3::Type::IfcParameterValue) ) {
 			const double value = *reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,IfcUtil::IfcArgumentSelect>(i)->wrappedValue();
-			flt1 = value * parameterFactor;
-			trimmed1 = true;
+			flts[sense_agreement] = value * parameterFactor;
+			has_flts[sense_agreement] = true;
 		}
 	}
 	for ( IfcUtil::IfcAbstractSelect::it it = trims2->begin(); it != trims2->end(); it ++ ) {
 		const IfcUtil::IfcAbstractSelect::ptr i = *it;
-		if ( i->is(Ifc2x3::Type::IfcCartesianPoint) && trim_cartesian && trimmed1 ) {
-			gp_Pnt pnt2;
-			IfcGeom::convert(reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,Ifc2x3::IfcCartesianPoint>(i), pnt2 );
-			BRepBuilderAPI_MakeEdge e (curve,sense_agreement ? pnt1 : pnt2,sense_agreement ? pnt2 : pnt1);
-			if ( ! e.IsDone() ) {
-				BRepBuilderAPI_EdgeError err = e.Error();
-				if ( err == BRepBuilderAPI_PointProjectionFailed ) {
-					w.Add(BRepBuilderAPI_MakeEdge(sense_agreement ? pnt1 : pnt2,sense_agreement ? pnt2 : pnt1));
-					Logger::Message(Logger::LOG_WARNING,"Point projection failed for:",l->entity);
-				}
-			} else {
-				w.Add(e.Edge());
-			}
-			trimmed2 = true;
-			break;
-		} else if ( i->is(Ifc2x3::Type::IfcParameterValue) && !trim_cartesian && trimmed1 ) {
+		if ( i->is(Ifc2x3::Type::IfcCartesianPoint) ) {
+			IfcGeom::convert(reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,Ifc2x3::IfcCartesianPoint>(i), pnts[1-sense_agreement] );
+			has_pnts[1-sense_agreement] = true;
+		} else if ( i->is(Ifc2x3::Type::IfcParameterValue) ) {
 			const double value = *reinterpret_pointer_cast<IfcUtil::IfcAbstractSelect,IfcUtil::IfcArgumentSelect>(i)->wrappedValue();
-			double flt2 = value * parameterFactor;
-			if ( isConic && ALMOST_THE_SAME(fmod(flt2-flt1,(double)(M_PI*2.0)),0.0f) ) {
-				w.Add(BRepBuilderAPI_MakeEdge(curve));
-			} else {
-				BRepBuilderAPI_MakeEdge e (curve,sense_agreement ? flt1 : flt2,sense_agreement ? flt2 : flt1);
-				w.Add(e.Edge());
-			}
-			trimmed2 = true;
-			break;
+			flts[1-sense_agreement] = value * parameterFactor;
+			has_flts[1-sense_agreement] = true;
 		}
 	}
-	if ( trimmed2 ) wire = w.Wire();
-	return trimmed2;
+	trim_cartesian &= has_pnts[0] && has_pnts[1];
+	bool trim_cartesian_failed = !trim_cartesian;
+	if ( trim_cartesian ) {
+		if ( pnts[0].Distance(pnts[1]) < GetValue(GV_WIRE_CREATION_TOLERANCE) ) {
+			Logger::Message(Logger::LOG_WARNING,"Skipping segment with length below tolerance level:",l->entity);
+			return false;
+		}
+		ShapeFix_ShapeTolerance FTol;
+		TopoDS_Vertex v1 = BRepBuilderAPI_MakeVertex(pnts[0]);
+		TopoDS_Vertex v2 = BRepBuilderAPI_MakeVertex(pnts[1]);
+		FTol.SetTolerance(v1, GetValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_VERTEX);
+		FTol.SetTolerance(v2, GetValue(GV_WIRE_CREATION_TOLERANCE), TopAbs_VERTEX);
+		BRepBuilderAPI_MakeEdge e (curve,v1,v2);
+		if ( ! e.IsDone() ) {
+			BRepBuilderAPI_EdgeError err = e.Error();
+			if ( err == BRepBuilderAPI_PointProjectionFailed ) {
+				Logger::Message(Logger::LOG_WARNING,"Point projection failed for:",l->entity);
+				trim_cartesian_failed = true;
+			}
+		} else {
+			w.Add(e.Edge());
+		}
+	}
+	if ( (!trim_cartesian || trim_cartesian_failed) && (has_flts[0] && has_flts[1]) ) {
+		if ( isConic && ALMOST_THE_SAME(fmod(flts[1]-flts[0],(double)(M_PI*2.0)),0.0f) ) {
+			w.Add(BRepBuilderAPI_MakeEdge(curve));
+		} else {
+			BRepBuilderAPI_MakeEdge e (curve,flts[0],flts[1]);
+			w.Add(e.Edge());
+		}			
+	} else if ( trim_cartesian_failed && (has_pnts[0] && has_pnts[1]) ) {
+		w.Add(BRepBuilderAPI_MakeEdge(pnts[0],pnts[1]));
+	}
+	if ( w.IsDone() ) {
+		wire = w.Wire();
+		return true;
+	} else {
+		return false;
+	}
 }
 bool IfcGeom::convert(const Ifc2x3::IfcPolyline::ptr l, TopoDS_Wire& result) {
 	Ifc2x3::IfcCartesianPoint::list points = l->Points();