Fix unit conversion (scaling)

Author: ifcapps

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

@@ -94,7 +94,7 @@ class GeometryConverter : public StatusCallback
 	{
 		m_product_shape_data.clear();
 		m_map_outside_spatial_structure.clear();
-		m_representation_converter->clearCache();
+		m_representation_converter->clearCache(false);
 		m_messages.clear();
 	}
 
@@ -116,7 +116,7 @@ class GeometryConverter : public StatusCallback
 		}
 		clearInputCache();
 		m_ifc_model = model;
-		m_representation_converter->clearCache();
+		m_representation_converter->clearCache(false);
 		m_representation_converter->setUnitConverter( m_ifc_model->getUnitConverter() );
 		m_ifc_model->setMessageTarget( this );
 	}
@@ -297,7 +297,7 @@ class GeometryConverter : public StatusCallback
 		progressValueCallback( 0, "geometry" );
 		m_product_shape_data.clear();
 		m_map_outside_spatial_structure.clear();
-		m_representation_converter->clearCache();
+		m_representation_converter->clearCache(false);
 
 		if( !m_ifc_model )
 		{

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

@@ -113,14 +113,17 @@ class RepresentationConverter : public StatusCallback
 
 	virtual ~RepresentationConverter()
 	{
-		clearCache();
+		clearCache(false);
 	}
 
-	void clearCache()
+	void clearCache( bool resetUnitFactor )
 	{
 		m_profile_cache->clearProfileCache();
 		m_styles_converter->clearStylesCache();
-		m_unit_converter->resetUnitFactors();
+		if (resetUnitFactor)
+		{
+			m_unit_converter->resetUnitFactors();
+		}
 	}
 	shared_ptr<GeometrySettings>&		getGeomSettings()	{ return m_geom_settings; }
 	shared_ptr<UnitConverter>&			getUnitConverter() { return m_unit_converter; }

IfcPlusPlus/src/ifcpp/model/UnitConverter.cpp

@@ -118,7 +118,7 @@ void UnitConverter::setIfcProject( shared_ptr<IfcProject> project )
 	std::vector<shared_ptr<IfcUnit> >& vec_units = unit_assignment->m_Units;
 	for(auto unit : vec_units)
 	{
-			if( !unit )
+		if( !unit )
 		{
 			continue;
 		}