Merge pull request #2 from ifcquery/master

merge

IfcPlusPlus/CMakeLists.txt

@@ -36,6 +36,7 @@ set(IFCPP_SOURCE_FILES
     src/ifcpp/writer/WriterSTEP.cpp
     src/ifcpp/writer/WriterUtil.cpp
 	src/ifcpp/geometry/CSG_Adapter.cpp
+	src/ifcpp/geometry/CurveConverter.cpp
 	src/ifcpp/geometry/GeometryInputData.cpp
 	src/ifcpp/geometry/MeshOps.cpp
 	src/ifcpp/geometry/MeshSimplifier.cpp

IfcPlusPlus/IfcPlusPlus.vcxproj

@@ -128,6 +128,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\ifcpp\geometry\CSG_Adapter.cpp" />
+    <ClCompile Include="src\ifcpp\geometry\CurveConverter.cpp" />
     <ClCompile Include="src\ifcpp\geometry\GeometryInputData.cpp" />
     <ClCompile Include="src\ifcpp\geometry\MeshOps.cpp" />
     <ClCompile Include="src\ifcpp\geometry\MeshSimplifier.cpp" />

IfcPlusPlus/IfcPlusPlus.vcxproj.filters

@@ -299,5 +299,8 @@
     <ClCompile Include="src\ifcpp\geometry\SolidModelConverter.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="src\ifcpp\geometry\CurveConverter.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcActorSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcActorSelect> IFC4X3::IfcActorSelect::createObjectFromSTEP(
 		return shared_ptr<IfcActorSelect>();
 	}
 	shared_ptr<IfcActorSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcAppliedValueSelect.cpp

@@ -131,6 +131,6 @@ shared_ptr<IFC4X3::IfcAppliedValueSelect> IFC4X3::IfcAppliedValueSelect::createO
 		return shared_ptr<IfcAppliedValueSelect>();
 	}
 	shared_ptr<IfcAppliedValueSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcAxis2Placement.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcAxis2Placement> IFC4X3::IfcAxis2Placement::createObjectFro
 		return shared_ptr<IfcAxis2Placement>();
 	}
 	shared_ptr<IfcAxis2Placement> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcBendingParameterSelect.cpp

@@ -20,6 +20,6 @@ shared_ptr<IFC4X3::IfcBendingParameterSelect> IFC4X3::IfcBendingParameterSelect:
 		return shared_ptr<IfcBendingParameterSelect>();
 	}
 	shared_ptr<IfcBendingParameterSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcBooleanOperand.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcBooleanOperand> IFC4X3::IfcBooleanOperand::createObjectFro
 		return shared_ptr<IfcBooleanOperand>();
 	}
 	shared_ptr<IfcBooleanOperand> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcClassificationReferenceSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcClassificationReferenceSelect> IFC4X3::IfcClassificationRe
 		return shared_ptr<IfcClassificationReferenceSelect>();
 	}
 	shared_ptr<IfcClassificationReferenceSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcClassificationSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcClassificationSelect> IFC4X3::IfcClassificationSelect::cre
 		return shared_ptr<IfcClassificationSelect>();
 	}
 	shared_ptr<IfcClassificationSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcColour.cpp

@@ -19,6 +19,6 @@ shared_ptr<IFC4X3::IfcColour> IFC4X3::IfcColour::createObjectFromSTEP( const std
 		return shared_ptr<IfcColour>();
 	}
 	shared_ptr<IfcColour> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcColourOrFactor.cpp

@@ -19,6 +19,6 @@ shared_ptr<IFC4X3::IfcColourOrFactor> IFC4X3::IfcColourOrFactor::createObjectFro
 		return shared_ptr<IfcColourOrFactor>();
 	}
 	shared_ptr<IfcColourOrFactor> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCoordinateReferenceSystemSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcCoordinateReferenceSystemSelect> IFC4X3::IfcCoordinateRefe
 		return shared_ptr<IfcCoordinateReferenceSystemSelect>();
 	}
 	shared_ptr<IfcCoordinateReferenceSystemSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCsgSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcCsgSelect> IFC4X3::IfcCsgSelect::createObjectFromSTEP( con
 		return shared_ptr<IfcCsgSelect>();
 	}
 	shared_ptr<IfcCsgSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCurveFontOrScaledCurveFontSelect.cpp

@@ -19,6 +19,6 @@ shared_ptr<IFC4X3::IfcCurveFontOrScaledCurveFontSelect> IFC4X3::IfcCurveFontOrSc
 		return shared_ptr<IfcCurveFontOrScaledCurveFontSelect>();
 	}
 	shared_ptr<IfcCurveFontOrScaledCurveFontSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCurveMeasureSelect.cpp

