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

Additional improvements for comp curve wire building

Browse Source
This commit is contained in:
Thomas Krijnen
2018-06-01 15:38:08 +02:00
parent 20cd383504
commit 6c1ad47481
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomWires.cpp
+34 -32
View File
@@ -99,21 +99,22 @@ namespace {
return v.IsSame(b) ? a : b; return v.IsSame(b) ? a : b;
} }
TopoDS_Edge first_edge(const TopoDS_Wire& w) {
TopoDS_Vertex v1, v2;
TopExp::Vertices(w, v1, v2);
TopTools_IndexedDataMapOfShapeListOfShape wm;
TopExp::MapShapesAndAncestors(w, TopAbs_VERTEX, TopAbs_EDGE, wm);
return TopoDS::Edge(wm.FindFromKey(v1).First());
}
// Returns new wire with the edge replaced by a linear edge with the vertex v moved to p // Returns new wire with the edge replaced by a linear edge with the vertex v moved to p
TopoDS_Wire adjust(const TopoDS_Wire& w, const TopoDS_Edge& e, const TopoDS_Vertex& v, const gp_Pnt& p) { TopoDS_Wire adjust(const TopoDS_Wire& w, const TopoDS_Vertex& v, const gp_Pnt& p) {
gp_Pnt p1 = p; BRep_Builder b;
gp_Pnt p2 = BRep_Tool::Pnt(other(e, v)); TopoDS_Vertex v2;
b.MakeVertex(v2, p, BRep_Tool::Tolerance(v));
if (e.Orientation() == TopAbs_REVERSED) {
std::swap(p1, p2);
}
// Already asserted this is a replacement for a linear edge
TopoDS_Edge new_edge = BRepBuilderAPI_MakeEdge(p1, p2).Edge();
new_edge.Orientation(e.Orientation());
ShapeBuild_ReShape reshape; ShapeBuild_ReShape reshape;
reshape.Replace(e, new_edge); reshape.Replace(v.Oriented(TopAbs_FORWARD), v2);
return TopoDS::Wire(reshape.Apply(w)); return TopoDS::Wire(reshape.Apply(w));
} }
@@ -123,32 +124,34 @@ namespace {
private: private:
BRepBuilderAPI_MakeWire mw_; BRepBuilderAPI_MakeWire mw_;
double p_; double p_;
bool skip_next_; bool override_next_;
gp_Pnt next_override_;
const IfcUtil::IfcBaseClass* inst_; const IfcUtil::IfcBaseClass* inst_;
public: public:
wire_builder(double p, const IfcUtil::IfcBaseClass* inst = 0) : p_(p), skip_next_(false), inst_(inst) {} wire_builder(double p, const IfcUtil::IfcBaseClass* inst = 0) : p_(p), override_next_(false), inst_(inst) {}
void operator()(const TopoDS_Shape& a) { void operator()(const TopoDS_Shape& a) {
if (skip_next_) { const TopoDS_Wire& w = TopoDS::Wire(a);
// tfk: not ideal, adjusting both start and end points not supported now. if (override_next_) {
skip_next_ = false; override_next_ = false;
return; TopoDS_Edge e = first_edge(w);
mw_.Add(adjust(w, TopExp::FirstVertex(e, true), next_override_));
} else {
mw_.Add(w);
} }
mw_.Add(TopoDS::Wire(a));
} }
void operator()(const TopoDS_Shape& a, const TopoDS_Shape& b, bool last) { void operator()(const TopoDS_Shape& a, const TopoDS_Shape& b, bool last) {
if (skip_next_) { TopoDS_Wire w1 = TopoDS::Wire(a);
// tfk: not ideal, adjusting both start and end points not supported now.
skip_next_ = false;
return;
}
const TopoDS_Wire& w1 = TopoDS::Wire(a);
const TopoDS_Wire& w2 = TopoDS::Wire(b); const TopoDS_Wire& w2 = TopoDS::Wire(b);
if (override_next_) {
override_next_ = false;
TopoDS_Edge e = first_edge(w1);
w1 = adjust(w1, TopExp::FirstVertex(e, true), next_override_);
}
TopoDS_Vertex w11, w12, w21, w22; TopoDS_Vertex w11, w12, w21, w22;
TopExp::Vertices(w1, w11, w12); TopExp::Vertices(w1, w11, w12);
TopExp::Vertices(w2, w21, w22); TopExp::Vertices(w2, w21, w22);
@@ -159,7 +162,7 @@ namespace {
double dist = p1.Distance(p2); double dist = p1.Distance(p2);
// Distance is within 2p, this is fine // Distance is within 2p, this is fine
if (dist < 2. * p_) { if (dist < p_) {
mw_.Add(w1); mw_.Add(w1);
goto check; goto check;
} }
@@ -192,13 +195,12 @@ namespace {
// Adjust the segment that is linear // Adjust the segment that is linear
if (is_line1) { if (is_line1) {
mw_.Add(adjust(w1, TopoDS::Edge(last_edges.First()), w12, p2)); mw_.Add(adjust(w1, w12, p2));
Logger::Message(Logger::LOG_ERROR, "Adjusted edge end-point with distance " + boost::lexical_cast<std::string>(dist) + " on:", inst_->entity); Logger::Message(Logger::LOG_ERROR, "Adjusted edge end-point with distance " + boost::lexical_cast<std::string>(dist) + " on:", inst_->entity);
} else if (is_line2 && !last) { } else if (is_line2 && !last) {
// tfk: not ideal, begin point of first edge cannot be adjusted now for cyclic wires
mw_.Add(w1); mw_.Add(w1);
mw_.Add(adjust(w1, TopoDS::Edge(last_edges.First()), w12, p2)); override_next_ = true;
skip_next_ = true; next_override_ = p1;
Logger::Message(Logger::LOG_ERROR, "Adjusted edge end-point with distance " + boost::lexical_cast<std::string>(dist) + " on:", inst_->entity); Logger::Message(Logger::LOG_ERROR, "Adjusted edge end-point with distance " + boost::lexical_cast<std::string>(dist) + " on:", inst_->entity);
} else { } else {
// If both aren't linear an edge is added // If both aren't linear an edge is added