Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-09 05:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable some disabled functionality in the 0.6 branch

Browse Source
This commit is contained in:
Thomas Krijnen
2018-12-28 16:02:03 +01:00
parent 13d2cf3357
commit 2c8a79e186
2 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcconvert/IfcConvert.cpp
-2
View File
@@ -682,8 +682,6 @@ int main(int argc, char** argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
throw std::runtime_error("needs more work");
if (!quiet) Logger::Status("Computing bounds..."); if (!quiet) Logger::Status("Computing bounds...");
context_iterator.compute_bounds(); context_iterator.compute_bounds();
if (!quiet) Logger::Status("Done!"); if (!quiet) Logger::Status("Done!");
src/serializers/SvgSerializer.cpp
+13 -29
View File
@@ -496,39 +496,24 @@ std::string SvgSerializer::nameElement(const IfcUtil::IfcBaseEntity* elem) {
} }
void SvgSerializer::setFile(IfcParse::IfcFile* f) { void SvgSerializer::setFile(IfcParse::IfcFile* f) {
throw std::runtime_error("todo");
/*
file = f; file = f;
IfcSchema::IfcBuildingStorey::list::ptr storeys = f->entitiesByType<IfcSchema::IfcBuildingStorey>();
auto storeys = f->instances_by_type("IfcBuildingStorey");
if (!storeys || storeys->size() == 0) { if (!storeys || storeys->size() == 0) {
IfcGeom::Kernel kernel; IfcGeom::Kernel kernel(f);
IfcSchema::IfcProject::list::ptr projects = f->entitiesByType<IfcSchema::IfcProject>(); std::vector<const IfcParse::declaration*> to_derive_from;
if (projects->size() == 1) { to_derive_from.push_back(f->schema()->declaration_by_name("IfcBuilding"));
IfcSchema::IfcProject* project = *projects->begin(); to_derive_from.push_back(f->schema()->declaration_by_name("IfcSite"));
std::pair<std::string, double> length_unit = kernel.initializeUnits(project->UnitsInContext()); for (auto it = to_derive_from.begin(); it != to_derive_from.end(); ++it) {
} else { IfcEntityList::ptr insts = f->instances_by_type(*it);
Logger::Error("No single project encountered, output might be invalid or missing"); if (insts) {
return; for (auto jt = insts->begin(); jt != insts->end(); ++jt) {
} IfcUtil::IfcBaseEntity* product = (IfcUtil::IfcBaseEntity*) *jt;
if (!product->get("ObjectPlacement")->isNull()) {
std::vector<IfcSchema::Type::Enum> to_derive_from;
to_derive_from.push_back(IfcSchema::Type::IfcBuilding);
to_derive_from.push_back(IfcSchema::Type::IfcSite);
std::vector<IfcSchema::Type::Enum>::const_iterator it;
for (it = to_derive_from.begin(); it != to_derive_from.end(); ++it) {
IfcEntityList::ptr untyped = f->entitiesByType(*it);
if (untyped) {
IfcSchema::IfcProduct::list::ptr insts = untyped->as<IfcSchema::IfcProduct>();
IfcSchema::IfcProduct::list::it jt;
for (jt = insts->begin(); jt != insts->end(); ++jt) {
IfcSchema::IfcProduct* product = *jt;
if (product->hasObjectPlacement()) {
gp_Trsf trsf; gp_Trsf trsf;
if (kernel.convert(product->ObjectPlacement(), trsf)) { if (kernel.convert_placement(*product->get("ObjectPlacement"), trsf)) {
setSectionHeight(trsf.TranslationPart().Z() + 1.); setSectionHeight(trsf.TranslationPart().Z() + 1.);
Logger::Warning("No building storeys encountered, used for reference:", product); Logger::Warning("No building storeys encountered, used for reference:", product);
return; return;
@@ -540,5 +525,4 @@ void SvgSerializer::setFile(IfcParse::IfcFile* f) {
Logger::Error("No building storeys encountered, output might be invalid or missing"); Logger::Error("No building storeys encountered, output might be invalid or missing");
} }
*/
} }