Skip to content

Commit a29bf75

Browse files
committed
Fixed parsing attribute as entity reference list instead of value list in IfcTriangulatedFaceSet
1 parent c66a10a commit a29bf75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+140
-76
lines changed

IfcPlusPlus/IfcPlusPlus.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
</Lib>
285285
<PostBuildEvent>
286286
<Command>copy /Y "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)\SimpleViewerExample\bin\$(TargetName)$(TargetExt)"
287-
copy /Y "$(OutDir)$(TargetName)$(TargetExt)" "$(SolutionDir)\..\..\IfcQuery\bin\$(TargetName)$(TargetExt)"</Command>
287+
</Command>
288288
</PostBuildEvent>
289289
<ProjectReference>
290290
<UseLibraryDependencyInputs>

IfcPlusPlus/src/ifcpp/IFC4/include/IfcBoxAlignment.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcBoxAlignment : public IfcLabel
1515
{
1616
public:
1717
IfcBoxAlignment();
18+
IfcBoxAlignment( std::wstring value ) { m_value = value; }
1819
~IfcBoxAlignment();
1920
virtual const char* className() const { return "IfcBoxAlignment"; }
2021
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcLanguageId.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcLanguageId : public IfcIdentifier
1515
{
1616
public:
1717
IfcLanguageId();
18+
IfcLanguageId( std::wstring value ) { m_value = value; }
1819
~IfcLanguageId();
1920
virtual const char* className() const { return "IfcLanguageId"; }
2021
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcNonNegativeLengthMeasure.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcNonNegativeLengthMeasure : public IfcLengthMeasure
1515
{
1616
public:
1717
IfcNonNegativeLengthMeasure();
18+
IfcNonNegativeLengthMeasure( double value ) { m_value = value; }
1819
~IfcNonNegativeLengthMeasure();
1920
virtual const char* className() const { return "IfcNonNegativeLengthMeasure"; }
2021
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcNormalisedRatioMeasure.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class IFCPP_EXPORT IfcNormalisedRatioMeasure : public IfcRatioMeasure, public If
1616
{
1717
public:
1818
IfcNormalisedRatioMeasure();
19+
IfcNormalisedRatioMeasure( double value ) { m_value = value; }
1920
~IfcNormalisedRatioMeasure();
2021
virtual const char* className() const { return "IfcNormalisedRatioMeasure"; }
2122
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositiveInteger.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcPositiveInteger : public IfcInteger
1515
{
1616
public:
1717
IfcPositiveInteger();
18+
IfcPositiveInteger( int value ) { m_value = value; }
1819
~IfcPositiveInteger();
1920
virtual const char* className() const { return "IfcPositiveInteger"; }
2021
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositiveLengthMeasure.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class IFCPP_EXPORT IfcPositiveLengthMeasure : public IfcLengthMeasure, public If
1616
{
1717
public:
1818
IfcPositiveLengthMeasure();
19+
IfcPositiveLengthMeasure( double value ) { m_value = value; }
1920
~IfcPositiveLengthMeasure();
2021
virtual const char* className() const { return "IfcPositiveLengthMeasure"; }
2122
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositivePlaneAngleMeasure.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcPositivePlaneAngleMeasure : public IfcPlaneAngleMeasure
1515
{
1616
public:
1717
IfcPositivePlaneAngleMeasure();
18+
IfcPositivePlaneAngleMeasure( double value ) { m_value = value; }
1819
~IfcPositivePlaneAngleMeasure();
1920
virtual const char* className() const { return "IfcPositivePlaneAngleMeasure"; }
2021
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/include/IfcPositiveRatioMeasure.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class IFCPP_EXPORT IfcPositiveRatioMeasure : public IfcRatioMeasure
1515
{
1616
public:
1717
IfcPositiveRatioMeasure();
18+
IfcPositiveRatioMeasure( double value ) { m_value = value; }
1819
~IfcPositiveRatioMeasure();
1920
virtual const char* className() const { return "IfcPositiveRatioMeasure"; }
2021
virtual shared_ptr<IfcPPObject> getDeepCopy( IfcPPCopyOptions& options );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcArcIndex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcArcIndex> IfcArcIndex::createObjectFromSTEP( const std::wstring& a
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcArcIndex>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcArcIndex>(); }
3838
shared_ptr<IfcArcIndex> type_object( new IfcArcIndex() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcBSplineCurveWithKnots.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void IfcBSplineCurveWithKnots::readStepArguments( const std::vector<std::wstring
8686
m_CurveForm = IfcBSplineCurveForm::createObjectFromSTEP( args[2], map );
8787
m_ClosedCurve = IfcLogical::createObjectFromSTEP( args[3], map );
8888
m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[4], map );
89-
readTypeOfIntList( args[5], m_KnotMultiplicities );
89+
readTypeOfIntegerList( args[5], m_KnotMultiplicities );
9090
readTypeOfRealList( args[6], m_Knots );
9191
m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[7], map );
9292
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcBSplineSurfaceWithKnots.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ void IfcBSplineSurfaceWithKnots::readStepArguments( const std::vector<std::wstri
120120
m_UClosed = IfcLogical::createObjectFromSTEP( args[4], map );
121121
m_VClosed = IfcLogical::createObjectFromSTEP( args[5], map );
122122
m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[6], map );
123-
readTypeOfIntList( args[7], m_UMultiplicities );
124-
readTypeOfIntList( args[8], m_VMultiplicities );
123+
readTypeOfIntegerList( args[7], m_UMultiplicities );
124+
readTypeOfIntegerList( args[8], m_VMultiplicities );
125125
readTypeOfRealList( args[9], m_UKnots );
126126
readTypeOfRealList( args[10], m_VKnots );
127127
m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[11], map );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcCardinalPointReference.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcCardinalPointReference> IfcCardinalPointReference::createObjectFro
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcCardinalPointReference>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcCardinalPointReference>(); }
3838
shared_ptr<IfcCardinalPointReference> type_object( new IfcCardinalPointReference() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcColourRgbList.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void IfcColourRgbList::readStepArguments( const std::vector<std::wstring>& args,
7070
{
7171
const size_t num_args = args.size();
7272
if( num_args != 1 ){ std::stringstream err; err << "Wrong parameter count for entity IfcColourRgbList, expecting 1, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
73-
readEntityReferenceList2D( args[0], m_ColourList, map );
73+
readTypeOfRealList2D( args[0], m_ColourList );
7474
}
7575
void IfcColourRgbList::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
7676
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcCompoundPlaneAngleMeasure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ shared_ptr<IfcCompoundPlaneAngleMeasure> IfcCompoundPlaneAngleMeasure::createObj
3939
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcCompoundPlaneAngleMeasure>(); }
4040
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcCompoundPlaneAngleMeasure>(); }
4141
shared_ptr<IfcCompoundPlaneAngleMeasure> type_object( new IfcCompoundPlaneAngleMeasure() );
42-
readIntList( arg, type_object->m_vec );
42+
readIntegerList( arg, type_object->m_vec );
4343
return type_object;
4444
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcCountMeasure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ shared_ptr<IfcCountMeasure> IfcCountMeasure::createObjectFromSTEP( const std::ws
3737
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcCountMeasure>(); }
3838
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcCountMeasure>(); }
3939
shared_ptr<IfcCountMeasure> type_object( new IfcCountMeasure() );
40-
readInt( arg, type_object->m_value );
40+
readInteger( arg, type_object->m_value );
4141
return type_object;
4242
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDayInMonthNumber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcDayInMonthNumber> IfcDayInMonthNumber::createObjectFromSTEP( const
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcDayInMonthNumber>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcDayInMonthNumber>(); }
3838
shared_ptr<IfcDayInMonthNumber> type_object( new IfcDayInMonthNumber() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDayInWeekNumber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcDayInWeekNumber> IfcDayInWeekNumber::createObjectFromSTEP( const s
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcDayInWeekNumber>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcDayInWeekNumber>(); }
3838
shared_ptr<IfcDayInWeekNumber> type_object( new IfcDayInWeekNumber() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDerivedUnitElement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void IfcDerivedUnitElement::readStepArguments( const std::vector<std::wstring>&
3636
const size_t num_args = args.size();
3737
if( num_args != 2 ){ std::stringstream err; err << "Wrong parameter count for entity IfcDerivedUnitElement, expecting 2, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
3838
readEntityReference( args[0], m_Unit, map );
39-
readIntValue( args[1], m_Exponent );
39+
readIntegerValue( args[1], m_Exponent );
4040
}
4141
void IfcDerivedUnitElement::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
4242
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDimensionCount.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcDimensionCount> IfcDimensionCount::createObjectFromSTEP( const std
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcDimensionCount>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcDimensionCount>(); }
3838
shared_ptr<IfcDimensionCount> type_object( new IfcDimensionCount() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcDimensionalExponents.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ void IfcDimensionalExponents::readStepArguments( const std::vector<std::wstring>
4949
{
5050
const size_t num_args = args.size();
5151
if( num_args != 7 ){ std::stringstream err; err << "Wrong parameter count for entity IfcDimensionalExponents, expecting 7, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
52-
readIntValue( args[0], m_LengthExponent );
53-
readIntValue( args[1], m_MassExponent );
54-
readIntValue( args[2], m_TimeExponent );
55-
readIntValue( args[3], m_ElectricCurrentExponent );
56-
readIntValue( args[4], m_ThermodynamicTemperatureExponent );
57-
readIntValue( args[5], m_AmountOfSubstanceExponent );
58-
readIntValue( args[6], m_LuminousIntensityExponent );
52+
readIntegerValue( args[0], m_LengthExponent );
53+
readIntegerValue( args[1], m_MassExponent );
54+
readIntegerValue( args[2], m_TimeExponent );
55+
readIntegerValue( args[3], m_ElectricCurrentExponent );
56+
readIntegerValue( args[4], m_ThermodynamicTemperatureExponent );
57+
readIntegerValue( args[5], m_AmountOfSubstanceExponent );
58+
readIntegerValue( args[6], m_LuminousIntensityExponent );
5959
}
6060
void IfcDimensionalExponents::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
6161
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedColourMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void IfcIndexedColourMap::readStepArguments( const std::vector<std::wstring>& ar
7171
readEntityReference( args[0], m_MappedTo, map );
7272
m_Opacity = IfcNormalisedRatioMeasure::createObjectFromSTEP( args[1], map );
7373
readEntityReference( args[2], m_Colours, map );
74-
readTypeList( args[3], m_ColourIndex, map );
74+
readTypeOfIntegerList( args[3], m_ColourIndex );
7575
}
7676
void IfcIndexedColourMap::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
7777
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedPolygonalFace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void IfcIndexedPolygonalFace::readStepArguments( const std::vector<std::wstring>
5959
{
6060
const size_t num_args = args.size();
6161
if( num_args != 1 ){ std::stringstream err; err << "Wrong parameter count for entity IfcIndexedPolygonalFace, expecting 1, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
62-
readTypeList( args[0], m_CoordIndex, map );
62+
readTypeOfIntegerList( args[0], m_CoordIndex );
6363
}
6464
void IfcIndexedPolygonalFace::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
6565
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedPolygonalFaceWithVoids.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ void IfcIndexedPolygonalFaceWithVoids::readStepArguments( const std::vector<std:
100100
{
101101
const size_t num_args = args.size();
102102
if( num_args != 2 ){ std::stringstream err; err << "Wrong parameter count for entity IfcIndexedPolygonalFaceWithVoids, expecting 2, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
103-
readTypeList( args[0], m_CoordIndex, map );
104-
readEntityReferenceList2D( args[1], m_InnerCoordIndices, map );
103+
readTypeOfIntegerList( args[0], m_CoordIndex );
104+
readTypeOfIntegerList2D( args[1], m_InnerCoordIndices );
105105
}
106106
void IfcIndexedPolygonalFaceWithVoids::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
107107
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIndexedTriangleTextureMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void IfcIndexedTriangleTextureMap::readStepArguments( const std::vector<std::wst
9292
readEntityReferenceList( args[0], m_Maps, map );
9393
readEntityReference( args[1], m_MappedTo, map );
9494
readEntityReference( args[2], m_TexCoords, map );
95-
readEntityReferenceList2D( args[3], m_TexCoordIndex, map );
95+
readTypeOfIntegerList2D( args[3], m_TexCoordIndex );
9696
}
9797
void IfcIndexedTriangleTextureMap::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
9898
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcInteger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ shared_ptr<IfcInteger> IfcInteger::createObjectFromSTEP( const std::wstring& arg
3737
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcInteger>(); }
3838
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcInteger>(); }
3939
shared_ptr<IfcInteger> type_object( new IfcInteger() );
40-
readInt( arg, type_object->m_value );
40+
readInteger( arg, type_object->m_value );
4141
return type_object;
4242
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcIntegerCountRateMeasure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ shared_ptr<IfcIntegerCountRateMeasure> IfcIntegerCountRateMeasure::createObjectF
3737
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcIntegerCountRateMeasure>(); }
3838
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcIntegerCountRateMeasure>(); }
3939
shared_ptr<IfcIntegerCountRateMeasure> type_object( new IfcIntegerCountRateMeasure() );
40-
readInt( arg, type_object->m_value );
40+
readInteger( arg, type_object->m_value );
4141
return type_object;
4242
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcLineIndex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ shared_ptr<IfcLineIndex> IfcLineIndex::createObjectFromSTEP( const std::wstring&
3535
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcLineIndex>(); }
3636
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcLineIndex>(); }
3737
shared_ptr<IfcLineIndex> type_object( new IfcLineIndex() );
38-
readInt( arg, type_object->m_value );
38+
readInteger( arg, type_object->m_value );
3939
return type_object;
4040
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcMonthInYearNumber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcMonthInYearNumber> IfcMonthInYearNumber::createObjectFromSTEP( con
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcMonthInYearNumber>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcMonthInYearNumber>(); }
3838
shared_ptr<IfcMonthInYearNumber> type_object( new IfcMonthInYearNumber() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcNumericMeasure.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ shared_ptr<IfcNumericMeasure> IfcNumericMeasure::createObjectFromSTEP( const std
3737
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcNumericMeasure>(); }
3838
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcNumericMeasure>(); }
3939
shared_ptr<IfcNumericMeasure> type_object( new IfcNumericMeasure() );
40-
readInt( arg, type_object->m_value );
40+
readInteger( arg, type_object->m_value );
4141
return type_object;
4242
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcPolygonalFaceSet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void IfcPolygonalFaceSet::readStepArguments( const std::vector<std::wstring>& ar
8282
readEntityReference( args[0], m_Coordinates, map );
8383
m_Closed = IfcBoolean::createObjectFromSTEP( args[1], map );
8484
readEntityReferenceList( args[2], m_Faces, map );
85-
readTypeList( args[3], m_PnIndex, map );
85+
readTypeOfIntegerList( args[3], m_PnIndex );
8686
}
8787
void IfcPolygonalFaceSet::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )
8888
{

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcPositiveInteger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ shared_ptr<IfcPositiveInteger> IfcPositiveInteger::createObjectFromSTEP( const s
3636
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcPositiveInteger>(); }
3737
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcPositiveInteger>(); }
3838
shared_ptr<IfcPositiveInteger> type_object( new IfcPositiveInteger() );
39-
readInt( arg, type_object->m_value );
39+
readInteger( arg, type_object->m_value );
4040
return type_object;
4141
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRationalBSplineCurveWithKnots.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void IfcRationalBSplineCurveWithKnots::readStepArguments( const std::vector<std:
9797
m_CurveForm = IfcBSplineCurveForm::createObjectFromSTEP( args[2], map );
9898
m_ClosedCurve = IfcLogical::createObjectFromSTEP( args[3], map );
9999
m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[4], map );
100-
readTypeOfIntList( args[5], m_KnotMultiplicities );
100+
readTypeOfIntegerList( args[5], m_KnotMultiplicities );
101101
readTypeOfRealList( args[6], m_Knots );
102102
m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[7], map );
103103
readTypeOfRealList( args[8], m_WeightsData );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRationalBSplineSurfaceWithKnots.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ void IfcRationalBSplineSurfaceWithKnots::readStepArguments( const std::vector<st
137137
m_UClosed = IfcLogical::createObjectFromSTEP( args[4], map );
138138
m_VClosed = IfcLogical::createObjectFromSTEP( args[5], map );
139139
m_SelfIntersect = IfcLogical::createObjectFromSTEP( args[6], map );
140-
readTypeOfIntList( args[7], m_UMultiplicities );
141-
readTypeOfIntList( args[8], m_VMultiplicities );
140+
readTypeOfIntegerList( args[7], m_UMultiplicities );
141+
readTypeOfIntegerList( args[8], m_VMultiplicities );
142142
readTypeOfRealList( args[9], m_UKnots );
143143
readTypeOfRealList( args[10], m_VKnots );
144144
m_KnotSpec = IfcKnotType::createObjectFromSTEP( args[11], map );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRecurrencePattern.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ void IfcRecurrencePattern::readStepArguments( const std::vector<std::wstring>& a
8787
const size_t num_args = args.size();
8888
if( num_args != 8 ){ std::stringstream err; err << "Wrong parameter count for entity IfcRecurrencePattern, expecting 8, having " << num_args << ". Entity ID: " << m_entity_id << std::endl; throw IfcPPException( err.str().c_str() ); }
8989
m_RecurrenceType = IfcRecurrenceTypeEnum::createObjectFromSTEP( args[0], map );
90-
readTypeOfIntList( args[1], m_DayComponent );
91-
readTypeOfIntList( args[2], m_WeekdayComponent );
92-
readTypeOfIntList( args[3], m_MonthComponent );
90+
readTypeOfIntegerList( args[1], m_DayComponent );
91+
readTypeOfIntegerList( args[2], m_WeekdayComponent );
92+
readTypeOfIntegerList( args[3], m_MonthComponent );
9393
m_Position = IfcInteger::createObjectFromSTEP( args[4], map );
9494
m_Interval = IfcInteger::createObjectFromSTEP( args[5], map );
9595
m_Occurrences = IfcInteger::createObjectFromSTEP( args[6], map );

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcReference.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void IfcReference::readStepArguments( const std::vector<std::wstring>& args, con
5656
m_TypeIdentifier = IfcIdentifier::createObjectFromSTEP( args[0], map );
5757
m_AttributeIdentifier = IfcIdentifier::createObjectFromSTEP( args[1], map );
5858
m_InstanceName = IfcLabel::createObjectFromSTEP( args[2], map );
59-
readTypeOfIntList( args[3], m_ListPositions );
59+
readTypeOfIntegerList( args[3], m_ListPositions );
6060
readEntityReference( args[4], m_InnerReference, map );
6161
}
6262
void IfcReference::getAttributes( std::vector<std::pair<std::string, shared_ptr<IfcPPObject> > >& vec_attributes )

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcRelConnectsPathElements.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ void IfcRelConnectsPathElements::readStepArguments( const std::vector<std::wstri
9898
readEntityReference( args[4], m_ConnectionGeometry, map );
9999
readEntityReference( args[5], m_RelatingElement, map );
100100
readEntityReference( args[6], m_RelatedElement, map );
101-
readTypeOfIntList( args[7], m_RelatingPriorities );
102-
readTypeOfIntList( args[8], m_RelatedPriorities );
101+
readTypeOfIntegerList( args[7], m_RelatingPriorities );
102+
readTypeOfIntegerList( args[8], m_RelatedPriorities );
103103
m_RelatedConnectionType = IfcConnectionTypeEnum::createObjectFromSTEP( args[9], map );
104104
m_RelatingConnectionType = IfcConnectionTypeEnum::createObjectFromSTEP( args[10], map );
105105
}

IfcPlusPlus/src/ifcpp/IFC4/lib/IfcTimeStamp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ shared_ptr<IfcTimeStamp> IfcTimeStamp::createObjectFromSTEP( const std::wstring&
3737
if( arg.compare( L"$" ) == 0 ) { return shared_ptr<IfcTimeStamp>(); }
3838
else if( arg.compare( L"*" ) == 0 ) { return shared_ptr<IfcTimeStamp>(); }
3939
shared_ptr<IfcTimeStamp> type_object( new IfcTimeStamp() );
40-
readInt( arg, type_object->m_value );
40+
readInteger( arg, type_object->m_value );
4141
return type_object;
4242
}

0 commit comments

Comments
 (0)