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

Sketcher: Excise SketchGeometryExtension outside of SketchObject

Browse Source
This commit is contained in:
Abdullah Tahiri
2019-01-24 16:03:54 +01:00
committed by wmayer
parent a6d1b899fa
commit 0e8a2d27a3
7 changed files with 145 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Sketcher/App/AppSketcher.cpp
View File

@@ -31,6 +31,7 @@
#include "SketchObjectSF.h"
#include "SketchObject.h"
#include "SketchGeometryExtension.h"
#include "Constraint.h"
#include "Sketch.h"
#include "ConstraintPy.h"
@@ -64,7 +65,7 @@ PyMOD_INIT_FUNC(Sketcher)
// NOTE: To finish the initialization of our own type objects we must
// call PyType_Ready, otherwise we run into a segmentation fault, later on.
// This function is responsible for adding inherited slots from a type's base class.
Sketcher::SketchGeometryExtension ::init();
Sketcher::SketchObjectSF ::init();
Sketcher::SketchObject ::init();

2
src/Mod/Sketcher/App/CMakeLists.txt
View File

@@ -51,6 +51,8 @@ SOURCE_GROUP("Properties" FILES ${Properties_SRCS})
SET(Features_SRCS
SketchObjectSF.cpp
SketchObjectSF.h
SketchGeometryExtension.cpp
SketchGeometryExtension.h
SketchObject.cpp
SketchObject.h
SketchAnalysis.h

83
src/Mod/Sketcher/App/SketchGeometryExtension.cpp Normal file
View File

@@ -0,0 +1,83 @@
/***************************************************************************
* Copyright (c) 2019 Abdullah Tahiri <abdullah.tahiri.yo@gmail.com> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#include <Base/Writer.h>
#include <Base/Reader.h>
#include <Mod/Sketcher/App/SketchGeometryExtensionPy.h>
#include "SketchGeometryExtension.h"
using namespace Sketcher;
//---------- Geometry Extension
TYPESYSTEM_SOURCE(Sketcher::SketchGeometryExtension,Part::GeometryExtension)
SketchGeometryExtension::SketchGeometryExtension():id(0)
{
}
SketchGeometryExtension::SketchGeometryExtension(long cid):id(cid)
{
}
SketchGeometryExtension::~SketchGeometryExtension()
{
}
// Persistence implementer
unsigned int SketchGeometryExtension::getMemSize (void) const
{
return sizeof(long int);
}
void SketchGeometryExtension::Save(Base::Writer &writer) const
{
writer.Stream() << writer.ind() << "<GeoExtension type=\"" << this->getTypeId().getName()
<< "\" id=\"" << id << "\"/>" << endl;
}
void SketchGeometryExtension::Restore(Base::XMLReader &reader)
{
id = reader.getAttributeAsInteger("id");
}
std::unique_ptr<Part::GeometryExtension> SketchGeometryExtension::copy(void) const
{
std::unique_ptr<SketchGeometryExtension> cpy = std::make_unique<SketchGeometryExtension>();
cpy->id = this->id;
return std::move(cpy);
}
PyObject * SketchGeometryExtension::getPyObject(void)
{
return new SketchGeometryExtensionPy(new SketchGeometryExtension(this->id));
}

55
src/Mod/Sketcher/App/SketchGeometryExtension.h Normal file
View File

@@ -0,0 +1,55 @@
/***************************************************************************
* Copyright (c) 2019 Abdullah Tahiri <abdullah.tahiri.yo@gmail.com> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef SKETCHER_SKETCHGEOMETRYEXTENSION_H
#define SKETCHER_SKETCHGEOMETRYEXTENSION_H
#include <Mod/Part/App/Geometry.h>
namespace Sketcher
{
class SketcherExport SketchGeometryExtension : public Part::GeometryExtension
{
TYPESYSTEM_HEADER();
public:
SketchGeometryExtension();
SketchGeometryExtension(long cid);
virtual ~SketchGeometryExtension();
// Persistence implementer ---------------------
virtual unsigned int getMemSize(void) const;
virtual void Save(Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
virtual std::unique_ptr<Part::GeometryExtension> copy(void) const;
virtual PyObject *getPyObject(void);
public:
long int id;
};
} //namespace Sketcher
#endif // SKETCHER_SKETCHGEOMETRYEXTENSION_H

2
src/Mod/Sketcher/App/SketchGeometryExtensionPy.xml
View File

@@ -6,7 +6,7 @@
PythonName="Sketcher.SketchGeometryExtension"
Twin="SketchGeometryExtension"
TwinPointer="SketchGeometryExtension"
Include="Mod/Sketcher/App/SketchObject.h"
Include="Mod/Sketcher/App/SketchGeometryExtension.h"
Namespace="Sketcher"
FatherInclude="Mod/Part/App/GeometryExtensionPy.h"
FatherNamespace="Part"

53
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -89,59 +89,6 @@
using namespace Sketcher;
using namespace Base;
//---------- Geometry Extension
TYPESYSTEM_SOURCE(Sketcher::SketchGeometryExtension,Part::GeometryExtension)
SketchGeometryExtension::SketchGeometryExtension():id(0)
{
}
SketchGeometryExtension::SketchGeometryExtension(long cid):id(cid)
{
}
SketchGeometryExtension::~SketchGeometryExtension()
{
}
// Persistence implementer
unsigned int SketchGeometryExtension::getMemSize (void) const
{
return sizeof(long int);
}
void SketchGeometryExtension::Save(Base::Writer &writer) const
{
writer.Stream() << writer.ind() << "<GeoExtension type=\"" << this->getTypeId().getName()
<< "\" id=\"" << id << "\"/>" << endl;
}
void SketchGeometryExtension::Restore(Base::XMLReader &reader)
{
id = reader.getAttributeAsInteger("id");
}
std::unique_ptr<Part::GeometryExtension> SketchGeometryExtension::copy(void) const
{
std::unique_ptr<SketchGeometryExtension> cpy = std::make_unique<SketchGeometryExtension>();
cpy->id = this->id;
return std::move(cpy);
}
PyObject * SketchGeometryExtension::getPyObject(void)
{
return new SketchGeometryExtensionPy(new SketchGeometryExtension(this->id));
}
//-------------- End Geometry Extension
const int GeoEnum::RtPnt = -1;
const int GeoEnum::HAxis = -1;

23
src/Mod/Sketcher/App/SketchObject.h
View File

@@ -38,30 +38,11 @@
#include "Sketch.h"
#include "SketchGeometryExtension.h"
namespace Sketcher
{
class SketcherExport SketchGeometryExtension : public Part::GeometryExtension
{
TYPESYSTEM_HEADER();
public:
SketchGeometryExtension();
SketchGeometryExtension(long cid);
virtual ~SketchGeometryExtension();
// Persistence implementer ---------------------
virtual unsigned int getMemSize(void) const;
virtual void Save(Base::Writer &/*writer*/) const;
virtual void Restore(Base::XMLReader &/*reader*/);
virtual std::unique_ptr<Part::GeometryExtension> copy(void) const;
virtual PyObject *getPyObject(void);
public:
long int id;
};
struct SketcherExport GeoEnum
{
static const int RtPnt;