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

Sketcher: new SolverGeometryExtension to store solver information within the geometry

Browse Source
This commit is contained in:
Abdullah Tahiri
2020-12-15 06:37:44 +01:00
committed by abdullahtahiriyo
parent 573a850b99
commit 5a20215e65
4 changed files with 164 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include "SketchObject.h"
#include "SketchGeometryExtension.h"
#include "ExternalGeometryExtension.h"
#include "SolverGeometryExtension.h"
#include "GeometryFacade.h"
#include "ExternalGeometryFacade.h"
#include "Constraint.h"
@@ -80,6 +81,7 @@ PyMOD_INIT_FUNC(Sketcher)
Sketcher::SketchGeometryExtension ::init();
Sketcher::ExternalGeometryExtension ::init();
Sketcher::SolverGeometryExtension ::init();
Sketcher::GeometryFacade ::init();
Sketcher::ExternalGeometryFacade ::init();
Sketcher::SketchObjectSF ::init();

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

@@ -58,6 +58,8 @@ SET(Features_SRCS
SketchGeometryExtension.h
ExternalGeometryExtension.cpp
ExternalGeometryExtension.h
SolverGeometryExtension.cpp
SolverGeometryExtension.h
SketchObject.cpp
SketchObject.h
SketchAnalysis.h

66
src/Mod/Sketcher/App/SolverGeometryExtension.cpp Normal file
View File

@@ -0,0 +1,66 @@
/***************************************************************************
* 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/Exception.h>
#include "SolverGeometryExtension.h"
using namespace Sketcher;
//---------- Geometry Extension
TYPESYSTEM_SOURCE(Sketcher::SolverGeometryExtension,Part::GeometryExtension)
SolverGeometryExtension::SolverGeometryExtension():
Edge(SolverGeometryExtension::Dependent),
Start(SolverGeometryExtension::Dependent),
Mid(SolverGeometryExtension::Dependent),
End(SolverGeometryExtension::Dependent)
{
}
std::unique_ptr<Part::GeometryExtension> SolverGeometryExtension::copy(void) const
{
auto cpy = std::make_unique<SolverGeometryExtension>();
cpy->Edge = this->Edge;
cpy->Start = this->Start;
cpy->End = this->End;
cpy->Mid = this->Mid;
cpy->setName(this->getName()); // Base Class
#if defined (__GNUC__) && (__GNUC__ <=4)
return std::move(cpy);
#else
return cpy;
#endif
}
PyObject * SolverGeometryExtension::getPyObject(void)
{
THROWM(Base::NotImplementedError, "SolverGeometryExtension does not have a Python counterpart");
}

94
src/Mod/Sketcher/App/SolverGeometryExtension.h Normal file
View File

@@ -0,0 +1,94 @@
/***************************************************************************
* 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_SOLVERGEOMETRYEXTENSION_H
#define SKETCHER_SOLVERGEOMETRYEXTENSION_H
#include <Mod/Part/App/GeometryExtension.h>
#include <Mod/Sketcher/App/Constraint.h>
namespace Sketcher
{
class SketcherExport SolverGeometryExtension : public Part::GeometryExtension
{
TYPESYSTEM_HEADER_WITH_OVERRIDE();
public:
enum SolverStatus {
FullyConstraint = 0,
NotFullyConstraint = 1,
NumSolverStatus
};
enum ParameterStatus {
Dependent = 0,
Independent = 1,
NumParameterStatus
};
SolverGeometryExtension();
SolverGeometryExtension(long cid);
virtual ~SolverGeometryExtension() override = default;
virtual std::unique_ptr<Part::GeometryExtension> copy(void) const override;
virtual PyObject *getPyObject(void) override;
SolverStatus getGeometry() const {return ( Edge == Independent &&
Start == Independent &&
End == Independent &&
Mid == Independent) ? FullyConstraint : NotFullyConstraint;}
ParameterStatus getEdge() const {return Edge;}
void setEdge(ParameterStatus status) {Edge = status;}
ParameterStatus getStart() const {return Start;}
void setStart(ParameterStatus status) {Start = status;}
ParameterStatus getMid() const {return Mid;}
void setMid(ParameterStatus status) {Mid = status;}
ParameterStatus getEnd() const {return End;}
void setEnd(ParameterStatus status) {End = status;}
void init(ParameterStatus status) {
Edge = status;
Start = status;
Mid = status;
End = status;
}
private:
SolverGeometryExtension(const SolverGeometryExtension&) = default;
private:
ParameterStatus Edge;
ParameterStatus Start;
ParameterStatus Mid;
ParameterStatus End;
};
} //namespace Sketcher
#endif // SKETCHER_SOLVERGEOMETRYEXTENSION_H