suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle degenerate edges in face detection

Browse Source
This commit is contained in:
WandererFan 2016-09-06 17:51:03 -04:00 committed by wmayer
parent 3f2264dc4d
commit cebe2faee1
4 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/TechDraw/App/DrawUtil.cpp
View File

@ -118,6 +118,13 @@ bool DrawUtil::isSamePoint(TopoDS_Vertex v1, TopoDS_Vertex v2)
return result;
}
bool DrawUtil::isZeroEdge(TopoDS_Edge& e)
{
TopoDS_Vertex vStart = TopExp::FirstVertex(e);
TopoDS_Vertex vEnd = TopExp::LastVertex(e);
return isSamePoint(vStart,vEnd);
}
//============================
// various debugging routines.
void DrawUtil::dumpVertexes(const char* text, const TopoDS_Shape& s)

2
src/Mod/TechDraw/App/DrawUtil.h
View File

@ -41,7 +41,7 @@ class TechDrawExport DrawUtil {
static std::string getGeomTypeFromName(std::string geomName);
static std::string makeGeomName(std::string geomType, int index);
static bool isSamePoint(TopoDS_Vertex v1, TopoDS_Vertex v2);
static bool isZeroEdge(TopoDS_Edge& e);
//debugging routines
static void dumpVertexes(const char* text, const TopoDS_Shape& s);
static void dumpEdge(char* label, int i, TopoDS_Edge e);

52
src/Mod/TechDraw/App/DrawViewPart.cpp
View File

@ -311,7 +311,16 @@ void DrawViewPart::extractFaces()
}
}
std::vector<TopoDS_Edge> faceEdges = origEdges;
std::vector<TopoDS_Edge> faceEdges;
std::vector<TopoDS_Edge> nonZero;
for (auto& e:origEdges) { //drop any zero edges
if (!DrawUtil::isZeroEdge(e)) {
nonZero.push_back(e);
}
}
faceEdges = nonZero;
origEdges = nonZero;
std::vector<TopoDS_Edge>::iterator itOrig = origEdges.begin();
//HLR algo does not provide all edge intersections for edge endpoints.
@ -320,6 +329,9 @@ void DrawViewPart::extractFaces()
for (; itOrig != origEdges.end(); itOrig++, idb++) {
TopoDS_Vertex v1 = TopExp::FirstVertex((*itOrig));
TopoDS_Vertex v2 = TopExp::LastVertex((*itOrig));
if (DrawUtil::isSamePoint(v1,v2)) {
continue; //skip zero length edges. shouldn't happen ;)
}
std::vector<TopoDS_Edge>::iterator itNew = faceEdges.begin();
std::vector<size_t> deleteList;
std::vector<TopoDS_Edge> edgesToAdd;
@ -328,6 +340,10 @@ void DrawViewPart::extractFaces()
if ( itOrig->IsSame(*itNew) ){
continue;
}
if (DrawUtil::isZeroEdge((*itNew))) {
continue; //skip zero length edges. shouldn't happen ;)
}
bool removeThis = false;
std::vector<TopoDS_Vertex> splitPoints;
if (isOnEdge((*itNew),v1,false)) {
@ -343,8 +359,10 @@ void DrawViewPart::extractFaces()
}
if (!splitPoints.empty()) {
std::vector<TopoDS_Edge> subEdges = splitEdge(splitPoints,(*itNew));
edgesToAdd.insert(std::end(edgesToAdd), std::begin(subEdges), std::end(subEdges));
if (!DrawUtil::isZeroEdge((*itNew))) {
std::vector<TopoDS_Edge> subEdges = splitEdge(splitPoints,(*itNew));
edgesToAdd.insert(std::end(edgesToAdd), std::begin(subEdges), std::end(subEdges));
}
}
}
//delete the split edge(s) and add the subedges
@ -431,12 +449,28 @@ std::vector<TopoDS_Edge> DrawViewPart::splitEdge(std::vector<TopoDS_Vertex> spli
Handle_Geom_Curve c = adapt.Curve().Curve();
//simple version for 1 splitPoint
//TODO: handle case where e is split in multiple points (ie circular edge cuts line twice)
BRepBuilderAPI_MakeEdge mkBuilder1(c, vStart, splitPoints[0]);
TopoDS_Edge e1 = mkBuilder1.Edge();
BRepBuilderAPI_MakeEdge mkBuilder2(c, splitPoints[0], vEnd);
TopoDS_Edge e2 = mkBuilder2.Edge();
result.push_back(e1);
result.push_back(e2);
// for some reason, BRepBuilderAPI_MakeEdge sometimes fails without reporting IsDone status or error, so we use try/catch
try {
BRepBuilderAPI_MakeEdge mkBuilder1(c, vStart ,splitPoints[0]);
if (mkBuilder1.IsDone()) {
TopoDS_Edge e1 = mkBuilder1.Edge();
result.push_back(e1);
}
}
catch (Standard_Failure) {
Base::Console().Message("LOG - DVP::splitEdge failed building 1st edge\n");
}
try{
BRepBuilderAPI_MakeEdge mkBuilder2(c, splitPoints[0], vEnd);
if (mkBuilder2.IsDone()) {
TopoDS_Edge e2 = mkBuilder2.Edge();
result.push_back(e2);
}
}
catch (Standard_Failure) {
Base::Console().Message("LOG - DVP::splitEdge failed building 2nd edge\n");
}
return result;
}

22
src/Mod/TechDraw/App/GeometryObject.cpp
View File

@ -168,17 +168,17 @@ void GeometryObject::projectShape(const TopoDS_Shape& input,
hidOutline = hlrToShape.OutLineHCompound();
hidIso = hlrToShape.IsoLineHCompound();
//just made 3d curves before starting HLR
// BRepLib::BuildCurves3d(visHard);
// BRepLib::BuildCurves3d(visSmooth);
// BRepLib::BuildCurves3d(visSeam);
// BRepLib::BuildCurves3d(visOutline);
// BRepLib::BuildCurves3d(visIso);
// BRepLib::BuildCurves3d(hidHard);
// BRepLib::BuildCurves3d(hidSmooth);
// BRepLib::BuildCurves3d(hidSeam);
// BRepLib::BuildCurves3d(hidOutline);
// BRepLib::BuildCurves3d(hidIso);
//need these 3d curves to prevent "zero edges" later
BRepLib::BuildCurves3d(visHard);
BRepLib::BuildCurves3d(visSmooth);
BRepLib::BuildCurves3d(visSeam);
BRepLib::BuildCurves3d(visOutline);
BRepLib::BuildCurves3d(visIso);
BRepLib::BuildCurves3d(hidHard);
BRepLib::BuildCurves3d(hidSmooth);
BRepLib::BuildCurves3d(hidSeam);
BRepLib::BuildCurves3d(hidOutline);
BRepLib::BuildCurves3d(hidIso);
}
catch (...) {
Standard_Failure::Raise("GeometryObject::projectShape - error occurred while extracting edges");