changed ProductShapeData( int entity_id ) to ProductShapeData( std::wstring entity_guid )

Author: ifcapps

IfcPlusPlus/src/ifcpp/geometry/Carve/GeometryConverter.h

@@ -348,13 +348,15 @@ class GeometryConverter : public StatusCallback
 				shared_ptr<IfcObjectDefinition> object_def = vec_object_definitions[i];
 				const int entity_id = object_def->m_entity_id;
 				std::string guid;
+				std::wstring guid_wstr;
 				if (object_def->m_GlobalId)
 				{
 					std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converterX;
-					guid = converterX.to_bytes(object_def->m_GlobalId->m_value);
+					guid_wstr = object_def->m_GlobalId->m_value;
+					guid = converterX.to_bytes(guid_wstr);
 				}
 
-				shared_ptr<ProductShapeData> product_geom_input_data( new ProductShapeData( entity_id ) );
+				shared_ptr<ProductShapeData> product_geom_input_data( new ProductShapeData(guid_wstr) );
 				product_geom_input_data->m_ifc_object_definition = object_def;
 
 				// TODO: check for equal product shapes: each representation and each item must be equal, also openings must be equal: m_HasOpenings_inverse

IfcPlusPlus/src/ifcpp/geometry/Carve/GeometryInputData.h

@@ -555,7 +555,7 @@ class RepresentationData
 class ProductShapeData 
 {
 public:
-	int m_entity_id = -1;
+	std::wstring m_entity_guid;
 	weak_ptr<IfcObjectDefinition>						m_ifc_object_definition;
 	weak_ptr<IfcObjectPlacement>						m_object_placement;
 	std::vector<shared_ptr<RepresentationData> >		m_vec_representations;
@@ -569,12 +569,12 @@ class ProductShapeData
 
 public:
 	ProductShapeData() {}
-	ProductShapeData( int entity_id ) : m_entity_id(entity_id) { }
+	ProductShapeData( std::wstring entity_guid ) : m_entity_guid(entity_guid) { }
 
 	const std::vector<shared_ptr<ProductShapeData> >& getChildren() { return m_vec_children; }
 	shared_ptr<ProductShapeData> getDeepCopy()
 	{
-		shared_ptr<ProductShapeData> copy_data( new ProductShapeData(m_entity_id) );
+		shared_ptr<ProductShapeData> copy_data( new ProductShapeData(m_entity_guid) );
 		for( size_t item_i = 0; item_i < m_vec_representations.size(); ++item_i )
 		{
 			shared_ptr<RepresentationData>& representation_data = m_vec_representations[item_i];
@@ -667,13 +667,13 @@ class ProductShapeData
 			const shared_ptr<ProductShapeData>& existing_child = m_vec_children[ii];
 			if( existing_child == add_child )
 			{
-				if( existing_child->m_entity_id == add_child->m_entity_id )
+				if( existing_child->m_entity_guid.compare( add_child->m_entity_guid ) == 0 )
 				{
-					std::cout << __FUNCTION__ << ": child already added, entity_id: " << add_child->m_entity_id << std::endl;
+					std::wcout << __FUNCTION__ << L": child already added, entity_id: " << add_child->m_entity_guid << std::endl;
 				}
 				else
 				{
-					std::cout << __FUNCTION__ << ": entity_id mismatch: " << add_child->m_entity_id << " != " << existing_child->m_entity_id << std::endl;
+					std::wcout << __FUNCTION__ << L": entity_id mismatch: " << add_child->m_entity_guid << L" != " << existing_child->m_entity_guid << std::endl;
 				}
 				return;
 			}

IfcPlusPlus/src/ifcpp/geometry/Carve/RepresentationConverter.h

@@ -35,6 +35,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <ifcpp/IFC4/include/IfcGeometricCurveSet.h>
 #include <ifcpp/IFC4/include/IfcGeometricRepresentationItem.h>
 #include <ifcpp/IFC4/include/IfcGeometricSet.h>
+#include <ifcpp/IFC4/include/IfcGloballyUniqueId.h>
 #include <ifcpp/IFC4/include/IfcLabel.h>
 #include <ifcpp/IFC4/include/IfcMappedItem.h>
 #include <ifcpp/IFC4/include/IfcOpenShell.h>
@@ -119,6 +120,7 @@ class RepresentationConverter : public StatusCallback
 	{
 		m_profile_cache->clearProfileCache();
 		m_styles_converter->clearStylesCache();
+		m_unit_converter->resetUnitFactors();
 	}
 	shared_ptr<GeometrySettings>&		getGeomSettings()	{ return m_geom_settings; }
 	shared_ptr<UnitConverter>&			getUnitConverter() { return m_unit_converter; }
@@ -947,7 +949,11 @@ class RepresentationConverter : public StatusCallback
 
 			// opening can have its own relative placement
 			shared_ptr<IfcObjectPlacement>	opening_placement = opening->m_ObjectPlacement;
-			shared_ptr<ProductShapeData> product_shape_opening( new ProductShapeData( opening_placement->m_entity_id ) );
+			shared_ptr<ProductShapeData> product_shape_opening( new ProductShapeData() );
+			if (opening->m_GlobalId)
+			{
+				product_shape_opening->m_entity_guid = opening->m_GlobalId->m_value;
+			}
 			if( opening_placement )
 			{
 				std::unordered_set<IfcObjectPlacement*> opening_placements_applied;

IfcPlusPlus/src/ifcpp/model/BuildingModel.h

@@ -35,7 +35,7 @@ class IFCQUERY_EXPORT BuildingModel : public StatusCallback
 	~BuildingModel() override;
 
 	enum SchemaVersionEnum { IFC_VERSION_UNDEFINED, IFC_VERSION_UNKNOWN, IFC2X, IFC2X2, IFC2X3, IFC2X4, IFC4, IFC4X1, IFC4X3RC1, IFC4X3RC2, IFC4X3RC3 };
-	const std::map<int, shared_ptr<BuildingEntity> >& getMapIfcEntities() const { return m_map_entities; }
+	std::map<int, shared_ptr<BuildingEntity> >& getMapIfcEntities() { return m_map_entities; }
 	void setMapIfcEntities( const std::map<int, shared_ptr<BuildingEntity> >& map );
 	void insertEntity( shared_ptr<BuildingEntity> e, bool overwrite_existing = false, bool warn_on_existing_entities = true );
 	void removeEntity( shared_ptr<BuildingEntity> e );

examples/SimpleViewerExampleQt/src/gui/TabReadWrite.cpp

@@ -362,9 +362,9 @@ void TabReadWrite::loadIfcFile( QString& path_in )
 		}
 	}
 
-	clock_t time_diff = clock() - millisecs;
+	int time_diff = (clock() - millisecs)/(double)CLOCKS_PER_SEC;
 	int num_entities = m_system->getIfcModel()->getMapIfcEntities().size();
-	txtOut( tr("File loaded: ") + QString::number(num_entities) + " entities in " + QString::number( round(time_diff*0.1)*0.01 ) + " sec."  );
+	txtOut( tr("File loaded: ") + QString::number(num_entities) + " entities in " + QString::number( round(time_diff*10)*0.1 ) + " sec."  );
 
 	m_system->notifyModelLoadingDone();
 	progressValue( 1.0, "" );