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

GeomServer: precision on double formatting, compound in meters, bounding box also from compound

Browse Source
This commit is contained in:
Thomas Krijnen
2019-02-20 12:29:44 +01:00
parent 33cbcc2510
commit 45136fce6c
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomRepresentation.cpp
+2 -2
View File
@@ -82,7 +82,7 @@ TopoDS_Shape apply_transformation(const TopoDS_Shape& s, const gp_GTrsf& t) {
} }
} }
TopoDS_Compound IfcGeom::Representation::BRep::as_compound() const { TopoDS_Compound IfcGeom::Representation::BRep::as_compound(bool force_meters) const {
TopoDS_Compound compound; TopoDS_Compound compound;
BRep_Builder builder; BRep_Builder builder;
builder.MakeCompound(compound); builder.MakeCompound(compound);
@@ -90,7 +90,7 @@ TopoDS_Compound IfcGeom::Representation::BRep::as_compound() const {
const TopoDS_Shape& s = it->Shape(); const TopoDS_Shape& s = it->Shape();
gp_GTrsf trsf = it->Placement(); gp_GTrsf trsf = it->Placement();
if (settings().get(IteratorSettings::CONVERT_BACK_UNITS)) { if (!force_meters && settings().get(IteratorSettings::CONVERT_BACK_UNITS)) {
gp_Trsf scale; gp_Trsf scale;
scale.SetScaleFactor(1.0 / settings().unit_magnitude()); scale.SetScaleFactor(1.0 / settings().unit_magnitude());
trsf.PreMultiply(scale); trsf.PreMultiply(scale);
src/ifcgeom/IfcGeomRepresentation.h
+1 -1
View File
@@ -75,7 +75,7 @@ namespace IfcGeom {
IfcGeom::IfcRepresentationShapeItems::const_iterator end() const { return shapes_.end(); } IfcGeom::IfcRepresentationShapeItems::const_iterator end() const { return shapes_.end(); }
const IfcGeom::IfcRepresentationShapeItems& shapes() const { return shapes_; } const IfcGeom::IfcRepresentationShapeItems& shapes() const { return shapes_; }
const std::string& id() const { return id_; } const std::string& id() const { return id_; }
TopoDS_Compound as_compound() const; TopoDS_Compound as_compound(bool force_meters = false) const;
bool calculate_volume(double&) const; bool calculate_volume(double&) const;
bool calculate_surface_area(double&) const; bool calculate_surface_area(double&) const;
src/ifcgeomserver/IfcGeomServer.cpp
+16 -13
View File
@@ -91,10 +91,18 @@ std::string format_json(const std::string& s) {
return "\"" + s + "\""; return "\"" + s + "\"";
} }
template <>
std::string format_json(const double& d) {
std::stringstream ss;
ss << std::setprecision(std::numeric_limits<double>::digits10) << d;
return ss.str();
}
template <> template <>
std::string format_json(const gp_Dir& d) { std::string format_json(const gp_Dir& d) {
std::stringstream ss; std::stringstream ss;
ss << "[" << d.X() << "," << d.Y() << "," << d.Z() << "]"; ss << std::setprecision(std::numeric_limits<double>::digits10)
<< "[" << d.X() << "," << d.Y() << "," << d.Z() << "]";
return ss.str(); return ss.str();
} }
@@ -470,7 +478,7 @@ public:
boost::optional<gp_Dir> largest_face_dir; boost::optional<gp_Dir> largest_face_dir;
{ {
TopoDS_Compound compound = elem_->geometry().as_compound(); TopoDS_Compound compound = elem_->geometry().as_compound(true);
TopExp_Explorer exp(compound, TopAbs_FACE); TopExp_Explorer exp(compound, TopAbs_FACE);
for (; exp.More(); exp.Next()) { for (; exp.More(); exp.Next()) {
GProp_GProps prop; GProp_GProps prop;
@@ -488,20 +496,11 @@ public:
} }
} }
} }
}
if (largest_face_dir) {
put_json(LARGEST_FACE_DIRECTION, *largest_face_dir);
put_json(LARGEST_FACE_AREA, largest_face_area);
}
{
Bnd_Box box; Bnd_Box box;
double xyz[6]; double xyz[6];
for (auto& part : elem->geometry()) { BRepBndLib::AddClose(compound, box);
BRepBndLib::AddClose(part.Shape(), box);
}
if (!box.IsVoid()) { if (!box.IsVoid()) {
box.Get(xyz[0], xyz[1], xyz[2], xyz[3], xyz[4], xyz[5]); box.Get(xyz[0], xyz[1], xyz[2], xyz[3], xyz[4], xyz[5]);
@@ -510,7 +509,11 @@ public:
put_json(BOUNDING_BOX_SIZE_ALONG_ + XYZ[i], bsz); put_json(BOUNDING_BOX_SIZE_ALONG_ + XYZ[i], bsz);
} }
} }
}
if (largest_face_dir) {
put_json(LARGEST_FACE_DIRECTION, *largest_face_dir);
put_json(LARGEST_FACE_AREA, largest_face_area);
} }
} }
}; };