Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-22 21:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added id (ISO 10303-21 Table 2: ENTITY_INSTANCE_NAME) to IfcGeomObject. Thanks to laurencepike.

Browse Source
This commit is contained in:
Thomas Krijnen
2011-10-08 09:01:35 +00:00
parent a9143655c3
commit 69ad96df25
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomObjects.cpp
+12 -11
View File
@@ -104,12 +104,13 @@ IfcGeomObjects::IfcMesh::IfcMesh(int i, TopoDS_Shape s) {
} }
} }
IfcGeomObjects::IfcGeomObject::IfcGeomObject( const std::string& n, const std::string& t, gp_Trsf trsf, IfcMesh* m ) { IfcGeomObjects::IfcGeomObject::IfcGeomObject(int my_id, const std::string& n, const std::string& t, gp_Trsf trsf, IfcMesh* m) {
// Convert the gp_Trsf into a 4x3 Matrix // Convert the gp_Trsf into a 4x3 Matrix
for( int i = 1; i < 5; ++ i ) for( int i = 1; i < 5; ++ i )
for ( int j = 1; j < 4; ++ j ) for ( int j = 1; j < 4; ++ j )
matrix.push_back((float)trsf.Value(j,i)); matrix.push_back((float)trsf.Value(j,i));
id = my_id;
name = n; name = n;
type = t; type = t;
mesh = m; mesh = m;
@@ -192,23 +193,23 @@ IfcGeomObjects::IfcGeomObject* _get() {
continue; continue;
} }
} }
Ifc2x3::IfcProduct::ptr entity = *inner; Ifc2x3::IfcProduct::ptr ifc_product = *inner;
const std::string name = entity->hasName() ? entity->Name() : entity->GlobalId(); const std::string name = ifc_product->hasName() ? ifc_product->Name() : ifc_product->GlobalId();
gp_Trsf trsf; gp_Trsf trsf;
try { try {
IfcGeom::convert(entity->ObjectPlacement(),trsf); IfcGeom::convert(ifc_product->ObjectPlacement(),trsf);
} catch (...) {} } catch (...) {}
// Does the IfcElement have any IfcOpenings? // Does the IfcElement have any IfcOpenings?
Ifc2x3::IfcRelVoidsElement::list openings = Ifc2x3::IfcRelVoidsElement::list(); Ifc2x3::IfcRelVoidsElement::list openings = Ifc2x3::IfcRelVoidsElement::list();
if ( entity->is(Ifc2x3::Type::IfcElement) ) { if ( ifc_product->is(Ifc2x3::Type::IfcElement) ) {
Ifc2x3::IfcElement::ptr element = reinterpret_pointer_cast<Ifc2x3::IfcProduct,Ifc2x3::IfcElement>(entity); Ifc2x3::IfcElement::ptr element = reinterpret_pointer_cast<Ifc2x3::IfcProduct,Ifc2x3::IfcElement>(ifc_product);
openings = element->HasOpenings(); openings = element->HasOpenings();
} }
// Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements? // Is the IfcElement a decomposition of an IfcElement with any IfcOpeningElements?
if ( entity->is(Ifc2x3::Type::IfcBuildingElementPart ) ) { if ( ifc_product->is(Ifc2x3::Type::IfcBuildingElementPart ) ) {
Ifc2x3::IfcBuildingElementPart::ptr part = reinterpret_pointer_cast<Ifc2x3::IfcProduct,Ifc2x3::IfcBuildingElementPart>(entity); Ifc2x3::IfcBuildingElementPart::ptr part = reinterpret_pointer_cast<Ifc2x3::IfcProduct,Ifc2x3::IfcBuildingElementPart>(ifc_product);
Ifc2x3::IfcRelDecomposes::list decomposes = part->Decomposes(); Ifc2x3::IfcRelDecomposes::list decomposes = part->Decomposes();
for ( Ifc2x3::IfcRelDecomposes::it it = decomposes->begin(); it != decomposes->end(); ++ it ) { for ( Ifc2x3::IfcRelDecomposes::it it = decomposes->begin(); it != decomposes->end(); ++ it ) {
Ifc2x3::IfcObjectDefinition::ptr obdef = (*it)->RelatingObject(); Ifc2x3::IfcObjectDefinition::ptr obdef = (*it)->RelatingObject();
@@ -223,9 +224,9 @@ IfcGeomObjects::IfcGeomObject* _get() {
if ( shape ) delete shape; if ( shape ) delete shape;
TopoDS_Shape temp_shape = shapes.Moved(gp_Trsf()); TopoDS_Shape temp_shape = shapes.Moved(gp_Trsf());
try { try {
if (openings && openings->Size()) IfcGeom::convert_openings(entity,openings,temp_shape,trsf); if (openings && openings->Size()) IfcGeom::convert_openings(ifc_product,openings,temp_shape,trsf);
} catch( IfcParse::IfcException& e ) {Ifc::LogMessage("Warning",e.what()); } } catch( IfcParse::IfcException& e ) {Ifc::LogMessage("Warning",e.what()); }
catch(...) { Ifc::LogMessage("Error","Error processing openings for:",entity->entity); } catch(...) { Ifc::LogMessage("Error","Error processing openings for:",ifc_product->entity); }
if ( use_world_coords ) { if ( use_world_coords ) {
shape = new IfcGeomObjects::IfcMesh(shaperep->entity->id(),temp_shape.Moved(trsf)); shape = new IfcGeomObjects::IfcMesh(shaperep->entity->id(),temp_shape.Moved(trsf));
trsf = gp_Trsf(); trsf = gp_Trsf();
@@ -236,7 +237,7 @@ IfcGeomObjects::IfcGeomObject* _get() {
shape = new IfcGeomObjects::IfcMesh(shaperep->entity->id(),shapes); shape = new IfcGeomObjects::IfcMesh(shaperep->entity->id(),shapes);
} }
return new IfcGeomObjects::IfcGeomObject(name, Ifc2x3::Type::ToString(entity->type()), trsf, shape); return new IfcGeomObjects::IfcGeomObject(ifc_product->entity->id(), name, Ifc2x3::Type::ToString(ifc_product->type()), trsf, shape);
} }
} }
src/ifcgeom/IfcGeomObjects.h
+2 -1
View File
@@ -90,11 +90,12 @@ namespace IfcGeomObjects {
class IfcGeomObject { class IfcGeomObject {
public: public:
int id;
std::string name; std::string name;
std::string type; std::string type;
std::vector<float> matrix; std::vector<float> matrix;
IfcMesh* mesh; IfcMesh* mesh;
IfcGeomObject( const std::string& n, const std::string& t, gp_Trsf trsf, IfcMesh* m ); IfcGeomObject(int i, const std::string& n, const std::string& t, gp_Trsf trsf, IfcMesh* m);
}; };
extern bool Init(const char* fn, bool world_coords = false); extern bool Init(const char* fn, bool world_coords = false);
src/ifcwrap/Interface.h
+1
View File
@@ -28,6 +28,7 @@ namespace IfcGeomObjects {
class IfcGeomObject { class IfcGeomObject {
public: public:
int id;
std::string name; std::string name;
std::string type; std::string type;
std::vector<float> matrix; std::vector<float> matrix;