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

Sketcher: GeometryFacade - Add ownership parameter to factory method

Browse Source
This commit is contained in:
Abdullah Tahiri
2021-12-21 20:26:22 +01:00
committed by abdullahtahiriyo
parent 501ebfe921
commit bc6e4c1355
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Sketcher/App/GeometryFacade.cpp
View File

@@ -43,8 +43,8 @@ GeometryFacade::GeometryFacade(): Geo(nullptr), OwnerGeo(false), SketchGeoExtens
}
GeometryFacade::GeometryFacade(const Part::Geometry * geometry)
: Geo(geometry), OwnerGeo(false)
GeometryFacade::GeometryFacade(const Part::Geometry * geometry, bool owner)
: Geo(geometry), OwnerGeo(owner)
{
assert(geometry != nullptr); // This should never be nullptr, as this constructor is protected
@@ -53,14 +53,14 @@ GeometryFacade::GeometryFacade(const Part::Geometry * geometry)
GeometryFacade::~GeometryFacade()
{
if (OwnerGeo)
if (OwnerGeo && Geo != nullptr)
delete Geo;
}
std::unique_ptr<GeometryFacade> GeometryFacade::getFacade(Part::Geometry * geometry)
std::unique_ptr<GeometryFacade> GeometryFacade::getFacade(Part::Geometry * geometry, bool owner)
{
if(geometry != nullptr)
return std::unique_ptr<GeometryFacade>(new GeometryFacade(geometry));
return std::unique_ptr<GeometryFacade>(new GeometryFacade(geometry, owner));
else
return std::unique_ptr<GeometryFacade>(nullptr);
//return std::make_unique<GeometryFacade>(geometry); // make_unique has no access to private constructor

4
src/Mod/Sketcher/App/GeometryFacade.h
View File

@@ -100,13 +100,13 @@ class SketcherExport GeometryFacade : public Base::BaseClass, private ISketchGeo
TYPESYSTEM_HEADER_WITH_OVERRIDE();
protected:
GeometryFacade(const Part::Geometry * geometry);
GeometryFacade(const Part::Geometry * geometry, bool owner = false);
GeometryFacade(); // As TYPESYSTEM requirement
friend class GeometryFacadePy;
public: // Factory methods
static std::unique_ptr<GeometryFacade> getFacade(Part::Geometry * geometry);
static std::unique_ptr<GeometryFacade> getFacade(Part::Geometry * geometry, bool owner = false);
static std::unique_ptr<const GeometryFacade> getFacade(const Part::Geometry * geometry);
public: // Utility methods