From: szy Date: Thu, 25 Dec 2014 13:49:09 +0000 (+0300) Subject: Small fix of ImportNaming. X-Git-Tag: V_0.7.0_rc1~42^2~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a352874d231ad2b117f55cf384c18361a0dfe67a;p=modules%2Fshaper.git Small fix of ImportNaming. --- diff --git a/src/Model/Model_ResultBody.cpp b/src/Model/Model_ResultBody.cpp index da3ceb26e..4a04dda1a 100644 --- a/src/Model/Model_ResultBody.cpp +++ b/src/Model/Model_ResultBody.cpp @@ -543,33 +543,33 @@ void Model_ResultBody::loadDisconnectedVertexes(std::shared_ptr t { if(theShape->isNull()) return; TopoDS_Shape aShape = theShape->impl(); - TopTools_DataMapOfShapeListOfShape vertexNaborFaces; + TopTools_DataMapOfShapeListOfShape vertexNaborEdges; TopTools_ListOfShape empty; - TopExp_Explorer explF(aShape, TopAbs_FACE); + TopExp_Explorer explF(aShape, TopAbs_EDGE); for (; explF.More(); explF.Next()) { - const TopoDS_Shape& aFace = explF.Current(); - TopExp_Explorer explV(aFace, TopAbs_VERTEX); + const TopoDS_Shape& anEdge = explF.Current(); + TopExp_Explorer explV(anEdge, TopAbs_VERTEX); for (; explV.More(); explV.Next()) { const TopoDS_Shape& aVertex = explV.Current(); - if (!vertexNaborFaces.IsBound(aVertex)) vertexNaborFaces.Bind(aVertex, empty); + if (!vertexNaborEdges.IsBound(aVertex)) vertexNaborEdges.Bind(aVertex, empty); Standard_Boolean faceIsNew = Standard_True; - TopTools_ListIteratorOfListOfShape itrF(vertexNaborFaces.Find(aVertex)); + TopTools_ListIteratorOfListOfShape itrF(vertexNaborEdges.Find(aVertex)); for (; itrF.More(); itrF.Next()) { - if (itrF.Value().IsSame(aFace)) { + if (itrF.Value().IsSame(anEdge)) { faceIsNew = Standard_False; break; } } if (faceIsNew) { - vertexNaborFaces.ChangeFind(aVertex).Append(aFace); + vertexNaborEdges.ChangeFind(aVertex).Append(anEdge); } } } std::string aName; - TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itr(vertexNaborFaces); + TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itr(vertexNaborEdges); for (; itr.More(); itr.Next()) { - const TopTools_ListOfShape& naborFaces = itr.Value(); - if (naborFaces.Extent() < 1) { + const TopTools_ListOfShape& naborEdges = itr.Value(); + if (naborEdges.Extent() < 2) { builder(theTag)->Generated(itr.Key()); TCollection_AsciiString aStr(theTag); aName = theName + aStr.ToCString();