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

fixes 0003771: Memory leak in Part.Face.Surface

Browse Source
This commit is contained in:
wmayer
2019-01-23 22:38:51 +01:00
parent 090fc64284
commit dedaa80762
5 changed files with 98 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Mod/Part/App/TopoShapeEdgePyImp.cpp
View File

@@ -775,6 +775,7 @@ Py::Object TopoShapeEdgePy::getCurve() const
{
const TopoDS_Edge& e = TopoDS::Edge(getTopoShapePtr()->getShape());
BRepAdaptor_Curve adapt(e);
Base::PyObjectBase* curve = nullptr;
switch(adapt.GetType())
{
case GeomAbs_Line:
@@ -805,14 +806,16 @@ Py::Object TopoShapeEdgePy::getCurve() const
"To suppress the warning set BaseApp/Preferences/Mod/Part/General/LineOld to false");
PyErr_Print();
return Py::Object(new LineSegmentPy(line),true); // LinePyOld
curve = new LineSegmentPy(line); // LinePyOld
break;
}
else {
GeomLine* line = new GeomLine();
Handle(Geom_Line) this_curv = Handle(Geom_Line)::DownCast
(line->handle());
this_curv->SetLin(adapt.Line());
return Py::Object(new LinePy(line),true);
curve = new LinePy(line);
break;
}
}
case GeomAbs_Circle:
@@ -823,7 +826,8 @@ Py::Object TopoShapeEdgePy::getCurve() const
this_curv->SetCirc(adapt.Circle());
//Standard_Real dd = adapt.FirstParameter();
//Standard_Real ee = adapt.LastParameter();
return Py::Object(new CirclePy(circle),true);
curve = new CirclePy(circle);
break;
}
case GeomAbs_Ellipse:
{
@@ -831,7 +835,8 @@ Py::Object TopoShapeEdgePy::getCurve() const
Handle(Geom_Ellipse) this_curv = Handle(Geom_Ellipse)::DownCast
(elips->handle());
this_curv->SetElips(adapt.Ellipse());
return Py::Object(new EllipsePy(elips),true);
curve = new EllipsePy(elips);
break;
}
case GeomAbs_Hyperbola:
{
@@ -839,7 +844,8 @@ Py::Object TopoShapeEdgePy::getCurve() const
Handle(Geom_Hyperbola) this_curv = Handle(Geom_Hyperbola)::DownCast
(hypr->handle());
this_curv->SetHypr(adapt.Hyperbola());
return Py::Object(new HyperbolaPy(hypr),true);
curve = new HyperbolaPy(hypr);
break;
}
case GeomAbs_Parabola:
{
@@ -847,17 +853,20 @@ Py::Object TopoShapeEdgePy::getCurve() const
Handle(Geom_Parabola) this_curv = Handle(Geom_Parabola)::DownCast
(parab->handle());
this_curv->SetParab(adapt.Parabola());
return Py::Object(new ParabolaPy(parab),true);
curve = new ParabolaPy(parab);
break;
}
case GeomAbs_BezierCurve:
{
GeomBezierCurve* curve = new GeomBezierCurve(adapt.Bezier());
return Py::Object(new BezierCurvePy(curve),true);
GeomBezierCurve* bezier = new GeomBezierCurve(adapt.Bezier());
curve = new BezierCurvePy(bezier);
break;
}
case GeomAbs_BSplineCurve:
{
GeomBSplineCurve* curve = new GeomBSplineCurve(adapt.BSpline());
return Py::Object(new BSplineCurvePy(curve),true);
GeomBSplineCurve* bspline = new GeomBSplineCurve(adapt.BSpline());
curve = new BSplineCurvePy(bspline);
break;
}
#if OCC_VERSION_HEX >= 0x070000
case GeomAbs_OffsetCurve:
@@ -866,8 +875,9 @@ Py::Object TopoShapeEdgePy::getCurve() const
Handle(Geom_Curve) c = BRep_Tool::Curve(e, first, last);
Handle(Geom_OffsetCurve) off = Handle(Geom_OffsetCurve)::DownCast(c);
if (!off.IsNull()) {
GeomOffsetCurve* curve = new GeomOffsetCurve(off);
return Py::Object(new OffsetCurvePy(curve),true);
GeomOffsetCurve* offset = new GeomOffsetCurve(off);
curve = new OffsetCurvePy(offset);
break;
}
else {
throw Py::RuntimeError("Failed to convert to offset curve");
@@ -878,6 +888,11 @@ Py::Object TopoShapeEdgePy::getCurve() const
break;
}
if (curve) {
curve->setNotTracking();
return Py::asObject(curve);
}
throw Py::TypeError("undefined curve type");
}