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

Path: fixes #9403: Memory leak in Path

Browse Source
This commit is contained in:
wmayer
2023-05-12 10:43:29 +02:00
parent 86128f1de2
commit c242b5de5b
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Path/PathSimulator/App/PathSim.cpp
View File

@@ -32,27 +32,21 @@ TYPESYSTEM_SOURCE(PathSimulator::PathSim , Base::BaseClass);
PathSim::PathSim()
{
m_stock = nullptr;
m_tool = nullptr;
}
PathSim::~PathSim()
{
if (m_stock)
delete m_stock;
if (m_tool)
delete m_tool;
}
void PathSim::BeginSimulation(Part::TopoShape * stock, float resolution)
{
Base::BoundBox3d bbox = stock->getBoundBox();
m_stock = new cStock(bbox.MinX, bbox.MinY, bbox.MinZ, bbox.LengthX(), bbox.LengthY(), bbox.LengthZ(), resolution);
m_stock = std::make_unique<cStock>(bbox.MinX, bbox.MinY, bbox.MinZ, bbox.LengthX(), bbox.LengthY(), bbox.LengthZ(), resolution);
}
void PathSim::SetToolShape(const TopoDS_Shape& toolShape, float resolution)
{
m_tool = new cSimTool(toolShape, resolution);
m_tool = std::make_unique<cSimTool>(toolShape, resolution);
}
Base::Placement * PathSim::ApplyCommand(Base::Placement * pos, Command * cmd)

5
src/Mod/Path/PathSimulator/App/PathSim.h
View File

@@ -23,6 +23,7 @@
#ifndef PATHSIMULATOR_PathSim_H
#define PATHSIMULATOR_PathSim_H
#include <memory>
#include <TopoDS_Shape.hxx>
#include <Mod/Path/App/Command.h>
@@ -51,8 +52,8 @@ namespace PathSimulator
Base::Placement * ApplyCommand(Base::Placement * pos, Command * cmd);
public:
cStock * m_stock;
cSimTool *m_tool;
std::unique_ptr<cStock> m_stock;
std::unique_ptr<cSimTool> m_tool;
};
} //namespace Path

2
src/Mod/Path/PathSimulator/App/PathSimPyImp.cpp
View File

@@ -86,7 +86,7 @@ PyObject* PathSimPy::GetResultMesh(PyObject * args)
{
if (!PyArg_ParseTuple(args, ""))
return nullptr;
cStock *stock = getPathSimPtr()->m_stock;
cStock *stock = getPathSimPtr()->m_stock.get();
if (!stock)
{
PyErr_SetString(PyExc_RuntimeError, "Simulation has stock object");