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

Use OCCT Handle macro for Handle_ classes

Browse Source 
This is the result of running OCCT's upgrade script provided
with OCCT 7.0. See
https://www.opencascade.com/content/freecad-occt710-and-windows-rtti-data-missing#comment-form
and
https://www.forum.freecadweb.org/viewtopic.php?f=4&t=21405&start=120#p169019
for why this is necessary for OCCT >= 7.1
This commit is contained in:
Peter Lama
2017-04-17 20:33:29 -04:00
committed by wmayer
parent ea3d86b735
commit a75a98ef27
141 changed files with 2198 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Mod/Part/App/ConePyImp.cpp
View File

@@ -89,7 +89,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
return -1;
}
Handle_Geom_ConicalSurface cone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeometryPtr()->handle());
cone->SetCone(mc.Value()->Cone());
return 0;
@@ -116,7 +116,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
return -1;
}
Handle_Geom_ConicalSurface cone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeometryPtr()->handle());
cone->SetCone(mc.Value()->Cone());
return 0;
@@ -129,7 +129,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_cd,
&(ConePy::Type), &pCone, &dist)) {
ConePy* pcCone = static_cast<ConePy*>(pCone);
Handle_Geom_ConicalSurface pcone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) pcone = Handle(Geom_ConicalSurface)::DownCast
(pcCone->getGeometryPtr()->handle());
GC_MakeConicalSurface mc(pcone->Cone(), dist);
if (!mc.IsDone()) {
@@ -137,7 +137,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
return -1;
}
Handle_Geom_ConicalSurface cone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeometryPtr()->handle());
cone->SetCone(mc.Value()->Cone());
return 0;
@@ -148,7 +148,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_c,
&(ConePy::Type), &pCone)) {
ConePy* pcCone = static_cast<ConePy*>(pCone);
Handle_Geom_ConicalSurface pcone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) pcone = Handle(Geom_ConicalSurface)::DownCast
(pcCone->getGeometryPtr()->handle());
GC_MakeConicalSurface mc(pcone->Cone());
if (!mc.IsDone()) {
@@ -156,7 +156,7 @@ int ConePy::PyInit(PyObject* args, PyObject* kwds)
return -1;
}
Handle_Geom_ConicalSurface cone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeometryPtr()->handle());
cone->SetCone(mc.Value()->Cone());
return 0;
@@ -178,17 +178,17 @@ PyObject* ConePy::uIso(PyObject * args)
return 0;
try {
Handle_Geom_ConicalSurface cone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
Handle_Geom_Line c = Handle_Geom_Line::DownCast(cone->UIso(u));
Handle(Geom_Line) c = Handle(Geom_Line)::DownCast(cone->UIso(u));
GeomLine* line = new GeomLine();
Handle_Geom_Line this_curv = Handle_Geom_Line::DownCast
Handle(Geom_Line) this_curv = Handle(Geom_Line)::DownCast
(line->handle());
this_curv->SetLin(c->Lin());
return new LinePy(line);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -201,13 +201,13 @@ PyObject* ConePy::vIso(PyObject * args)
return 0;
try {
Handle_Geom_ConicalSurface cone = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) cone = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
Handle_Geom_Curve c = cone->VIso(v);
return new CirclePy(new GeomCircle(Handle_Geom_Circle::DownCast(c)));
Handle(Geom_Curve) c = cone->VIso(v);
return new CirclePy(new GeomCircle(Handle(Geom_Circle)::DownCast(c)));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -215,7 +215,7 @@ PyObject* ConePy::vIso(PyObject * args)
Py::Object ConePy::getApex(void) const
{
Handle_Geom_ConicalSurface s = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
gp_Pnt loc = s->Apex();
return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z()));
@@ -223,35 +223,35 @@ Py::Object ConePy::getApex(void) const
Py::Float ConePy::getRadius(void) const
{
Handle_Geom_ConicalSurface s = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
return Py::Float(s->RefRadius());
}
void ConePy::setRadius(Py::Float arg)
{
Handle_Geom_ConicalSurface s = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
s->SetRadius((double)arg);
}
Py::Float ConePy::getSemiAngle(void) const
{
Handle_Geom_ConicalSurface s = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
return Py::Float(s->SemiAngle());
}
void ConePy::setSemiAngle(Py::Float arg)
{
Handle_Geom_ConicalSurface s = Handle_Geom_ConicalSurface::DownCast
Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast
(getGeomConePtr()->handle());
s->SetSemiAngle((double)arg);
}
Py::Object ConePy::getCenter(void) const
{
Handle_Geom_ElementarySurface s = Handle_Geom_ElementarySurface::DownCast
Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast
(getGeomConePtr()->handle());
gp_Pnt loc = s->Location();
return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z()));
@@ -262,13 +262,13 @@ void ConePy::setCenter(Py::Object arg)
PyObject* p = arg.ptr();
if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) {
Base::Vector3d loc = static_cast<Base::VectorPy*>(p)->value();
Handle_Geom_ElementarySurface s = Handle_Geom_ElementarySurface::DownCast
Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast
(getGeomConePtr()->handle());
s->SetLocation(gp_Pnt(loc.x, loc.y, loc.z));
}
else if (PyObject_TypeCheck(p, &PyTuple_Type)) {
Base::Vector3d loc = Base::getVectorFromTuple<double>(p);
Handle_Geom_ElementarySurface s = Handle_Geom_ElementarySurface::DownCast
Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast
(getGeomConePtr()->handle());
s->SetLocation(gp_Pnt(loc.x, loc.y, loc.z));
}
@@ -281,7 +281,7 @@ void ConePy::setCenter(Py::Object arg)
Py::Object ConePy::getAxis(void) const
{
Handle_Geom_ElementarySurface s = Handle_Geom_ElementarySurface::DownCast
Handle(Geom_ElementarySurface) s = Handle(Geom_ElementarySurface)::DownCast
(getGeometryPtr()->handle());
gp_Dir dir = s->Axis().Direction();
return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z()));
@@ -310,7 +310,7 @@ void ConePy::setAxis(Py::Object arg)
}
try {
Handle_Geom_ElementarySurface this_surf = Handle_Geom_ElementarySurface::DownCast
Handle(Geom_ElementarySurface) this_surf = Handle(Geom_ElementarySurface)::DownCast
(this->getGeometryPtr()->handle());
gp_Ax1 axis;
axis.SetLocation(this_surf->Location());