Skip to content

Commit d2b0e9c

Browse files
committed
minor improvements
1 parent 67a9a2f commit d2b0e9c

File tree

395 files changed

+1440
-649
lines changed

Some content is hidden

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

395 files changed

+1440
-649
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ IfcPlusPlus/src/ifcpp---/
5151
IfcPlusPlus/src/ifcpp----/
5252
examples/LoadFileExample/dump_mesh_debug.txt
5353
examples/CreateIfcWallAndWriteFile/example.ifc
54+
examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user

IfcPlusPlus/src/ifcpp/IFC4X3/TypeFactory.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -889,10 +889,19 @@ static std::map<std::string, std::function<shared_ptr<BuildingObject>( const std
889889

890890
shared_ptr<BuildingObject> IFC4X3::TypeFactory::createTypeObject( const std::string& class_name_upper, const std::string& type_arg, const std::map<int, shared_ptr<BuildingEntity> >& map_entities, std::stringstream& errorStream )
891891
{
892-
auto it_find = type_factory_map.find( class_name_upper );
893-
if( it_find != type_factory_map.end() )
892+
if (class_name_upper.size() > 0)
894893
{
895-
return it_find->second( type_arg, map_entities, errorStream );
894+
if (class_name_upper.compare("$") != 0)
895+
{
896+
if (class_name_upper.compare("*") != 0)
897+
{
898+
auto it_find = type_factory_map.find( class_name_upper );
899+
if( it_find != type_factory_map.end() )
900+
{
901+
return it_find->second( type_arg, map_entities, errorStream );
902+
}
903+
}
904+
}
896905
}
897906
// class_name not registered
898907
return shared_ptr<BuildingObject>();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ void IFC4X3::IfcAbsorbedDoseMeasure::getStepParameter( std::stringstream& stream
2020
}
2121
shared_ptr<IFC4X3::IfcAbsorbedDoseMeasure> IFC4X3::IfcAbsorbedDoseMeasure::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2222
{
23+
if( arg.size() == 0 ) { return shared_ptr<IfcAbsorbedDoseMeasure>(); }
2324
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcAbsorbedDoseMeasure>(); }
2425
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcAbsorbedDoseMeasure>(); }
2526
shared_ptr<IfcAbsorbedDoseMeasure> type_object( new IfcAbsorbedDoseMeasure() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ void IFC4X3::IfcAccelerationMeasure::getStepParameter( std::stringstream& stream
2020
}
2121
shared_ptr<IFC4X3::IfcAccelerationMeasure> IFC4X3::IfcAccelerationMeasure::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2222
{
23+
if( arg.size() == 0 ) { return shared_ptr<IfcAccelerationMeasure>(); }
2324
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcAccelerationMeasure>(); }
2425
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcAccelerationMeasure>(); }
2526
shared_ptr<IfcAccelerationMeasure> type_object( new IfcAccelerationMeasure() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ void IFC4X3::IfcActionRequestTypeEnum::getStepParameter( std::stringstream& stre
2727
}
2828
shared_ptr<IFC4X3::IfcActionRequestTypeEnum> IFC4X3::IfcActionRequestTypeEnum::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2929
{
30+
if( arg.size() == 0 ) { return shared_ptr<IfcActionRequestTypeEnum>(); }
3031
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcActionRequestTypeEnum>(); }
3132
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcActionRequestTypeEnum>(); }
3233
shared_ptr<IfcActionRequestTypeEnum> type_object( new IfcActionRequestTypeEnum() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ void IFC4X3::IfcActionSourceTypeEnum::getStepParameter( std::stringstream& strea
4747
}
4848
shared_ptr<IFC4X3::IfcActionSourceTypeEnum> IFC4X3::IfcActionSourceTypeEnum::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
4949
{
50+
if( arg.size() == 0 ) { return shared_ptr<IfcActionSourceTypeEnum>(); }
5051
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcActionSourceTypeEnum>(); }
5152
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcActionSourceTypeEnum>(); }
5253
shared_ptr<IfcActionSourceTypeEnum> type_object( new IfcActionSourceTypeEnum() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ void IFC4X3::IfcActionTypeEnum::getStepParameter( std::stringstream& stream, boo
2525
}
2626
shared_ptr<IFC4X3::IfcActionTypeEnum> IFC4X3::IfcActionTypeEnum::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2727
{
28+
if( arg.size() == 0 ) { return shared_ptr<IfcActionTypeEnum>(); }
2829
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcActionTypeEnum>(); }
2930
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcActionTypeEnum>(); }
3031
shared_ptr<IfcActionTypeEnum> type_object( new IfcActionTypeEnum() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ void IFC4X3::IfcActuatorTypeEnum::getStepParameter( std::stringstream& stream, b
2727
}
2828
shared_ptr<IFC4X3::IfcActuatorTypeEnum> IFC4X3::IfcActuatorTypeEnum::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2929
{
30+
if( arg.size() == 0 ) { return shared_ptr<IfcActuatorTypeEnum>(); }
3031
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcActuatorTypeEnum>(); }
3132
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcActuatorTypeEnum>(); }
3233
shared_ptr<IfcActuatorTypeEnum> type_object( new IfcActuatorTypeEnum() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ void IFC4X3::IfcAddressTypeEnum::getStepParameter( std::stringstream& stream, bo
2525
}
2626
shared_ptr<IFC4X3::IfcAddressTypeEnum> IFC4X3::IfcAddressTypeEnum::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2727
{
28+
if( arg.size() == 0 ) { return shared_ptr<IfcAddressTypeEnum>(); }
2829
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcAddressTypeEnum>(); }
2930
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcAddressTypeEnum>(); }
3031
shared_ptr<IfcAddressTypeEnum> type_object( new IfcAddressTypeEnum() );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ void IFC4X3::IfcAirTerminalBoxTypeEnum::getStepParameter( std::stringstream& str
2525
}
2626
shared_ptr<IFC4X3::IfcAirTerminalBoxTypeEnum> IFC4X3::IfcAirTerminalBoxTypeEnum::createObjectFromSTEP( const std::string& arg, const std::map<int,shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )
2727
{
28+
if( arg.size() == 0 ) { return shared_ptr<IfcAirTerminalBoxTypeEnum>(); }
2829
if( arg.compare( "$" ) == 0 ) { return shared_ptr<IfcAirTerminalBoxTypeEnum>(); }
2930
if( arg.compare( "*" ) == 0 ) { return shared_ptr<IfcAirTerminalBoxTypeEnum>(); }
3031
shared_ptr<IfcAirTerminalBoxTypeEnum> type_object( new IfcAirTerminalBoxTypeEnum() );

0 commit comments

Comments
 (0)