Merge developments from the python_wrapper branch into master

src/ifcgeom/IfcGeom.h

@@ -41,6 +41,8 @@
 #include "../ifcparse/IfcParse.h"
 #include "../ifcparse/IfcUtil.h"
 
+#include "../ifcgeom/IfcGeomElement.h" 
+#include "../ifcgeom/IfcGeomRepresentation.h" 
 #include "../ifcgeom/IfcRepresentationShapeItem.h"
 
 #define IN_CACHE(T,E,t,e) std::map<int,t>::const_iterator it = cache.T.find(E->entity->id());\
@@ -124,6 +126,13 @@ public:
 	IfcSchema::IfcProductDefinitionShape* tesselate(TopoDS_Shape& shape, double deflection, IfcEntityList::ptr es);
 	void remove_redundant_points_from_loop(TColgp_SequenceOfPnt& polygon, bool closed, double tol=-1.);
 
+	std::pair<std::string, double> initializeUnits(IfcSchema::IfcUnitAssignment*);
+
+	IfcSchema::IfcObjectDefinition* get_decomposing_entity(IfcSchema::IfcProduct*);
+
+	template <typename P>
+	IfcGeom::BRepElement<P>* create_brep_for_representation_and_product(const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*);
+
 	const SurfaceStyle* get_style(const IfcSchema::IfcRepresentationItem* representation_item);
 	
 	template <typename T> std::pair<IfcSchema::IfcSurfaceStyle*, T*> get_surface_style(const IfcSchema::IfcRepresentationItem* representation_item) {
@@ -141,14 +150,14 @@ public:
 			for (IfcSchema::IfcPresentationStyleAssignment::list::it kt = style_assignments->begin(); kt != style_assignments->end(); ++kt) {
 				IfcSchema::IfcPresentationStyleAssignment* style_assignment = *kt;
 #endif
-				IfcUtil::IfcAbstractSelect::list::ptr styles = style_assignment->Styles();
-				for (IfcUtil::IfcAbstractSelect::list::it lt = styles->begin(); lt != styles->end(); ++lt) {
-					IfcUtil::IfcAbstractSelect* style = *lt;
+				IfcEntityList::ptr styles = style_assignment->Styles();
+				for (IfcEntityList::it lt = styles->begin(); lt != styles->end(); ++lt) {
+					IfcUtil::IfcBaseClass* style = *lt;
 					if (style->is(IfcSchema::Type::IfcSurfaceStyle)) {
 						IfcSchema::IfcSurfaceStyle* surface_style = (IfcSchema::IfcSurfaceStyle*) style;
 						if (surface_style->Side() != IfcSchema::IfcSurfaceSide::IfcSurfaceSide_NEGATIVE) {
-							IfcUtil::IfcAbstractSelect::list::ptr styles_elements = surface_style->Styles();
-							for (IfcUtil::IfcAbstractSelect::list::it mt = styles_elements->begin(); mt != styles_elements->end(); ++mt) {
+							IfcEntityList::ptr styles_elements = surface_style->Styles();
+							for (IfcEntityList::it mt = styles_elements->begin(); mt != styles_elements->end(); ++mt) {
 								if ((*mt)->is(T::Class())) {
 									return std::make_pair(surface_style, (T*) *mt);
 								}

src/ifcgeom/IfcGeomCurves.cpp

@@ -86,7 +86,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcCircle* l, Handle(Geom_Curve)&
 		return false;
 	}
 	gp_Trsf trsf;
-	IfcSchema::IfcAxis2Placement placement = l->Position();
+	IfcSchema::IfcAxis2Placement* placement = l->Position();
 	if (placement->is(IfcSchema::Type::IfcAxis2Placement3D)) {
 		IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
 	} else {
@@ -111,7 +111,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcEllipse* l, Handle(Geom_Curve)
 	// when creating a trimmed curve off of an ellipse like this.
 	const bool rotated = y > x;
 	gp_Trsf trsf;
-	IfcSchema::IfcAxis2Placement placement = l->Position();
+	IfcSchema::IfcAxis2Placement* placement = l->Position();
 	if (placement->is(IfcSchema::Type::IfcAxis2Placement3D)) {
 		convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
 	} else {

src/ifcgeom/IfcGeomElement.h

@@ -87,21 +87,21 @@ namespace IfcGeom {
 	};
 
 	template <typename P>
-	class ShapeModelElement : public Element<P> {
+	class BRepElement : public Element<P> {
 	private:
 		Representation::BRep* _geometry;
 	public:
 		const Representation::BRep& geometry() const { return *_geometry; }
-		ShapeModelElement(int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf, Representation::BRep* geometry)
+		BRepElement(int id, int parent_id, const std::string& name, const std::string& type, const std::string& guid, const gp_Trsf& trsf, Representation::BRep* geometry)
 			: Element<P>(geometry->settings(),id,parent_id,name,type,guid,trsf)
 			, _geometry(geometry)
 		{}
-		virtual ~ShapeModelElement() {
+		virtual ~BRepElement() {
 			delete _geometry;
 		}
 	private:
-		ShapeModelElement(const ShapeModelElement& other);
-		ShapeModelElement& operator=(const ShapeModelElement& other);		
+		BRepElement(const BRepElement& other);
+		BRepElement& operator=(const BRepElement& other);		
 	};
 
 	template <typename P>
@@ -110,7 +110,7 @@ namespace IfcGeom {
 		Representation::Triangulation<P>* _geometry;
 	public:
 		const Representation::Triangulation<P>& geometry() const { return *_geometry; }
-		TriangulationElement(const ShapeModelElement<P>& shape_model)
+		TriangulationElement(const BRepElement<P>& shape_model)
 			: Element<P>(shape_model)
 			, _geometry(new Representation::Triangulation<P>(shape_model.geometry()))
 		{}
@@ -128,7 +128,7 @@ namespace IfcGeom {
 		Representation::Serialization* _geometry;
 	public:
 		const Representation::Serialization& geometry() const { return *_geometry; }
-		SerializedElement(const ShapeModelElement<P>& shape_model)
+		SerializedElement(const BRepElement<P>& shape_model)
 			: Element<P>(shape_model)
 			, _geometry(new Representation::Serialization(shape_model.geometry()))
 		{}

src/ifcgeom/IfcGeomFunctions.cpp

@@ -101,6 +101,7 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
 #include "../ifcgeom/IfcGeom.h"
+#include "../ifcgeom/IfcGeomUtils.h"
 
 bool IfcGeom::Kernel::create_solid_from_compound(const TopoDS_Shape& compound, TopoDS_Shape& shape) {
 	BRepOffsetAPI_Sewing builder;
@@ -815,4 +816,221 @@ void IfcGeom::Kernel::remove_redundant_points_from_loop(TColgp_SequenceOfPnt& po
 		}
 		if (!removed) break;
 	}
+}
+
+template <typename P>
+IfcGeom::BRepElement<P>* IfcGeom::Kernel::create_brep_for_representation_and_product(const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product) {
+	IfcGeom::Representation::BRep* shape;
+	IfcGeom::IfcRepresentationShapeItems shapes;
+
+	if ( !convert_shapes(representation,shapes) ) {
+		return 0;
+	}
+
+	int parent_id = -1;
+	try {
+		IfcSchema::IfcObjectDefinition* parent_object = get_decomposing_entity(product);
+		if (parent_object) {
+			parent_id = parent_object->entity->id();
+		}
+	} catch (...) {}
+		
+	const std::string name = product->hasName() ? product->Name() : "";
+	const std::string guid = product->GlobalId();
+		
+	gp_Trsf trsf;
+	try {
+		convert(product->ObjectPlacement(),trsf);
+	} catch (...) {}
+
+	// Does the IfcElement have any IfcOpenings?
+	// Note that openings for IfcOpeningElements are not processed
+	IfcSchema::IfcRelVoidsElement::list::ptr openings;
+	if ( product->is(IfcSchema::Type::IfcElement) && !product->is(IfcSchema::Type::IfcOpeningElement) ) {
+		IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)product;
+		openings = element->HasOpenings();
+	}
+	// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
+	if ( product->is(IfcSchema::Type::IfcBuildingElementPart ) ) {
+		IfcSchema::IfcBuildingElementPart* part = (IfcSchema::IfcBuildingElementPart*)product;
+#ifdef USE_IFC4
+		IfcSchema::IfcRelAggregates::list::ptr decomposes = part->Decomposes();
+		for ( IfcSchema::IfcRelAggregates::list::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
+#else
+		IfcSchema::IfcRelDecomposes::list::ptr decomposes = part->Decomposes();
+		for ( IfcSchema::IfcRelDecomposes::list::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
+#endif
+			IfcSchema::IfcObjectDefinition* obdef = (*it)->RelatingObject();
+			if ( obdef->is(IfcSchema::Type::IfcElement) ) {
+				IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)obdef;
+				openings->push(element->HasOpenings());
+			}
+		}
+	}
+
+	const std::string product_type = IfcSchema::Type::ToString(product->type());
+	ElementSettings element_settings(settings, getValue(GV_LENGTH_UNIT), product_type);
+
+	if ( !settings.disable_opening_subtractions() && openings && openings->Size() ) {
+		IfcGeom::IfcRepresentationShapeItems opened_shapes;
+		try {
+			if ( settings.faster_booleans() ) {
+				bool succes = convert_openings_fast(product,openings,shapes,trsf,opened_shapes);
+				if ( ! succes ) {
+					opened_shapes.clear();
+					convert_openings(product,openings,shapes,trsf,opened_shapes);
+				}
+			} else {
+				convert_openings(product,openings,shapes,trsf,opened_shapes);
+			}
+		} catch(...) { 
+			Logger::Message(Logger::LOG_ERROR,"Error processing openings for:",product->entity); 
+		}
+		if ( settings.use_world_coords() ) {
+			for ( IfcGeom::IfcRepresentationShapeItems::iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
+				it->prepend(trsf);
+			}
+			trsf = gp_Trsf();
+		}
+		shape = new IfcGeom::Representation::BRep(element_settings, representation->entity->id(), opened_shapes);
+	} else if ( settings.use_world_coords() ) {
+		for ( IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
+			it->prepend(trsf);
+		}
+		trsf = gp_Trsf();
+		shape = new IfcGeom::Representation::BRep(element_settings, representation->entity->id(), shapes);
+	} else {
+		shape = new IfcGeom::Representation::BRep(element_settings, representation->entity->id(), shapes);
+	}
+
+	return new BRepElement<P>(
+		product->entity->id(),
+		parent_id,
+		name, 
+		product_type,
+		guid,
+		trsf,
+		shape
+	);
+}
+
+IfcSchema::IfcObjectDefinition* IfcGeom::Kernel::get_decomposing_entity(IfcSchema::IfcProduct* product) {
+	IfcSchema::IfcObjectDefinition* parent = 0;
+
+	// In case of an opening element, parent to the RelatingBuildingElement
+	if ( product->is(IfcSchema::Type::IfcOpeningElement ) ) {
+		IfcSchema::IfcOpeningElement* opening = (IfcSchema::IfcOpeningElement*)product;
+		IfcSchema::IfcRelVoidsElement::list::ptr voids = opening->VoidsElements();
+		if ( voids->Size() ) {
+			IfcSchema::IfcRelVoidsElement* ifc_void = *voids->begin();
+			parent = ifc_void->RelatingBuildingElement();
+		}
+	} else if ( product->is(IfcSchema::Type::IfcElement ) ) {
+		IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)product;
+		IfcSchema::IfcRelFillsElement::list::ptr fills = element->FillsVoids();
+		// Incase of a RelatedBuildingElement parent to the opening element
+		if ( fills->Size() ) {
+			for ( IfcSchema::IfcRelFillsElement::list::it it = fills->begin(); it != fills->end(); ++ it ) {
+				IfcSchema::IfcRelFillsElement* fill = *it;
+				IfcSchema::IfcObjectDefinition* ifc_objectdef = fill->RelatingOpeningElement();
+				if ( product == ifc_objectdef ) continue;
+				parent = ifc_objectdef;
+			}
+		} 
+		// Else simply parent to the containing structure
+		if (!parent) {
+			IfcSchema::IfcRelContainedInSpatialStructure::list::ptr parents = element->ContainedInStructure();
+			if ( parents->Size() ) {
+				IfcSchema::IfcRelContainedInSpatialStructure* container = *parents->begin();
+				parent = container->RelatingStructure();
+			}
+		}
+	}
+	// Parent decompositions to the RelatingObject
+	if (!parent) {
+		IfcEntityList::ptr parents = product->entity->getInverse(IfcSchema::Type::IfcRelAggregates);
+		parents->push(product->entity->getInverse(IfcSchema::Type::IfcRelNests));
+		for ( IfcEntityList::it it = parents->begin(); it != parents->end(); ++ it ) {
+			IfcSchema::IfcRelDecomposes* decompose = (IfcSchema::IfcRelDecomposes*)*it;
+			IfcSchema::IfcObjectDefinition* ifc_objectdef;
+#ifdef USE_IFC4
+			if (decompose->is(IfcSchema::Type::IfcRelAggregates)) {
+				ifc_objectdef = ((IfcSchema::IfcRelAggregates*)decompose)->RelatingObject();
+			} else {
+				continue;
+			}
+#else
+			ifc_objectdef = decompose->RelatingObject();
+#endif
+			if ( product == ifc_objectdef ) continue;
+			parent = ifc_objectdef;
+		}
+	}
+	return parent;
+}
+
+template IfcGeom::BRepElement<float>* IfcGeom::Kernel::create_brep_for_representation_and_product<float>(const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+template IfcGeom::BRepElement<double>* IfcGeom::Kernel::create_brep_for_representation_and_product<double>(const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+
+std::pair<std::string, double> IfcGeom::Kernel::initializeUnits(IfcSchema::IfcUnitAssignment* unit_assignment) {
+	// Set default units, set length to meters, angles to undefined
+	setValue(IfcGeom::Kernel::GV_LENGTH_UNIT, 1.0);
+	setValue(IfcGeom::Kernel::GV_PLANEANGLE_UNIT, -1.0);
+
+	std::string unit_name = "METER";
+	double unit_magnitude = 1.;
+
+	try {
+		IfcEntityList::ptr units = unit_assignment->Units();
+		if (!units || !units->Size()) {
+			Logger::Message(Logger::LOG_ERROR, "No unit information found");
+		} else {
+			for ( IfcEntityList::it it = units->begin(); it != units->end(); ++ it ) {
+				std::string current_unit_name = "";
+				IfcUtil::IfcBaseClass* base = *it;
+				IfcSchema::IfcSIUnit* unit = 0;
+				double value = 1.f;
+				if ( base->is(IfcSchema::Type::IfcConversionBasedUnit) ) {
+					IfcSchema::IfcConversionBasedUnit* u = (IfcSchema::IfcConversionBasedUnit*)base;
+					current_unit_name = u->Name();
+					IfcSchema::IfcMeasureWithUnit* u2 = u->ConversionFactor();
+					IfcSchema::IfcUnit* u3 = u2->UnitComponent();
+					if ( u3->is(IfcSchema::Type::IfcSIUnit) ) {
+						unit = (IfcSchema::IfcSIUnit*) u3;
+					}
+					IfcSchema::IfcValue* v = u2->ValueComponent();
+					// Quick hack to get the numeric value from an IfcValue:
+					const double f = *v->entity->getArgument(0);
+					value *= f;
+				} else if ( base->is(IfcSchema::Type::IfcSIUnit) ) {
+					unit = (IfcSchema::IfcSIUnit*)base;
+				}
+				if ( unit ) {
+					if ( unit->hasPrefix() ) {
+						value *= IfcGeom::Utils::UnitPrefixToValue(unit->Prefix());
+					}
+					IfcSchema::IfcUnitEnum::IfcUnitEnum type = unit->UnitType();
+					if ( type == IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT ) {
+						setValue(IfcGeom::Kernel::GV_LENGTH_UNIT,value);
+						if (current_unit_name.empty()) {
+							if (unit->hasPrefix()) {
+								current_unit_name = IfcSchema::IfcSIPrefix::ToString(unit->Prefix());
+							}
+							current_unit_name += IfcSchema::IfcSIUnitName::ToString(unit->Name());
+						}
+						unit_magnitude = value;
+						unit_name = current_unit_name;
+					} else if ( type == IfcSchema::IfcUnitEnum::IfcUnit_PLANEANGLEUNIT ) {
+						setValue(IfcGeom::Kernel::GV_PLANEANGLE_UNIT, value);
+					}
+				}
+			}
+		}
+	} catch (const IfcParse::IfcException& ex) {
+		std::stringstream ss;
+		ss << "Failed to determine unit information '" << ex.what() << "'";
+		Logger::Message(Logger::LOG_ERROR, ss.str());
+	}
+
+	return std::pair<std::string, double>(unit_name, unit_magnitude);
 }

src/ifcgeom/IfcGeomHelpers.cpp

@@ -289,7 +289,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcObjectPlacement* l, gp_Trsf& t
 	IfcSchema::IfcLocalPlacement* current = (IfcSchema::IfcLocalPlacement*)l;
 	while (1) {
 		gp_Trsf trsf2;
-		IfcSchema::IfcAxis2Placement relplacement = current->RelativePlacement();
+		IfcSchema::IfcAxis2Placement* relplacement = current->RelativePlacement();
 		if ( relplacement->is(IfcSchema::Type::IfcAxis2Placement3D) ) {
 			IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement3D*)relplacement,trsf2);
 			trsf.PreMultiply(trsf2);

src/ifcgeom/IfcGeomIterator.h

@@ -71,10 +71,9 @@
 #include <gp_Trsf.hxx>
 #include <gp_Trsf2d.hxx>
 
-#include "../ifcparse/IfcParse.h"
+#include "../ifcparse/IfcFile.h"
 
 #include "../ifcgeom/IfcGeom.h"
-#include "../ifcgeom/IfcGeomUtils.h"
 #include "../ifcgeom/IfcGeomElement.h"
 #include "../ifcgeom/IfcGeomMaterial.h"
 #include "../ifcgeom/IfcGeomIteratorSettings.h"
@@ -90,16 +89,16 @@ namespace IfcGeom {
 
 		IfcParse::IfcFile* ifc_file;
 
-		// A container and iterator for IfcShapeRepresentations
+		// A container and iterator for IfcRepresentations
 		IfcSchema::IfcRepresentation::list::ptr representations;
-		IfcSchema::IfcRepresentation::list::it shaperep_iterator;
+		IfcSchema::IfcRepresentation::list::it representation_iterator;
 
 		// The object is fetched beforehand to be sure that get() returns a valid element
 		TriangulationElement<P>* current_triangulation;
-		ShapeModelElement<P>* current_shape_model;
+		BRepElement<P>* current_shape_model;
 		SerializedElement<P>* current_serialization;
 		
-		// A container and iterator for IfcBuildingElements for the current IfcRepresentation referenced by *shaperep_iterator
+		// A container and iterator for IfcBuildingElements for the current IfcRepresentation referenced by *representation_iterator
 		IfcSchema::IfcProduct::list::ptr entities;
 		IfcSchema::IfcProduct::list::it ifcproduct_iterator;
 
@@ -110,93 +109,18 @@ namespace IfcGeom {
 		// double?
 		P unit_magnitude;
 
-		// Store references to all returned non-geometric elements to be freed when the destructor is called
-		std::vector<Element<P>*> returned_elements;
-
 		void initUnits() {
-			// Set default units, set length to meters, angles to undefined
-			kernel.setValue(IfcGeom::Kernel::GV_LENGTH_UNIT, 1.0);
-			kernel.setValue(IfcGeom::Kernel::GV_PLANEANGLE_UNIT, -1.0);
-			
-			IfcSchema::IfcUnitAssignment::list::ptr unit_assignments = ifc_file->EntitiesByType<IfcSchema::IfcUnitAssignment>();
-			IfcUtil::IfcAbstractSelect::list::ptr units;
-			try {
-				if ( unit_assignments->Size() ) {
-					IfcSchema::IfcUnitAssignment* unit_assignment = *unit_assignments->begin();
-					units = unit_assignment->Units();
-				}
-			} catch (const IfcParse::IfcException&) {}
-
-			if (!units || !units->Size()) {
-				// No units eh... Since tolerances and deflection are specified internally in meters
-				// we will try to find another indication of the model size.
-				IfcSchema::IfcExtrudedAreaSolid::list::ptr extrusions = ifc_file->EntitiesByType<IfcSchema::IfcExtrudedAreaSolid>();
-				if ( ! extrusions->Size() ) return;
-				double max_height = -1.0f;
-				for ( IfcSchema::IfcExtrudedAreaSolid::list::it it = extrusions->begin(); it != extrusions->end(); ++ it ) {
-					try {
-						const double depth = (*it)->Depth();
-						if ( depth > max_height ) max_height = depth;
-					} catch (const IfcParse::IfcException&) {}
-				}
-				if ( max_height > 100.0f ) {
-					kernel.setValue(IfcGeom::Kernel::GV_LENGTH_UNIT, 0.001);
-					Logger::Message(Logger::LOG_NOTICE, "Guessed length unit to be in millimeters based on extrusion depth");
-				}
-				return;
-			}
-
-			try {
-				for ( IfcUtil::IfcAbstractSelect::list::it it = units->begin(); it != units->end(); ++ it ) {
-					std::string current_unit_name = "";
-					IfcUtil::IfcAbstractSelect* base = *it;
-					IfcSchema::IfcSIUnit* unit = 0;
-					double value = 1.f;
-					if ( base->is(IfcSchema::Type::IfcConversionBasedUnit) ) {
-						IfcSchema::IfcConversionBasedUnit* u = (IfcSchema::IfcConversionBasedUnit*)base;
-						current_unit_name = u->Name();
-						IfcSchema::IfcMeasureWithUnit* u2 = u->ConversionFactor();
-						IfcSchema::IfcUnit u3 = u2->UnitComponent();
-						if ( u3->is(IfcSchema::Type::IfcSIUnit) ) {
-							unit = (IfcSchema::IfcSIUnit*) u3;
-						}
-						IfcSchema::IfcValue v = u2->ValueComponent();
-						IfcUtil::IfcArgumentSelect* v2 = (IfcUtil::IfcArgumentSelect*) v;
-						const double f = *v2->wrappedValue();
-						value *= f;
-					} else if ( base->is(IfcSchema::Type::IfcSIUnit) ) {
-						unit = (IfcSchema::IfcSIUnit*)base;
-					}
-					if ( unit ) {
-						if ( unit->hasPrefix() ) {
-							value *= IfcGeom::Utils::UnitPrefixToValue(unit->Prefix());
-						}
-						IfcSchema::IfcUnitEnum::IfcUnitEnum type = unit->UnitType();
-						if ( type == IfcSchema::IfcUnitEnum::IfcUnit_LENGTHUNIT ) {
-							kernel.setValue(IfcGeom::Kernel::GV_LENGTH_UNIT,value);
-							if (current_unit_name.empty()) {
-								if (unit->hasPrefix()) {
-									current_unit_name = IfcSchema::IfcSIPrefix::ToString(unit->Prefix());
-								}
-								current_unit_name += IfcSchema::IfcSIUnitName::ToString(unit->Name());
-							}
-							unit_magnitude = static_cast<P>(value);
-							unit_name = current_unit_name;
-						} else if ( type == IfcSchema::IfcUnitEnum::IfcUnit_PLANEANGLEUNIT ) {
-							kernel.setValue(IfcGeom::Kernel::GV_PLANEANGLE_UNIT, value);
-						}
-					}
-				}
-			} catch (const IfcParse::IfcException& ex) {
-				std::stringstream ss;
-				ss << "Failed to determine unit information '" << ex.what() << "'";
-				Logger::Message(Logger::LOG_ERROR, ss.str());
+			IfcSchema::IfcProject::list::ptr projects = ifc_file->EntitiesByType<IfcSchema::IfcProject>();
+			if (projects->Size() == 1) {
+				IfcSchema::IfcProject* project = *projects->begin();
+				std::pair<std::string, double> length_unit = kernel.initializeUnits(project->UnitsInContext());
+				unit_name = length_unit.first;
+				unit_magnitude = static_cast<P>(length_unit.second);
 			}
 		}
 
 	public:
 		bool findContext() {
-
 			try {
 				initUnits();
 			} catch (...) {}
@@ -266,7 +190,7 @@ namespace IfcGeom {
 
 			if (representations->Size() == 0) return false;
 
-			shaperep_iterator = representations->begin();
+			representation_iterator = representations->begin();
 			entities.reset();
 
 			if (!create()) {
@@ -300,82 +224,28 @@ namespace IfcGeom {
 		}
 
 	private:
-		// Move the the next IfcRepresentation
+		// Move to the next IfcRepresentation
 		void _nextShape() {
 			entities.reset();
-			++ shaperep_iterator;
+			++ representation_iterator;
 			++ done;
 		}
 
-		int _getParentId(IfcSchema::IfcProduct* ifc_product) {
-			int parent_id = -1;
-			// In case of an opening element, parent to the RelatingBuildingElement
-			if ( ifc_product->is(IfcSchema::Type::IfcOpeningElement ) ) {
-				IfcSchema::IfcOpeningElement* opening = (IfcSchema::IfcOpeningElement*)ifc_product;
-				IfcSchema::IfcRelVoidsElement::list::ptr voids = opening->VoidsElements();
-				if ( voids->Size() ) {
-					IfcSchema::IfcRelVoidsElement* ifc_void = *voids->begin();
-					parent_id = ifc_void->RelatingBuildingElement()->entity->id();
-				}
-			} else if ( ifc_product->is(IfcSchema::Type::IfcElement ) ) {
-				IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)ifc_product;
-				IfcSchema::IfcRelFillsElement::list::ptr fills = element->FillsVoids();
-				// Incase of a RelatedBuildingElement parent to the opening element
-				if ( fills->Size() ) {
-					for ( IfcSchema::IfcRelFillsElement::list::it it = fills->begin(); it != fills->end(); ++ it ) {
-						IfcSchema::IfcRelFillsElement* fill = *it;
-						IfcSchema::IfcObjectDefinition* ifc_objectdef = fill->RelatingOpeningElement();
-						if ( ifc_product == ifc_objectdef ) continue;
-						parent_id = ifc_objectdef->entity->id();
-					}
-				} 
-				// Else simply parent to the containing structure
-				if ( parent_id == -1 ) {
-					IfcSchema::IfcRelContainedInSpatialStructure::list::ptr parents = element->ContainedInStructure();
-					if ( parents->Size() ) {
-						IfcSchema::IfcRelContainedInSpatialStructure* parent = *parents->begin();
-						parent_id = parent->RelatingStructure()->entity->id();
-					}
-				}
-			}
-			// Parent decompositions to the RelatingObject
-			if ( parent_id == -1 ) {
-				IfcEntityList::ptr parents = ifc_product->entity->getInverse(IfcSchema::Type::IfcRelAggregates);
-				parents->push(ifc_product->entity->getInverse(IfcSchema::Type::IfcRelNests));
-				for ( IfcEntityList::it it = parents->begin(); it != parents->end(); ++ it ) {
-					IfcSchema::IfcRelDecomposes* decompose = (IfcSchema::IfcRelDecomposes*)*it;
-					IfcSchema::IfcObjectDefinition* ifc_objectdef;
-		#ifdef USE_IFC4
-					if (decompose->is(IfcSchema::Type::IfcRelAggregates)) {
-						ifc_objectdef = ((IfcSchema::IfcRelAggregates*)decompose)->RelatingObject();
-					} else {
-						continue;
-					}
-		#else
-					ifc_objectdef = decompose->RelatingObject();
-		#endif
-					if ( ifc_product == ifc_objectdef ) continue;
-					parent_id = ifc_objectdef->entity->id();
-				}
-			}
-			return parent_id;
-		}
-
-		ShapeModelElement<P>* create_shape_model_for_next_entity() {
+		BRepElement<P>* create_shape_model_for_next_entity() {
 			while ( true ) {
-				IfcSchema::IfcRepresentation* shaperep;
+				IfcSchema::IfcRepresentation* representation;
 
 				// Have we reached the end of our list of representations?
-				if ( shaperep_iterator == representations->end() ) {
+				if ( representation_iterator == representations->end() ) {
 					representations.reset();
 					return 0;
 				}
-				shaperep = *shaperep_iterator;
+				representation = *representation_iterator;
 
 				// Has the list of IfcProducts for this representation been initialized?
 				if ( ! entities ) {
 					
-					IfcSchema::IfcProductRepresentation::list::ptr prodreps = shaperep->OfProductRepresentation();
+					IfcSchema::IfcProductRepresentation::list::ptr prodreps = representation->OfProductRepresentation();
 					entities = IfcSchema::IfcProduct::list::ptr(new IfcSchema::IfcProduct::list);
 					for ( IfcSchema::IfcProductRepresentation::list::it it = prodreps->begin(); it != prodreps->end(); ++it ) {
 						if ( (*it)->is(IfcSchema::Type::IfcProductDefinitionShape) ) {
@@ -406,99 +276,17 @@ namespace IfcGeom {
 					_nextShape();
 					continue;
 				}
-						
-				IfcGeom::Representation::BRep* shape;
-				IfcGeom::IfcRepresentationShapeItems shapes;
 
-				if ( !kernel.convert_shapes(shaperep,shapes) ) {
+				IfcSchema::IfcProduct* product = *ifcproduct_iterator;
+
+				BRepElement<P>* element = kernel.create_brep_for_representation_and_product<P>(settings, representation, product);
+
+				if ( !element ) {
 					_nextShape();
 					continue;
 				}
 
-				IfcSchema::IfcProduct* ifc_product = *ifcproduct_iterator;
-
-				int parent_id = -1;
-				try {
-					parent_id = _getParentId(ifc_product);
-				} catch (...) {}
-		
-				const std::string name = ifc_product->hasName() ? ifc_product->Name() : "";
-				const std::string guid = ifc_product->GlobalId();
-		
-				gp_Trsf trsf;
-				try {
-					kernel.convert(ifc_product->ObjectPlacement(),trsf);
-				} catch (...) {}
-
-				// Does the IfcElement have any IfcOpenings?
-				// Note that openings for IfcOpeningElements are not processed
-				IfcSchema::IfcRelVoidsElement::list::ptr openings;
-				if ( ifc_product->is(IfcSchema::Type::IfcElement) && !ifc_product->is(IfcSchema::Type::IfcOpeningElement) ) {
-					IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)ifc_product;
-					openings = element->HasOpenings();
-				}
-				// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
-				if ( ifc_product->is(IfcSchema::Type::IfcBuildingElementPart ) ) {
-					IfcSchema::IfcBuildingElementPart* part = (IfcSchema::IfcBuildingElementPart*)ifc_product;
-		#ifdef USE_IFC4
-					IfcSchema::IfcRelAggregates::list::ptr decomposes = part->Decomposes();
-					for ( IfcSchema::IfcRelAggregates::list::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
-		#else
-					IfcSchema::IfcRelDecomposes::list::ptr decomposes = part->Decomposes();
-					for ( IfcSchema::IfcRelDecomposes::list::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
-		#endif
-						IfcSchema::IfcObjectDefinition* obdef = (*it)->RelatingObject();
-						if ( obdef->is(IfcSchema::Type::IfcElement) ) {
-							IfcSchema::IfcElement* element = (IfcSchema::IfcElement*)obdef;
-							openings->push(element->HasOpenings());
-						}
-					}
-				}
-
-				const std::string product_type = IfcSchema::Type::ToString(ifc_product->type());
-				ElementSettings element_settings(settings, unit_magnitude, product_type);
-
-				if ( !settings.disable_opening_subtractions() && openings && openings->Size() ) {
-					IfcGeom::IfcRepresentationShapeItems opened_shapes;
-					try {
-						if ( settings.faster_booleans() ) {
-							bool succes = kernel.convert_openings_fast(ifc_product,openings,shapes,trsf,opened_shapes);
-							if ( ! succes ) {
-								opened_shapes.clear();
-								kernel.convert_openings(ifc_product,openings,shapes,trsf,opened_shapes);
-							}
-						} else {
-							kernel.convert_openings(ifc_product,openings,shapes,trsf,opened_shapes);
-						}
-					} catch(...) { 
-						Logger::Message(Logger::LOG_ERROR,"Error processing openings for:",ifc_product->entity); 
-					}
-					if ( settings.use_world_coords() ) {
-						for ( IfcGeom::IfcRepresentationShapeItems::iterator it = opened_shapes.begin(); it != opened_shapes.end(); ++ it ) {
-							it->prepend(trsf);
-						}
-						trsf = gp_Trsf();
-					}
-					shape = new IfcGeom::Representation::BRep(element_settings, shaperep->entity->id(), opened_shapes);
-				} else if ( settings.use_world_coords() ) {
-					for ( IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++ it ) {
-						it->prepend(trsf);
-					}
-					trsf = gp_Trsf();
-					shape = new IfcGeom::Representation::BRep(element_settings, shaperep->entity->id(), shapes);
-				} else {
-					shape = new IfcGeom::Representation::BRep(element_settings, shaperep->entity->id(), shapes);
-				}
-
-				return new ShapeModelElement<P>(
-					ifc_product->entity->id(),
-					parent_id,
-					name, 
-					product_type,
-					guid,
-					trsf,
-					shape
-				);
+				return element;
 			}	
 		}
 
@@ -508,6 +296,10 @@ namespace IfcGeom {
 			// Free all possible representations of the current geometrical entity
 			delete current_triangulation;
 			current_triangulation = 0;
+			delete current_serialization;
+			current_serialization = 0;
+			delete current_shape_model;
+			current_shape_model = 0;
 			
 			// Increment the iterator over the list of products using the current
 			// shape representation
@@ -541,8 +333,12 @@ namespace IfcGeom {
 					product_guid = ifc_product->GlobalId();
 					product_name = ifc_product->hasName() ? ifc_product->Name() : "";
 					
+					parent_id = -1;
 					try {
-						parent_id = _getParentId(ifc_product);
+						IfcSchema::IfcObjectDefinition* parent_object = kernel.get_decomposing_entity(ifc_product);
+						if (parent_object) {
+							parent_id = parent_object->entity->id();
+						}
 					} catch (...) {}
 					
 					try {
@@ -554,7 +350,6 @@ namespace IfcGeom {
 			ElementSettings element_settings(settings, unit_magnitude, instance_type);
 			Element<P>* ifc_object = new Element<P>(element_settings, id, parent_id, product_name, instance_type, product_guid, trsf);
 			
-			returned_elements.push_back(ifc_object);
 			return ifc_object;
 		}
 
@@ -622,15 +417,14 @@ namespace IfcGeom {
 			// TODO: Correctly implement destructor for IfcFile
 			delete ifc_file;
 
-			typename std::vector<Element<P>*>::const_iterator it;
-			for (it = returned_elements.begin(); it != returned_elements.end(); ++ it ) {
-				delete *it;
-			}
-
-			returned_elements.clear();
+			delete current_triangulation;
+			current_triangulation = 0;
+			delete current_serialization;
+			current_serialization = 0;
+			delete current_shape_model;
+			current_shape_model = 0;
 		}
 	};
 }
 
-
 #endif

src/ifcgeom/IfcGeomMaterial.h

@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../ifcgeom/IfcGeomRenderStyles.h"
 
 namespace IfcGeom {	
 

src/ifcgeom/IfcGeomRenderStyles.cpp

@@ -30,21 +30,21 @@ bool process_colour(IfcSchema::IfcColourRgb* colour, std::tr1::array<double, 3>&
 	return colour != 0;
 }
 
-bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::tr1::array<double, 3>& rgb) {
+bool process_colour(IfcSchema::IfcNormalisedRatioMeasure* factor, std::tr1::array<double, 3>& rgb) {
 	if (factor != 0) {
-		const double f = *factor->wrappedValue();
+		const double f = *factor;
 		rgb[0] = rgb[1] = rgb[2] = f;
 	}
 	return factor != 0;
 }
 
-bool process_colour(IfcSchema::IfcColourOrFactor colour_or_factor, std::tr1::array<double, 3>& rgb) {
+bool process_colour(IfcSchema::IfcColourOrFactor* colour_or_factor, std::tr1::array<double, 3>& rgb) {
 	if (colour_or_factor == 0) {
 		return false;
 	} else if (colour_or_factor->is(IfcSchema::Type::IfcColourRgb)) {
 		return process_colour(static_cast<IfcSchema::IfcColourRgb*>(colour_or_factor), rgb);
 	} else if (colour_or_factor->is(IfcSchema::Type::IfcNormalisedRatioMeasure)) {
-		return process_colour(static_cast<IfcUtil::IfcArgumentSelect*>(colour_or_factor), rgb);
+		return process_colour(static_cast<IfcSchema::IfcNormalisedRatioMeasure*>(colour_or_factor), rgb);
 	} else {
 		return false;
 	}
@@ -86,14 +86,14 @@ const IfcGeom::SurfaceStyle* IfcGeom::Kernel::get_style(const IfcSchema::IfcRepr
 			surface_style.Specular().reset(SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2]));
 		}
 		if (rendering_style->hasSpecularHighlight()) {
-			IfcUtil::IfcArgumentSelect* highlight = static_cast<IfcUtil::IfcArgumentSelect*>(rendering_style->SpecularHighlight());
+			IfcSchema::IfcSpecularHighlightSelect* highlight = rendering_style->SpecularHighlight();
 			if (highlight->is(IfcSchema::Type::IfcSpecularRoughness)) {
-				double roughness = *highlight->wrappedValue();
+				double roughness = *((IfcSchema::IfcSpecularRoughness*)highlight);
 				if (roughness >= 1e-9) {
 					surface_style.Specularity().reset(1.0 / roughness);
 				}
-			} else if (highlight->is(IfcSchema::Type::IfcSpecularRoughness)) {
-				surface_style.Specularity().reset(*highlight->wrappedValue());
+			} else if (highlight->is(IfcSchema::Type::IfcSpecularExponent)) {
+				surface_style.Specularity().reset(*((IfcSchema::IfcSpecularExponent*)highlight));
 			}
 		}
 		if (rendering_style->hasTransmissionColour()) {

src/ifcgeom/IfcGeomRepresentation.h

@@ -31,6 +31,7 @@
 
 #include "../ifcgeom/IfcGeomIteratorSettings.h"
 #include "../ifcgeom/IfcGeomMaterial.h"
+#include "../ifcgeom/IfcRepresentationShapeItem.h"
 
 namespace IfcGeom {
 
@@ -40,8 +41,11 @@ namespace IfcGeom {
 		protected:
 			const ElementSettings _settings;
 		public:
-			explicit Representation(const ElementSettings& settings) : _settings(settings) {}
+			explicit Representation(const ElementSettings& settings)
+				: _settings(settings) 
+			{}
 			const ElementSettings& settings() const { return _settings; }
+			virtual ~Representation() {}
 		};
 
 		class BRep : public Representation {

src/ifcgeom/IfcGeomShapes.cpp

@@ -253,9 +253,9 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcPolygonalBoundedHalfSpace* l,
 }
 
 bool IfcGeom::Kernel::convert(const IfcSchema::IfcShellBasedSurfaceModel* l, IfcRepresentationShapeItems& shapes) {
-	IfcUtil::IfcAbstractSelect::list::ptr shells = l->SbsmBoundary();
+	IfcEntityList::ptr shells = l->SbsmBoundary();
 	const SurfaceStyle* collective_style = get_style(l);
-	for( IfcUtil::IfcAbstractSelect::list::it it = shells->begin(); it != shells->end(); ++ it ) {
+	for( IfcEntityList::it it = shells->begin(); it != shells->end(); ++ it ) {
 		TopoDS_Shape s;
 		const SurfaceStyle* shell_style = 0;
 		if ((*it)->is(IfcSchema::Type::IfcRepresentationItem)) {
@@ -272,8 +272,8 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcBooleanResult* l, TopoDS_Shape
 	TopoDS_Shape s1, s2;
 	IfcRepresentationShapeItems items1, items2;
 	TopoDS_Wire boundary_wire;
-	IfcSchema::IfcBooleanOperand operand1 = l->FirstOperand();
-	IfcSchema::IfcBooleanOperand operand2 = l->SecondOperand();
+	IfcSchema::IfcBooleanOperand* operand1 = l->FirstOperand();
+	IfcSchema::IfcBooleanOperand* operand2 = l->SecondOperand();
 	bool is_halfspace = operand2->is(IfcSchema::Type::IfcHalfSpaceSolid);
 
 	if ( is_shape_collection(operand1) ) {
@@ -467,7 +467,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcMappedItem* l, IfcRepresentati
 		gtrsf = (gp_Trsf) trsf_2d;
 	}
 	IfcSchema::IfcRepresentationMap* map = l->MappingSource();
-	IfcSchema::IfcAxis2Placement placement = map->MappingOrigin();
+	IfcSchema::IfcAxis2Placement* placement = map->MappingOrigin();
 	gp_Trsf trsf;
 	if (placement->is(IfcSchema::Type::IfcAxis2Placement3D)) {
 		IfcGeom::Kernel::convert((IfcSchema::IfcAxis2Placement3D*)placement,trsf);
@@ -506,12 +506,12 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcShapeRepresentation* l, IfcRep
 }
 
 bool IfcGeom::Kernel::convert(const IfcSchema::IfcGeometricSet* l, IfcRepresentationShapeItems& shapes) {
-	IfcUtil::IfcAbstractSelect::list::ptr elements = l->Elements();
+	IfcEntityList::ptr elements = l->Elements();
 	if ( !elements->Size() ) return false;
 	bool part_succes = false;
 	const IfcGeom::SurfaceStyle* parent_style = get_style(l);
-	for ( IfcUtil::IfcAbstractSelect::list::it it = elements->begin(); it != elements->end(); ++ it ) {
-		IfcSchema::IfcGeometricSetSelect element = *it;
+	for ( IfcEntityList::it it = elements->begin(); it != elements->end(); ++ it ) {
+		IfcSchema::IfcGeometricSetSelect* element = *it;
 		if (element->is(IfcSchema::Type::IfcSurface)) {
 			IfcSchema::IfcSurface* surface = (IfcSchema::IfcSurface*) element;
 			TopoDS_Shape s;

src/ifcgeom/IfcGeomWires.cpp

@@ -180,8 +180,8 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcTrimmedCurve* l, TopoDS_Wire&
 	Handle(Geom_Curve) curve;
 	if ( !convert_curve(basis_curve,curve) ) return false;
 	bool trim_cartesian = l->MasterRepresentation() == IfcSchema::IfcTrimmingPreference::IfcTrimmingPreference_CARTESIAN;
-	IfcUtil::IfcAbstractSelect::list::ptr trims1 = l->Trim1();
-	IfcUtil::IfcAbstractSelect::list::ptr trims2 = l->Trim2();
+	IfcEntityList::ptr trims1 = l->Trim1();
+	IfcEntityList::ptr trims2 = l->Trim2();
 	bool trimmed1 = false;
 	bool trimmed2 = false;
 	unsigned sense_agreement = l->SenseAgreement() ? 0 : 1;
@@ -190,24 +190,24 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcTrimmedCurve* l, TopoDS_Wire&
 	bool has_flts[2] = {false,false};
 	bool has_pnts[2] = {false,false};
 	BRepBuilderAPI_MakeWire w;
-	for ( IfcUtil::IfcAbstractSelect::list::it it = trims1->begin(); it != trims1->end(); it ++ ) {
-		IfcUtil::IfcAbstractSelect* i = *it;
+	for ( IfcEntityList::it it = trims1->begin(); it != trims1->end(); it ++ ) {
+		IfcUtil::IfcBaseClass* i = *it;
 		if ( i->is(IfcSchema::Type::IfcCartesianPoint) ) {
 			IfcGeom::Kernel::convert((IfcSchema::IfcCartesianPoint*)i, pnts[sense_agreement] );
 			has_pnts[sense_agreement] = true;
 		} else if ( i->is(IfcSchema::Type::IfcParameterValue) ) {
-			const double value = *((IfcUtil::IfcArgumentSelect*)i)->wrappedValue();
+			const double value = *((IfcSchema::IfcParameterValue*)i);
 			flts[sense_agreement] = value * parameterFactor;
 			has_flts[sense_agreement] = true;
 		}
 	}
-	for ( IfcUtil::IfcAbstractSelect::list::it it = trims2->begin(); it != trims2->end(); it ++ ) {
-		IfcUtil::IfcAbstractSelect* i = *it;
+	for ( IfcEntityList::it it = trims2->begin(); it != trims2->end(); it ++ ) {
+		IfcUtil::IfcBaseClass* i = *it;
 		if ( i->is(IfcSchema::Type::IfcCartesianPoint) ) {
 			IfcGeom::Kernel::convert((IfcSchema::IfcCartesianPoint*)i, pnts[1-sense_agreement] );
 			has_pnts[1-sense_agreement] = true;
 		} else if ( i->is(IfcSchema::Type::IfcParameterValue) ) {
-			const double value = *((IfcUtil::IfcArgumentSelect*)i)->wrappedValue();
+			const double value = *((IfcSchema::IfcParameterValue*)i);
 			flts[1-sense_agreement] = value * parameterFactor;
 			has_flts[1-sense_agreement] = true;
 		}