Skip to content

Commit

Permalink
implement OffsetCurve2d
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Nov 25, 2016
1 parent c817c33 commit de8bfaa
Show file tree
Hide file tree
Showing 5 changed files with 122 additions and 89 deletions.
2 changes: 1 addition & 1 deletion src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp
View file
Expand Up @@ -55,7 +55,7 @@ using namespace Part;
// returns a string which represents the object e.g. when printed in python
std::string BSplineCurve2dPy::representation(void) const
{
return "<BSplineCurve object>";
return "<BSplineCurve2d object>";
}

PyObject *BSplineCurve2dPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp
View file
Expand Up @@ -42,7 +42,7 @@ using namespace Part;
// returns a string which represents the object e.g. when printed in python
std::string BezierCurve2dPy::representation(void) const
{
return "<BezierCurve object>";
return "<BezierCurve2d object>";
}

PyObject *BezierCurve2dPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper
Expand Down
10 changes: 0 additions & 10 deletions src/Mod/Part/App/Geom2d/OffsetCurve2dPy.xml
View file
Expand Up @@ -14,7 +14,6 @@
<Author Licence="LGPL" Name="Werner Mayer" EMail="wmayer@users.sourceforge.net" />
<UserDocu></UserDocu>
</Documentation>
<!--
<Attribute Name="OffsetValue">
<Documentation>
<UserDocu>
Expand All @@ -23,14 +22,6 @@
</Documentation>
<Parameter Name="OffsetValue" Type="Float"/>
</Attribute>
<Attribute Name="OffsetDirection">
<Documentation>
<UserDocu>
Sets or gets the offset direction to offset the underlying curve.
</UserDocu>
</Documentation>
<Parameter Name="OffsetDirection" Type="Object"/>
</Attribute>
<Attribute Name="BasisCurve">
<Documentation>
<UserDocu>
Expand All @@ -39,6 +30,5 @@
</Documentation>
<Parameter Name="BasisCurve" Type="Object"/>
</Attribute>
-->
</PythonExport>
</GenerateModel>
113 changes: 58 additions & 55 deletions src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp
View file
Expand Up @@ -23,7 +23,7 @@

#include "PreCompiled.h"
#ifndef _PreComp_
# include <Geom_OffsetCurve.hxx>
# include <Geom2d_OffsetCurve.hxx>
#endif

#include <Mod/Part/App/OCCError.h>
Expand All @@ -32,8 +32,6 @@
#include <Mod/Part/App/Geom2d/OffsetCurve2dPy.cpp>

#include <Base/GeometryPyCXX.h>
#include <Base/VectorPy.h>
#include <Base/Vector3D.h>

using namespace Part;

Expand All @@ -52,99 +50,104 @@ PyObject *OffsetCurve2dPy::PyMake(struct _typeobject *, PyObject *, PyObject *)
// constructor method
int OffsetCurve2dPy::PyInit(PyObject* args, PyObject* /*kwd*/)
{
return 0;
#if 0
PyObject* pGeom;
PyObject* pDir;
double offset;
if (!PyArg_ParseTuple(args, "O!dO!",
&(GeometryPy::Type), &pGeom,
&offset,
&(Base::VectorPy::Type),&pDir))
if (!PyArg_ParseTuple(args, "O!d",
&(Curve2dPy::Type), &pGeom,
&offset))
return -1;

GeometryPy* pcGeo = static_cast<GeometryPy*>(pGeom);
Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast
(pcGeo->getGeometryPtr()->handle());
Curve2dPy* pcGeo = static_cast<Curve2dPy*>(pGeom);
Handle_Geom2d_Curve curve = Handle_Geom2d_Curve::DownCast
(pcGeo->getGeometry2dPtr()->handle());
if (curve.IsNull()) {
PyErr_SetString(PyExc_TypeError, "geometry is not a curve");
return -1;
}

try {
Base::Vector3d dir = static_cast<Base::VectorPy*>(pDir)->value();
Handle_Geom_OffsetCurve curve2 = new Geom_OffsetCurve(curve, offset, gp_Dir(dir.x,dir.y,dir.z));
getGeomOffsetCurvePtr()->setHandle(curve2);
Handle_Geom2d_OffsetCurve curve2 = new Geom2d_OffsetCurve(curve, offset);
getGeom2dOffsetCurvePtr()->setHandle(curve2);
return 0;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return -1;
}
#endif
}
#if 0

Py::Float OffsetCurve2dPy::getOffsetValue(void) const
{
Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle());
Handle_Geom2d_OffsetCurve curve = Handle_Geom2d_OffsetCurve::DownCast(getGeometry2dPtr()->handle());
return Py::Float(curve->Offset());
}

void OffsetCurve2dPy::setOffsetValue(Py::Float arg)
{
Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle());
Handle_Geom2d_OffsetCurve curve = Handle_Geom2d_OffsetCurve::DownCast(getGeometry2dPtr()->handle());
curve->SetOffsetValue((double)arg);
}

