Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-17 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Parsing: make argument out of range errors catchable

Browse Source 
- Geometry: support for IfcLine
- Geometry: more correct initialization of placements
This commit is contained in:
Thomas Krijnen
2011-06-17 13:07:06 +00:00
parent a7ed78c4a8
commit 1040a5ef6e
4 changed files with 101 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcParse.cpp
+11 -3
View File
@@ -142,7 +142,13 @@ bool ArgumentList::b() const { return _arg->b(); }
int ArgumentList::i() const { return _arg->i(); }
std::string ArgumentList::s() const { return _arg->s(); }
int ArgumentList::count() const { return _arg ? 1 : _args.size(); }
ArgumentList* ArgumentList::arg(int i) const { return _args[i]; }
ArgumentList* ArgumentList::arg(int i) const {
if ( i >= count() ) {
throw IfcException();
} else {
return _args[i];
}
}
EntityPtr ArgumentList::ref() const {
if ( _arg->type == Argument::IDENTIFIER ) {
@@ -410,8 +416,10 @@ bool Ifc::Init(const std::string& fn) {
if ( unit->dt == IfcSchema::Enum::IfcConversionBasedUnit ) {
IfcSchema::ConversionBasedUnit* IfcConversionBasedUnit = (IfcSchema::ConversionBasedUnit*)(*it).get();
IfcSchema::MeasureWithUnit* IfcMeasureWithUnit = (IfcSchema::MeasureWithUnit*)IfcConversionBasedUnit->ConversionFactor().get();
unit = IfcMeasureWithUnit->Unit();
value = IfcMeasureWithUnit->Value()->arg(0)->f();
try {
unit = IfcMeasureWithUnit->Unit();
value = IfcMeasureWithUnit->Value()->arg(0)->f();
} catch (... ) {}
}
if ( unit->dt == IfcSchema::Enum::IfcSIUnit ) {
IfcSchema::SIUnit* IfcSIUnit = (IfcSchema::SIUnit*)(*it).get();