@@ -20,6 +20,6 @@ shared_ptr<IFC4X3::IfcCurveMeasureSelect> IFC4X3::IfcCurveMeasureSelect::createO
 		return shared_ptr<IfcCurveMeasureSelect>();
 	}
 	shared_ptr<IfcCurveMeasureSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCurveOnSurface.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcCurveOnSurface> IFC4X3::IfcCurveOnSurface::createObjectFro
 		return shared_ptr<IfcCurveOnSurface>();
 	}
 	shared_ptr<IfcCurveOnSurface> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCurveOrEdgeCurve.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcCurveOrEdgeCurve> IFC4X3::IfcCurveOrEdgeCurve::createObjec
 		return shared_ptr<IfcCurveOrEdgeCurve>();
 	}
 	shared_ptr<IfcCurveOrEdgeCurve> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcCurveStyleFontSelect.cpp

@@ -19,6 +19,6 @@ shared_ptr<IFC4X3::IfcCurveStyleFontSelect> IFC4X3::IfcCurveStyleFontSelect::cre
 		return shared_ptr<IfcCurveStyleFontSelect>();
 	}
 	shared_ptr<IfcCurveStyleFontSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcDefinitionSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcDefinitionSelect> IFC4X3::IfcDefinitionSelect::createObjec
 		return shared_ptr<IfcDefinitionSelect>();
 	}
 	shared_ptr<IfcDefinitionSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcDerivedMeasureValue.cpp

@@ -90,6 +90,6 @@ shared_ptr<IFC4X3::IfcDerivedMeasureValue> IFC4X3::IfcDerivedMeasureValue::creat
 		return shared_ptr<IfcDerivedMeasureValue>();
 	}
 	shared_ptr<IfcDerivedMeasureValue> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcDocumentInformation.cpp

@@ -92,7 +92,7 @@ void IFC4X3::IfcDocumentInformation::readStepArguments( const std::vector<std::s
 	if( num_args > 6 ){m_Scope = IfcText::createObjectFromSTEP( args[6], map, errorStream, entityIdNotFound );}
 	if( num_args > 7 ){m_Revision = IfcLabel::createObjectFromSTEP( args[7], map, errorStream, entityIdNotFound );}
 	if( num_args > 8 ){m_DocumentOwner = IfcActorSelect::createObjectFromSTEP( args[8], map, errorStream, entityIdNotFound );}
-	if( num_args > 9 ){readSelectList( args[9], m_Editors, map, errorStream, entityIdNotFound );}
+	if( num_args > 9 ){readSelectList( args[9], m_Editors, "IFCACTORSELECT", map, errorStream, entityIdNotFound );}
 	if( num_args > 10 ){m_CreationTime = IfcDateTime::createObjectFromSTEP( args[10], map, errorStream, entityIdNotFound );}
 	if( num_args > 11 ){m_LastRevisionTime = IfcDateTime::createObjectFromSTEP( args[11], map, errorStream, entityIdNotFound );}
 	if( num_args > 12 ){m_ElectronicFormat = IfcIdentifier::createObjectFromSTEP( args[12], map, errorStream, entityIdNotFound );}

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcDocumentSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcDocumentSelect> IFC4X3::IfcDocumentSelect::createObjectFro
 		return shared_ptr<IfcDocumentSelect>();
 	}
 	shared_ptr<IfcDocumentSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcExternalReferenceRelationship.cpp

