Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Part Module New Feature: Parabola & ArcOfParabola
- Completed Parabola c++ implementation and python wrapper implementation - Created ArOfParabola c++ and python wrapper implementation
- Loading branch information
1 parent
2b01506
commit 6997cc9
Showing
8 changed files
with
742 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <GenerateModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="generateMetaModel_Module.xsd"> | ||
| <PythonExport | ||
| Father="GeometryCurvePy" | ||
| Name="ArcOfParabolaPy" | ||
| Twin="GeomArcOfParabola" | ||
| TwinPointer="GeomArcOfParabola" | ||
| Include="Mod/Part/App/Geometry.h" | ||
| Namespace="Part" | ||
| FatherInclude="Mod/Part/App/GeometryCurvePy.h" | ||
| FatherNamespace="Part" | ||
| Constructor="true"> | ||
| <Documentation> | ||
| <Author Licence="LGPL" Name="Abdullah Tahiri" EMail="abdullah.tahiri.yo[at]gmail.com" /> | ||
| <UserDocu>Describes a portion of an parabola</UserDocu> | ||
| </Documentation> | ||
| <Attribute Name="Focal" ReadOnly="false"> | ||
| <Documentation> | ||
| <UserDocu>The focal length of the parabola.</UserDocu> | ||
| </Documentation> | ||
| <Parameter Name="Focal" Type="Float"/> | ||
| </Attribute> | ||
| <Attribute Name="AngleXU" ReadOnly="false"> | ||
| <Documentation> | ||
| <UserDocu>The angle between the X axis and the major axis of the parabola.</UserDocu> | ||
| </Documentation> | ||
| <Parameter Name="AngleXU" Type="Float"/> | ||
| </Attribute> | ||
| <Attribute Name="Center" ReadOnly="false"> | ||
| <Documentation> | ||
| <UserDocu>Center of the parabola.</UserDocu> | ||
| </Documentation> | ||
| <Parameter Name="Center" Type="Object"/> | ||
| </Attribute> | ||
| <Attribute Name="Axis" ReadOnly="false"> | ||
| <Documentation> | ||
| <UserDocu>The axis direction of the parabola</UserDocu> | ||
| </Documentation> | ||
| <Parameter Name="Axis" Type="Object"/> | ||
| </Attribute> | ||
| <Attribute Name="Parabola" ReadOnly="true"> | ||
| <Documentation> | ||
| <UserDocu>The internal parabola representation</UserDocu> | ||
| </Documentation> | ||
| <Parameter Name="Parabola" Type="Object"/> | ||
| </Attribute> | ||
| </PythonExport> | ||
| </GenerateModel> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| /*************************************************************************** | ||
| * Copyright (c) 2014 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" | ||
| #ifndef _PreComp_ | ||
| # include <gp_Parab.hxx> | ||
| # include <Geom_Parabola.hxx> | ||
| # include <GC_MakeArcOfParabola.hxx> | ||
| # include <gce_MakeParab.hxx> | ||
| # include <Geom_TrimmedCurve.hxx> | ||
| #endif | ||
|
|
||
| #include "Mod/Part/App/Geometry.h" | ||
| #include "ArcOfParabolaPy.h" | ||
| #include "ArcOfParabolaPy.cpp" | ||
| #include "ParabolaPy.h" | ||
| #include "OCCError.h" | ||
|
|
||
| #include <Base/GeometryPyCXX.h> | ||
| #include <Base/VectorPy.h> | ||
|
|
||
| using namespace Part; | ||
|
|
||
| extern const char* gce_ErrorStatusText(gce_ErrorType et); | ||
|
|
||
| // returns a string which represents the object e.g. when printed in python | ||
| std::string ArcOfParabolaPy::representation(void) const | ||
| { | ||
| Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast | ||
| (getGeomArcOfParabolaPtr()->handle()); | ||
| Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(trim->BasisCurve()); | ||
|
|
||
| gp_Ax1 axis = parabola->Axis(); | ||
| gp_Dir dir = axis.Direction(); | ||
| gp_Pnt loc = axis.Location(); | ||
| Standard_Real fFocal = parabola->Focal(); | ||
| Standard_Real u1 = trim->FirstParameter(); | ||
| Standard_Real u2 = trim->LastParameter(); | ||
|
|
||
| gp_Dir normal = parabola->Axis().Direction(); | ||
| gp_Dir xdir = parabola->XAxis().Direction(); | ||
|
|
||
| gp_Ax2 xdirref(loc, normal); // this is a reference XY for the parabola | ||
|
|
||
| Standard_Real fAngleXU = -xdir.AngleWithRef(xdirref.XDirection(),normal); | ||
|
|
||
|
|
||
| std::stringstream str; | ||
| str << "ArcOfParabola ("; | ||
| str << "Focal : " << fFocal << ", "; | ||
| str << "AngleXU : " << fAngleXU << ", "; | ||
| str << "Position : (" << loc.X() << ", "<< loc.Y() << ", "<< loc.Z() << "), "; | ||
| str << "Direction : (" << dir.X() << ", "<< dir.Y() << ", "<< dir.Z() << "), "; | ||
| str << "Parameter : (" << u1 << ", " << u2 << ")"; | ||
| str << ")"; | ||
|
|
||
| return str.str(); | ||
| } | ||
|
|
||
| PyObject *ArcOfParabolaPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper | ||
| { | ||
| // create a new instance of ArcOfParabolaPy and the Twin object | ||
| return new ArcOfParabolaPy(new GeomArcOfParabola); | ||
| } | ||
|
|
||
| // constructor method | ||
| int ArcOfParabolaPy::PyInit(PyObject* args, PyObject* kwds) | ||
| { | ||
| PyObject* o; | ||
| double u1, u2; | ||
| PyObject *sense=Py_True; | ||
| if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::ParabolaPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { | ||
| try { | ||
| Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast | ||
| (static_cast<ParabolaPy*>(o)->getGeomParabolaPtr()->handle()); | ||
| GC_MakeArcOfParabola arc(parabola->Parab(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); | ||
| if (!arc.IsDone()) { | ||
| PyErr_SetString(PartExceptionOCCError, gce_ErrorStatusText(arc.Status())); | ||
| return -1; | ||
| } | ||
|
|
||
| getGeomArcOfParabolaPtr()->setHandle(arc.Value()); | ||
| return 0; | ||
| } | ||
| catch (Standard_Failure) { | ||
| Handle_Standard_Failure e = Standard_Failure::Caught(); | ||
| PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); | ||
| return -1; | ||
| } | ||
| catch (...) { | ||
| PyErr_SetString(PartExceptionOCCError, "creation of arc failed"); | ||
| return -1; | ||
| } | ||
| } | ||
|
|
||
| // All checks failed | ||
| PyErr_SetString(PyExc_TypeError, | ||
| "ArcOfParabola constructor expects an parabola curve and a parameter range"); | ||
| return -1; | ||
| } | ||
|
|
||
| Py::Float ArcOfParabolaPy::getFocal(void) const | ||
| { | ||
| return Py::Float(getGeomArcOfParabolaPtr()->getFocal()); | ||
| } | ||
|
|
||
| void ArcOfParabolaPy::setFocal(Py::Float arg) | ||
| { | ||
| getGeomArcOfParabolaPtr()->setFocal((double)arg); | ||
| } | ||
|
|
||
| Py::Float ArcOfParabolaPy::getAngleXU(void) const | ||
| { | ||
| return Py::Float(getGeomArcOfParabolaPtr()->getAngleXU()); | ||
| } | ||
|
|
||
| void ArcOfParabolaPy::setAngleXU(Py::Float arg) | ||
| { | ||
| getGeomArcOfParabolaPtr()->setAngleXU((double)arg); | ||
| } | ||
|
|
||
| Py::Object ArcOfParabolaPy::getCenter(void) const | ||
| { | ||
| return Py::Vector(getGeomArcOfParabolaPtr()->getCenter()); | ||
| } | ||
|
|
||
| void ArcOfParabolaPy::setCenter(Py::Object arg) | ||
| { | ||
| PyObject* p = arg.ptr(); | ||
| if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { | ||
| Base::Vector3d loc = static_cast<Base::VectorPy*>(p)->value(); | ||
| getGeomArcOfParabolaPtr()->setCenter(loc); | ||
| } | ||
| else if (PyObject_TypeCheck(p, &PyTuple_Type)) { | ||
| Base::Vector3d loc = Base::getVectorFromTuple<double>(p); | ||
| getGeomArcOfParabolaPtr()->setCenter(loc); | ||
| } | ||
| else { | ||
| std::string error = std::string("type must be 'Vector', not "); | ||
| error += p->ob_type->tp_name; | ||
| throw Py::TypeError(error); | ||
| } | ||
| } | ||
|
|
||
| Py::Object ArcOfParabolaPy::getAxis(void) const | ||
| { | ||
| Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast | ||
| (getGeomArcOfParabolaPtr()->handle()); | ||
| Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(trim->BasisCurve()); | ||
| gp_Ax1 axis = parabola->Axis(); | ||
| gp_Dir dir = axis.Direction(); | ||
| return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); | ||
| } | ||
|
|
||
| void ArcOfParabolaPy::setAxis(Py::Object arg) | ||
| { | ||
| PyObject* p = arg.ptr(); | ||
| Base::Vector3d val; | ||
| if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { | ||
| val = static_cast<Base::VectorPy*>(p)->value(); | ||
| } | ||
| else if (PyTuple_Check(p)) { | ||
| val = Base::getVectorFromTuple<double>(p); | ||
| } | ||
| else { | ||
| std::string error = std::string("type must be 'Vector', not "); | ||
| error += p->ob_type->tp_name; | ||
| throw Py::TypeError(error); | ||
| } | ||
|
|
||
| Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast | ||
| (getGeomArcOfParabolaPtr()->handle()); | ||
| Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(trim->BasisCurve()); | ||
| try { | ||
| gp_Ax1 axis; | ||
| axis.SetLocation(parabola->Location()); | ||
| axis.SetDirection(gp_Dir(val.x, val.y, val.z)); | ||
| parabola->SetAxis(axis); | ||
| } | ||
| catch (Standard_Failure) { | ||
| throw Py::Exception("cannot set axis"); | ||
| } | ||
| } | ||
|
|
||
| Py::Object ArcOfParabolaPy::getParabola(void) const | ||
| { | ||
| Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast | ||
| (getGeomArcOfParabolaPtr()->handle()); | ||
| Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(trim->BasisCurve()); | ||
| return Py::Object(new ParabolaPy(new GeomParabola(parabola)), true); | ||
| } | ||
|
|
||
| PyObject *ArcOfParabolaPy::getCustomAttributes(const char* attr) const | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| int ArcOfParabolaPy::setCustomAttributes(const char* attr, PyObject *obj) | ||
| { | ||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.