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

#1785 check settings in cache and upgrade to world coords

Browse Source
This commit is contained in:
Thomas Krijnen
2021-11-07 19:23:48 +01:00
parent 580678c2c1
commit 1cdf695891
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomIteratorSettings.h
+5 -1
View File
@@ -160,8 +160,12 @@ namespace IfcGeom
/// Optional rotation that is applied to serialized objects, (0,0,0,1) by default. /// Optional rotation that is applied to serialized objects, (0,0,0,1) by default.
std::array<double,4> rotation = std::array<double,4>{0.0, 0.0, 0.0, 1.0}; std::array<double,4> rotation = std::array<double,4>{0.0, 0.0, 0.0, 1.0};
uint64_t get_raw() const {
return settings_;
}
protected: protected:
unsigned settings_; uint64_t settings_;
double deflection_tolerance_, angular_tolerance_, force_space_transparency_; double deflection_tolerance_, angular_tolerance_, force_space_transparency_;
std::set<int> context_ids_; std::set<int> context_ids_;
}; };
src/serializers/HdfSerializer.cpp
+25 -1
View File
@@ -113,6 +113,11 @@ namespace {
return H5::PredType::NATIVE_INT; return H5::PredType::NATIVE_INT;
} }
template <>
H5::DataType h5_datatype_for_cpp<uint64_t>() {
return H5::PredType::NATIVE_UINT64;
}
template <> template <>
H5::DataType h5_datatype_for_cpp<double>() { H5::DataType h5_datatype_for_cpp<double>() {
return H5::PredType::NATIVE_DOUBLE; return H5::PredType::NATIVE_DOUBLE;
@@ -308,6 +313,10 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
if (rt == READ_BREP && !brep_geometry) { if (rt == READ_BREP && !brep_geometry) {
auto brepDataset = representation_group.openDataSet(DATASET_NAME_OCCT); auto brepDataset = representation_group.openDataSet(DATASET_NAME_OCCT);
auto stored_settings = read_scalar_attribute<uint64_t>(brepDataset, "settings");
if (stored_settings != settings_.get_raw() && (stored_settings | IfcGeom::IteratorSettings::USE_WORLD_COORDS) != settings_.get_raw()) {
throw std::runtime_error("Settings mismatch");
}
std::vector<brep_element> parts; std::vector<brep_element> parts;
{ {
@@ -379,9 +388,19 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
shapes.push_back(IfcGeom::IfcRepresentationShapeItem(part.id, trsf, shp, style_ptr)); shapes.push_back(IfcGeom::IfcRepresentationShapeItem(part.id, trsf, shp, style_ptr));
} }
if (settings_.get(IfcGeom::IteratorSettings::USE_WORLD_COORDS) && !(stored_settings & IfcGeom::IteratorSettings::USE_WORLD_COORDS)) {
for (IfcGeom::IfcRepresentationShapeItems::iterator it = shapes.begin(); it != shapes.end(); ++it) {
it->prepend(trsf);
}
trsf = gp_Trsf();
}
brep_geometry = boost::shared_ptr<IfcGeom::Representation::BRep>(new IfcGeom::Representation::BRep(element_settings, geom_id, shapes)); brep_geometry = boost::shared_ptr<IfcGeom::Representation::BRep>(new IfcGeom::Representation::BRep(element_settings, geom_id, shapes));
brep_cache_.insert({ representation_id_str, brep_geometry });
if (!settings_.get(IfcGeom::IteratorSettings::USE_WORLD_COORDS)) {
brep_cache_.insert({ representation_id_str, brep_geometry });
}
} }
if (rt == READ_TRIANGULATION && !triangulation_geometry) { if (rt == READ_TRIANGULATION && !triangulation_geometry) {
@@ -626,6 +645,11 @@ void HdfSerializer::write(const IfcGeom::BRepElement* o) {
auto brepDataset = representation_group.createDataSet(DATASET_NAME_OCCT, compound, dataspace_parts); auto brepDataset = representation_group.createDataSet(DATASET_NAME_OCCT, compound, dataspace_parts);
brepDataset.write(parts, compound); brepDataset.write(parts, compound);
H5::DataSpace attrdspace(H5S_SCALAR);
H5::Attribute att = brepDataset.createAttribute("settings", H5::PredType::NATIVE_UINT64, attrdspace);
uint64_t value = o->geometry().settings().get_raw();
att.write(H5::PredType::NATIVE_UINT64, &value);
} }
namespace { namespace {