kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 2 Packages Projects 9 Releases 2 Wiki Activity

fixes #0003071: List of vertexes returned by wire.OrederedVertexes missing last vertext in the list

Browse Source
This commit is contained in:
wmayer
2017-09-30 22:24:47 +02:00
parent 53168d39d6
commit 62d98deccf
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Mod/Part/App/TopoShapeWirePyImp.cpp
View File

@@ -32,6 +32,7 @@
# include <BRepTools_WireExplorer.hxx>
# include <Precision.hxx>
# include <ShapeFix_Wire.hxx>
# include <TopExp.hxx>
# include <TopoDS.hxx>
# include <TopoDS_Wire.hxx>
# include <gp_Ax1.hxx>
@@ -62,6 +63,11 @@
using namespace Part;
namespace Part {
extern Py::Object shape2pyshape(const TopoDS_Shape &shape);
}
// returns a string which represents the object e.g. when printed in python
std::string TopoShapeWirePy::representation(void) const
{
@@ -603,7 +609,7 @@ Py::List TopoShapeWirePy::getOrderedEdges(void) const
BRepTools_WireExplorer xp(TopoDS::Wire(getTopoShapePtr()->getShape()));
while (xp.More()) {
ret.append(Py::asObject(new TopoShapeEdgePy(new TopoShape(xp.Current()))));
ret.append(shape2pyshape(xp.Current()));
xp.Next();
}
@@ -614,12 +620,22 @@ Py::List TopoShapeWirePy::getOrderedVertexes(void) const
{
Py::List ret;
BRepTools_WireExplorer xp(TopoDS::Wire(getTopoShapePtr()->getShape()));
TopoDS_Wire wire = TopoDS::Wire(getTopoShapePtr()->getShape());
BRepTools_WireExplorer xp(wire);
while (xp.More()) {
ret.append(Py::asObject(new TopoShapeVertexPy(new TopoShape(xp.CurrentVertex()))));
ret.append(shape2pyshape(xp.CurrentVertex()));
xp.Next();
}
// special treatment for open wires
TopoDS_Vertex Vfirst, Vlast;
TopExp::Vertices(wire, Vfirst, Vlast);
if (!Vfirst.IsNull() && !Vlast.IsNull()) {
if (!Vfirst.IsSame(Vlast)) {
ret.append(shape2pyshape(Vlast));
}
}
return ret;
}