@@ -60,7 +60,7 @@ void IFC4X3::IfcExternalReferenceRelationship::readStepArguments( const std::vec
 	if( num_args > 0 ){m_Name = IfcLabel::createObjectFromSTEP( args[0], map, errorStream, entityIdNotFound );}
 	if( num_args > 1 ){m_Description = IfcText::createObjectFromSTEP( args[1], map, errorStream, entityIdNotFound );}
 	if( num_args > 2 ){readEntityReference( args[2], m_RelatingReference, map, errorStream, entityIdNotFound );}
-	if( num_args > 3 ){readSelectList( args[3], m_RelatedResourceObjects, map, errorStream, entityIdNotFound );}
+	if( num_args > 3 ){readSelectList( args[3], m_RelatedResourceObjects, "IFCRESOURCEOBJECTSELECT", map, errorStream, entityIdNotFound );}
 	if( num_args != 4 ){ errorStream << "Wrong parameter count for entity IfcExternalReferenceRelationship, expecting 4, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }
 void IFC4X3::IfcExternalReferenceRelationship::getAttributes( std::vector<std::pair<std::string, shared_ptr<BuildingObject> > >& vec_attributes ) const

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcFillAreaStyle.cpp

@@ -43,7 +43,7 @@ void IFC4X3::IfcFillAreaStyle::readStepArguments( const std::vector<std::string>
 {
 	const size_t num_args = args.size();
 	if( num_args > 0 ){m_Name = IfcLabel::createObjectFromSTEP( args[0], map, errorStream, entityIdNotFound );}
-	if( num_args > 1 ){readSelectList( args[1], m_FillStyles, map, errorStream, entityIdNotFound );}
+	if( num_args > 1 ){readSelectList( args[1], m_FillStyles, "IFCFILLSTYLESELECT", map, errorStream, entityIdNotFound );}
 	if( num_args > 2 ){m_ModelOrDraughting = IfcBoolean::createObjectFromSTEP( args[2], map, errorStream, entityIdNotFound );}
 	if( num_args != 3 ){ errorStream << "Wrong parameter count for entity IfcFillAreaStyle, expecting 3, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcFillStyleSelect.cpp

@@ -19,6 +19,6 @@ shared_ptr<IFC4X3::IfcFillStyleSelect> IFC4X3::IfcFillStyleSelect::createObjectF
 		return shared_ptr<IfcFillStyleSelect>();
 	}
 	shared_ptr<IfcFillStyleSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcGeometricCurveSet.cpp

@@ -38,7 +38,7 @@ void IFC4X3::IfcGeometricCurveSet::getStepParameter( std::stringstream& stream,
 void IFC4X3::IfcGeometricCurveSet::readStepArguments( const std::vector<std::string>& args, const BuildingModelMapType<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream, std::unordered_set<int>& entityIdNotFound )
 {
 	const size_t num_args = args.size();
-	if( num_args > 0 ){readSelectList( args[0], m_Elements, map, errorStream, entityIdNotFound );}
+	if( num_args > 0 ){readSelectList( args[0], m_Elements, "IFCGEOMETRICSETSELECT", map, errorStream, entityIdNotFound );}
 	if( num_args != 1 ){ errorStream << "Wrong parameter count for entity IfcGeometricCurveSet, expecting 1, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }
 void IFC4X3::IfcGeometricCurveSet::getAttributes( std::vector<std::pair<std::string, shared_ptr<BuildingObject> > >& vec_attributes ) const

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcGeometricSet.cpp

@@ -38,7 +38,7 @@ void IFC4X3::IfcGeometricSet::getStepParameter( std::stringstream& stream, bool
 void IFC4X3::IfcGeometricSet::readStepArguments( const std::vector<std::string>& args, const BuildingModelMapType<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream, std::unordered_set<int>& entityIdNotFound )
 {
 	const size_t num_args = args.size();
-	if( num_args > 0 ){readSelectList( args[0], m_Elements, map, errorStream, entityIdNotFound );}
+	if( num_args > 0 ){readSelectList( args[0], m_Elements, "IFCGEOMETRICSETSELECT", map, errorStream, entityIdNotFound );}
 	if( num_args != 1 ){ errorStream << "Wrong parameter count for entity IfcGeometricSet, expecting 1, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }
 void IFC4X3::IfcGeometricSet::getAttributes( std::vector<std::pair<std::string, shared_ptr<BuildingObject> > >& vec_attributes ) const

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcGeometricSetSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcGeometricSetSelect> IFC4X3::IfcGeometricSetSelect::createO
 		return shared_ptr<IfcGeometricSetSelect>();
 	}
 	shared_ptr<IfcGeometricSetSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcGridPlacementDirectionSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcGridPlacementDirectionSelect> IFC4X3::IfcGridPlacementDire
 		return shared_ptr<IfcGridPlacementDirectionSelect>();
 	}
 	shared_ptr<IfcGridPlacementDirectionSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcHatchLineDistanceSelect.cpp

@@ -19,6 +19,6 @@ shared_ptr<IFC4X3::IfcHatchLineDistanceSelect> IFC4X3::IfcHatchLineDistanceSelec
 		return shared_ptr<IfcHatchLineDistanceSelect>();
 	}
 	shared_ptr<IfcHatchLineDistanceSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcIndexedPolyCurve.cpp

@@ -49,7 +49,7 @@ void IFC4X3::IfcIndexedPolyCurve::readStepArguments( const std::vector<std::stri
 {
 	const size_t num_args = args.size();
 	if( num_args > 0 ){readEntityReference( args[0], m_Points, map, errorStream, entityIdNotFound );}
-	if( num_args > 1 ){readSelectList( args[1], m_Segments, map, errorStream, entityIdNotFound );}
+	if( num_args > 1 ){readSelectList( args[1], m_Segments, "IFCSEGMENTINDEXSELECT", map, errorStream, entityIdNotFound );}
 	if( num_args > 2 ){m_SelfIntersect = IfcBoolean::createObjectFromSTEP( args[2], map, errorStream, entityIdNotFound );}
 	if( num_args != 3 ){ errorStream << "Wrong parameter count for entity IfcIndexedPolyCurve, expecting 3, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcInterferenceSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcInterferenceSelect> IFC4X3::IfcInterferenceSelect::createO
 		return shared_ptr<IfcInterferenceSelect>();
 	}
 	shared_ptr<IfcInterferenceSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcIrregularTimeSeriesValue.cpp

@@ -40,7 +40,7 @@ void IFC4X3::IfcIrregularTimeSeriesValue::readStepArguments( const std::vector<s
 {
 	const size_t num_args = args.size();
 	if( num_args > 0 ){m_TimeStamp = IfcDateTime::createObjectFromSTEP( args[0], map, errorStream, entityIdNotFound );}
-	if( num_args > 1 ){readSelectList( args[1], m_ListValues, map, errorStream, entityIdNotFound );}
+	if( num_args > 1 ){readSelectList( args[1], m_ListValues, "IFCVALUE", map, errorStream, entityIdNotFound );}
 	if( num_args != 2 ){ errorStream << "Wrong parameter count for entity IfcIrregularTimeSeriesValue, expecting 2, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }
 void IFC4X3::IfcIrregularTimeSeriesValue::getAttributes( std::vector<std::pair<std::string, shared_ptr<BuildingObject> > >& vec_attributes ) const

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcLayeredItem.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcLayeredItem> IFC4X3::IfcLayeredItem::createObjectFromSTEP(
 		return shared_ptr<IfcLayeredItem>();
 	}
 	shared_ptr<IfcLayeredItem> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcLibrarySelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcLibrarySelect> IFC4X3::IfcLibrarySelect::createObjectFromS
 		return shared_ptr<IfcLibrarySelect>();
 	}
 	shared_ptr<IfcLibrarySelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcLightDistributionDataSourceSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcLightDistributionDataSourceSelect> IFC4X3::IfcLightDistrib
 		return shared_ptr<IfcLightDistributionDataSourceSelect>();
 	}
 	shared_ptr<IfcLightDistributionDataSourceSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcMaterialClassificationRelationship.cpp

@@ -39,7 +39,7 @@ void IFC4X3::IfcMaterialClassificationRelationship::getStepParameter( std::strin
 void IFC4X3::IfcMaterialClassificationRelationship::readStepArguments( const std::vector<std::string>& args, const BuildingModelMapType<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream, std::unordered_set<int>& entityIdNotFound )
 {
 	const size_t num_args = args.size();
-	if( num_args > 0 ){readSelectList( args[0], m_MaterialClassifications, map, errorStream, entityIdNotFound );}
+	if( num_args > 0 ){readSelectList( args[0], m_MaterialClassifications, "IFCCLASSIFICATIONSELECT", map, errorStream, entityIdNotFound );}
 	if( num_args > 1 ){readEntityReference( args[1], m_ClassifiedMaterial, map, errorStream, entityIdNotFound );}
 	if( num_args != 2 ){ errorStream << "Wrong parameter count for entity IfcMaterialClassificationRelationship, expecting 2, having " << num_args << ". Entity ID: " << m_tag << std::endl; }
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcMaterialSelect.cpp

@@ -18,6 +18,6 @@ shared_ptr<IFC4X3::IfcMaterialSelect> IFC4X3::IfcMaterialSelect::createObjectFro
 		return shared_ptr<IfcMaterialSelect>();
 	}
 	shared_ptr<IfcMaterialSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcMeasureValue.cpp

@@ -42,6 +42,6 @@ shared_ptr<IFC4X3::IfcMeasureValue> IFC4X3::IfcMeasureValue::createObjectFromSTE
 		return shared_ptr<IfcMeasureValue>();
 	}
 	shared_ptr<IfcMeasureValue> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcMetricValueSelect.cpp

@@ -131,6 +131,6 @@ shared_ptr<IFC4X3::IfcMetricValueSelect> IFC4X3::IfcMetricValueSelect::createObj
 		return shared_ptr<IfcMetricValueSelect>();
 	}
 	shared_ptr<IfcMetricValueSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }

IfcPlusPlus/src/ifcpp/IFC4X3/lib/IfcModulusOfRotationalSubgradeReactionSelect.cpp

@@ -20,6 +20,6 @@ shared_ptr<IFC4X3::IfcModulusOfRotationalSubgradeReactionSelect> IFC4X3::IfcModu
 		return shared_ptr<IfcModulusOfRotationalSubgradeReactionSelect>();
 	}
 	shared_ptr<IfcModulusOfRotationalSubgradeReactionSelect> result_object;
-	readSelectType( arg, result_object, map, errorStream, entityIdNotFound );
+	readSelectType( arg, result_object, "", map, errorStream, entityIdNotFound );
 	return result_object;
 }