Py::Object OffsetCurve2dPy::getOffsetDirection(void) const
{
Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle());
const gp_Dir& dir = curve->Direction();
return Py::Vector(Base::Vector3d(dir.X(),dir.Y(),dir.Z()));
}

void OffsetCurve2dPy::setOffsetDirection(Py::Object arg)
Py::Object OffsetCurve2dPy::getBasisCurve(void) const
{
PyObject* p = arg.ptr();
if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
Base::Vector3d dir = static_cast<Base::VectorPy*>(p)->value();
Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle());
curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z));
Handle_Geom2d_OffsetCurve curve = Handle_Geom2d_OffsetCurve::DownCast(getGeometry2dPtr()->handle());
Handle_Geom2d_Curve basis = curve->BasisCurve();
if (basis.IsNull())
return Py::None();
if (basis->IsKind(STANDARD_TYPE (Geom2d_Parabola))) {
Geom2dParabola c(Handle_Geom2d_Parabola::DownCast(basis));
return Py::asObject(c.getPyObject());
}
else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
Base::Vector3d dir = Base::getVectorFromTuple<double>(p);
Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle());
curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z));
if (basis->IsKind(STANDARD_TYPE (Geom2d_Hyperbola))) {
Geom2dHyperbola c(Handle_Geom2d_Hyperbola::DownCast(basis));
return Py::asObject(c.getPyObject());
}
else {
std::string error = std::string("type must be 'Vector', not ");
error += p->ob_type->tp_name;
throw Py::TypeError(error);
if (basis->IsKind(STANDARD_TYPE (Geom2d_Ellipse))) {
Geom2dEllipse c(Handle_Geom2d_Ellipse::DownCast(basis));
return Py::asObject(c.getPyObject());
}
}

Py::Object OffsetCurve2dPy::getBasisCurve(void) const
{
Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle());
Handle_Geom_Curve basis = curve->BasisCurve();
throw Py::Exception(PyExc_NotImplementedError, "Not yet implemented");
if (basis->IsKind(STANDARD_TYPE (Geom2d_Circle))) {
Geom2dCircle c(Handle_Geom2d_Circle::DownCast(basis));
return Py::asObject(c.getPyObject());
}
if (basis->IsKind(STANDARD_TYPE (Geom2d_Line))) {
Geom2dLine c(Handle_Geom2d_Line::DownCast(basis));
return Py::asObject(c.getPyObject());
}
if (basis->IsKind(STANDARD_TYPE (Geom2d_BSplineCurve))) {
Geom2dBSplineCurve c(Handle_Geom2d_BSplineCurve::DownCast(basis));
return Py::asObject(c.getPyObject());
}
if (basis->IsKind(STANDARD_TYPE (Geom2d_BezierCurve))) {
Geom2dBezierCurve c(Handle_Geom2d_BezierCurve::DownCast(basis));
return Py::asObject(c.getPyObject());
}
if (basis->IsKind(STANDARD_TYPE (Geom2d_TrimmedCurve))) {
Geom2dTrimmedCurve c(Handle_Geom2d_TrimmedCurve::DownCast(basis));
return Py::asObject(c.getPyObject());
}
throw Py::RuntimeError("Unknown curve type");
}

void OffsetCurve2dPy::setBasisCurve(Py::Object arg)
{
PyObject* p = arg.ptr();
if (PyObject_TypeCheck(p, &(GeometryPy::Type))) {
GeometryPy* pcGeo = static_cast<GeometryPy*>(p);
Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast
(pcGeo->getGeometryPtr()->handle());
if (PyObject_TypeCheck(p, &(Curve2dPy::Type))) {
Curve2dPy* pcGeo = static_cast<Curve2dPy*>(p);
Handle_Geom2d_Curve curve = Handle_Geom2d_Curve::DownCast
(pcGeo->getGeometry2dPtr()->handle());
if (curve.IsNull()) {
throw Py::TypeError("geometry is not a curve");
}

Handle_Geom2d_OffsetCurve curve2 = Handle_Geom2d_OffsetCurve::DownCast
(getGeometry2dPtr()->handle());
if (curve == curve2) {
throw Py::RuntimeError("cannot set this curve as basis");
}

try {
Handle_Geom_OffsetCurve curve2 = Handle_Geom_OffsetCurve::DownCast
(getGeometryPtr()->handle());
curve2->SetBasisCurve(curve);
}
catch (Standard_Failure) {
Expand All @@ -153,7 +156,7 @@ void OffsetCurve2dPy::setBasisCurve(Py::Object arg)
}
}
}
#endif

PyObject *OffsetCurve2dPy::getCustomAttributes(const char* /*attr*/) const
{
return 0;
Expand Down

0 comments on commit de8bfaa

Please sign in to comment.