diff --git a/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx b/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx index 57e005857b..c397d1bb79 100644 --- a/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx +++ b/src/3rdParty/salomesmesh/inc/Handle_SMESH_MeshVSLink.hxx @@ -41,14 +41,14 @@ #ifndef _Handle_MeshVS_DataSource3D_HeaderFile //#include #include +#include #endif class Standard_Transient; -class Handle_Standard_Type; -class Handle(MeshVS_DataSource3D); +class Standard_Type; class SMESH_MeshVSLink; -Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(SMESH_MeshVSLink); +Standard_EXPORT Handle(Standard_Type)& STANDARD_TYPE(SMESH_MeshVSLink); class Handle(SMESH_MeshVSLink) : public Handle(MeshVS_DataSource3D) { public: diff --git a/src/3rdParty/salomesmesh/inc/StdMeshers_QuadToTriaAdaptor.hxx b/src/3rdParty/salomesmesh/inc/StdMeshers_QuadToTriaAdaptor.hxx index 9426971d71..35808cd89d 100644 --- a/src/3rdParty/salomesmesh/inc/StdMeshers_QuadToTriaAdaptor.hxx +++ b/src/3rdParty/salomesmesh/inc/StdMeshers_QuadToTriaAdaptor.hxx @@ -33,8 +33,8 @@ struct SMESH_ElementSearcher; class SMDS_MeshElement; class SMDS_MeshNode; class SMDS_MeshFace; -// class Handle_TColgp_HArray1OfPnt; -// class Handle_TColgp_HArray1OfVec; +// class Handle(TColgp_HArray1OfPnt); +// class Handle(TColgp_HArray1OfVec); class gp_Pnt; class gp_Vec; @@ -66,8 +66,8 @@ public: protected: int Preparation(const SMDS_MeshElement* face, - Handle_TColgp_HArray1OfPnt& PN, - Handle_TColgp_HArray1OfVec& VN, + Handle(TColgp_HArray1OfPnt)& PN, + Handle(TColgp_HArray1OfVec)& VN, std::vector& FNodes, gp_Pnt& PC, gp_Vec& VNorm, const SMDS_MeshElement** volumes=0); diff --git a/src/Mod/Drawing/App/DrawingExport.cpp b/src/Mod/Drawing/App/DrawingExport.cpp index 8ad64b502b..0f5879f269 100644 --- a/src/Mod/Drawing/App/DrawingExport.cpp +++ b/src/Mod/Drawing/App/DrawingExport.cpp @@ -157,12 +157,12 @@ TopoDS_Edge DrawingOutput::asBSpline(const BRepAdaptor_Curve& c, int maxDegree) { Standard_Real tol3D = 0.001; Standard_Integer maxSegment = 50; - Handle_BRepAdaptor_HCurve hCurve = new BRepAdaptor_HCurve(c); + Handle(BRepAdaptor_HCurve) hCurve = new BRepAdaptor_HCurve(c); // approximate the curve using a tolerance Approx_Curve3d approx(hCurve,tol3D,GeomAbs_C0,maxSegment,maxDegree); if (approx.IsDone() && approx.HasResult()) { // have the result - Handle_Geom_BSplineCurve spline = approx.Curve(); + Handle(Geom_BSplineCurve) spline = approx.Curve(); BRepBuilderAPI_MakeEdge mkEdge(spline, spline->FirstParameter(), spline->LastParameter()); return mkEdge.Edge(); } @@ -297,7 +297,7 @@ void SVGOutput::printBezier(const BRepAdaptor_Curve& c, int id, std::ostream& ou std::stringstream str; str << "NbPoles(); // if it's a bezier with degree higher than 3 convert it into a B-spline @@ -359,11 +359,11 @@ void SVGOutput::printBSpline(const BRepAdaptor_Curve& c, int id, std::ostream& o { try { std::stringstream str; - Handle_Geom_BSplineCurve spline = c.BSpline(); + Handle(Geom_BSplineCurve) spline = c.BSpline(); if (spline->Degree() > 3 || spline->IsRational()) { Standard_Real tol3D = 0.001; Standard_Integer maxDegree = 3, maxSegment = 50; - Handle_BRepAdaptor_HCurve hCurve = new BRepAdaptor_HCurve(c); + Handle(BRepAdaptor_HCurve) hCurve = new BRepAdaptor_HCurve(c); // approximate the curve using a tolerance Approx_Curve3d approx(hCurve,tol3D,GeomAbs_C0,maxSegment,maxDegree); if (approx.IsDone() && approx.HasResult()) { @@ -376,7 +376,7 @@ void SVGOutput::printBSpline(const BRepAdaptor_Curve& c, int id, std::ostream& o Standard_Integer arcs = crt.NbArcs(); str << "NbPoles(); if (i == 1) { gp_Pnt p1 = bezier->Pole(1); @@ -646,11 +646,11 @@ void DXFOutput::printBSpline(const BRepAdaptor_Curve& c, int id, std::ostream& o { try { std::stringstream str; - Handle_Geom_BSplineCurve spline = c.BSpline(); + Handle(Geom_BSplineCurve) spline = c.BSpline(); if (spline->Degree() > 3 || spline->IsRational()) { Standard_Real tol3D = 0.001; Standard_Integer maxDegree = 3, maxSegment = 50; - Handle_BRepAdaptor_HCurve hCurve = new BRepAdaptor_HCurve(c); + Handle(BRepAdaptor_HCurve) hCurve = new BRepAdaptor_HCurve(c); // approximate the curve using a tolerance Approx_Curve3d approx(hCurve,tol3D,GeomAbs_C0,maxSegment,maxDegree); if (approx.IsDone() && approx.HasResult()) { diff --git a/src/Mod/Drawing/App/FeatureProjection.cpp b/src/Mod/Drawing/App/FeatureProjection.cpp index 5428400143..c76e4bc360 100644 --- a/src/Mod/Drawing/App/FeatureProjection.cpp +++ b/src/Mod/Drawing/App/FeatureProjection.cpp @@ -109,7 +109,7 @@ App::DocumentObjectExecReturn *FeatureProjection::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Drawing/App/FeatureView.cpp b/src/Mod/Drawing/App/FeatureView.cpp index 45f3fa9438..a359dc246d 100644 --- a/src/Mod/Drawing/App/FeatureView.cpp +++ b/src/Mod/Drawing/App/FeatureView.cpp @@ -73,7 +73,7 @@ App::DocumentObjectExecReturn *FeatureView::recompute(void) return App::DocumentObject::recompute(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); App::DocumentObjectExecReturn* ret = new App::DocumentObjectExecReturn(e->GetMessageString()); if (ret->Why.empty()) ret->Why = "Unknown OCC exception"; return ret; diff --git a/src/Mod/Drawing/App/FeatureViewPart.cpp b/src/Mod/Drawing/App/FeatureViewPart.cpp index ed984f5135..d58ac7dfcc 100644 --- a/src/Mod/Drawing/App/FeatureViewPart.cpp +++ b/src/Mod/Drawing/App/FeatureViewPart.cpp @@ -130,7 +130,7 @@ App::DocumentObjectExecReturn *FeatureViewPart::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Fem/App/FemConstraint.cpp b/src/Mod/Fem/App/FemConstraint.cpp index dd41d68c48..e6b16b0840 100644 --- a/src/Mod/Fem/App/FemConstraint.cpp +++ b/src/Mod/Fem/App/FemConstraint.cpp @@ -348,7 +348,7 @@ Base::Vector3d Constraint::getBasePoint(const Base::Vector3d& base, const Base:: } // Translate the plane in direction of the cylinder (for positive values of Distance) - Handle_Geom_Plane pln = new Geom_Plane(plane); + Handle(Geom_Plane) pln = new Geom_Plane(plane); gp_Pnt cylbase(base.x, base.y, base.z); GeomAPI_ProjectPointOnSurf proj(cylbase, pln); if (!proj.IsDone()) @@ -357,10 +357,10 @@ Base::Vector3d Constraint::getBasePoint(const Base::Vector3d& base, const Base:: gp_Pnt projPnt = proj.NearestPoint(); if ((fabs(dist) > Precision::Confusion()) && (projPnt.IsEqual(cylbase, Precision::Confusion()) == Standard_False)) plane.Translate(gp_Vec(projPnt, cylbase).Normalized().Multiplied(dist)); - Handle_Geom_Plane plnt = new Geom_Plane(plane); + Handle(Geom_Plane) plnt = new Geom_Plane(plane); // Intersect translated plane with cylinder axis - Handle_Geom_Curve crv = new Geom_Line(cylbase, cylaxis); + Handle(Geom_Curve) crv = new Geom_Line(cylbase, cylaxis); GeomAPI_IntCS intersector(crv, plnt); if (!intersector.IsDone()) return Base::Vector3d(0,0,0); diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp index bb79793ecc..e86ca169e2 100644 --- a/src/Mod/Fem/App/FemMeshPyImp.cpp +++ b/src/Mod/Fem/App/FemMeshPyImp.cpp @@ -701,7 +701,7 @@ PyObject* FemMeshPy::getFacesByFace(PyObject *args) return Py::new_reference_to(ret); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -734,7 +734,7 @@ PyObject* FemMeshPy::getVolumesByFace(PyObject *args) return Py::new_reference_to(ret); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -767,7 +767,7 @@ PyObject* FemMeshPy::getccxVolumesByFace(PyObject *args) return Py::new_reference_to(ret); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -814,7 +814,7 @@ PyObject* FemMeshPy::getNodesBySolid(PyObject *args) } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -842,7 +842,7 @@ PyObject* FemMeshPy::getNodesByFace(PyObject *args) } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -870,7 +870,7 @@ PyObject* FemMeshPy::getNodesByEdge(PyObject *args) } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -898,7 +898,7 @@ PyObject* FemMeshPy::getNodesByVertex(PyObject *args) } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } @@ -920,7 +920,7 @@ PyObject* FemMeshPy::getElementNodes(PyObject *args) return Py::new_reference_to(ret); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(Base::BaseExceptionFreeCADError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Fem/App/FemTools.cpp b/src/Mod/Fem/App/FemTools.cpp index 234aaaef13..4aad1ab6dc 100644 --- a/src/Mod/Fem/App/FemTools.cpp +++ b/src/Mod/Fem/App/FemTools.cpp @@ -72,7 +72,7 @@ bool Fem::Tools::isPlanar(const TopoDS_Face& face) return true; } else if (surface.GetType() == GeomAbs_BSplineSurface) { - Handle_Geom_BSplineSurface spline = surface.BSpline(); + Handle(Geom_BSplineSurface) spline = surface.BSpline(); try { TColgp_Array2OfPnt poles(1,spline->NbUPoles(),1,spline->NbVPoles()); spline->Poles(poles); @@ -104,7 +104,7 @@ bool Fem::Tools::isPlanar(const TopoDS_Face& face) } } else if (surface.GetType() == GeomAbs_BezierSurface) { - Handle_Geom_BezierSurface bezier = surface.Bezier(); + Handle(Geom_BezierSurface) bezier = surface.Bezier(); try { TColgp_Array2OfPnt poles(1,bezier->NbUPoles(),1,bezier->NbVPoles()); bezier->Poles(poles); @@ -148,7 +148,7 @@ gp_XYZ Fem::Tools::getDirection(const TopoDS_Face& face) dir = surface.Plane().Axis().Direction().XYZ(); } else if (surface.GetType() == GeomAbs_BSplineSurface) { - Handle_Geom_BSplineSurface spline = surface.BSpline(); + Handle(Geom_BSplineSurface) spline = surface.BSpline(); try { TColgp_Array2OfPnt poles(1,spline->NbUPoles(),1,spline->NbVPoles()); spline->Poles(poles); @@ -167,7 +167,7 @@ gp_XYZ Fem::Tools::getDirection(const TopoDS_Face& face) } } else if (surface.GetType() == GeomAbs_BezierSurface) { - Handle_Geom_BezierSurface bezier = surface.Bezier(); + Handle(Geom_BezierSurface) bezier = surface.Bezier(); try { TColgp_Array2OfPnt poles(1,bezier->NbUPoles(),1,bezier->NbVPoles()); bezier->Poles(poles); @@ -196,7 +196,7 @@ bool Fem::Tools::isLinear(const TopoDS_Edge& edge) return true; } else if (curve.GetType() == GeomAbs_BSplineCurve) { - Handle_Geom_BSplineCurve spline = curve.BSpline(); + Handle(Geom_BSplineCurve) spline = curve.BSpline(); try { gp_Pnt s1 = spline->Pole(1); gp_Pnt sn = spline->Pole(spline->NbPoles()); @@ -218,7 +218,7 @@ bool Fem::Tools::isLinear(const TopoDS_Edge& edge) } } else if (curve.GetType() == GeomAbs_BezierCurve) { - Handle_Geom_BezierCurve bezier = curve.Bezier(); + Handle(Geom_BezierCurve) bezier = curve.Bezier(); try { gp_Pnt s1 = bezier->Pole(1); gp_Pnt sn = bezier->Pole(bezier->NbPoles()); @@ -252,7 +252,7 @@ gp_XYZ Fem::Tools::getDirection(const TopoDS_Edge& edge) dir = curve.Line().Direction().XYZ(); } else if (curve.GetType() == GeomAbs_BSplineCurve) { - Handle_Geom_BSplineCurve spline = curve.BSpline(); + Handle(Geom_BSplineCurve) spline = curve.BSpline(); try { gp_Pnt s1 = spline->Pole(1); gp_Pnt sn = spline->Pole(spline->NbPoles()); @@ -264,7 +264,7 @@ gp_XYZ Fem::Tools::getDirection(const TopoDS_Edge& edge) } } else if (curve.GetType() == GeomAbs_BezierCurve) { - Handle_Geom_BezierCurve bezier = curve.Bezier(); + Handle(Geom_BezierCurve) bezier = curve.Bezier(); try { gp_Pnt s1 = bezier->Pole(1); gp_Pnt sn = bezier->Pole(bezier->NbPoles()); diff --git a/src/Mod/Import/App/AppImportPy.cpp b/src/Mod/Import/App/AppImportPy.cpp index 7c08838c8f..ce9d20fecc 100644 --- a/src/Mod/Import/App/AppImportPy.cpp +++ b/src/Mod/Import/App/AppImportPy.cpp @@ -127,7 +127,7 @@ private: throw Py::Exception(PyExc_IOError, "cannot read STEP file"); } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.Reader().WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading STEP file..."); pi->Show(); @@ -135,7 +135,7 @@ private: pi->EndScope(); } catch (OSD_Exception) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Base::Console().Error("%s\n", e->GetMessageString()); Base::Console().Message("Try to load STEP file without colors...\n"); @@ -160,7 +160,7 @@ private: throw Py::Exception(PyExc_IOError, "cannot read IGES file"); } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading IGES file..."); pi->Show(); @@ -171,7 +171,7 @@ private: ->SetModel(new IGESData_IGESModel); } catch (OSD_Exception) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Base::Console().Error("%s\n", e->GetMessageString()); Base::Console().Message("Try to load IGES file without colors...\n"); @@ -194,7 +194,7 @@ private: hApp->Close(hDoc); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Base::BaseExceptionFreeCADError, e->GetMessageString()); } catch (const Base::Exception& e) { @@ -300,7 +300,7 @@ private: hApp->Close(hDoc); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Base::BaseExceptionFreeCADError, e->GetMessageString()); } catch (const Base::Exception& e) { @@ -354,7 +354,7 @@ static PyObject * importAssembly(PyObject *self, PyObject *args) return 0; } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.Reader().WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading STEP file..."); pi->Show(); @@ -362,7 +362,7 @@ static PyObject * importAssembly(PyObject *self, PyObject *args) pi->EndScope(); } catch (OSD_Exception) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Base::Console().Error("%s\n", e->GetMessageString()); Base::Console().Message("Try to load STEP file without colors...\n"); @@ -383,7 +383,7 @@ static PyObject * importAssembly(PyObject *self, PyObject *args) return 0; } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading IGES file..."); pi->Show(); @@ -391,7 +391,7 @@ static PyObject * importAssembly(PyObject *self, PyObject *args) pi->EndScope(); } catch (OSD_Exception) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Base::Console().Error("%s\n", e->GetMessageString()); Base::Console().Message("Try to load IGES file without colors...\n"); @@ -410,7 +410,7 @@ static PyObject * importAssembly(PyObject *self, PyObject *args) } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } diff --git a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp index 7f94ed8ad8..a37f6fa4df 100644 --- a/src/Mod/Import/App/ImportOCAF.cpp +++ b/src/Mod/Import/App/ImportOCAF.cpp @@ -92,7 +92,7 @@ using namespace Import; #define OCAF_KEEP_PLACEMENT -ImportOCAF::ImportOCAF(Handle_TDocStd_Document h, App::Document* d, const std::string& name) +ImportOCAF::ImportOCAF(Handle(TDocStd_Document) h, App::Document* d, const std::string& name) : pDoc(h), doc(d), default_name(name) { aShapeTool = XCAFDoc_DocumentTool::ShapeTool (pDoc->Main()); @@ -128,7 +128,7 @@ void ImportOCAF::loadShapes(const TDF_Label& label, const TopLoc_Location& loc, hash = aShape.HashCode(HashUpper); } - Handle_TDataStd_Name name; + Handle(TDataStd_Name) name; std::string part_name = defaultname; if (label.FindAttribute(TDataStd_Name::GetID(),name)) { TCollection_ExtendedString extstr = name->Get(); @@ -153,7 +153,7 @@ void ImportOCAF::loadShapes(const TDF_Label& label, const TopLoc_Location& loc, } TopLoc_Location part_loc = loc; - Handle_XCAFDoc_Location hLoc; + Handle(XCAFDoc_Location) hLoc; if (label.FindAttribute(XCAFDoc_Location::GetID(), hLoc)) { if (isRef) part_loc = part_loc * hLoc->Get(); @@ -344,7 +344,7 @@ void ImportOCAF::createShape(const TopoDS_Shape& aShape, const TopLoc_Location& // ---------------------------------------------------------------------------- -ExportOCAF::ExportOCAF(Handle_TDocStd_Document h, bool explicitPlacement) +ExportOCAF::ExportOCAF(Handle(TDocStd_Document) h, bool explicitPlacement) : pDoc(h) , keepExplicitPlacement(explicitPlacement) { @@ -434,7 +434,7 @@ void ExportOCAF::saveShape(Part::Feature* part, const std::vector& c // ---------------------------------------------------------------------------- -ImportXCAF::ImportXCAF(Handle_TDocStd_Document h, App::Document* d, const std::string& name) +ImportXCAF::ImportXCAF(Handle(TDocStd_Document) h, App::Document* d, const std::string& name) : hdoc(h), doc(d), default_name(name) { aShapeTool = XCAFDoc_DocumentTool::ShapeTool (hdoc->Main()); diff --git a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h index eb46a5e88f..02e82798db 100644 --- a/src/Mod/Import/App/ImportOCAF.h +++ b/src/Mod/Import/App/ImportOCAF.h @@ -54,7 +54,7 @@ namespace Import { class ImportExport ImportOCAF { public: - ImportOCAF(Handle_TDocStd_Document h, App::Document* d, const std::string& name); + ImportOCAF(Handle(TDocStd_Document) h, App::Document* d, const std::string& name); virtual ~ImportOCAF(); void loadShapes(); @@ -65,10 +65,10 @@ private: virtual void applyColors(Part::Feature*, const std::vector&){} private: - Handle_TDocStd_Document pDoc; + Handle(TDocStd_Document) pDoc; App::Document* doc; - Handle_XCAFDoc_ShapeTool aShapeTool; - Handle_XCAFDoc_ColorTool aColorTool; + Handle(XCAFDoc_ShapeTool) aShapeTool; + Handle(XCAFDoc_ColorTool) aColorTool; std::string default_name; std::set myRefShapes; static const int HashUpper = INT_MAX; @@ -77,13 +77,13 @@ private: class ImportExport ExportOCAF { public: - ExportOCAF(Handle_TDocStd_Document h, bool explicitPlacement); + ExportOCAF(Handle(TDocStd_Document) h, bool explicitPlacement); void saveShape(Part::Feature* part, const std::vector&); private: - Handle_TDocStd_Document pDoc; - Handle_XCAFDoc_ShapeTool aShapeTool; - Handle_XCAFDoc_ColorTool aColorTool; + Handle(TDocStd_Document) pDoc; + Handle(XCAFDoc_ShapeTool) aShapeTool; + Handle(XCAFDoc_ColorTool) aColorTool; TDF_Label rootLabel; bool keepExplicitPlacement; }; @@ -92,7 +92,7 @@ private: class ImportXCAF { public: - ImportXCAF(Handle_TDocStd_Document h, App::Document* d, const std::string& name); + ImportXCAF(Handle(TDocStd_Document) h, App::Document* d, const std::string& name); virtual ~ImportXCAF(); void loadShapes(); @@ -102,10 +102,10 @@ private: virtual void applyColors(Part::Feature*, const std::vector&){} private: - Handle_TDocStd_Document hdoc; + Handle(TDocStd_Document) hdoc; App::Document* doc; - Handle_XCAFDoc_ShapeTool aShapeTool; - Handle_XCAFDoc_ColorTool hColors; + Handle(XCAFDoc_ShapeTool) aShapeTool; + Handle(XCAFDoc_ColorTool) hColors; std::string default_name; std::map mySolids; std::map myShells; diff --git a/src/Mod/Import/App/ImportOCAFAssembly.cpp b/src/Mod/Import/App/ImportOCAFAssembly.cpp index 0619a9aa4c..bd0d681019 100644 --- a/src/Mod/Import/App/ImportOCAFAssembly.cpp +++ b/src/Mod/Import/App/ImportOCAFAssembly.cpp @@ -30,8 +30,6 @@ # include # include # include -# include -# include # include # include # include @@ -79,7 +77,7 @@ using namespace Import; -ImportOCAFAssembly::ImportOCAFAssembly(Handle_TDocStd_Document h, App::Document* d, const std::string& name, App::DocumentObject *target) +ImportOCAFAssembly::ImportOCAFAssembly(Handle(TDocStd_Document) h, App::Document* d, const std::string& name, App::DocumentObject *target) : pDoc(h), doc(d), default_name(name), diff --git a/src/Mod/Import/App/ImportOCAFAssembly.h b/src/Mod/Import/App/ImportOCAFAssembly.h index c89d486705..296e5ab849 100644 --- a/src/Mod/Import/App/ImportOCAFAssembly.h +++ b/src/Mod/Import/App/ImportOCAFAssembly.h @@ -24,9 +24,6 @@ #ifndef IMPORT_ImportOCAFAssembly_H #define IMPORT_ImportOCAFAssembly_H -#include -#include -#include #include #include #include @@ -52,7 +49,7 @@ namespace Import { class ImportExport ImportOCAFAssembly { public: - ImportOCAFAssembly(Handle_TDocStd_Document h, App::Document* d, const std::string& name, App::DocumentObject *target); + ImportOCAFAssembly(Handle(TDocStd_Document) h, App::Document* d, const std::string& name, App::DocumentObject *target); virtual ~ImportOCAFAssembly(); void loadShapes(); void loadAssembly(); @@ -69,10 +66,10 @@ private: virtual void applyColors(Part::Feature*, const std::vector&){} private: - Handle_TDocStd_Document pDoc; + Handle(TDocStd_Document) pDoc; App::Document* doc; - Handle_XCAFDoc_ShapeTool aShapeTool; - Handle_XCAFDoc_ColorTool aColorTool; + Handle(XCAFDoc_ShapeTool) aShapeTool; + Handle(XCAFDoc_ColorTool) aColorTool; std::string default_name; std::set myRefShapes; static const int HashUpper = INT_MAX; diff --git a/src/Mod/Import/App/StepShape.cpp b/src/Mod/Import/App/StepShape.cpp index 6742b4b7e5..14fbe283a3 100644 --- a/src/Mod/Import/App/StepShape.cpp +++ b/src/Mod/Import/App/StepShape.cpp @@ -82,11 +82,11 @@ int StepShape::read(const char* fileName) //Use method StepData_StepModel::NextNumberForLabel to find its rank with the following: //Standard_CString label = "#..."; - Handle_StepData_StepModel model = aReader.StepModel(); + Handle(StepData_StepModel) model = aReader.StepModel(); //rank = model->NextNumberForLabe(label, 0, Standard_False); - Handle_Message_PrinterOStream mstr = new Message_PrinterOStream(); - Handle_Message_Messenger msg = new Message_Messenger(mstr); + Handle(Message_PrinterOStream) mstr = new Message_PrinterOStream(); + Handle(Message_Messenger) msg = new Message_Messenger(mstr); std::cout << "dump of step header:" << std::endl; diff --git a/src/Mod/Import/Gui/AppImportGuiPy.cpp b/src/Mod/Import/Gui/AppImportGuiPy.cpp index b4ba0e1059..620c5b77d2 100644 --- a/src/Mod/Import/Gui/AppImportGuiPy.cpp +++ b/src/Mod/Import/Gui/AppImportGuiPy.cpp @@ -121,7 +121,7 @@ class OCAFBrowser { public: - OCAFBrowser(Handle_TDocStd_Document h) + OCAFBrowser(Handle(TDocStd_Document) h) : pDoc(h) { myGroupIcon = QApplication::style()->standardIcon(QStyle::SP_DirIcon); @@ -156,7 +156,7 @@ private: private: QIcon myGroupIcon; TDF_IDList myList; - Handle_TDocStd_Document pDoc; + Handle(TDocStd_Document) pDoc; }; void OCAFBrowser::load(QTreeWidget* theTree) @@ -188,25 +188,25 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr QString text; QTextStream str(&text); str << attr->DynamicType()->Name(); - str << " = " << toString(Handle_TDataStd_Name::DownCast(attr)->Get()).c_str(); + str << " = " << toString(Handle(TDataStd_Name)::DownCast(attr)->Get()).c_str(); child->setText(0, text); } else if (it.Value() == TDF_TagSource::GetID()) { QString text; QTextStream str(&text); str << attr->DynamicType()->Name(); - str << " = " << Handle_TDF_TagSource::DownCast(attr)->Get(); + str << " = " << Handle(TDF_TagSource)::DownCast(attr)->Get(); child->setText(0, text); } else if (it.Value() == TDataStd_Integer::GetID()) { QString text; QTextStream str(&text); str << attr->DynamicType()->Name(); - str << " = " << Handle_TDataStd_Integer::DownCast(attr)->Get(); + str << " = " << Handle(TDataStd_Integer)::DownCast(attr)->Get(); child->setText(0, text); } else if (it.Value() == TNaming_NamedShape::GetID()) { - TopoDS_Shape shape = Handle_TNaming_NamedShape::DownCast(attr)->Get(); + TopoDS_Shape shape = Handle(TNaming_NamedShape)::DownCast(attr)->Get(); QString text; QTextStream str(&text); str << attr->DynamicType()->Name() << " = "; @@ -273,7 +273,7 @@ void OCAFBrowser::load(const TDF_Label& label, QTreeWidgetItem* item, const QStr class ImportOCAFExt : public Import::ImportOCAF { public: - ImportOCAFExt(Handle_TDocStd_Document h, App::Document* d, const std::string& name) + ImportOCAFExt(Handle(TDocStd_Document) h, App::Document* d, const std::string& name) : ImportOCAF(h, d, name) { } @@ -354,7 +354,7 @@ private: throw Py::Exception(PyExc_IOError, "cannot read STEP file"); } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.Reader().WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading STEP file..."); pi->Show(); @@ -362,7 +362,7 @@ private: pi->EndScope(); } catch (OSD_Exception) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Base::Console().Error("%s\n", e->GetMessageString()); Base::Console().Message("Try to load STEP file without colors...\n"); @@ -387,7 +387,7 @@ private: throw Py::Exception(Base::BaseExceptionFreeCADError, "cannot read IGES file"); } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading IGES file..."); pi->Show(); @@ -398,7 +398,7 @@ private: ->SetModel(new IGESData_IGESModel); } catch (OSD_Exception) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Base::Console().Error("%s\n", e->GetMessageString()); Base::Console().Message("Try to load IGES file without colors...\n"); @@ -416,7 +416,7 @@ private: hApp->Close(hDoc); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Base::BaseExceptionFreeCADError, e->GetMessageString()); } catch (const Base::Exception& e) { @@ -511,7 +511,7 @@ private: hApp->Close(hDoc); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Base::BaseExceptionFreeCADError, e->GetMessageString()); } catch (const Base::Exception& e) { @@ -542,7 +542,7 @@ private: throw Py::Exception(PyExc_IOError, "cannot read STEP file"); } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.Reader().WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading STEP file..."); pi->Show(); @@ -564,7 +564,7 @@ private: throw Py::Exception(PyExc_IOError, "cannot read IGES file"); } - Handle_Message_ProgressIndicator pi = new Part::ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new Part::ProgressIndicator(100); aReader.WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading IGES file..."); pi->Show(); @@ -605,7 +605,7 @@ private: hApp->Close(hDoc); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Base::BaseExceptionFreeCADError, e->GetMessageString()); } catch (const Base::Exception& e) { diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index 40f8f0b112..8d4d634bfc 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -140,7 +140,7 @@ MeasureType Measurement::getType() } catch (Standard_Failure) { std::stringstream errorMsg; - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); errorMsg << "Measurement - getType - " << e->GetMessageString() << std::endl; throw Base::Exception(e->GetMessageString()); } @@ -222,7 +222,7 @@ TopoDS_Shape Measurement::getShape(App::DocumentObject *obj , const char *subNam refSubShape = refShape.getSubShape(subName); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } return refSubShape; diff --git a/src/Mod/MeshPart/App/Mesher.cpp b/src/Mod/MeshPart/App/Mesher.cpp index 7ecb39ec70..21e55ab903 100644 --- a/src/Mod/MeshPart/App/Mesher.cpp +++ b/src/Mod/MeshPart/App/Mesher.cpp @@ -172,7 +172,7 @@ Mesh::MeshObject* Mesher::createMesh() const { // OCC standard mesher if (method == Standard) { - Handle_StlMesh_Mesh aMesh = new StlMesh_Mesh(); + Handle(StlMesh_Mesh) aMesh = new StlMesh_Mesh(); if (!shape.IsNull()) { BRepTools::Clean(shape); diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 8ab91eec1d..cbfa129116 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -198,7 +198,7 @@ PartExport std::list sort_Edges(double tol3d, std::listv2.SquareDistance(last) <= tol3d) { last = pEI->v1; Standard_Real first, last; - const Handle_Geom_Curve & curve = BRep_Tool::Curve(pEI->edge, first, last); + const Handle(Geom_Curve) & curve = BRep_Tool::Curve(pEI->edge, first, last); first = curve->ReversedParameter(first); last = curve->ReversedParameter(last); TopoDS_Edge edgeReversed = BRepBuilderAPI_MakeEdge(curve->Reversed(), last, first); @@ -211,7 +211,7 @@ PartExport std::list sort_Edges(double tol3d, std::listv1.SquareDistance(first) <= tol3d) { first = pEI->v2; Standard_Real first, last; - const Handle_Geom_Curve & curve = BRep_Tool::Curve(pEI->edge, first, last); + const Handle(Geom_Curve) & curve = BRep_Tool::Curve(pEI->edge, first, last); first = curve->ReversedParameter(first); last = curve->ReversedParameter(last); TopoDS_Edge edgeReversed = BRepBuilderAPI_MakeEdge(curve->Reversed(), last, first); @@ -598,7 +598,7 @@ private: } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } @@ -635,7 +635,7 @@ private: } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } @@ -692,7 +692,7 @@ private: throw Py::Exception(Base::BaseExceptionFreeCADError, std::string("Argument type signature not recognized. Should be either (list, string), or (shape, string)")); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } catch (Base::Exception &e){ throw Py::Exception(Base::BaseExceptionFreeCADError, e.what()); @@ -754,7 +754,7 @@ private: } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -836,7 +836,7 @@ private: Base::Vector3d vec = static_cast(pDirZ)->value(); d.SetCoord(vec.x, vec.y, vec.z); } - Handle_Geom_Plane aPlane; + Handle(Geom_Plane) aPlane; if (pDirX) { Base::Vector3d vec = static_cast(pDirX)->value(); gp_Dir dx; @@ -1046,7 +1046,7 @@ private: return Py::asObject(new TopoShapeWirePy(new TopoShape(mkPoly.Wire()))); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -1077,7 +1077,7 @@ private: circle.SetAxis(axis); circle.SetRadius(radius); - Handle_Geom_Circle hCircle = new Geom_Circle (circle); + Handle(Geom_Circle) hCircle = new Geom_Circle (circle); BRepBuilderAPI_MakeEdge aMakeEdge(hCircle, angle1*(M_PI/180), angle2*(M_PI/180)); TopoDS_Edge edge = aMakeEdge.Edge(); return Py::asObject(new TopoShapeEdgePy(new TopoShape(edge))); @@ -1226,7 +1226,7 @@ private: return Py::asObject(new TopoShapeWirePy(new TopoShape(wire))); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -1246,7 +1246,7 @@ private: return Py::asObject(new TopoShapeWirePy(new TopoShape(wire))); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -1262,7 +1262,7 @@ private: return Py::asObject(new TopoShapeWirePy(new TopoShape(wire))); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -1271,7 +1271,7 @@ private: double vmin = DBL_MAX, vmax=-DBL_MAX; double angle=360; PyObject *pPnt=0, *pDir=0, *pCrv; - Handle_Geom_Curve curve; + Handle(Geom_Curve) curve; union PyType_Object defaultType = {&Part::TopoShapeSolidPy::Type}; PyObject* type = defaultType.o; if (PyArg_ParseTuple(args.ptr(), "O!|dddO!O!O!", &(GeometryPy::Type), &pCrv, @@ -1280,7 +1280,7 @@ private: &(Base::VectorPy::Type), &pDir, &(PyType_Type), &type)) { GeometryPy* pcGeo = static_cast(pCrv); - curve = Handle_Geom_Curve::DownCast + curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { throw Py::Exception(PyExc_TypeError, "geometry is not a curve"); @@ -1310,10 +1310,10 @@ private: const TopoDS_Edge& edge = TopoDS::Edge(shape); BRepAdaptor_Curve adapt(edge); - const Handle_Geom_Curve& hCurve = adapt.Curve().Curve(); + const Handle(Geom_Curve)& hCurve = adapt.Curve().Curve(); // Apply placement of the shape to the curve TopLoc_Location loc = edge.Location(); - curve = Handle_Geom_Curve::DownCast(hCurve->Transformed(loc.Transformation())); + curve = Handle(Geom_Curve)::DownCast(hCurve->Transformed(loc.Transformation())); if (curve.IsNull()) { throw Py::Exception(PartExceptionOCCError, "invalid curve in edge"); } @@ -1428,7 +1428,7 @@ private: return Py::asObject(new TopoShapeFacePy(new TopoShape(face))); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -1453,7 +1453,7 @@ private: return Py::asObject(new TopoShapeFacePy(new TopoShape(face))); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(PartExceptionOCCError, e->GetMessageString()); } } @@ -1464,11 +1464,11 @@ private: if (!PyArg_ParseTuple(args.ptr(), "O", &pcObj)) throw Py::Exception; - NCollection_List theSections; + NCollection_List theSections; Py::Sequence list(pcObj); for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { if (PyObject_TypeCheck((*it).ptr(), &(Part::GeometryCurvePy::Type))) { - Handle_Geom_Curve hCurve = Handle_Geom_Curve::DownCast( + Handle(Geom_Curve) hCurve = Handle(Geom_Curve)::DownCast( static_cast((*it).ptr())->getGeomCurvePtr()->handle()); theSections.Append(hCurve); } @@ -1476,13 +1476,13 @@ private: //populate section generator GeomFill_SectionGenerator aSecGenerator; - for (NCollection_List::Iterator anIt(theSections); anIt.More(); anIt.Next()) { - const Handle_Geom_Curve& aCurve = anIt.Value(); + for (NCollection_List::Iterator anIt(theSections); anIt.More(); anIt.Next()) { + const Handle(Geom_Curve)& aCurve = anIt.Value(); aSecGenerator.AddCurve (aCurve); } aSecGenerator.Perform (Precision::PConfusion()); - Handle_GeomFill_Line aLine = new GeomFill_Line (theSections.Size()); + Handle(GeomFill_Line) aLine = new GeomFill_Line (theSections.Size()); //parameters const Standard_Integer aMinDeg = 1, aMaxDeg = BSplCLib::MaxDegree(), aNbIt = 0; @@ -1497,7 +1497,7 @@ private: return 0; } - Handle_Geom_BSplineSurface aRes; + Handle(Geom_BSplineSurface) aRes; aRes = new Geom_BSplineSurface(anAlgo.SurfPoles(), anAlgo.SurfWeights(), anAlgo.SurfUKnots(), anAlgo.SurfVKnots(), anAlgo.SurfUMults(), anAlgo.SurfVMults(), anAlgo.UDegree(), anAlgo.VDegree()); diff --git a/src/Mod/Part/App/ArcOfCirclePyImp.cpp b/src/Mod/Part/App/ArcOfCirclePyImp.cpp index 9143a80900..632825e214 100644 --- a/src/Mod/Part/App/ArcOfCirclePyImp.cpp +++ b/src/Mod/Part/App/ArcOfCirclePyImp.cpp @@ -46,9 +46,9 @@ extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python std::string ArcOfCirclePy::representation(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfCirclePtr()->handle()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(trim->BasisCurve()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(trim->BasisCurve()); gp_Ax1 axis = circle->Axis(); gp_Dir dir = axis.Direction(); @@ -82,7 +82,7 @@ int ArcOfCirclePy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::CirclePy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast (static_cast(o)->getGeomCirclePtr()->handle()); GC_MakeArcOfCircle arc(circle->Circ(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -94,7 +94,7 @@ int ArcOfCirclePy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -143,9 +143,9 @@ void ArcOfCirclePy::setRadius(Py::Float arg) Py::Object ArcOfCirclePy::getCircle(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfCirclePtr()->handle()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(trim->BasisCurve()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(trim->BasisCurve()); return Py::Object(new CirclePy(new GeomCircle(circle)), true); } diff --git a/src/Mod/Part/App/ArcOfConicPyImp.cpp b/src/Mod/Part/App/ArcOfConicPyImp.cpp index e6806f5ecd..dd2c8554fc 100644 --- a/src/Mod/Part/App/ArcOfConicPyImp.cpp +++ b/src/Mod/Part/App/ArcOfConicPyImp.cpp @@ -114,9 +114,9 @@ void ArcOfConicPy::setAngleXU(Py::Float arg) Py::Object ArcOfConicPy::getAxis(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(trim->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(trim->BasisCurve()); gp_Ax1 axis = conic->Axis(); gp_Dir dir = axis.Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -138,9 +138,9 @@ void ArcOfConicPy::setAxis(Py::Object arg) throw Py::TypeError(error); } - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(trim->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(trim->BasisCurve()); try { gp_Ax1 axis; axis.SetLocation(conic->Location()); @@ -154,9 +154,9 @@ void ArcOfConicPy::setAxis(Py::Object arg) Py::Object ArcOfConicPy::getXAxis(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(trim->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(trim->BasisCurve()); gp_Ax1 axis = conic->XAxis(); gp_Dir dir = axis.Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -178,9 +178,9 @@ void ArcOfConicPy::setXAxis(Py::Object arg) throw Py::TypeError(error); } - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(trim->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(trim->BasisCurve()); try { gp_Ax2 pos; pos = conic->Position(); @@ -194,9 +194,9 @@ void ArcOfConicPy::setXAxis(Py::Object arg) Py::Object ArcOfConicPy::getYAxis(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(trim->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(trim->BasisCurve()); gp_Ax1 axis = conic->YAxis(); gp_Dir dir = axis.Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -218,9 +218,9 @@ void ArcOfConicPy::setYAxis(Py::Object arg) throw Py::TypeError(error); } - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfConicPtr()->handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(trim->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(trim->BasisCurve()); try { gp_Ax2 pos; pos = conic->Position(); diff --git a/src/Mod/Part/App/ArcOfEllipsePyImp.cpp b/src/Mod/Part/App/ArcOfEllipsePyImp.cpp index dfb61ca0cf..2aa4c5729e 100644 --- a/src/Mod/Part/App/ArcOfEllipsePyImp.cpp +++ b/src/Mod/Part/App/ArcOfEllipsePyImp.cpp @@ -46,9 +46,9 @@ extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python std::string ArcOfEllipsePy::representation(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfEllipsePtr()->handle()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(trim->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(trim->BasisCurve()); gp_Ax1 axis = ellipse->Axis(); gp_Dir dir = axis.Direction(); @@ -93,7 +93,7 @@ int ArcOfEllipsePy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::EllipsePy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast (static_cast(o)->getGeomEllipsePtr()->handle()); GC_MakeArcOfEllipse arc(ellipse->Elips(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -105,7 +105,7 @@ int ArcOfEllipsePy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -143,9 +143,9 @@ void ArcOfEllipsePy::setMinorRadius(Py::Float arg) Py::Object ArcOfEllipsePy::getEllipse(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfEllipsePtr()->handle()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(trim->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(trim->BasisCurve()); return Py::Object(new EllipsePy(new GeomEllipse(ellipse)), true); } diff --git a/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp b/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp index 077890eff3..7e9f0bfb80 100644 --- a/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp +++ b/src/Mod/Part/App/ArcOfHyperbolaPyImp.cpp @@ -46,9 +46,9 @@ extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python std::string ArcOfHyperbolaPy::representation(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfHyperbolaPtr()->handle()); - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(trim->BasisCurve()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(trim->BasisCurve()); gp_Ax1 axis = hyperbola->Axis(); gp_Dir dir = axis.Direction(); @@ -93,7 +93,7 @@ int ArcOfHyperbolaPy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::HyperbolaPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast (static_cast(o)->getGeomHyperbolaPtr()->handle()); GC_MakeArcOfHyperbola arc(hyperbola->Hypr(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -105,7 +105,7 @@ int ArcOfHyperbolaPy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -143,9 +143,9 @@ void ArcOfHyperbolaPy::setMinorRadius(Py::Float arg) Py::Object ArcOfHyperbolaPy::getHyperbola(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfHyperbolaPtr()->handle()); - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(trim->BasisCurve()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(trim->BasisCurve()); return Py::Object(new HyperbolaPy(new GeomHyperbola(hyperbola)), true); } diff --git a/src/Mod/Part/App/ArcOfParabolaPyImp.cpp b/src/Mod/Part/App/ArcOfParabolaPyImp.cpp index b946e920ea..6cfca96536 100644 --- a/src/Mod/Part/App/ArcOfParabolaPyImp.cpp +++ b/src/Mod/Part/App/ArcOfParabolaPyImp.cpp @@ -46,9 +46,9 @@ 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 + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfParabolaPtr()->handle()); - Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(trim->BasisCurve()); + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast(trim->BasisCurve()); gp_Ax1 axis = parabola->Axis(); gp_Dir dir = axis.Direction(); @@ -91,7 +91,7 @@ int ArcOfParabolaPy::PyInit(PyObject* args, PyObject* /*kwds*/) 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 + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast (static_cast(o)->getGeomParabolaPtr()->handle()); GC_MakeArcOfParabola arc(parabola->Parab(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -103,7 +103,7 @@ int ArcOfParabolaPy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -131,9 +131,9 @@ void ArcOfParabolaPy::setFocal(Py::Float arg) Py::Object ArcOfParabolaPy::getParabola(void) const { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast (getGeomArcOfParabolaPtr()->handle()); - Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(trim->BasisCurve()); + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast(trim->BasisCurve()); return Py::Object(new ParabolaPy(new GeomParabola(parabola)), true); } diff --git a/src/Mod/Part/App/ArcPyImp.cpp b/src/Mod/Part/App/ArcPyImp.cpp index 3604d750e3..787ed8398c 100644 --- a/src/Mod/Part/App/ArcPyImp.cpp +++ b/src/Mod/Part/App/ArcPyImp.cpp @@ -76,7 +76,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::CirclePy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast (static_cast(o)->getGeomCirclePtr()->handle()); GC_MakeArcOfCircle arc(circle->Circ(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -88,7 +88,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -122,7 +122,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) PyErr_Clear(); if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::EllipsePy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast (static_cast(o)->getGeomEllipsePtr()->handle()); GC_MakeArcOfEllipse arc(ellipse->Elips(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -134,7 +134,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -148,7 +148,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) PyErr_Clear(); 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 + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast (static_cast(o)->getGeomParabolaPtr()->handle()); GC_MakeArcOfParabola arc(parabola->Parab(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -160,7 +160,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -174,7 +174,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::HyperbolaPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast (static_cast(o)->getGeomHyperbolaPtr()->handle()); GC_MakeArcOfHyperbola arc(hyperbola->Hypr(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -186,7 +186,7 @@ int ArcPy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } diff --git a/src/Mod/Part/App/AttachEnginePyImp.cpp b/src/Mod/Part/App/AttachEnginePyImp.cpp index 64054f97b4..4169b200f4 100644 --- a/src/Mod/Part/App/AttachEnginePyImp.cpp +++ b/src/Mod/Part/App/AttachEnginePyImp.cpp @@ -84,7 +84,7 @@ Py::String AttachEnginePy::getAttacherType(void) const */ #define ATTACHERPY_STDCATCH_ATTR \ catch (Standard_Failure) {\ - Handle_Standard_Failure e = Standard_Failure::Caught();\ + Handle(Standard_Failure) e = Standard_Failure::Caught();\ throw Py::Exception(Part::PartExceptionOCCError, e->GetMessageString());\ } catch (Base::Exception &e) {\ throw Py::Exception(Base::BaseExceptionFreeCADError, e.what());\ @@ -225,7 +225,7 @@ Py::List AttachEnginePy::getImplementedModes(void) const */ #define ATTACHERPY_STDCATCH_METH \ catch (Standard_Failure) {\ - Handle_Standard_Failure e = Standard_Failure::Caught();\ + Handle(Standard_Failure) e = Standard_Failure::Caught();\ PyErr_SetString(Part::PartExceptionOCCError, e->GetMessageString());\ return NULL;\ } catch (Base::Exception &e) {\ diff --git a/src/Mod/Part/App/AttachExtensionPyImp.cpp b/src/Mod/Part/App/AttachExtensionPyImp.cpp index 3740c5991d..e6c755159f 100644 --- a/src/Mod/Part/App/AttachExtensionPyImp.cpp +++ b/src/Mod/Part/App/AttachExtensionPyImp.cpp @@ -26,7 +26,7 @@ PyObject* AttachExtensionPy::positionBySupport(PyObject *args) try{ bAttached = this->getAttachExtensionPtr()->positionBySupport(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } catch (Base::Exception &e) { @@ -45,7 +45,7 @@ PyObject* AttachExtensionPy::changeAttacherType(PyObject *args) try{ ret = this->getAttachExtensionPtr()->changeAttacherType(typeName); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } catch (Base::Exception &e) { @@ -66,7 +66,7 @@ Py::Object AttachExtensionPy::getAttacher(void) const try { return Py::Object( new Attacher::AttachEnginePy(this->getAttachExtensionPtr()->attacher().copy()), true); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Part::PartExceptionOCCError, e->GetMessageString()); } catch (Base::Exception &e) { throw Py::Exception(Base::BaseExceptionFreeCADError, e.what()); diff --git a/src/Mod/Part/App/BSplineCurvePyImp.cpp b/src/Mod/Part/App/BSplineCurvePyImp.cpp index 1ff5798381..ae71694dcc 100644 --- a/src/Mod/Part/App/BSplineCurvePyImp.cpp +++ b/src/Mod/Part/App/BSplineCurvePyImp.cpp @@ -95,7 +95,7 @@ PyObject* BSplineCurvePy::isRational(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = curve->IsRational(); return PyBool_FromLong(val ? 1 : 0); @@ -105,7 +105,7 @@ PyObject* BSplineCurvePy::isPeriodic(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = curve->IsPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -115,7 +115,7 @@ PyObject* BSplineCurvePy::isClosed(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = curve->IsClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -127,7 +127,7 @@ PyObject* BSplineCurvePy::increaseDegree(PyObject * args) if (!PyArg_ParseTuple(args, "i", °ree)) return 0; PY_TRY { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->IncreaseDegree(degree); Py_Return; @@ -142,7 +142,7 @@ PyObject* BSplineCurvePy::increaseMultiplicity(PyObject * args) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); if (mult == -1) { mult = end; @@ -155,7 +155,7 @@ PyObject* BSplineCurvePy::increaseMultiplicity(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -168,12 +168,12 @@ PyObject* BSplineCurvePy::incrementMultiplicity(PyObject * args) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->IncrementMultiplicity(start, end, mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -190,12 +190,12 @@ PyObject* BSplineCurvePy::insertKnot(PyObject * args) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->InsertKnot(U,M,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -234,13 +234,13 @@ PyObject* BSplineCurvePy::insertKnots(PyObject * args) m(index++) = (int)val; } - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->InsertKnots(k,m,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -256,13 +256,13 @@ PyObject* BSplineCurvePy::removeKnot(PyObject * args) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean ok = curve->RemoveKnot(Index,M,tol); return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -274,13 +274,13 @@ PyObject* BSplineCurvePy::segment(PyObject * args) if (!PyArg_ParseTuple(args, "dd", &u1,&u2)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->Segment(u1,u2); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -294,7 +294,7 @@ PyObject* BSplineCurvePy::setKnot(PyObject * args) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); if (M == -1) { curve->SetKnot(Index, K); @@ -306,7 +306,7 @@ PyObject* BSplineCurvePy::setKnot(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -319,14 +319,14 @@ PyObject* BSplineCurvePy::getKnot(PyObject * args) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); double M = curve->Knot(Index); return Py_BuildValue("d",M); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -346,13 +346,13 @@ PyObject* BSplineCurvePy::setKnots(PyObject * args) k(index++) = (double)val; } - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->SetKnots(k); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -363,7 +363,7 @@ PyObject* BSplineCurvePy::getKnots(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfReal w(1,curve->NbKnots()); curve->Knots(w); @@ -374,7 +374,7 @@ PyObject* BSplineCurvePy::getKnots(PyObject * args) return Py::new_reference_to(knots); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -390,7 +390,7 @@ PyObject* BSplineCurvePy::setPole(PyObject * args) Base::Vector3d vec = static_cast(p)->value(); gp_Pnt pnt(vec.x, vec.y, vec.z); try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); if (weight < 0.0) curve->SetPole(index,pnt); @@ -399,7 +399,7 @@ PyObject* BSplineCurvePy::setPole(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -411,7 +411,7 @@ PyObject* BSplineCurvePy::getPole(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles(), "Pole index out of range"); @@ -421,7 +421,7 @@ PyObject* BSplineCurvePy::getPole(PyObject * args) return vec; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -432,7 +432,7 @@ PyObject* BSplineCurvePy::getPoles(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); TColgp_Array1OfPnt p(1,curve->NbPoles()); curve->Poles(p); @@ -446,7 +446,7 @@ PyObject* BSplineCurvePy::getPoles(PyObject * args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -457,7 +457,7 @@ PyObject* BSplineCurvePy::getPolesAndWeights(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); TColgp_Array1OfPnt p(1,curve->NbPoles()); curve->Poles(p); @@ -478,7 +478,7 @@ PyObject* BSplineCurvePy::getPolesAndWeights(PyObject * args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -491,13 +491,13 @@ PyObject* BSplineCurvePy::setWeight(PyObject * args) if (!PyArg_ParseTuple(args, "id", &index,&weight)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->SetWeight(index,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -509,7 +509,7 @@ PyObject* BSplineCurvePy::getWeight(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles() , "Weight index out of range"); @@ -517,7 +517,7 @@ PyObject* BSplineCurvePy::getWeight(PyObject * args) return Py_BuildValue("d", weight); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -528,7 +528,7 @@ PyObject* BSplineCurvePy::getWeights(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfReal w(1,curve->NbPoles()); curve->Weights(w); @@ -539,7 +539,7 @@ PyObject* BSplineCurvePy::getWeights(PyObject * args) return Py::new_reference_to(weights); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -551,14 +551,14 @@ PyObject* BSplineCurvePy::getResolution(PyObject * args) if (!PyArg_ParseTuple(args, "d", &tol)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); double utol; curve->Resolution(tol,utol); return Py_BuildValue("d",utol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -573,14 +573,14 @@ PyObject* BSplineCurvePy::movePoint(PyObject * args) return 0; try { Base::Vector3d p = static_cast(pnt)->value(); - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); int first, last; curve->MovePoint(U, gp_Pnt(p.x,p.y,p.z), index1, index2, first, last); return Py_BuildValue("(ii)",first, last); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -591,13 +591,13 @@ PyObject* BSplineCurvePy::setNotPeriodic(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->SetNotPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -608,13 +608,13 @@ PyObject* BSplineCurvePy::setPeriodic(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->SetPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -626,13 +626,13 @@ PyObject* BSplineCurvePy::setOrigin(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); curve->SetOrigin(index); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -644,13 +644,13 @@ PyObject* BSplineCurvePy::getMultiplicity(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); int mult = curve->Multiplicity(index); return Py_BuildValue("i", mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -661,7 +661,7 @@ PyObject* BSplineCurvePy::getMultiplicities(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfInteger m(1,curve->NbKnots()); curve->Multiplicities(m); @@ -672,42 +672,42 @@ PyObject* BSplineCurvePy::getMultiplicities(PyObject * args) return Py::new_reference_to(mults); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } } Py::Long BSplineCurvePy::getDegree(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->Degree()); } Py::Long BSplineCurvePy::getMaxDegree(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->MaxDegree()); } Py::Long BSplineCurvePy::getNbPoles(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->NbPoles()); } Py::Long BSplineCurvePy::getNbKnots(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->NbKnots()); } Py::Object BSplineCurvePy::getStartPoint(void) const { - Handle_Geom_BSplineCurve c = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) c = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); gp_Pnt pnt = c->StartPoint(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -715,7 +715,7 @@ Py::Object BSplineCurvePy::getStartPoint(void) const Py::Object BSplineCurvePy::getEndPoint(void) const { - Handle_Geom_BSplineCurve c = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) c = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); gp_Pnt pnt = c->EndPoint(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -723,21 +723,21 @@ Py::Object BSplineCurvePy::getEndPoint(void) const Py::Object BSplineCurvePy::getFirstUKnotIndex(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->FirstUKnotIndex()); } Py::Object BSplineCurvePy::getLastUKnotIndex(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->LastUKnotIndex()); } Py::List BSplineCurvePy::getKnotSequence(void) const { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast (getGeometryPtr()->handle()); Standard_Integer m = 0; if (curve->IsPeriodic()) { @@ -778,7 +778,7 @@ PyObject* BSplineCurvePy::toBiArcs(PyObject * args) return Py::new_reference_to(list); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -842,7 +842,7 @@ PyObject* BSplineCurvePy::approximate(PyObject *args, PyObject *kwds) if (weight1 || weight2 || weight3) { // It seems that this function only works with Continuity = C0, C1 or C2 GeomAPI_PointsToBSpline fit(pnts, weight1, weight2, weight3, degMax, c, tol3d); - Handle_Geom_BSplineCurve spline = fit.Curve(); + Handle(Geom_BSplineCurve) spline = fit.Curve(); if (!spline.IsNull()) { this->getGeomBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -863,7 +863,7 @@ PyObject* BSplineCurvePy::approximate(PyObject *args, PyObject *kwds) } GeomAPI_PointsToBSpline fit(pnts, parameters, degMin, degMax, c, tol3d); - Handle_Geom_BSplineCurve spline = fit.Curve(); + Handle(Geom_BSplineCurve) spline = fit.Curve(); if (!spline.IsNull()) { this->getGeomBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -884,7 +884,7 @@ PyObject* BSplineCurvePy::approximate(PyObject *args, PyObject *kwds) pt = Approx_ChordLength; GeomAPI_PointsToBSpline fit(pnts, pt, degMin, degMax, c, tol3d); - Handle_Geom_BSplineCurve spline = fit.Curve(); + Handle(Geom_BSplineCurve) spline = fit.Curve(); if (!spline.IsNull()) { this->getGeomBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -895,7 +895,7 @@ PyObject* BSplineCurvePy::approximate(PyObject *args, PyObject *kwds) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -983,7 +983,7 @@ PyObject* BSplineCurvePy::interpolate(PyObject *args, PyObject *kwds) try { Py::Sequence list(obj); - Handle_TColgp_HArray1OfPnt interpolationPoints = new TColgp_HArray1OfPnt(1, list.size()); + Handle(TColgp_HArray1OfPnt) interpolationPoints = new TColgp_HArray1OfPnt(1, list.size()); Standard_Integer index = 1; for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { Py::Vector v(*it); @@ -995,7 +995,7 @@ PyObject* BSplineCurvePy::interpolate(PyObject *args, PyObject *kwds) Standard_Failure::Raise("not enough points given"); } - Handle_TColStd_HArray1OfReal parameters; + Handle(TColStd_HArray1OfReal) parameters; if (par) { Py::Sequence plist(par); parameters = new TColStd_HArray1OfReal(1, plist.size()); @@ -1034,7 +1034,7 @@ PyObject* BSplineCurvePy::interpolate(PyObject *args, PyObject *kwds) } Py::Sequence flist(fl); - Handle_TColStd_HArray1OfBoolean tangentFlags = new TColStd_HArray1OfBoolean(1, flist.size()); + Handle(TColStd_HArray1OfBoolean) tangentFlags = new TColStd_HArray1OfBoolean(1, flist.size()); Standard_Integer findex = 1; for (Py::Sequence::iterator it = flist.begin(); it != flist.end(); ++it) { Py::Boolean flag(*it); @@ -1047,7 +1047,7 @@ PyObject* BSplineCurvePy::interpolate(PyObject *args, PyObject *kwds) aBSplineInterpolation->Perform(); if (aBSplineInterpolation->IsDone()) { - Handle_Geom_BSplineCurve aBSplineCurve(aBSplineInterpolation->Curve()); + Handle(Geom_BSplineCurve) aBSplineCurve(aBSplineInterpolation->Curve()); this->getGeomBSplineCurvePtr()->setHandle(aBSplineCurve); Py_Return; } @@ -1057,7 +1057,7 @@ PyObject* BSplineCurvePy::interpolate(PyObject *args, PyObject *kwds) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string err = e->GetMessageString(); if (err.empty()) err = e->DynamicType()->Name(); PyErr_SetString(PartExceptionOCCError, err.c_str()); @@ -1106,7 +1106,7 @@ PyObject* BSplineCurvePy::buildFromPoles(PyObject *args) mults.SetValue(1, mult); mults.SetValue(knots.Length(), mult); - Handle_Geom_BSplineCurve spline = new Geom_BSplineCurve(poles, knots, mults, degree, Standard_True); + Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(poles, knots, mults, degree, Standard_True); if (!spline.IsNull()) { this->getGeomBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -1126,7 +1126,7 @@ PyObject* BSplineCurvePy::buildFromPoles(PyObject *args) mults.SetValue(1, degree+1); mults.SetValue(knots.Length(), degree+1); - Handle_Geom_BSplineCurve spline = new Geom_BSplineCurve(poles, knots, mults, degree, Standard_False); + Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(poles, knots, mults, degree, Standard_False); if (!spline.IsNull()) { this->getGeomBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -1138,7 +1138,7 @@ PyObject* BSplineCurvePy::buildFromPoles(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1271,7 +1271,7 @@ PyObject* BSplineCurvePy::buildFromPolesMultsKnots(PyObject *args, PyObject *key return(0); } - Handle_Geom_BSplineCurve spline = new Geom_BSplineCurve(occpoles,occweights,occknots,occmults,degree, + Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(occpoles,occweights,occknots,occmults,degree, PyObject_IsTrue(periodic) ? Standard_True : Standard_False, PyObject_IsTrue(CheckRational) ? Standard_True : Standard_False); if (!spline.IsNull()) { @@ -1284,7 +1284,7 @@ PyObject* BSplineCurvePy::buildFromPolesMultsKnots(PyObject *args, PyObject *key } } catch (const Standard_Failure & ) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Standard_CString msg = e->GetMessageString(); PyErr_SetString(PartExceptionOCCError, msg ? msg : ""); return 0; @@ -1298,21 +1298,21 @@ PyObject* BSplineCurvePy::toBezier(PyObject *args) return 0; try { - Handle_Geom_BSplineCurve spline = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) spline = Handle(Geom_BSplineCurve)::DownCast (this->getGeomBSplineCurvePtr()->handle()); GeomConvert_BSplineCurveToBezierCurve crt(spline); Py::List list; Standard_Integer arcs = crt.NbArcs(); for (Standard_Integer i=1; i<=arcs; i++) { - Handle_Geom_BezierCurve bezier = crt.Arc(i); + Handle(Geom_BezierCurve) bezier = crt.Arc(i); list.append(Py::asObject(new BezierCurvePy(new GeomBezierCurve(bezier)))); } return Py::new_reference_to(list); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1327,7 +1327,7 @@ PyObject* BSplineCurvePy::join(PyObject *args) try { GeomBSplineCurve* curve1 = this->getGeomBSplineCurvePtr(); BSplineCurvePy* curve2 = static_cast(c); - Handle_Geom_BSplineCurve spline = Handle_Geom_BSplineCurve::DownCast + Handle(Geom_BSplineCurve) spline = Handle(Geom_BSplineCurve)::DownCast (curve2->getGeomBSplineCurvePtr()->handle()); bool ok = curve1->join(spline); @@ -1335,7 +1335,7 @@ PyObject* BSplineCurvePy::join(PyObject *args) return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1354,7 +1354,7 @@ PyObject* BSplineCurvePy::makeC1Continuous(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string err = e->GetMessageString(); if (err.empty()) err = e->DynamicType()->Name(); PyErr_SetString(PartExceptionOCCError, err.c_str()); diff --git a/src/Mod/Part/App/BSplineSurfacePyImp.cpp b/src/Mod/Part/App/BSplineSurfacePyImp.cpp index 949cd6cb3c..a04550bd4c 100644 --- a/src/Mod/Part/App/BSplineSurfacePyImp.cpp +++ b/src/Mod/Part/App/BSplineSurfacePyImp.cpp @@ -71,7 +71,7 @@ PyObject* BSplineSurfacePy::bounds(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Py::Tuple bound(4); Standard_Real u1,u2,v1,v2; @@ -88,7 +88,7 @@ PyObject* BSplineSurfacePy::isURational(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsURational(); return PyBool_FromLong(val ? 1 : 0); @@ -99,7 +99,7 @@ PyObject* BSplineSurfacePy::isVRational(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVRational(); return PyBool_FromLong(val ? 1 : 0); @@ -110,7 +110,7 @@ PyObject* BSplineSurfacePy::isUPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsUPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -121,7 +121,7 @@ PyObject* BSplineSurfacePy::isVPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -132,7 +132,7 @@ PyObject* BSplineSurfacePy::isUClosed(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsUClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -143,7 +143,7 @@ PyObject* BSplineSurfacePy::isVClosed(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -155,7 +155,7 @@ PyObject* BSplineSurfacePy::increaseDegree(PyObject *args) if (!PyArg_ParseTuple(args, "ii",&udegree,&vdegree)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->IncreaseDegree(udegree,vdegree); Py_Return; @@ -168,7 +168,7 @@ PyObject* BSplineSurfacePy::increaseUMultiplicity(PyObject *args) if (!PyArg_ParseTuple(args, "ii|i", &start, &end, &mult)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (mult == -1) { mult = end; @@ -188,7 +188,7 @@ PyObject* BSplineSurfacePy::increaseVMultiplicity(PyObject *args) if (!PyArg_ParseTuple(args, "ii|i", &start, &end, &mult)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (mult == -1) { mult = end; @@ -208,12 +208,12 @@ PyObject* BSplineSurfacePy::incrementUMultiplicity(PyObject *args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->IncrementUMultiplicity(start, end, mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -228,12 +228,12 @@ PyObject* BSplineSurfacePy::incrementVMultiplicity(PyObject *args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->IncrementVMultiplicity(start, end, mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -250,12 +250,12 @@ PyObject* BSplineSurfacePy::insertUKnot(PyObject *args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->InsertUKnot(U,M,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -294,13 +294,13 @@ PyObject* BSplineSurfacePy::insertUKnots(PyObject *args) m(index++) = (int)val; } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->InsertUKnots(k,m,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -317,12 +317,12 @@ PyObject* BSplineSurfacePy::insertVKnot(PyObject *args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->InsertVKnot(V,M,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -361,13 +361,13 @@ PyObject* BSplineSurfacePy::insertVKnots(PyObject *args) m(index++) = (int)val; } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->InsertVKnots(k,m,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -383,13 +383,13 @@ PyObject* BSplineSurfacePy::removeUKnot(PyObject *args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean ok = surf->RemoveUKnot(Index,M,tol); return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -403,13 +403,13 @@ PyObject* BSplineSurfacePy::removeVKnot(PyObject *args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean ok = surf->RemoveVKnot(Index,M,tol); return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -421,13 +421,13 @@ PyObject* BSplineSurfacePy::segment(PyObject *args) if (!PyArg_ParseTuple(args, "dddd", &u1,&u2,&v1,&v2)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->Segment(u1,u2,v1,v2); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -440,7 +440,7 @@ PyObject* BSplineSurfacePy::setUKnot(PyObject *args) if (!PyArg_ParseTuple(args, "id|i", &Index, &K, &M)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (M == -1) { surf->SetUKnot(Index, K); @@ -459,7 +459,7 @@ PyObject* BSplineSurfacePy::setVKnot(PyObject *args) if (!PyArg_ParseTuple(args, "id|i", &Index, &K, &M)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (M == -1) { surf->SetUKnot(Index, K); @@ -477,7 +477,7 @@ PyObject* BSplineSurfacePy::getUKnot(PyObject *args) if (!PyArg_ParseTuple(args, "i", &Index)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); double M = surf->UKnot(Index); @@ -490,7 +490,7 @@ PyObject* BSplineSurfacePy::getVKnot(PyObject *args) if (!PyArg_ParseTuple(args, "i", &Index)) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); double M = surf->VKnot(Index); @@ -511,13 +511,13 @@ PyObject* BSplineSurfacePy::setUKnots(PyObject *args) k(index++) = (double)val; } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetUKnots(k); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -537,13 +537,13 @@ PyObject* BSplineSurfacePy::setVKnots(PyObject *args) k(index++) = (double)val; } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetVKnots(k); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -554,7 +554,7 @@ PyObject* BSplineSurfacePy::getUKnots(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfReal w(1,surf->NbUKnots()); surf->UKnots(w); @@ -565,7 +565,7 @@ PyObject* BSplineSurfacePy::getUKnots(PyObject *args) return Py::new_reference_to(knots); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -576,7 +576,7 @@ PyObject* BSplineSurfacePy::getVKnots(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfReal w(1,surf->NbVKnots()); surf->VKnots(w); @@ -587,7 +587,7 @@ PyObject* BSplineSurfacePy::getVKnots(PyObject *args) return Py::new_reference_to(knots); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -603,7 +603,7 @@ PyObject* BSplineSurfacePy::setPole(PyObject *args) Base::Vector3d vec = static_cast(p)->value(); gp_Pnt pnt(vec.x, vec.y, vec.z); try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (weight < 0.0) surf->SetPole(uindex,vindex,pnt); @@ -612,7 +612,7 @@ PyObject* BSplineSurfacePy::setPole(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -635,7 +635,7 @@ PyObject* BSplineSurfacePy::setPoleCol(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->SetPoleCol(vindex, poles); @@ -653,7 +653,7 @@ PyObject* BSplineSurfacePy::setPoleCol(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -676,7 +676,7 @@ PyObject* BSplineSurfacePy::setPoleRow(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->SetPoleRow(uindex, poles); @@ -694,7 +694,7 @@ PyObject* BSplineSurfacePy::setPoleRow(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -706,7 +706,7 @@ PyObject* BSplineSurfacePy::getPole(PyObject *args) if (!PyArg_ParseTuple(args, "ii", &uindex,&vindex)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (uindex < 1 || uindex > surf->NbUPoles() || @@ -717,7 +717,7 @@ PyObject* BSplineSurfacePy::getPole(PyObject *args) return vec; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -728,7 +728,7 @@ PyObject* BSplineSurfacePy::getPoles(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColgp_Array2OfPnt p(1,surf->NbUPoles(),1,surf->NbVPoles()); surf->Poles(p); @@ -745,7 +745,7 @@ PyObject* BSplineSurfacePy::getPoles(PyObject *args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -758,13 +758,13 @@ PyObject* BSplineSurfacePy::setWeight(PyObject *args) if (!PyArg_ParseTuple(args, "iid",&uindex,&vindex,&weight)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetWeight(uindex,vindex,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -784,13 +784,13 @@ PyObject* BSplineSurfacePy::setWeightCol(PyObject *args) weights(index++) = (double)Py::Float(*it); } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetWeightCol(vindex, weights); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -810,13 +810,13 @@ PyObject* BSplineSurfacePy::setWeightRow(PyObject *args) weights(index++) = (double)Py::Float(*it); } - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetWeightRow(uindex, weights); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -828,7 +828,7 @@ PyObject* BSplineSurfacePy::getWeight(PyObject *args) if (!PyArg_ParseTuple(args, "ii",&uindex,&vindex)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (uindex < 1 || uindex > surf->NbUPoles() || @@ -837,7 +837,7 @@ PyObject* BSplineSurfacePy::getWeight(PyObject *args) return Py_BuildValue("d", w); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -848,7 +848,7 @@ PyObject* BSplineSurfacePy::getWeights(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColStd_Array2OfReal w(1,surf->NbUPoles(),1,surf->NbVPoles()); surf->Weights(w); @@ -863,7 +863,7 @@ PyObject* BSplineSurfacePy::getWeights(PyObject *args) return Py::new_reference_to(weights); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -874,7 +874,7 @@ PyObject* BSplineSurfacePy::getPolesAndWeights(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColgp_Array2OfPnt p(1,surf->NbUPoles(),1,surf->NbVPoles()); surf->Poles(p); @@ -899,7 +899,7 @@ PyObject* BSplineSurfacePy::getPolesAndWeights(PyObject *args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -911,14 +911,14 @@ PyObject* BSplineSurfacePy::getResolution(PyObject *args) if (!PyArg_ParseTuple(args, "d", &tol)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); double utol, vtol; surf->Resolution(tol,utol,vtol); return Py_BuildValue("(dd)",utol,vtol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -935,7 +935,7 @@ PyObject* BSplineSurfacePy::movePoint(PyObject *args) return 0; try { Base::Vector3d p = static_cast(pnt)->value(); - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int ufirst, ulast, vfirst, vlast; surf->MovePoint(U, V, gp_Pnt(p.x,p.y,p.z), uindex1, uindex2, vindex1, vindex2, @@ -943,7 +943,7 @@ PyObject* BSplineSurfacePy::movePoint(PyObject *args) return Py_BuildValue("(iiii)",ufirst, ulast, vfirst, vlast); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -954,13 +954,13 @@ PyObject* BSplineSurfacePy::setUNotPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetUNotPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -971,13 +971,13 @@ PyObject* BSplineSurfacePy::setVNotPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetVNotPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -988,13 +988,13 @@ PyObject* BSplineSurfacePy::setUPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetUPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1005,13 +1005,13 @@ PyObject* BSplineSurfacePy::setVPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetVPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1023,13 +1023,13 @@ PyObject* BSplineSurfacePy::setUOrigin(PyObject *args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetUOrigin(index); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1041,13 +1041,13 @@ PyObject* BSplineSurfacePy::setVOrigin(PyObject *args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->SetVOrigin(index); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1059,13 +1059,13 @@ PyObject* BSplineSurfacePy::getUMultiplicity(PyObject *args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int mult = surf->UMultiplicity(index); return Py_BuildValue("i", mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1077,13 +1077,13 @@ PyObject* BSplineSurfacePy::getVMultiplicity(PyObject *args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int mult = surf->VMultiplicity(index); return Py_BuildValue("i", mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1094,7 +1094,7 @@ PyObject* BSplineSurfacePy::getUMultiplicities(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfInteger m(1,surf->NbUKnots()); surf->UMultiplicities(m); @@ -1105,7 +1105,7 @@ PyObject* BSplineSurfacePy::getUMultiplicities(PyObject *args) return Py::new_reference_to(mults); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1116,7 +1116,7 @@ PyObject* BSplineSurfacePy::getVMultiplicities(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfInteger m(1,surf->NbVKnots()); surf->VMultiplicities(m); @@ -1127,7 +1127,7 @@ PyObject* BSplineSurfacePy::getVMultiplicities(PyObject *args) return Py::new_reference_to(mults); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1138,7 +1138,7 @@ PyObject* BSplineSurfacePy::exchangeUV(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); surf->ExchangeUV(); Py_Return; @@ -1151,13 +1151,13 @@ PyObject* BSplineSurfacePy::uIso(PyObject * args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->UIso(u); - return new BSplineCurvePy(new GeomBSplineCurve(Handle_Geom_BSplineCurve::DownCast(c))); + Handle(Geom_Curve) c = surf->UIso(u); + return new BSplineCurvePy(new GeomBSplineCurve(Handle(Geom_BSplineCurve)::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; } @@ -1170,13 +1170,13 @@ PyObject* BSplineSurfacePy::vIso(PyObject * args) return 0; try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->VIso(v); - return new BSplineCurvePy(new GeomBSplineCurve(Handle_Geom_BSplineCurve::DownCast(c))); + Handle(Geom_Curve) c = surf->VIso(v); + return new BSplineCurvePy(new GeomBSplineCurve(Handle(Geom_BSplineCurve)::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; } @@ -1194,14 +1194,14 @@ PyObject* BSplineSurfacePy::reparametrize(PyObject * args) v = std::max(v, 2); try { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); double maxU = surf->UKnot(surf->NbUKnots()); // 1.0 if normalized surface double maxV = surf->VKnot(surf->NbVKnots()); // 1.0 if normalized surface GeomBSplineSurface* geom = new GeomBSplineSurface(); - Handle_Geom_BSplineSurface spline = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) spline = Handle(Geom_BSplineSurface)::DownCast (geom->handle()); for (int i=1; iGetMessageString()); return 0; } @@ -1335,12 +1335,12 @@ PyObject* BSplineSurfacePy::approximate(PyObject *args, PyObject *kwds) // fallback to strandard method surInterpolation.Init(interpolationPoints, degMin, degMax, c, tol3d); } - Handle_Geom_BSplineSurface sur(surInterpolation.Surface()); + Handle(Geom_BSplineSurface) sur(surInterpolation.Surface()); this->getGeomBSplineSurfacePtr()->setHandle(sur); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string err = e->GetMessageString(); if (err.empty()) err = e->DynamicType()->Name(); PyErr_SetString(PartExceptionOCCError, err.c_str()); @@ -1403,12 +1403,12 @@ PyObject* BSplineSurfacePy::interpolate(PyObject *args) else { surInterpolation.Interpolate(zPoints, X0, dX, Y0, dY); } - Handle_Geom_BSplineSurface sur(surInterpolation.Surface()); + Handle(Geom_BSplineSurface) sur(surInterpolation.Surface()); this->getGeomBSplineSurfacePtr()->setHandle(sur); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string err = e->GetMessageString(); if (err.empty()) err = e->DynamicType()->Name(); PyErr_SetString(PartExceptionOCCError, err.c_str()); @@ -1557,7 +1557,7 @@ PyObject* BSplineSurfacePy::buildFromPolesMultsKnots(PyObject *args, PyObject *k (PyObject_Not(vperiodic) && sum_of_vmults - vdegree -1 != lv)) { Standard_Failure::Raise("number of poles and sum of mults mismatch"); } - Handle_Geom_BSplineSurface spline = new Geom_BSplineSurface(occpoles,occweights, + Handle(Geom_BSplineSurface) spline = new Geom_BSplineSurface(occpoles,occweights, occuknots,occvknots,occumults,occvmults,udegree,vdegree, PyObject_IsTrue(uperiodic) ? Standard_True : Standard_False, PyObject_IsTrue(vperiodic) ? Standard_True : Standard_False); @@ -1572,7 +1572,7 @@ PyObject* BSplineSurfacePy::buildFromPolesMultsKnots(PyObject *args, PyObject *k } catch (const Standard_Failure & ) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Standard_CString msg = e->GetMessageString(); PyErr_SetString(PartExceptionOCCError, msg ? msg : ""); return 0; @@ -1580,7 +1580,7 @@ PyObject* BSplineSurfacePy::buildFromPolesMultsKnots(PyObject *args, PyObject *k } Py::Long BSplineSurfacePy::getUDegree(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int deg = surf->UDegree(); return Py::Long(deg); @@ -1588,7 +1588,7 @@ Py::Long BSplineSurfacePy::getUDegree(void) const Py::Long BSplineSurfacePy::getVDegree(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int deg = surf->VDegree(); return Py::Long(deg); @@ -1596,42 +1596,42 @@ Py::Long BSplineSurfacePy::getVDegree(void) const Py::Long BSplineSurfacePy::getMaxDegree(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->MaxDegree()); } Py::Long BSplineSurfacePy::getNbUPoles(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbUPoles()); } Py::Long BSplineSurfacePy::getNbVPoles(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbVPoles()); } Py::Long BSplineSurfacePy::getNbUKnots(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbUKnots()); } Py::Long BSplineSurfacePy::getNbVKnots(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbVKnots()); } Py::Object BSplineSurfacePy::getFirstUKnotIndex(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int index = surf->FirstUKnotIndex(); return Py::Long(index); @@ -1639,7 +1639,7 @@ Py::Object BSplineSurfacePy::getFirstUKnotIndex(void) const Py::Object BSplineSurfacePy::getLastUKnotIndex(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int index = surf->LastUKnotIndex(); return Py::Long(index); @@ -1647,7 +1647,7 @@ Py::Object BSplineSurfacePy::getLastUKnotIndex(void) const Py::Object BSplineSurfacePy::getFirstVKnotIndex(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int index = surf->FirstVKnotIndex(); return Py::Long(index); @@ -1655,7 +1655,7 @@ Py::Object BSplineSurfacePy::getFirstVKnotIndex(void) const Py::Object BSplineSurfacePy::getLastVKnotIndex(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); int index = surf->LastVKnotIndex(); return Py::Long(index); @@ -1663,7 +1663,7 @@ Py::Object BSplineSurfacePy::getLastVKnotIndex(void) const Py::List BSplineSurfacePy::getUKnotSequence(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Integer m = 0; for (int i=1; i<= surf->NbUKnots(); i++) @@ -1679,7 +1679,7 @@ Py::List BSplineSurfacePy::getUKnotSequence(void) const Py::List BSplineSurfacePy::getVKnotSequence(void) const { - Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast + Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); Standard_Integer m = 0; for (int i=1; i<= surf->NbVKnots(); i++) diff --git a/src/Mod/Part/App/BezierCurvePyImp.cpp b/src/Mod/Part/App/BezierCurvePyImp.cpp index 302468c603..69c2c2b888 100644 --- a/src/Mod/Part/App/BezierCurvePyImp.cpp +++ b/src/Mod/Part/App/BezierCurvePyImp.cpp @@ -61,7 +61,7 @@ PyObject* BezierCurvePy::isRational(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = curve->IsRational(); return PyBool_FromLong(val ? 1 : 0); @@ -71,7 +71,7 @@ PyObject* BezierCurvePy::isPeriodic(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = curve->IsPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -81,7 +81,7 @@ PyObject* BezierCurvePy::isClosed(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = curve->IsClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -92,7 +92,7 @@ PyObject* BezierCurvePy::increase(PyObject * args) int degree; if (!PyArg_ParseTuple(args, "i", °ree)) return 0; - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); curve->Increase(degree); Py_Return; @@ -108,13 +108,13 @@ PyObject* BezierCurvePy::insertPoleAfter(PyObject * args) Base::Vector3d vec = static_cast(p)->value(); gp_Pnt pnt(vec.x, vec.y, vec.z); try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); curve->InsertPoleAfter(index,pnt,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -130,13 +130,13 @@ PyObject* BezierCurvePy::insertPoleBefore(PyObject * args) Base::Vector3d vec = static_cast(p)->value(); gp_Pnt pnt(vec.x, vec.y, vec.z); try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); curve->InsertPoleBefore(index,pnt,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -148,13 +148,13 @@ PyObject* BezierCurvePy::removePole(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); curve->RemovePole(index); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -166,13 +166,13 @@ PyObject* BezierCurvePy::segment(PyObject * args) if (!PyArg_ParseTuple(args, "dd", &u1,&u2)) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); curve->Segment(u1,u2); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -188,7 +188,7 @@ PyObject* BezierCurvePy::setPole(PyObject * args) Base::Vector3d vec = static_cast(p)->value(); gp_Pnt pnt(vec.x, vec.y, vec.z); try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); if (weight < 0.0) curve->SetPole(index,pnt); @@ -197,7 +197,7 @@ PyObject* BezierCurvePy::setPole(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -209,7 +209,7 @@ PyObject* BezierCurvePy::getPole(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles(), "Pole index out of range"); @@ -219,7 +219,7 @@ PyObject* BezierCurvePy::getPole(PyObject * args) return vec; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -230,7 +230,7 @@ PyObject* BezierCurvePy::getPoles(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); TColgp_Array1OfPnt p(1,curve->NbPoles()); curve->Poles(p); @@ -244,7 +244,7 @@ PyObject* BezierCurvePy::getPoles(PyObject * args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -265,12 +265,12 @@ PyObject* BezierCurvePy::setPoles(PyObject * args) poles.SetValue(index++, gp_Pnt(pole.x,pole.y,pole.z)); } - Handle_Geom_BezierCurve bezier = new Geom_BezierCurve(poles); + Handle(Geom_BezierCurve) bezier = new Geom_BezierCurve(poles); this->getGeomBezierCurvePtr()->setHandle(bezier); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -283,13 +283,13 @@ PyObject* BezierCurvePy::setWeight(PyObject * args) if (!PyArg_ParseTuple(args, "id", &index,&weight)) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); curve->SetWeight(index,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -301,7 +301,7 @@ PyObject* BezierCurvePy::getWeight(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles() , "Weight index out of range"); @@ -309,7 +309,7 @@ PyObject* BezierCurvePy::getWeight(PyObject * args) return Py_BuildValue("d", weight); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -320,7 +320,7 @@ PyObject* BezierCurvePy::getWeights(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); TColStd_Array1OfReal w(1,curve->NbPoles()); curve->Weights(w); @@ -331,7 +331,7 @@ PyObject* BezierCurvePy::getWeights(PyObject * args) return Py::new_reference_to(weights); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -343,42 +343,42 @@ PyObject* BezierCurvePy::getResolution(PyObject* args) if (!PyArg_ParseTuple(args, "d", &tol)) return 0; try { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); double utol; curve->Resolution(tol,utol); return Py_BuildValue("d",utol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } } Py::Long BezierCurvePy::getDegree(void) const { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->Degree()); } Py::Long BezierCurvePy::getMaxDegree(void) const { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->MaxDegree()); } Py::Long BezierCurvePy::getNbPoles(void) const { - Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) curve = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); return Py::Long(curve->NbPoles()); } Py::Object BezierCurvePy::getStartPoint(void) const { - Handle_Geom_BezierCurve c = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) c = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); gp_Pnt pnt = c->StartPoint(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -386,7 +386,7 @@ Py::Object BezierCurvePy::getStartPoint(void) const Py::Object BezierCurvePy::getEndPoint(void) const { - Handle_Geom_BezierCurve c = Handle_Geom_BezierCurve::DownCast + Handle(Geom_BezierCurve) c = Handle(Geom_BezierCurve)::DownCast (getGeometryPtr()->handle()); gp_Pnt pnt = c->EndPoint(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); diff --git a/src/Mod/Part/App/BezierSurfacePyImp.cpp b/src/Mod/Part/App/BezierSurfacePyImp.cpp index 973ef8dba8..07d651f406 100644 --- a/src/Mod/Part/App/BezierSurfacePyImp.cpp +++ b/src/Mod/Part/App/BezierSurfacePyImp.cpp @@ -66,7 +66,7 @@ PyObject* BezierSurfacePy::bounds(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Py::Tuple bound(4); Standard_Real u1,u2,v1,v2; @@ -83,7 +83,7 @@ PyObject* BezierSurfacePy::isURational(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsURational(); return PyBool_FromLong(val ? 1 : 0); @@ -94,7 +94,7 @@ PyObject* BezierSurfacePy::isVRational(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVRational(); return PyBool_FromLong(val ? 1 : 0); @@ -105,7 +105,7 @@ PyObject* BezierSurfacePy::isUPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsUPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -116,7 +116,7 @@ PyObject* BezierSurfacePy::isVPeriodic(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -127,7 +127,7 @@ PyObject* BezierSurfacePy::isUClosed(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsUClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -138,7 +138,7 @@ PyObject* BezierSurfacePy::isVClosed(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -150,13 +150,13 @@ PyObject* BezierSurfacePy::increase(PyObject *args) if (!PyArg_ParseTuple(args, "ii", &udegree, &vdegree)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->Increase(udegree, vdegree); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -179,7 +179,7 @@ PyObject* BezierSurfacePy::insertPoleColAfter(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->InsertPoleColAfter(vindex, poles); @@ -197,7 +197,7 @@ PyObject* BezierSurfacePy::insertPoleColAfter(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -220,7 +220,7 @@ PyObject* BezierSurfacePy::insertPoleRowAfter(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->InsertPoleRowAfter(uindex, poles); @@ -238,7 +238,7 @@ PyObject* BezierSurfacePy::insertPoleRowAfter(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -261,7 +261,7 @@ PyObject* BezierSurfacePy::insertPoleColBefore(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->InsertPoleColBefore(vindex, poles); @@ -279,7 +279,7 @@ PyObject* BezierSurfacePy::insertPoleColBefore(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -302,7 +302,7 @@ PyObject* BezierSurfacePy::insertPoleRowBefore(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->InsertPoleRowBefore(uindex, poles); @@ -320,7 +320,7 @@ PyObject* BezierSurfacePy::insertPoleRowBefore(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -332,13 +332,13 @@ PyObject* BezierSurfacePy::removePoleCol(PyObject *args) if (!PyArg_ParseTuple(args, "i",&vindex)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->RemovePoleCol(vindex); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -350,13 +350,13 @@ PyObject* BezierSurfacePy::removePoleRow(PyObject *args) if (!PyArg_ParseTuple(args, "i",&uindex)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->RemovePoleRow(uindex); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -368,13 +368,13 @@ PyObject* BezierSurfacePy::segment(PyObject *args) if (!PyArg_ParseTuple(args, "dddd",&u1,&u2,&v1,&v2)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->Segment(u1,u2,v1,v2); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -389,7 +389,7 @@ PyObject* BezierSurfacePy::setPole(PyObject *args) return 0; try { Base::Vector3d pole = static_cast(obj)->value(); - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (weight <= gp::Resolution()) surf->SetPole(uindex,vindex,gp_Pnt(pole.x,pole.y,pole.z)); @@ -398,7 +398,7 @@ PyObject* BezierSurfacePy::setPole(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -421,7 +421,7 @@ PyObject* BezierSurfacePy::setPoleCol(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->SetPoleCol(vindex, poles); @@ -439,7 +439,7 @@ PyObject* BezierSurfacePy::setPoleCol(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -462,7 +462,7 @@ PyObject* BezierSurfacePy::setPoleRow(PyObject *args) poles(index++) = gp_Pnt(v.x,v.y,v.z); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); if (obj2 == 0) { surf->SetPoleRow(uindex, poles); @@ -480,7 +480,7 @@ PyObject* BezierSurfacePy::setPoleRow(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -492,7 +492,7 @@ PyObject* BezierSurfacePy::getPole(PyObject *args) if (!PyArg_ParseTuple(args, "ii",&uindex,&vindex)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (uindex < 1 || uindex > surf->NbUPoles() || @@ -501,7 +501,7 @@ PyObject* BezierSurfacePy::getPole(PyObject *args) return new Base::VectorPy(Base::Vector3d(p.X(),p.Y(),p.Z())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -512,7 +512,7 @@ PyObject* BezierSurfacePy::getPoles(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); TColgp_Array2OfPnt p(1,surf->NbUPoles(),1,surf->NbVPoles()); surf->Poles(p); @@ -529,7 +529,7 @@ PyObject* BezierSurfacePy::getPoles(PyObject *args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -542,13 +542,13 @@ PyObject* BezierSurfacePy::setWeight(PyObject *args) if (!PyArg_ParseTuple(args, "iid",&uindex,&vindex,&weight)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->SetWeight(uindex,vindex,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -568,13 +568,13 @@ PyObject* BezierSurfacePy::setWeightCol(PyObject *args) weights(index++) = (double)Py::Float(*it); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->SetWeightCol(vindex, weights); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -594,13 +594,13 @@ PyObject* BezierSurfacePy::setWeightRow(PyObject *args) weights(index++) = (double)Py::Float(*it); } - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); surf->SetWeightRow(uindex, weights); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -612,7 +612,7 @@ PyObject* BezierSurfacePy::getWeight(PyObject *args) if (!PyArg_ParseTuple(args, "ii",&uindex,&vindex)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); Standard_OutOfRange_Raise_if (uindex < 1 || uindex > surf->NbUPoles() || @@ -621,7 +621,7 @@ PyObject* BezierSurfacePy::getWeight(PyObject *args) return Py_BuildValue("d", w); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -632,7 +632,7 @@ PyObject* BezierSurfacePy::getWeights(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); TColStd_Array2OfReal w(1,surf->NbUPoles(),1,surf->NbVPoles()); surf->Weights(w); @@ -647,7 +647,7 @@ PyObject* BezierSurfacePy::getWeights(PyObject *args) return Py::new_reference_to(weights); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -659,14 +659,14 @@ PyObject* BezierSurfacePy::getResolution(PyObject *args) if (!PyArg_ParseTuple(args, "d", &tol)) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); double utol, vtol; surf->Resolution(tol,utol,vtol); return Py_BuildValue("(dd)",utol,vtol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -678,14 +678,14 @@ PyObject* BezierSurfacePy::exchangeUV(PyObject *args) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); //FIXME: Crashes surf->ExchangeUV(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -698,13 +698,13 @@ PyObject* BezierSurfacePy::uIso(PyObject * args) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->UIso(u); - return new BezierCurvePy(new GeomBezierCurve(Handle_Geom_BezierCurve::DownCast(c))); + Handle(Geom_Curve) c = surf->UIso(u); + return new BezierCurvePy(new GeomBezierCurve(Handle(Geom_BezierCurve)::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; } @@ -717,48 +717,48 @@ PyObject* BezierSurfacePy::vIso(PyObject * args) return 0; try { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->VIso(v); - return new BezierCurvePy(new GeomBezierCurve(Handle_Geom_BezierCurve::DownCast(c))); + Handle(Geom_Curve) c = surf->VIso(v); + return new BezierCurvePy(new GeomBezierCurve(Handle(Geom_BezierCurve)::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; } } Py::Long BezierSurfacePy::getUDegree(void) const { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->UDegree()); } Py::Long BezierSurfacePy::getVDegree(void) const { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->VDegree()); } Py::Long BezierSurfacePy::getMaxDegree(void) const { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->MaxDegree()); } Py::Long BezierSurfacePy::getNbUPoles(void) const { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbUPoles()); } Py::Long BezierSurfacePy::getNbVPoles(void) const { - Handle_Geom_BezierSurface surf = Handle_Geom_BezierSurface::DownCast + Handle(Geom_BezierSurface) surf = Handle(Geom_BezierSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbVPoles()); } diff --git a/src/Mod/Part/App/CirclePyImp.cpp b/src/Mod/Part/App/CirclePyImp.cpp index 3906cca699..da7480d932 100644 --- a/src/Mod/Part/App/CirclePyImp.cpp +++ b/src/Mod/Part/App/CirclePyImp.cpp @@ -42,7 +42,7 @@ extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python std::string CirclePy::representation(void) const { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); gp_Ax1 axis = circle->Axis(); gp_Dir dir = axis.Direction(); gp_Pnt loc = axis.Location(); @@ -61,7 +61,7 @@ std::string CirclePy::representation(void) const PyObject *CirclePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper { // create a new instance of CirclePy and the Twin object - Handle_Geom_Circle circle = new Geom_Circle(gp_Circ()); + Handle(Geom_Circle) circle = new Geom_Circle(gp_Circ()); return new CirclePy(new GeomCircle(circle)); } @@ -74,7 +74,7 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_cd[] = {"Circle","Distance",NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_cd, &(CirclePy::Type), &pCirc, &dist)) { CirclePy* pcCircle = static_cast(pCirc); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast (pcCircle->getGeomCirclePtr()->handle()); GC_MakeCircle mc(circle->Circ(), dist); if (!mc.IsDone()) { @@ -82,7 +82,7 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Circle circ = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circ = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); circ->SetCirc(mc.Value()->Circ()); return 0; } @@ -105,7 +105,7 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); circle->SetCirc(mc.Value()->Circ()); return 0; } @@ -114,9 +114,9 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", keywords_c, &(CirclePy::Type), &pCirc)) { CirclePy* pcCircle = static_cast(pCirc); - Handle_Geom_Circle circ1 = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) circ1 = Handle(Geom_Circle)::DownCast (pcCircle->getGeomCirclePtr()->handle()); - Handle_Geom_Circle circ2 = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) circ2 = Handle(Geom_Circle)::DownCast (this->getGeomCirclePtr()->handle()); circ2->SetCirc(circ1->Circ()); return 0; @@ -139,7 +139,7 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); circle->SetCirc(mc.Value()->Circ()); return 0; } @@ -148,7 +148,7 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_n[] = {NULL}; PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); circle->SetRadius(1.0); return 0; } @@ -164,13 +164,13 @@ int CirclePy::PyInit(PyObject* args, PyObject* kwds) Py::Float CirclePy::getRadius(void) const { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); return Py::Float(circle->Radius()); } void CirclePy::setRadius(Py::Float arg) { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(getGeomCirclePtr()->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(getGeomCirclePtr()->handle()); circle->SetRadius((double)arg); } diff --git a/src/Mod/Part/App/ConePyImp.cpp b/src/Mod/Part/App/ConePyImp.cpp index 5811d85dd7..508d237182 100644 --- a/src/Mod/Part/App/ConePyImp.cpp +++ b/src/Mod/Part/App/ConePyImp.cpp @@ -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(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(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(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(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()); diff --git a/src/Mod/Part/App/ConicPyImp.cpp b/src/Mod/Part/App/ConicPyImp.cpp index 45d5bb9872..755ff5db6a 100644 --- a/src/Mod/Part/App/ConicPyImp.cpp +++ b/src/Mod/Part/App/ConicPyImp.cpp @@ -57,14 +57,14 @@ int ConicPy::PyInit(PyObject* /*args*/, PyObject* /*kwds*/) Py::Object ConicPy::getCenter(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Pnt loc = conic->Location(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } Py::Object ConicPy::getLocation(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Pnt loc = conic->Location(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } @@ -105,7 +105,7 @@ void ConicPy::setLocation(Py::Object arg) Py::Float ConicPy::getEccentricity(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); return Py::Float(conic->Eccentricity()); } @@ -121,7 +121,7 @@ void ConicPy::setAngleXU(Py::Float arg) Py::Object ConicPy::getAxis(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Ax1 axis = conic->Axis(); gp_Dir dir = axis.Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -143,7 +143,7 @@ void ConicPy::setAxis(Py::Object arg) throw Py::TypeError(error); } - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); try { gp_Ax1 axis; axis.SetLocation(conic->Location()); @@ -157,7 +157,7 @@ void ConicPy::setAxis(Py::Object arg) Py::Object ConicPy::getXAxis(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Ax1 axis = conic->XAxis(); gp_Dir dir = axis.Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -179,7 +179,7 @@ void ConicPy::setXAxis(Py::Object arg) throw Py::TypeError(error); } - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); try { gp_Ax2 pos; pos = conic->Position(); @@ -193,7 +193,7 @@ void ConicPy::setXAxis(Py::Object arg) Py::Object ConicPy::getYAxis(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); gp_Ax1 axis = conic->YAxis(); gp_Dir dir = axis.Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -215,7 +215,7 @@ void ConicPy::setYAxis(Py::Object arg) throw Py::TypeError(error); } - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(getGeomConicPtr()->handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(getGeomConicPtr()->handle()); try { gp_Ax2 pos; pos = conic->Position(); diff --git a/src/Mod/Part/App/CylinderPyImp.cpp b/src/Mod/Part/App/CylinderPyImp.cpp index 786503511d..e6cb1dd458 100644 --- a/src/Mod/Part/App/CylinderPyImp.cpp +++ b/src/Mod/Part/App/CylinderPyImp.cpp @@ -69,7 +69,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_cd[] = {"Cylinder","Distance",NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_cd, &(CylinderPy::Type), &pCyl, &dist)) { CylinderPy* pcCylinder = static_cast(pCyl); - Handle_Geom_CylindricalSurface cylinder = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cylinder = Handle(Geom_CylindricalSurface)::DownCast (pcCylinder->getGeomCylinderPtr()->handle()); GC_MakeCylindricalSurface mc(cylinder->Cylinder(), dist); if (!mc.IsDone()) { @@ -77,7 +77,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetCylinder(mc.Value()->Cylinder()); return 0; @@ -87,9 +87,9 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", keywords_c, &(CylinderPy::Type), &pCyl)) { CylinderPy* pcCylinder = static_cast(pCyl); - Handle_Geom_CylindricalSurface cyl1 = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl1 = Handle(Geom_CylindricalSurface)::DownCast (pcCylinder->getGeomCylinderPtr()->handle()); - Handle_Geom_CylindricalSurface cyl2 = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl2 = Handle(Geom_CylindricalSurface)::DownCast (this->getGeomCylinderPtr()->handle()); cyl2->SetCylinder(cyl1->Cylinder()); return 0; @@ -113,7 +113,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetCylinder(mc.Value()->Cylinder()); return 0; @@ -124,7 +124,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) PyObject *pCirc; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", keywords_cc, &(CirclePy::Type), &pCirc)) { CirclePy* pcCircle = static_cast(pCirc); - Handle_Geom_Circle circ = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) circ = Handle(Geom_Circle)::DownCast (pcCircle->getGeomCirclePtr()->handle()); GC_MakeCylindricalSurface mc(circ->Circ()); if (!mc.IsDone()) { @@ -132,7 +132,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetCylinder(mc.Value()->Cylinder()); return 0; @@ -141,7 +141,7 @@ int CylinderPy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_n[] = {NULL}; PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetRadius(1.0); return 0; @@ -164,14 +164,14 @@ PyObject* CylinderPy::uIso(PyObject * args) return 0; try { - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); - Handle_Geom_Curve c = cyl->UIso(v); - if (!Handle_Geom_Line::DownCast(c).IsNull()) { + Handle(Geom_Curve) c = cyl->UIso(v); + if (!Handle(Geom_Line)::DownCast(c).IsNull()) { 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(Handle_Geom_Line::DownCast(c)->Lin()); + this_curv->SetLin(Handle(Geom_Line)::DownCast(c)->Lin()); return new LinePy(line); } @@ -179,7 +179,7 @@ PyObject* CylinderPy::uIso(PyObject * args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -192,21 +192,21 @@ PyObject* CylinderPy::vIso(PyObject * args) return 0; try { - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); - Handle_Geom_Curve c = cyl->VIso(v); - if (!Handle_Geom_Circle::DownCast(c).IsNull()) { - return new CirclePy(new GeomCircle(Handle_Geom_Circle::DownCast(c))); + Handle(Geom_Curve) c = cyl->VIso(v); + if (!Handle(Geom_Circle)::DownCast(c).IsNull()) { + return new CirclePy(new GeomCircle(Handle(Geom_Circle)::DownCast(c))); } - if (!Handle_Geom_Ellipse::DownCast(c).IsNull()) { - return new EllipsePy(new GeomEllipse(Handle_Geom_Ellipse::DownCast(c))); + if (!Handle(Geom_Ellipse)::DownCast(c).IsNull()) { + return new EllipsePy(new GeomEllipse(Handle(Geom_Ellipse)::DownCast(c))); } PyErr_SetString(PyExc_NotImplementedError, "this type of conical curve is not implemented"); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -214,21 +214,21 @@ PyObject* CylinderPy::vIso(PyObject * args) Py::Float CylinderPy::getRadius(void) const { - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); return Py::Float(cyl->Radius()); } void CylinderPy::setRadius(Py::Float arg) { - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetRadius((double)arg); } Py::Object CylinderPy::getCenter(void) const { - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); gp_Pnt loc = cyl->Location(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); @@ -239,13 +239,13 @@ void CylinderPy::setCenter(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d loc = static_cast(p)->value(); - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetLocation(gp_Pnt(loc.x, loc.y, loc.z)); } else if (PyObject_TypeCheck(p, &PyTuple_Type)) { Base::Vector3d loc = Base::getVectorFromTuple(p); - Handle_Geom_CylindricalSurface cyl = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) cyl = Handle(Geom_CylindricalSurface)::DownCast (getGeomCylinderPtr()->handle()); cyl->SetLocation(gp_Pnt(loc.x, loc.y, loc.z)); } @@ -258,7 +258,7 @@ void CylinderPy::setCenter(Py::Object arg) Py::Object CylinderPy::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())); @@ -287,7 +287,7 @@ void CylinderPy::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()); diff --git a/src/Mod/Part/App/EllipsePyImp.cpp b/src/Mod/Part/App/EllipsePyImp.cpp index 266bd5206e..1941954599 100644 --- a/src/Mod/Part/App/EllipsePyImp.cpp +++ b/src/Mod/Part/App/EllipsePyImp.cpp @@ -57,7 +57,7 @@ int EllipsePy::PyInit(PyObject* args, PyObject* kwds) { char* keywords_n[] = {NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); ellipse->SetMajorRadius(2.0); ellipse->SetMinorRadius(1.0); return 0; @@ -68,9 +68,9 @@ int EllipsePy::PyInit(PyObject* args, PyObject* kwds) PyObject *pElips; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!",keywords_e, &(EllipsePy::Type), &pElips)) { EllipsePy* pEllipse = static_cast(pElips); - Handle_Geom_Ellipse Elips1 = Handle_Geom_Ellipse::DownCast + Handle(Geom_Ellipse) Elips1 = Handle(Geom_Ellipse)::DownCast (pEllipse->getGeomEllipsePtr()->handle()); - Handle_Geom_Ellipse Elips2 = Handle_Geom_Ellipse::DownCast + Handle(Geom_Ellipse) Elips2 = Handle(Geom_Ellipse)::DownCast (this->getGeomEllipsePtr()->handle()); Elips2->SetElips(Elips1->Elips()); return 0; @@ -94,7 +94,7 @@ int EllipsePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); ellipse->SetElips(me.Value()->Elips()); return 0; } @@ -114,7 +114,7 @@ int EllipsePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); ellipse->SetElips(me.Value()->Elips()); return 0; } @@ -129,44 +129,44 @@ int EllipsePy::PyInit(PyObject* args, PyObject* kwds) Py::Float EllipsePy::getMajorRadius(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); return Py::Float(ellipse->MajorRadius()); } void EllipsePy::setMajorRadius(Py::Float arg) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); ellipse->SetMajorRadius((double)arg); } Py::Float EllipsePy::getMinorRadius(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); return Py::Float(ellipse->MinorRadius()); } void EllipsePy::setMinorRadius(Py::Float arg) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); ellipse->SetMinorRadius((double)arg); } Py::Float EllipsePy::getFocal(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); return Py::Float(ellipse->Focal()); } Py::Object EllipsePy::getFocus1(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); gp_Pnt loc = ellipse->Focus1(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } Py::Object EllipsePy::getFocus2(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(getGeomEllipsePtr()->handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(getGeomEllipsePtr()->handle()); gp_Pnt loc = ellipse->Focus2(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } diff --git a/src/Mod/Part/App/FT2FC.cpp b/src/Mod/Part/App/FT2FC.cpp index 8b4518a7b4..5f6580c4e3 100644 --- a/src/Mod/Part/App/FT2FC.cpp +++ b/src/Mod/Part/App/FT2FC.cpp @@ -187,7 +187,7 @@ struct FTDC_Ctx { std::vector Edges; UNICHAR currchar; FT_Vector LastVert; - Handle_Geom_Surface surf; + Handle(Geom_Surface) surf; }; // move_cb called for start of new contour. pt is xy of contour start. diff --git a/src/Mod/Part/App/FaceMakerBullseye.h b/src/Mod/Part/App/FaceMakerBullseye.h index 619c60d6fc..39749ced4d 100644 --- a/src/Mod/Part/App/FaceMakerBullseye.h +++ b/src/Mod/Part/App/FaceMakerBullseye.h @@ -96,7 +96,7 @@ protected: private: gp_Pln myPlane; TopoDS_Face myFace; - Handle_Geom_Surface myHPlane; + Handle(Geom_Surface) myHPlane; }; }; diff --git a/src/Mod/Part/App/FaceMakerCheese.cpp b/src/Mod/Part/App/FaceMakerCheese.cpp index 2943f61211..7e098acb99 100644 --- a/src/Mod/Part/App/FaceMakerCheese.cpp +++ b/src/Mod/Part/App/FaceMakerCheese.cpp @@ -135,7 +135,7 @@ bool FaceMakerCheese::isInside(const TopoDS_Wire& wire1, const TopoDS_Wire& wire TopoDS_Face face = validateFace(mkFace.Face()); BRepAdaptor_Surface adapt(face); IntTools_FClass2d class2d(face, prec); - Handle_Geom_Surface surf = new Geom_Plane(adapt.Plane()); + Handle(Geom_Surface) surf = new Geom_Plane(adapt.Plane()); ShapeAnalysis_Surface as(surf); TopExp_Explorer xp(wire2,TopAbs_VERTEX); @@ -257,7 +257,7 @@ void FaceMakerCheese::Build_Essence() { TopoDS_Shape faces = makeFace(this->myWires); ShapeExtend_Explorer xp; - Handle_TopTools_HSequenceOfShape seq = xp.SeqFromCompound(faces, Standard_True); + Handle(TopTools_HSequenceOfShape) seq = xp.SeqFromCompound(faces, Standard_True); for(int i = 0 ; i < seq->Length() ; i++){ this->myShapesToReturn.push_back(seq->Value(i+1)); } diff --git a/src/Mod/Part/App/FeatureChamfer.cpp b/src/Mod/Part/App/FeatureChamfer.cpp index f4ec4658d3..538baafdf9 100644 --- a/src/Mod/Part/App/FeatureChamfer.cpp +++ b/src/Mod/Part/App/FeatureChamfer.cpp @@ -87,7 +87,7 @@ App::DocumentObjectExecReturn *Chamfer::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/FeatureCompound.cpp b/src/Mod/Part/App/FeatureCompound.cpp index 3b58288f06..8bbc6db519 100644 --- a/src/Mod/Part/App/FeatureCompound.cpp +++ b/src/Mod/Part/App/FeatureCompound.cpp @@ -96,7 +96,7 @@ App::DocumentObjectExecReturn *Compound::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/FeatureExtrusion.cpp b/src/Mod/Part/App/FeatureExtrusion.cpp index 4cd71f8964..6a4c750346 100644 --- a/src/Mod/Part/App/FeatureExtrusion.cpp +++ b/src/Mod/Part/App/FeatureExtrusion.cpp @@ -339,7 +339,7 @@ App::DocumentObjectExecReturn *Extrusion::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/FeatureFillet.cpp b/src/Mod/Part/App/FeatureFillet.cpp index daff992c6a..241599a1a0 100644 --- a/src/Mod/Part/App/FeatureFillet.cpp +++ b/src/Mod/Part/App/FeatureFillet.cpp @@ -86,7 +86,7 @@ App::DocumentObjectExecReturn *Fillet::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } catch (...) { diff --git a/src/Mod/Part/App/FeatureMirroring.cpp b/src/Mod/Part/App/FeatureMirroring.cpp index 24db416201..e95ce544b1 100644 --- a/src/Mod/Part/App/FeatureMirroring.cpp +++ b/src/Mod/Part/App/FeatureMirroring.cpp @@ -98,7 +98,7 @@ App::DocumentObjectExecReturn *Mirroring::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/FeaturePartBox.cpp b/src/Mod/Part/App/FeaturePartBox.cpp index fb1e746076..606dc4da3e 100644 --- a/src/Mod/Part/App/FeaturePartBox.cpp +++ b/src/Mod/Part/App/FeaturePartBox.cpp @@ -77,7 +77,7 @@ App::DocumentObjectExecReturn *Box::execute(void) this->Shape.setValue(ResultShape); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } diff --git a/src/Mod/Part/App/FeaturePartCommon.cpp b/src/Mod/Part/App/FeaturePartCommon.cpp index c70dad2cdb..ffaffc8274 100644 --- a/src/Mod/Part/App/FeaturePartCommon.cpp +++ b/src/Mod/Part/App/FeaturePartCommon.cpp @@ -174,7 +174,7 @@ App::DocumentObjectExecReturn *MultiCommon::execute(void) this->History.setValues(history); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/FeaturePartFuse.cpp b/src/Mod/Part/App/FeaturePartFuse.cpp index 56ede6b8a0..5df58b829e 100644 --- a/src/Mod/Part/App/FeaturePartFuse.cpp +++ b/src/Mod/Part/App/FeaturePartFuse.cpp @@ -199,7 +199,7 @@ App::DocumentObjectExecReturn *MultiFuse::execute(void) this->History.setValues(history); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/FeatureRevolution.cpp b/src/Mod/Part/App/FeatureRevolution.cpp index 73f7c5dbf2..b624277651 100644 --- a/src/Mod/Part/App/FeatureRevolution.cpp +++ b/src/Mod/Part/App/FeatureRevolution.cpp @@ -201,7 +201,7 @@ App::DocumentObjectExecReturn *Revolution::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp index 5511225bb9..5ab062450b 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfCircle2dPyImp.cpp @@ -62,7 +62,7 @@ int ArcOfCircle2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::Circle2dPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast (static_cast(o)->getGeom2dCirclePtr()->handle()); GCE2d_MakeArcOfCircle arc(circle->Circ2d(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -74,7 +74,7 @@ int ArcOfCircle2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -123,8 +123,8 @@ void ArcOfCircle2dPy::setRadius(Py::Float arg) Py::Object ArcOfCircle2dPy::getCircle(void) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(curve->BasisCurve()); return Py::asObject(new Circle2dPy(new Geom2dCircle(circle))); } diff --git a/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp index f7588bcf10..2478abf2a1 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfConic2dPyImp.cpp @@ -76,15 +76,15 @@ void ArcOfConic2dPy::setLocation(Py::Object arg) Py::Float ArcOfConic2dPy::getEccentricity(void) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); return Py::Float(conic->Eccentricity()); } Py::Object ArcOfConic2dPy::getXAxis(void) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); gp_Dir2d xdir = conic->XAxis().Direction(); Py::Module module("__FreeCADBase__"); Py::Callable method(module.getAttr("Vector2d")); @@ -96,8 +96,8 @@ Py::Object ArcOfConic2dPy::getXAxis(void) const void ArcOfConic2dPy::setXAxis(Py::Object arg) { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); Base::Vector2d dir = Py::Vector2d(arg.ptr()).getCxxObject()->value(); gp_Ax2d xaxis = conic->XAxis(); xaxis.SetDirection(gp_Dir2d(dir.x, dir.y)); @@ -106,8 +106,8 @@ void ArcOfConic2dPy::setXAxis(Py::Object arg) Py::Object ArcOfConic2dPy::getYAxis(void) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); gp_Dir2d ydir = conic->YAxis().Direction(); Py::Module module("__FreeCADBase__"); Py::Callable method(module.getAttr("Vector2d")); @@ -119,8 +119,8 @@ Py::Object ArcOfConic2dPy::getYAxis(void) const void ArcOfConic2dPy::setYAxis(Py::Object arg) { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); Base::Vector2d dir = Py::Vector2d(arg.ptr()).getCxxObject()->value(); gp_Ax2d yaxis = conic->YAxis(); yaxis.SetDirection(gp_Dir2d(dir.x, dir.y)); diff --git a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp index acf8556bde..536a80f799 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfEllipse2dPyImp.cpp @@ -62,7 +62,7 @@ int ArcOfEllipse2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::Ellipse2dPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast (static_cast(o)->getGeom2dEllipsePtr()->handle()); GCE2d_MakeArcOfEllipse arc(ellipse->Elips2d(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -74,7 +74,7 @@ int ArcOfEllipse2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -112,8 +112,8 @@ void ArcOfEllipse2dPy::setMinorRadius(Py::Float arg) Py::Object ArcOfEllipse2dPy::getEllipse(void) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(getGeom2dArcOfConicPtr()->handle()); - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(getGeom2dArcOfConicPtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(curve->BasisCurve()); return Py::asObject(new Ellipse2dPy(new Geom2dEllipse(ellipse))); } diff --git a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp index 66fd922ab8..678a9dc92e 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp @@ -62,7 +62,7 @@ int ArcOfHyperbola2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::Hyperbola2dPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast (static_cast(o)->getGeom2dHyperbolaPtr()->handle()); GCE2d_MakeArcOfHyperbola arc(hyperbola->Hypr2d(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -74,7 +74,7 @@ int ArcOfHyperbola2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -112,9 +112,9 @@ void ArcOfHyperbola2dPy::setMinorRadius(Py::Float arg) Py::Object ArcOfHyperbola2dPy::getHyperbola(void) const { - Handle_Geom2d_TrimmedCurve trim = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) trim = Handle(Geom2d_TrimmedCurve)::DownCast (getGeom2dArcOfHyperbolaPtr()->handle()); - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(trim->BasisCurve()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(trim->BasisCurve()); return Py::asObject(new Hyperbola2dPy(new Geom2dHyperbola(hyperbola))); } diff --git a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp index 66f9cf03e8..ac65b61099 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfParabola2dPyImp.cpp @@ -61,7 +61,7 @@ int ArcOfParabola2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) PyObject *sense=Py_True; if (PyArg_ParseTuple(args, "O!dd|O!", &(Part::Parabola2dPy::Type), &o, &u1, &u2, &PyBool_Type, &sense)) { try { - Handle_Geom2d_Parabola parabola = Handle_Geom2d_Parabola::DownCast + Handle(Geom2d_Parabola) parabola = Handle(Geom2d_Parabola)::DownCast (static_cast(o)->getGeom2dParabolaPtr()->handle()); GCE2d_MakeArcOfParabola arc(parabola->Parab2d(), u1, u2, PyObject_IsTrue(sense) ? Standard_True : Standard_False); if (!arc.IsDone()) { @@ -73,7 +73,7 @@ int ArcOfParabola2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -101,9 +101,9 @@ void ArcOfParabola2dPy::setFocal(Py::Float arg) Py::Object ArcOfParabola2dPy::getParabola(void) const { - Handle_Geom2d_TrimmedCurve trim = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) trim = Handle(Geom2d_TrimmedCurve)::DownCast (getGeom2dArcOfParabolaPtr()->handle()); - Handle_Geom2d_Parabola parabola = Handle_Geom2d_Parabola::DownCast(trim->BasisCurve()); + Handle(Geom2d_Parabola) parabola = Handle(Geom2d_Parabola)::DownCast(trim->BasisCurve()); return Py::asObject(new Parabola2dPy(new Geom2dParabola(parabola))); } diff --git a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp index 7553844d4b..6d47e30251 100644 --- a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp @@ -79,7 +79,7 @@ PyObject* BSplineCurve2dPy::isRational(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean val = curve->IsRational(); return PyBool_FromLong(val ? 1 : 0); @@ -89,7 +89,7 @@ PyObject* BSplineCurve2dPy::isPeriodic(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean val = curve->IsPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -99,7 +99,7 @@ PyObject* BSplineCurve2dPy::isClosed(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean val = curve->IsClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -111,13 +111,13 @@ PyObject* BSplineCurve2dPy::increaseDegree(PyObject * args) if (!PyArg_ParseTuple(args, "i", °ree)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->IncreaseDegree(degree); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -131,7 +131,7 @@ PyObject* BSplineCurve2dPy::increaseMultiplicity(PyObject * args) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); if (mult == -1) { mult = end; @@ -144,7 +144,7 @@ PyObject* BSplineCurve2dPy::increaseMultiplicity(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -157,12 +157,12 @@ PyObject* BSplineCurve2dPy::incrementMultiplicity(PyObject * args) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->IncrementMultiplicity(start, end, mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -178,12 +178,12 @@ PyObject* BSplineCurve2dPy::insertKnot(PyObject * args) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->InsertKnot(U,M,tol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -222,13 +222,13 @@ PyObject* BSplineCurve2dPy::insertKnots(PyObject * args) m(index++) = (int)val; } - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->InsertKnots(k,m,tol,PyObject_IsTrue(add) ? Standard_True : Standard_False); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -244,13 +244,13 @@ PyObject* BSplineCurve2dPy::removeKnot(PyObject * args) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean ok = curve->RemoveKnot(Index,M,tol); return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -262,13 +262,13 @@ PyObject* BSplineCurve2dPy::segment(PyObject * args) if (!PyArg_ParseTuple(args, "dd", &u1,&u2)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->Segment(u1,u2); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -281,7 +281,7 @@ PyObject* BSplineCurve2dPy::setKnot(PyObject * args) if (!PyArg_ParseTuple(args, "id|i", &Index, &K, &M)) return 0; - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); if (M == -1) { curve->SetKnot(Index, K); @@ -299,7 +299,7 @@ PyObject* BSplineCurve2dPy::getKnot(PyObject * args) if (!PyArg_ParseTuple(args, "i", &Index)) return 0; - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); double M = curve->Knot(Index); @@ -320,13 +320,13 @@ PyObject* BSplineCurve2dPy::setKnots(PyObject * args) k(index++) = (double)val; } - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->SetKnots(k); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -337,7 +337,7 @@ PyObject* BSplineCurve2dPy::getKnots(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); TColStd_Array1OfReal w(1,curve->NbKnots()); curve->Knots(w); @@ -348,7 +348,7 @@ PyObject* BSplineCurve2dPy::getKnots(PyObject * args) return Py::new_reference_to(knots); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -364,7 +364,7 @@ PyObject* BSplineCurve2dPy::setPole(PyObject * args) Base::Vector2d vec = Py::Vector2d(p).getCxxObject()->value(); gp_Pnt2d pnt(vec.x, vec.y); try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); if (weight < 0.0) curve->SetPole(index,pnt); @@ -373,7 +373,7 @@ PyObject* BSplineCurve2dPy::setPole(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -385,7 +385,7 @@ PyObject* BSplineCurve2dPy::getPole(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles(), "Pole index out of range"); @@ -399,7 +399,7 @@ PyObject* BSplineCurve2dPy::getPole(PyObject * args) return Py::new_reference_to(method.apply(arg)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -410,7 +410,7 @@ PyObject* BSplineCurve2dPy::getPoles(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); TColgp_Array1OfPnt2d p(1, (int)curve->NbPoles()); curve->Poles(p); @@ -429,7 +429,7 @@ PyObject* BSplineCurve2dPy::getPoles(PyObject * args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -440,7 +440,7 @@ PyObject* BSplineCurve2dPy::getPolesAndWeights(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); TColgp_Array1OfPnt2d p(1,curve->NbPoles()); curve->Poles(p); @@ -460,7 +460,7 @@ PyObject* BSplineCurve2dPy::getPolesAndWeights(PyObject * args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -473,13 +473,13 @@ PyObject* BSplineCurve2dPy::setWeight(PyObject * args) if (!PyArg_ParseTuple(args, "id", &index,&weight)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->SetWeight(index,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -491,7 +491,7 @@ PyObject* BSplineCurve2dPy::getWeight(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles() , "Weight index out of range"); @@ -499,7 +499,7 @@ PyObject* BSplineCurve2dPy::getWeight(PyObject * args) return Py_BuildValue("d", weight); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -510,7 +510,7 @@ PyObject* BSplineCurve2dPy::getWeights(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); TColStd_Array1OfReal w(1,curve->NbPoles()); curve->Weights(w); @@ -521,7 +521,7 @@ PyObject* BSplineCurve2dPy::getWeights(PyObject * args) return Py::new_reference_to(weights); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -533,14 +533,14 @@ PyObject* BSplineCurve2dPy::getResolution(PyObject * args) if (!PyArg_ParseTuple(args, "d", &tol)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); double utol; curve->Resolution(tol,utol); return Py_BuildValue("d",utol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -555,14 +555,14 @@ PyObject* BSplineCurve2dPy::movePoint(PyObject * args) return 0; try { Base::Vector2d p = Py::Vector2d(pnt).getCxxObject()->value(); - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); int first, last; curve->MovePoint(U, gp_Pnt2d(p.x,p.y), index1, index2, first, last); return Py_BuildValue("(ii)",first, last); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -573,13 +573,13 @@ PyObject* BSplineCurve2dPy::setNotPeriodic(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->SetNotPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -590,13 +590,13 @@ PyObject* BSplineCurve2dPy::setPeriodic(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->SetPeriodic(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -608,13 +608,13 @@ PyObject* BSplineCurve2dPy::setOrigin(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); curve->SetOrigin(index); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -626,13 +626,13 @@ PyObject* BSplineCurve2dPy::getMultiplicity(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); int mult = curve->Multiplicity(index); return Py_BuildValue("i", mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -643,7 +643,7 @@ PyObject* BSplineCurve2dPy::getMultiplicities(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); TColStd_Array1OfInteger m(1,curve->NbKnots()); curve->Multiplicities(m); @@ -658,7 +658,7 @@ PyObject* BSplineCurve2dPy::getMultiplicities(PyObject * args) return Py::new_reference_to(mults); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -666,35 +666,35 @@ PyObject* BSplineCurve2dPy::getMultiplicities(PyObject * args) Py::Long BSplineCurve2dPy::getDegree(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->Degree()); } Py::Long BSplineCurve2dPy::getMaxDegree(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->MaxDegree()); } Py::Long BSplineCurve2dPy::getNbPoles(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->NbPoles()); } Py::Long BSplineCurve2dPy::getNbKnots(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->NbKnots()); } Py::Object BSplineCurve2dPy::getStartPoint(void) const { - Handle_Geom2d_BSplineCurve c = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) c = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); gp_Pnt2d pnt = c->StartPoint(); @@ -708,7 +708,7 @@ Py::Object BSplineCurve2dPy::getStartPoint(void) const Py::Object BSplineCurve2dPy::getEndPoint(void) const { - Handle_Geom2d_BSplineCurve c = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) c = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); gp_Pnt2d pnt = c->EndPoint(); @@ -722,7 +722,7 @@ Py::Object BSplineCurve2dPy::getEndPoint(void) const Py::Object BSplineCurve2dPy::getFirstUKnotIndex(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); #if PY_MAJOR_VERSION >= 3 return Py::Long(curve->FirstUKnotIndex()); @@ -733,7 +733,7 @@ Py::Object BSplineCurve2dPy::getFirstUKnotIndex(void) const Py::Object BSplineCurve2dPy::getLastUKnotIndex(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); #if PY_MAJOR_VERSION >= 3 return Py::Long(curve->LastUKnotIndex()); @@ -744,7 +744,7 @@ Py::Object BSplineCurve2dPy::getLastUKnotIndex(void) const Py::List BSplineCurve2dPy::getKnotSequence(void) const { - Handle_Geom2d_BSplineCurve curve = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) curve = Handle(Geom2d_BSplineCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Integer m = 0; if (curve->IsPeriodic()) { @@ -785,7 +785,7 @@ PyObject* BSplineCurve2dPy::toBiArcs(PyObject * args) return Py::new_reference_to(list); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -853,7 +853,7 @@ PyObject* BSplineCurve2dPy::approximate(PyObject *args, PyObject *kwds) } Geom2dAPI_PointsToBSpline fit(pnts, weight1, weight2, weight3, degMax, c, tol3d); - Handle_Geom2d_BSplineCurve spline = fit.Curve(); + Handle(Geom2d_BSplineCurve) spline = fit.Curve(); if (!spline.IsNull()) { this->getGeom2dBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -874,7 +874,7 @@ PyObject* BSplineCurve2dPy::approximate(PyObject *args, PyObject *kwds) } Geom2dAPI_PointsToBSpline fit(pnts, parameters, degMin, degMax, c, tol3d); - Handle_Geom2d_BSplineCurve spline = fit.Curve(); + Handle(Geom2d_BSplineCurve) spline = fit.Curve(); if (!spline.IsNull()) { this->getGeom2dBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -895,7 +895,7 @@ PyObject* BSplineCurve2dPy::approximate(PyObject *args, PyObject *kwds) pt = Approx_ChordLength; Geom2dAPI_PointsToBSpline fit(pnts, pt, degMin, degMax, c, tol3d); - Handle_Geom2d_BSplineCurve spline = fit.Curve(); + Handle(Geom2d_BSplineCurve) spline = fit.Curve(); if (!spline.IsNull()) { this->getGeom2dBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -906,7 +906,7 @@ PyObject* BSplineCurve2dPy::approximate(PyObject *args, PyObject *kwds) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1003,7 +1003,7 @@ PyObject* BSplineCurve2dPy::interpolate(PyObject *args, PyObject *kwds) try { Py::Sequence list(obj); - Handle_TColgp_HArray1OfPnt2d interpolationPoints = new TColgp_HArray1OfPnt2d(1, list.size()); + Handle(TColgp_HArray1OfPnt2d) interpolationPoints = new TColgp_HArray1OfPnt2d(1, list.size()); Standard_Integer index = 1; for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) { Base::Vector2d pnt = Py::Vector2d(*it).getCxxObject()->value(); @@ -1014,7 +1014,7 @@ PyObject* BSplineCurve2dPy::interpolate(PyObject *args, PyObject *kwds) Standard_Failure::Raise("not enough points given"); } - Handle_TColStd_HArray1OfReal parameters; + Handle(TColStd_HArray1OfReal) parameters; if (par) { Py::Sequence plist(par); parameters = new TColStd_HArray1OfReal(1, plist.size()); @@ -1051,7 +1051,7 @@ PyObject* BSplineCurve2dPy::interpolate(PyObject *args, PyObject *kwds) } Py::Sequence flist(fl); - Handle_TColStd_HArray1OfBoolean tangentFlags = new TColStd_HArray1OfBoolean(1, flist.size()); + Handle(TColStd_HArray1OfBoolean) tangentFlags = new TColStd_HArray1OfBoolean(1, flist.size()); Standard_Integer findex = 1; for (Py::Sequence::iterator it = flist.begin(); it != flist.end(); ++it) { Py::Boolean flag(*it); @@ -1063,7 +1063,7 @@ PyObject* BSplineCurve2dPy::interpolate(PyObject *args, PyObject *kwds) aBSplineInterpolation->Perform(); if (aBSplineInterpolation->IsDone()) { - Handle_Geom2d_BSplineCurve aBSplineCurve(aBSplineInterpolation->Curve()); + Handle(Geom2d_BSplineCurve) aBSplineCurve(aBSplineInterpolation->Curve()); this->getGeom2dBSplineCurvePtr()->setHandle(aBSplineCurve); Py_Return; } @@ -1073,7 +1073,7 @@ PyObject* BSplineCurve2dPy::interpolate(PyObject *args, PyObject *kwds) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string err = e->GetMessageString(); if (err.empty()) err = e->DynamicType()->Name(); PyErr_SetString(PartExceptionOCCError, err.c_str()); @@ -1121,7 +1121,7 @@ PyObject* BSplineCurve2dPy::buildFromPoles(PyObject *args) mults.SetValue(1, mult); mults.SetValue(knots.Length(), mult); - Handle_Geom2d_BSplineCurve spline = new Geom2d_BSplineCurve(poles, knots, mults, degree, Standard_True); + Handle(Geom2d_BSplineCurve) spline = new Geom2d_BSplineCurve(poles, knots, mults, degree, Standard_True); if (!spline.IsNull()) { this->getGeom2dBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -1141,7 +1141,7 @@ PyObject* BSplineCurve2dPy::buildFromPoles(PyObject *args) mults.SetValue(1, degree+1); mults.SetValue(knots.Length(), degree+1); - Handle_Geom2d_BSplineCurve spline = new Geom2d_BSplineCurve(poles, knots, mults, degree, Standard_False); + Handle(Geom2d_BSplineCurve) spline = new Geom2d_BSplineCurve(poles, knots, mults, degree, Standard_False); if (!spline.IsNull()) { this->getGeom2dBSplineCurvePtr()->setHandle(spline); Py_Return; @@ -1153,7 +1153,7 @@ PyObject* BSplineCurve2dPy::buildFromPoles(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1283,7 +1283,7 @@ PyObject* BSplineCurve2dPy::buildFromPolesMultsKnots(PyObject *args, PyObject *k return(0); } - Handle_Geom2d_BSplineCurve spline = new Geom2d_BSplineCurve(occpoles,occweights,occknots,occmults,degree, + Handle(Geom2d_BSplineCurve) spline = new Geom2d_BSplineCurve(occpoles,occweights,occknots,occmults,degree, PyObject_IsTrue(periodic) ? Standard_True : Standard_False); if (!spline.IsNull()) { this->getGeom2dBSplineCurvePtr()->setHandle(spline); @@ -1295,7 +1295,7 @@ PyObject* BSplineCurve2dPy::buildFromPolesMultsKnots(PyObject *args, PyObject *k } } catch (const Standard_Failure & ) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); Standard_CString msg = e->GetMessageString(); PyErr_SetString(PartExceptionOCCError, msg ? msg : ""); return 0; @@ -1307,14 +1307,14 @@ PyObject* BSplineCurve2dPy::toBezier(PyObject *args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BSplineCurve spline = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) spline = Handle(Geom2d_BSplineCurve)::DownCast (this->getGeom2dBSplineCurvePtr()->handle()); Geom2dConvert_BSplineCurveToBezierCurve crt(spline); Py::List list; Standard_Integer arcs = crt.NbArcs(); for (Standard_Integer i=1; i<=arcs; i++) { - Handle_Geom2d_BezierCurve bezier = crt.Arc(i); + Handle(Geom2d_BezierCurve) bezier = crt.Arc(i); list.append(Py::asObject(new BezierCurve2dPy(new Geom2dBezierCurve(bezier)))); } @@ -1329,7 +1329,7 @@ PyObject* BSplineCurve2dPy::join(PyObject *args) Geom2dBSplineCurve* curve1 = this->getGeom2dBSplineCurvePtr(); BSplineCurve2dPy* curve2 = static_cast(c); - Handle_Geom2d_BSplineCurve spline = Handle_Geom2d_BSplineCurve::DownCast + Handle(Geom2d_BSplineCurve) spline = Handle(Geom2d_BSplineCurve)::DownCast (curve2->getGeom2dBSplineCurvePtr()->handle()); bool ok = curve1->join(spline); @@ -1349,7 +1349,7 @@ PyObject* BSplineCurve2dPy::makeC1Continuous(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string err = e->GetMessageString(); if (err.empty()) err = e->DynamicType()->Name(); PyErr_SetString(PartExceptionOCCError, err.c_str()); diff --git a/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp index 002d139d28..ee896c34c6 100644 --- a/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/BezierCurve2dPyImp.cpp @@ -60,7 +60,7 @@ PyObject* BezierCurve2dPy::isRational(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean val = curve->IsRational(); return PyBool_FromLong(val ? 1 : 0); @@ -70,7 +70,7 @@ PyObject* BezierCurve2dPy::isPeriodic(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean val = curve->IsPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -80,7 +80,7 @@ PyObject* BezierCurve2dPy::isClosed(PyObject *args) { if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_Boolean val = curve->IsClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -91,7 +91,7 @@ PyObject* BezierCurve2dPy::increase(PyObject * args) int degree; if (!PyArg_ParseTuple(args, "i", °ree)) return 0; - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); curve->Increase(degree); Py_Return; @@ -107,13 +107,13 @@ PyObject* BezierCurve2dPy::insertPoleAfter(PyObject * args) Base::Vector2d vec = Py::Vector2d(p).getCxxObject()->value(); gp_Pnt2d pnt(vec.x, vec.y); try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); curve->InsertPoleAfter(index,pnt,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -129,13 +129,13 @@ PyObject* BezierCurve2dPy::insertPoleBefore(PyObject * args) Base::Vector2d vec = Py::Vector2d(p).getCxxObject()->value(); gp_Pnt2d pnt(vec.x, vec.y); try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); curve->InsertPoleBefore(index,pnt,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -147,13 +147,13 @@ PyObject* BezierCurve2dPy::removePole(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); curve->RemovePole(index); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -165,13 +165,13 @@ PyObject* BezierCurve2dPy::segment(PyObject * args) if (!PyArg_ParseTuple(args, "dd", &u1,&u2)) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); curve->Segment(u1,u2); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -187,7 +187,7 @@ PyObject* BezierCurve2dPy::setPole(PyObject * args) Base::Vector2d vec = Py::Vector2d(p).getCxxObject()->value(); gp_Pnt2d pnt(vec.x, vec.y); try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); if (weight < 0.0) curve->SetPole(index,pnt); @@ -196,7 +196,7 @@ PyObject* BezierCurve2dPy::setPole(PyObject * args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -208,7 +208,7 @@ PyObject* BezierCurve2dPy::getPole(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles(), "Pole index out of range"); @@ -222,7 +222,7 @@ PyObject* BezierCurve2dPy::getPole(PyObject * args) return Py::new_reference_to(method.apply(arg)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -233,7 +233,7 @@ PyObject* BezierCurve2dPy::getPoles(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); TColgp_Array1OfPnt2d p(1,curve->NbPoles()); curve->Poles(p); @@ -252,7 +252,7 @@ PyObject* BezierCurve2dPy::getPoles(PyObject * args) return Py::new_reference_to(poles); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -272,12 +272,12 @@ PyObject* BezierCurve2dPy::setPoles(PyObject * args) poles.SetValue(index++, gp_Pnt2d(pole.x,pole.y)); } - Handle_Geom2d_BezierCurve bezier = new Geom2d_BezierCurve(poles); + Handle(Geom2d_BezierCurve) bezier = new Geom2d_BezierCurve(poles); this->getGeom2dBezierCurvePtr()->setHandle(bezier); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -290,13 +290,13 @@ PyObject* BezierCurve2dPy::setWeight(PyObject * args) if (!PyArg_ParseTuple(args, "id", &index,&weight)) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); curve->SetWeight(index,weight); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -308,7 +308,7 @@ PyObject* BezierCurve2dPy::getWeight(PyObject * args) if (!PyArg_ParseTuple(args, "i", &index)) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); Standard_OutOfRange_Raise_if (index < 1 || index > curve->NbPoles() , "Weight index out of range"); @@ -316,7 +316,7 @@ PyObject* BezierCurve2dPy::getWeight(PyObject * args) return Py_BuildValue("d", weight); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -327,7 +327,7 @@ PyObject* BezierCurve2dPy::getWeights(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); TColStd_Array1OfReal w(1,curve->NbPoles()); curve->Weights(w); @@ -338,7 +338,7 @@ PyObject* BezierCurve2dPy::getWeights(PyObject * args) return Py::new_reference_to(weights); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -350,42 +350,42 @@ PyObject* BezierCurve2dPy::getResolution(PyObject* args) if (!PyArg_ParseTuple(args, "d", &tol)) return 0; try { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); double utol; curve->Resolution(tol,utol); return Py_BuildValue("d",utol); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } } Py::Long BezierCurve2dPy::getDegree(void) const { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->Degree()); } Py::Long BezierCurve2dPy::getMaxDegree(void) const { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->MaxDegree()); } Py::Long BezierCurve2dPy::getNbPoles(void) const { - Handle_Geom2d_BezierCurve curve = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) curve = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); return Py::Long(curve->NbPoles()); } Py::Object BezierCurve2dPy::getStartPoint(void) const { - Handle_Geom2d_BezierCurve c = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) c = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); gp_Pnt2d pnt = c->StartPoint(); @@ -399,7 +399,7 @@ Py::Object BezierCurve2dPy::getStartPoint(void) const Py::Object BezierCurve2dPy::getEndPoint(void) const { - Handle_Geom2d_BezierCurve c = Handle_Geom2d_BezierCurve::DownCast + Handle(Geom2d_BezierCurve) c = Handle(Geom2d_BezierCurve)::DownCast (getGeometry2dPtr()->handle()); gp_Pnt2d pnt = c->EndPoint(); diff --git a/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp index ad37b86266..d040ba7821 100644 --- a/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Circle2dPyImp.cpp @@ -59,7 +59,7 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_cd[] = {"Circle","Distance",NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_cd, &(Circle2dPy::Type), &pCirc, &dist)) { Circle2dPy* pcCircle = static_cast(pCirc); - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast (pcCircle->getGeom2dCirclePtr()->handle()); GCE2d_MakeCircle mc(circle->Circ2d(), dist); if (!mc.IsDone()) { @@ -67,7 +67,7 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Circle circ = Handle_Geom2d_Circle::DownCast(getGeom2dCirclePtr()->handle()); + Handle(Geom2d_Circle) circ = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); circ->SetCirc2d(mc.Value()->Circ2d()); return 0; } @@ -86,7 +86,7 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(getGeom2dCirclePtr()->handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); circle->SetCirc2d(mc.Value()->Circ2d()); return 0; } @@ -95,9 +95,9 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", keywords_c, &(Circle2dPy::Type), &pCirc)) { Circle2dPy* pcCircle = static_cast(pCirc); - Handle_Geom2d_Circle circ1 = Handle_Geom2d_Circle::DownCast + Handle(Geom2d_Circle) circ1 = Handle(Geom2d_Circle)::DownCast (pcCircle->getGeom2dCirclePtr()->handle()); - Handle_Geom2d_Circle circ2 = Handle_Geom2d_Circle::DownCast + Handle(Geom2d_Circle) circ2 = Handle(Geom2d_Circle)::DownCast (this->getGeom2dCirclePtr()->handle()); circ2->SetCirc2d(circ1->Circ2d()); return 0; @@ -120,7 +120,7 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(getGeom2dCirclePtr()->handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); circle->SetCirc2d(mc.Value()->Circ2d()); return 0; } @@ -129,7 +129,7 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_n[] = {NULL}; PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(getGeom2dCirclePtr()->handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); circle->SetRadius(1.0); return 0; } @@ -145,13 +145,13 @@ int Circle2dPy::PyInit(PyObject* args, PyObject* kwds) Py::Float Circle2dPy::getRadius(void) const { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(getGeom2dCirclePtr()->handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); return Py::Float(circle->Radius()); } void Circle2dPy::setRadius(Py::Float arg) { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(getGeom2dCirclePtr()->handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(getGeom2dCirclePtr()->handle()); circle->SetRadius((double)arg); } diff --git a/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp index 9655f1670b..4811ae4cb6 100644 --- a/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Conic2dPyImp.cpp @@ -74,13 +74,13 @@ void Conic2dPy::setLocation(Py::Object arg) Py::Float Conic2dPy::getEccentricity(void) const { - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(getGeom2dConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); return Py::Float(conic->Eccentricity()); } Py::Object Conic2dPy::getXAxis(void) const { - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(getGeom2dConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); gp_Dir2d xdir = conic->XAxis().Direction(); Py::Module module("__FreeCADBase__"); Py::Callable method(module.getAttr("Vector2d")); @@ -93,7 +93,7 @@ Py::Object Conic2dPy::getXAxis(void) const void Conic2dPy::setXAxis(Py::Object arg) { Base::Vector2d dir = Py::Vector2d(arg.ptr()).getCxxObject()->value(); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(getGeom2dConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); gp_Ax2d xaxis = conic->XAxis(); xaxis.SetDirection(gp_Dir2d(dir.x, dir.y)); conic->SetXAxis(xaxis); @@ -101,7 +101,7 @@ void Conic2dPy::setXAxis(Py::Object arg) Py::Object Conic2dPy::getYAxis(void) const { - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(getGeom2dConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); gp_Dir2d ydir = conic->YAxis().Direction(); Py::Module module("__FreeCADBase__"); Py::Callable method(module.getAttr("Vector2d")); @@ -114,7 +114,7 @@ Py::Object Conic2dPy::getYAxis(void) const void Conic2dPy::setYAxis(Py::Object arg) { Base::Vector2d dir = Py::Vector2d(arg.ptr()).getCxxObject()->value(); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(getGeom2dConicPtr()->handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(getGeom2dConicPtr()->handle()); gp_Ax2d yaxis = conic->YAxis(); yaxis.SetDirection(gp_Dir2d(dir.x, dir.y)); conic->SetYAxis(yaxis); diff --git a/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp index 2097cad46c..ebdd2572aa 100644 --- a/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Curve2dPyImp.cpp @@ -73,7 +73,7 @@ #include namespace Part { -extern const Py::Object makeGeometryCurvePy(const Handle_Geom_Curve& c); +extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c); } using namespace Part; @@ -102,12 +102,12 @@ PyObject* Curve2dPy::reverse(PyObject * args) { if (PyArg_ParseTuple(args, "")) { try { - Handle_Geom2d_Curve curve = Handle_Geom2d_Curve::DownCast(getGeom2dCurvePtr()->handle()); + Handle(Geom2d_Curve) curve = Handle(Geom2d_Curve)::DownCast(getGeom2dCurvePtr()->handle()); curve->Reverse(); Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -187,14 +187,14 @@ PyObject* Curve2dPy::toShape(PyObject *args) { if (PyArg_ParseTuple(args, "")) { try { - Handle_Geom2d_Curve curv = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curv = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); BRepBuilderAPI_MakeEdge2d mkBuilder(curv); TopoDS_Shape edge = mkBuilder.Shape(); return Py::new_reference_to(shape2pyshape(edge)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -204,14 +204,14 @@ PyObject* Curve2dPy::toShape(PyObject *args) double u1, u2; if (PyArg_ParseTuple(args, "dd", &u1, &u2)) { try { - Handle_Geom2d_Curve curv = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curv = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); BRepBuilderAPI_MakeEdge2d mkBuilder(curv, u1, u2); TopoDS_Shape edge = mkBuilder.Shape(); return Py::new_reference_to(shape2pyshape(edge)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -221,9 +221,9 @@ PyObject* Curve2dPy::toShape(PyObject *args) PyObject* p; if (PyArg_ParseTuple(args, "O!", &(Part::GeometrySurfacePy::Type), &p)) { try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast( + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast( static_cast(p)->getGeomSurfacePtr()->handle()); - Handle_Geom2d_Curve curv = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curv = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); BRepBuilderAPI_MakeEdge mkBuilder(curv, surf); TopoDS_Edge edge = mkBuilder.Edge(); @@ -232,7 +232,7 @@ PyObject* Curve2dPy::toShape(PyObject *args) return Py::new_reference_to(shape2pyshape(edge)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -241,9 +241,9 @@ PyObject* Curve2dPy::toShape(PyObject *args) PyErr_Clear(); if (PyArg_ParseTuple(args, "O!dd", &(Part::GeometrySurfacePy::Type), &p, &u1, &u2)) { try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast( + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast( static_cast(p)->getGeomSurfacePtr()->handle()); - Handle_Geom2d_Curve curv = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curv = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); BRepBuilderAPI_MakeEdge mkBuilder(curv, surf, u1, u2); TopoDS_Edge edge = mkBuilder.Edge(); @@ -252,7 +252,7 @@ PyObject* Curve2dPy::toShape(PyObject *args) return Py::new_reference_to(shape2pyshape(edge)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -262,7 +262,7 @@ PyObject* Curve2dPy::toShape(PyObject *args) if (PyArg_ParseTuple(args, "O!", &(Part::TopoShapeFacePy::Type), &p)) { try { const TopoDS_Face& face = TopoDS::Face(static_cast(p)->getTopoShapePtr()->getShape()); - Handle_Geom2d_Curve curv = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curv = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); BRepAdaptor_Surface adapt(face); BRepBuilderAPI_MakeEdge mkBuilder(curv, adapt.Surface().Surface()); @@ -272,7 +272,7 @@ PyObject* Curve2dPy::toShape(PyObject *args) return Py::new_reference_to(shape2pyshape(edge)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -282,7 +282,7 @@ PyObject* Curve2dPy::toShape(PyObject *args) if (PyArg_ParseTuple(args, "O!dd", &(Part::TopoShapeFacePy::Type), &p, &u1, &u2)) { try { const TopoDS_Face& face = TopoDS::Face(static_cast(p)->getTopoShapePtr()->getShape()); - Handle_Geom2d_Curve curv = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curv = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); BRepAdaptor_Surface adapt(face); BRepBuilderAPI_MakeEdge mkBuilder(curv, adapt.Surface().Surface(), u1, u2); @@ -292,7 +292,7 @@ PyObject* Curve2dPy::toShape(PyObject *args) return Py::new_reference_to(shape2pyshape(edge)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -305,8 +305,8 @@ PyObject* Curve2dPy::toShape(PyObject *args) PyObject* Curve2dPy::discretize(PyObject *args, PyObject *kwds) { try { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); if (c.IsNull()) { PyErr_SetString(PartExceptionOCCError, "Geometry is not a curve"); return 0; @@ -501,8 +501,8 @@ PyObject* Curve2dPy::discretize(PyObject *args, PyObject *kwds) PyObject* Curve2dPy::length(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u=c->FirstParameter(); @@ -516,7 +516,7 @@ PyObject* Curve2dPy::length(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -527,8 +527,8 @@ PyObject* Curve2dPy::length(PyObject *args) PyObject* Curve2dPy::parameterAtDistance(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double abscissa; @@ -542,7 +542,7 @@ PyObject* Curve2dPy::parameterAtDistance(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -553,8 +553,8 @@ PyObject* Curve2dPy::parameterAtDistance(PyObject *args) PyObject* Curve2dPy::value(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -571,7 +571,7 @@ PyObject* Curve2dPy::value(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -582,8 +582,8 @@ PyObject* Curve2dPy::value(PyObject *args) PyObject* Curve2dPy::tangent(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -604,7 +604,7 @@ PyObject* Curve2dPy::tangent(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -615,8 +615,8 @@ PyObject* Curve2dPy::tangent(PyObject *args) PyObject* Curve2dPy::normal(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -635,7 +635,7 @@ PyObject* Curve2dPy::normal(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -646,8 +646,8 @@ PyObject* Curve2dPy::normal(PyObject *args) PyObject* Curve2dPy::curvature(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -659,7 +659,7 @@ PyObject* Curve2dPy::curvature(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -670,8 +670,8 @@ PyObject* Curve2dPy::curvature(PyObject *args) PyObject* Curve2dPy::centerOfCurvature(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -690,7 +690,7 @@ PyObject* Curve2dPy::centerOfCurvature(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -701,8 +701,8 @@ PyObject* Curve2dPy::centerOfCurvature(PyObject *args) PyObject* Curve2dPy::parameter(PyObject *args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { PyObject *p; @@ -716,7 +716,7 @@ PyObject* Curve2dPy::parameter(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -727,8 +727,8 @@ PyObject* Curve2dPy::parameter(PyObject *args) PyObject* Curve2dPy::toBSpline(PyObject * args) { - Handle_Geom2d_Geometry g = getGeometry2dPtr()->handle(); - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(g); + Handle(Geom2d_Geometry) g = getGeometry2dPtr()->handle(); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(g); try { if (!c.IsNull()) { double u,v; @@ -737,14 +737,14 @@ PyObject* Curve2dPy::toBSpline(PyObject * args) if (!PyArg_ParseTuple(args, "|dd", &u,&v)) return 0; ShapeConstruct_Curve scc; - Handle_Geom2d_BSplineCurve spline = scc.ConvertToBSpline(c, u, v, Precision::Confusion()); + Handle(Geom2d_BSplineCurve) spline = scc.ConvertToBSpline(c, u, v, Precision::Confusion()); if (spline.IsNull()) Standard_NullValue::Raise("Conversion to B-Spline failed"); return new BSplineCurve2dPy(new Geom2dBSplineCurve(spline)); } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -781,7 +781,7 @@ PyObject* Curve2dPy::approximateBSpline(PyObject *args) absShape = GeomAbs_C2; try { - Handle_Geom2d_Curve self = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) self = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); Geom2dConvert_ApproxCurve approx(self, tolerance, absShape, maxSegment, maxDegree); if (approx.IsDone()) { return new BSplineCurve2dPy(new Geom2dBSplineCurve(approx.Curve())); @@ -798,7 +798,7 @@ PyObject* Curve2dPy::approximateBSpline(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -806,7 +806,7 @@ PyObject* Curve2dPy::approximateBSpline(PyObject *args) Py::String Curve2dPy::getContinuity(void) const { - GeomAbs_Shape c = Handle_Geom2d_Curve::DownCast + GeomAbs_Shape c = Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->Continuity(); std::string str; switch (c) { @@ -840,25 +840,25 @@ Py::String Curve2dPy::getContinuity(void) const Py::Boolean Curve2dPy::getClosed(void) const { - return Py::Boolean(Handle_Geom2d_Curve::DownCast + return Py::Boolean(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->IsClosed() ? true : false); } Py::Boolean Curve2dPy::getPeriodic(void) const { - return Py::Boolean(Handle_Geom2d_Curve::DownCast + return Py::Boolean(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->IsPeriodic() ? true : false); } Py::Float Curve2dPy::getFirstParameter(void) const { - return Py::Float(Handle_Geom2d_Curve::DownCast + return Py::Float(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->FirstParameter()); } Py::Float Curve2dPy::getLastParameter(void) const { - return Py::Float(Handle_Geom2d_Curve::DownCast + return Py::Float(Handle(Geom2d_Curve)::DownCast (getGeometry2dPtr()->handle())->LastParameter()); } @@ -874,14 +874,14 @@ int Curve2dPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) PyObject* Curve2dPy::intersectCC(PyObject *args) { - Handle_Geom2d_Curve curve1 = Handle_Geom2d_Curve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curve1 = Handle(Geom2d_Curve)::DownCast(getGeometry2dPtr()->handle()); try { if (!curve1.IsNull()) { PyObject *p; double prec = Precision::Confusion(); if (!PyArg_ParseTuple(args, "O!|d", &(Part::Curve2dPy::Type), &p, &prec)) return 0; - Handle_Geom2d_Curve curve2 = Handle_Geom2d_Curve::DownCast(static_cast(p)->getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) curve2 = Handle(Geom2d_Curve)::DownCast(static_cast(p)->getGeometry2dPtr()->handle()); Geom2dAPI_ExtremaCurveCurve intersector(curve1, curve2, curve1->FirstParameter(), curve1->LastParameter(), @@ -911,7 +911,7 @@ PyObject* Curve2dPy::intersectCC(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp index a3343681eb..5397e66095 100644 --- a/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Ellipse2dPyImp.cpp @@ -56,7 +56,7 @@ int Ellipse2dPy::PyInit(PyObject* args, PyObject* kwds) { char* keywords_n[] = {NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); ellipse->SetMajorRadius(2.0); ellipse->SetMinorRadius(1.0); return 0; @@ -67,9 +67,9 @@ int Ellipse2dPy::PyInit(PyObject* args, PyObject* kwds) PyObject *pElips; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!",keywords_e, &(Ellipse2dPy::Type), &pElips)) { Ellipse2dPy* pEllipse = static_cast(pElips); - Handle_Geom2d_Ellipse Elips1 = Handle_Geom2d_Ellipse::DownCast + Handle(Geom2d_Ellipse) Elips1 = Handle(Geom2d_Ellipse)::DownCast (pEllipse->getGeom2dEllipsePtr()->handle()); - Handle_Geom2d_Ellipse Elips2 = Handle_Geom2d_Ellipse::DownCast + Handle(Geom2d_Ellipse) Elips2 = Handle(Geom2d_Ellipse)::DownCast (this->getGeom2dEllipsePtr()->handle()); Elips2->SetElips2d(Elips1->Elips2d()); return 0; @@ -93,7 +93,7 @@ int Ellipse2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); ellipse->SetElips2d(me.Value()->Elips2d()); return 0; } @@ -113,7 +113,7 @@ int Ellipse2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); ellipse->SetElips2d(me.Value()->Elips2d()); return 0; } @@ -128,37 +128,37 @@ int Ellipse2dPy::PyInit(PyObject* args, PyObject* kwds) Py::Float Ellipse2dPy::getMajorRadius(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); return Py::Float(ellipse->MajorRadius()); } void Ellipse2dPy::setMajorRadius(Py::Float arg) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); ellipse->SetMajorRadius((double)arg); } Py::Float Ellipse2dPy::getMinorRadius(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); return Py::Float(ellipse->MinorRadius()); } void Ellipse2dPy::setMinorRadius(Py::Float arg) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); ellipse->SetMinorRadius((double)arg); } Py::Float Ellipse2dPy::getFocal(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); return Py::Float(ellipse->Focal()); } Py::Object Ellipse2dPy::getFocus1(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); gp_Pnt2d loc = ellipse->Focus1(); Py::Module module("__FreeCADBase__"); @@ -171,7 +171,7 @@ Py::Object Ellipse2dPy::getFocus1(void) const Py::Object Ellipse2dPy::getFocus2(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(getGeom2dEllipsePtr()->handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(getGeom2dEllipsePtr()->handle()); gp_Pnt2d loc = ellipse->Focus2(); Py::Module module("__FreeCADBase__"); diff --git a/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp index 8dd3cbb4c6..32be89baaf 100644 --- a/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Hyperbola2dPyImp.cpp @@ -56,7 +56,7 @@ int Hyperbola2dPy::PyInit(PyObject* args, PyObject* kwds) { char* keywords_n[] = {NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); hyperbola->SetMajorRadius(2.0); hyperbola->SetMinorRadius(1.0); return 0; @@ -67,9 +67,9 @@ int Hyperbola2dPy::PyInit(PyObject* args, PyObject* kwds) PyObject *pHypr; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!",keywords_e, &(Hyperbola2dPy::Type), &pHypr)) { Hyperbola2dPy* pHyperbola = static_cast(pHypr); - Handle_Geom2d_Hyperbola Hypr1 = Handle_Geom2d_Hyperbola::DownCast + Handle(Geom2d_Hyperbola) Hypr1 = Handle(Geom2d_Hyperbola)::DownCast (pHyperbola->getGeom2dHyperbolaPtr()->handle()); - Handle_Geom2d_Hyperbola Hypr2 = Handle_Geom2d_Hyperbola::DownCast + Handle(Geom2d_Hyperbola) Hypr2 = Handle(Geom2d_Hyperbola)::DownCast (this->getGeom2dHyperbolaPtr()->handle()); Hypr2->SetHypr2d(Hypr1->Hypr2d()); return 0; @@ -93,7 +93,7 @@ int Hyperbola2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); hyperbola->SetHypr2d(me.Value()->Hypr2d()); return 0; } @@ -113,7 +113,7 @@ int Hyperbola2dPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); hyperbola->SetHypr2d(me.Value()->Hypr2d()); return 0; } @@ -128,37 +128,37 @@ int Hyperbola2dPy::PyInit(PyObject* args, PyObject* kwds) Py::Float Hyperbola2dPy::getMajorRadius(void) const { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); return Py::Float(hyperbola->MajorRadius()); } void Hyperbola2dPy::setMajorRadius(Py::Float arg) { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); hyperbola->SetMajorRadius((double)arg); } Py::Float Hyperbola2dPy::getMinorRadius(void) const { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); return Py::Float(hyperbola->MinorRadius()); } void Hyperbola2dPy::setMinorRadius(Py::Float arg) { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); hyperbola->SetMinorRadius((double)arg); } Py::Float Hyperbola2dPy::getFocal(void) const { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); return Py::Float(hyperbola->Focal()); } Py::Object Hyperbola2dPy::getFocus1(void) const { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); gp_Pnt2d loc = hyperbola->Focus1(); Py::Module module("__FreeCADBase__"); @@ -171,7 +171,7 @@ Py::Object Hyperbola2dPy::getFocus1(void) const Py::Object Hyperbola2dPy::getFocus2(void) const { - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(getGeom2dHyperbolaPtr()->handle()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(getGeom2dHyperbolaPtr()->handle()); gp_Pnt2d loc = hyperbola->Focus2(); Py::Module module("__FreeCADBase__"); diff --git a/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp index 54f2f21ca7..63106039be 100644 --- a/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Line2dPyImp.cpp @@ -67,10 +67,10 @@ int Line2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line Line2dPy* pcLine = static_cast(pLine); // get Geom_Line of line - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast (pcLine->getGeom2dLinePtr()->handle()); // get Geom_Line of line - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); // Assign the lines @@ -97,14 +97,14 @@ int Line2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) } // get Geom_Line of line - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); - Handle_Geom2d_Line that_line = ms.Value(); + Handle(Geom2d_Line) that_line = ms.Value(); this_line->SetLin2d(that_line->Lin2d()); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -123,7 +123,7 @@ int Line2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Object Line2dPy::getLocation(void) const { - Handle_Geom2d_Line this_curve = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_curve = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); gp_Pnt2d pnt = this_curve->Location(); @@ -139,7 +139,7 @@ void Line2dPy::setLocation(Py::Object arg) { gp_Pnt2d pnt; gp_Dir2d dir; - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); dir = this_line->Direction(); @@ -167,18 +167,18 @@ void Line2dPy::setLocation(Py::Object arg) } // get Geom_Line of line - Handle_Geom2d_Line that_line = ms.Value(); + Handle(Geom2d_Line) that_line = ms.Value(); this_line->SetLin2d(that_line->Lin2d()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Object Line2dPy::getDirection(void) const { - Handle_Geom2d_Line this_curve = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_curve = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); gp_Dir2d dir = this_curve->Direction(); @@ -194,7 +194,7 @@ void Line2dPy::setDirection(Py::Object arg) { gp_Pnt2d pnt; gp_Dir2d dir; - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this->getGeom2dLinePtr()->handle()); pnt = this_line->Location(); @@ -222,11 +222,11 @@ void Line2dPy::setDirection(Py::Object arg) } // get Geom_Line of line - Handle_Geom2d_Line that_line = ms.Value(); + Handle(Geom2d_Line) that_line = ms.Value(); this_line->SetLin2d(that_line->Lin2d()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp b/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp index 90ba042865..a2e05a258e 100644 --- a/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Line2dSegmentPyImp.cpp @@ -70,14 +70,14 @@ int Line2dSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line Line2dSegmentPy* pcLine = static_cast(pLine); // get Geom_Line of line segment - Handle_Geom2d_TrimmedCurve that_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) that_curv = Handle(Geom2d_TrimmedCurve)::DownCast (pcLine->getGeom2dLineSegmentPtr()->handle()); - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast (that_curv->BasisCurve()); // get Geom_Line of line segment - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); // Assign the lines @@ -92,14 +92,14 @@ int Line2dSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line Line2dSegmentPy* pcLine = static_cast(pLine); // get Geom_Line of line segment - Handle_Geom2d_TrimmedCurve that_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) that_curv = Handle(Geom2d_TrimmedCurve)::DownCast (pcLine->getGeom2dLineSegmentPtr()->handle()); - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast (that_curv->BasisCurve()); // get Geom_Line of line segment - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); // Assign the lines @@ -113,12 +113,12 @@ int Line2dSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line Line2dPy* pcLine = static_cast(pLine); // get Geom_Line of line - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast (pcLine->getGeom2dLinePtr()->handle()); // get Geom_Line of line segment - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); // Assign the lines @@ -146,18 +146,18 @@ int Line2dSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) } // get Geom_Line of line segment - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom2d_TrimmedCurve that_curv = ms.Value(); - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom2d_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin2d(that_line->Lin2d()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -183,12 +183,12 @@ PyObject* Line2dSegmentPy::setParameterRange(PyObject *args) return NULL; try { - Handle_Geom2d_TrimmedCurve this_curve = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); this_curve->SetTrim(first, last); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -198,7 +198,7 @@ PyObject* Line2dSegmentPy::setParameterRange(PyObject *args) Py::Object Line2dSegmentPy::getStartPoint(void) const { - Handle_Geom2d_TrimmedCurve this_curve = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); gp_Pnt2d pnt = this_curve->StartPoint(); @@ -213,7 +213,7 @@ Py::Object Line2dSegmentPy::getStartPoint(void) const void Line2dSegmentPy::setStartPoint(Py::Object arg) { gp_Pnt2d p1, p2; - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); p2 = this_curv->EndPoint(); @@ -244,22 +244,22 @@ void Line2dSegmentPy::setStartPoint(Py::Object arg) } // get Geom_Line of line segment - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom2d_TrimmedCurve that_curv = ms.Value(); - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom2d_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin2d(that_line->Lin2d()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Object Line2dSegmentPy::getEndPoint(void) const { - Handle_Geom2d_TrimmedCurve this_curve = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); gp_Pnt2d pnt = this_curve->EndPoint(); @@ -274,7 +274,7 @@ Py::Object Line2dSegmentPy::getEndPoint(void) const void Line2dSegmentPy::setEndPoint(Py::Object arg) { gp_Pnt2d p1, p2; - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast (this->getGeom2dLineSegmentPtr()->handle()); p1 = this_curv->StartPoint(); @@ -305,15 +305,15 @@ void Line2dSegmentPy::setEndPoint(Py::Object arg) } // get Geom_Line of line segment - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom2d_TrimmedCurve that_curv = ms.Value(); - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom2d_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin2d(that_line->Lin2d()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp index a58c907ad5..b241e07986 100644 --- a/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/OffsetCurve2dPyImp.cpp @@ -58,7 +58,7 @@ int OffsetCurve2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; Curve2dPy* pcGeo = static_cast(pGeom); - Handle_Geom2d_Curve curve = Handle_Geom2d_Curve::DownCast + Handle(Geom2d_Curve) curve = Handle(Geom2d_Curve)::DownCast (pcGeo->getGeometry2dPtr()->handle()); if (curve.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a curve"); @@ -66,12 +66,12 @@ int OffsetCurve2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) } try { - Handle_Geom2d_OffsetCurve curve2 = new Geom2d_OffsetCurve(curve, offset); + Handle(Geom2d_OffsetCurve) curve2 = new Geom2d_OffsetCurve(curve, offset); getGeom2dOffsetCurvePtr()->setHandle(curve2); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -79,20 +79,20 @@ int OffsetCurve2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Float OffsetCurve2dPy::getOffsetValue(void) const { - Handle_Geom2d_OffsetCurve curve = Handle_Geom2d_OffsetCurve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_OffsetCurve) curve = Handle(Geom2d_OffsetCurve)::DownCast(getGeometry2dPtr()->handle()); return Py::Float(curve->Offset()); } void OffsetCurve2dPy::setOffsetValue(Py::Float arg) { - Handle_Geom2d_OffsetCurve curve = Handle_Geom2d_OffsetCurve::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_OffsetCurve) curve = Handle(Geom2d_OffsetCurve)::DownCast(getGeometry2dPtr()->handle()); curve->SetOffsetValue((double)arg); } Py::Object OffsetCurve2dPy::getBasisCurve(void) const { - Handle_Geom2d_OffsetCurve curve = Handle_Geom2d_OffsetCurve::DownCast(getGeometry2dPtr()->handle()); - Handle_Geom2d_Curve basis = curve->BasisCurve(); + Handle(Geom2d_OffsetCurve) curve = Handle(Geom2d_OffsetCurve)::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Curve) basis = curve->BasisCurve(); if (basis.IsNull()) return Py::None(); std::unique_ptr geo2d = getCurve2dFromGeom2d(basis); @@ -106,13 +106,13 @@ void OffsetCurve2dPy::setBasisCurve(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Curve2dPy::Type))) { Curve2dPy* pcGeo = static_cast(p); - Handle_Geom2d_Curve curve = Handle_Geom2d_Curve::DownCast + 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 + Handle(Geom2d_OffsetCurve) curve2 = Handle(Geom2d_OffsetCurve)::DownCast (getGeometry2dPtr()->handle()); if (curve == curve2) { throw Py::RuntimeError("cannot set this curve as basis"); @@ -122,7 +122,7 @@ void OffsetCurve2dPy::setBasisCurve(Py::Object arg) curve2->SetBasisCurve(curve); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp index d09127daa0..b012c97396 100644 --- a/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/Parabola2dPyImp.cpp @@ -51,7 +51,7 @@ PyObject *Parabola2dPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // int Parabola2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) { if (PyArg_ParseTuple(args, "")) { - Handle_Geom2d_Parabola c = Handle_Geom2d_Parabola::DownCast + Handle(Geom2d_Parabola) c = Handle(Geom2d_Parabola)::DownCast (getGeometry2dPtr()->handle()); c->SetFocal(1.0); return 0; @@ -62,19 +62,19 @@ int Parabola2dPy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Float Parabola2dPy::getFocal(void) const { - Handle_Geom2d_Parabola curve = Handle_Geom2d_Parabola::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); return Py::Float(curve->Focal()); } void Parabola2dPy::setFocal(Py::Float arg) { - Handle_Geom2d_Parabola curve = Handle_Geom2d_Parabola::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); curve->SetFocal((double)arg); } Py::Object Parabola2dPy::getFocus(void) const { - Handle_Geom2d_Parabola curve = Handle_Geom2d_Parabola::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); gp_Pnt2d loc = curve->Focus(); Py::Module module("__FreeCADBase__"); @@ -87,7 +87,7 @@ Py::Object Parabola2dPy::getFocus(void) const Py::Float Parabola2dPy::getParameter(void) const { - Handle_Geom2d_Parabola curve = Handle_Geom2d_Parabola::DownCast(getGeometry2dPtr()->handle()); + Handle(Geom2d_Parabola) curve = Handle(Geom2d_Parabola)::DownCast(getGeometry2dPtr()->handle()); return Py::Float(curve->Parameter()); } diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index 4ca4267ccd..c52b0f6310 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -254,7 +254,7 @@ GeomPoint::GeomPoint() this->myPoint = new Geom_CartesianPoint(0,0,0); } -GeomPoint::GeomPoint(const Handle_Geom_CartesianPoint& p) +GeomPoint::GeomPoint(const Handle(Geom_CartesianPoint)& p) { setHandle(p); } @@ -268,15 +268,15 @@ GeomPoint::~GeomPoint() { } -const Handle_Geom_Geometry& GeomPoint::handle() const +const Handle(Geom_Geometry)& GeomPoint::handle() const { return myPoint; } -void GeomPoint::setHandle(const Handle_Geom_CartesianPoint& p) +void GeomPoint::setHandle(const Handle(Geom_CartesianPoint)& p) { - myPoint = Handle_Geom_CartesianPoint::DownCast(p->Copy()); + myPoint = Handle(Geom_CartesianPoint)::DownCast(p->Copy()); } Geometry *GeomPoint::copy(void) const @@ -358,7 +358,7 @@ GeomCurve::~GeomCurve() TopoDS_Shape GeomCurve::toShape() const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); BRepBuilderAPI_MakeEdge mkBuilder(c, c->FirstParameter(), c->LastParameter()); return mkBuilder.Shape(); } @@ -366,8 +366,8 @@ TopoDS_Shape GeomCurve::toShape() const GeomBSplineCurve* GeomCurve::toBSpline(double first, double last) const { ShapeConstruct_Curve scc; - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); - Handle_Geom_BSplineCurve spline = scc.ConvertToBSpline(c, first, last, Precision::Confusion()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); + Handle(Geom_BSplineCurve) spline = scc.ConvertToBSpline(c, first, last, Precision::Confusion()); if (spline.IsNull()) throw Base::RuntimeError("Conversion to B-Spline failed"); return new GeomBSplineCurve(spline); @@ -380,7 +380,7 @@ GeomBSplineCurve* GeomCurve::toNurbs(double first, double last) const bool GeomCurve::tangent(double u, gp_Dir& dir) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); GeomLProp_CLProps prop(c,u,1,Precision::Confusion()); if (prop.IsTangentDefined()) { prop.Tangent(dir); @@ -392,7 +392,7 @@ bool GeomCurve::tangent(double u, gp_Dir& dir) const Base::Vector3d GeomCurve::pointAtParameter(double u) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); GeomLProp_CLProps prop(c,u,0,Precision::Confusion()); const gp_Pnt &point=prop.Value(); @@ -402,7 +402,7 @@ Base::Vector3d GeomCurve::pointAtParameter(double u) const Base::Vector3d GeomCurve::firstDerivativeAtParameter(double u) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); GeomLProp_CLProps prop(c,u,1,Precision::Confusion()); const gp_Vec &vec=prop.D1(); @@ -412,7 +412,7 @@ Base::Vector3d GeomCurve::firstDerivativeAtParameter(double u) const Base::Vector3d GeomCurve::secondDerivativeAtParameter(double u) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); GeomLProp_CLProps prop(c,u,2,Precision::Confusion()); const gp_Vec &vec=prop.D2(); @@ -422,7 +422,7 @@ Base::Vector3d GeomCurve::secondDerivativeAtParameter(double u) const bool GeomCurve::normalAt(double u, Base::Vector3d& dir) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { if (!c.IsNull()) { @@ -435,7 +435,7 @@ bool GeomCurve::normalAt(double u, Base::Vector3d& dir) const } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } @@ -444,7 +444,7 @@ bool GeomCurve::normalAt(double u, Base::Vector3d& dir) const bool GeomCurve::closestParameter(const Base::Vector3d& point, double &u) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { if (!c.IsNull()) { gp_Pnt pnt(point.x,point.y,point.z); @@ -454,7 +454,7 @@ bool GeomCurve::closestParameter(const Base::Vector3d& point, double &u) const } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } @@ -463,11 +463,11 @@ bool GeomCurve::closestParameter(const Base::Vector3d& point, double &u) const bool GeomCurve::closestParameterToBasicCurve(const Base::Vector3d& point, double &u) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))){ - Handle_Geom_TrimmedCurve tc = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Curve bc = tc->BasisCurve(); + Handle(Geom_TrimmedCurve) tc = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Curve) bc = tc->BasisCurve(); try { if (!bc.IsNull()) { gp_Pnt pnt(point.x,point.y,point.z); @@ -477,7 +477,7 @@ bool GeomCurve::closestParameterToBasicCurve(const Base::Vector3d& point, double } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } @@ -490,14 +490,14 @@ bool GeomCurve::closestParameterToBasicCurve(const Base::Vector3d& point, double double GeomCurve::getFirstParameter() const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { // pending check for RealFirst RealLast in case of infinite curve return c->FirstParameter(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } @@ -505,28 +505,28 @@ double GeomCurve::getFirstParameter() const double GeomCurve::getLastParameter() const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { // pending check for RealFirst RealLast in case of infinite curve return c->LastParameter(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } double GeomCurve::curvatureAt(double u) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { GeomLProp_CLProps prop(c,u,2,Precision::Confusion()); return prop.Curvature(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -534,27 +534,27 @@ double GeomCurve::curvatureAt(double u) const double GeomCurve::length(double u, double v) const { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { GeomAdaptor_Curve adaptor(c); return GCPnts_AbscissaPoint::Length(adaptor,u,v,Precision::Confusion()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } void GeomCurve::reverse(void) { - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(handle()); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(handle()); try { c->Reverse(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -574,7 +574,7 @@ GeomBoundedCurve::~GeomBoundedCurve() Base::Vector3d GeomBoundedCurve::getStartPoint() const { - Handle_Geom_BoundedCurve curve = Handle_Geom_BoundedCurve::DownCast(handle()); + Handle(Geom_BoundedCurve) curve = Handle(Geom_BoundedCurve)::DownCast(handle()); gp_Pnt pnt = curve->StartPoint(); return Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z()); @@ -582,7 +582,7 @@ Base::Vector3d GeomBoundedCurve::getStartPoint() const Base::Vector3d GeomBoundedCurve::getEndPoint() const { - Handle_Geom_BoundedCurve curve = Handle_Geom_BoundedCurve::DownCast(handle()); + Handle(Geom_BoundedCurve) curve = Handle(Geom_BoundedCurve)::DownCast(handle()); gp_Pnt pnt = curve->EndPoint(); return Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z()); @@ -598,11 +598,11 @@ GeomBezierCurve::GeomBezierCurve() TColgp_Array1OfPnt poles(1,2); poles(1) = gp_Pnt(0.0,0.0,0.0); poles(2) = gp_Pnt(0.0,0.0,1.0); - Handle_Geom_BezierCurve b = new Geom_BezierCurve(poles); + Handle(Geom_BezierCurve) b = new Geom_BezierCurve(poles); this->myCurve = b; } -GeomBezierCurve::GeomBezierCurve(const Handle_Geom_BezierCurve& b) +GeomBezierCurve::GeomBezierCurve(const Handle(Geom_BezierCurve)& b) { setHandle(b); } @@ -611,12 +611,12 @@ GeomBezierCurve::~GeomBezierCurve() { } -void GeomBezierCurve::setHandle(const Handle_Geom_BezierCurve& c) +void GeomBezierCurve::setHandle(const Handle(Geom_BezierCurve)& c) { - myCurve = Handle_Geom_BezierCurve::DownCast(c->Copy()); + myCurve = Handle(Geom_BezierCurve)::DownCast(c->Copy()); } -const Handle_Geom_Geometry& GeomBezierCurve::handle() const +const Handle(Geom_Geometry)& GeomBezierCurve::handle() const { return myCurve; } @@ -659,7 +659,7 @@ GeomBSplineCurve::GeomBSplineCurve() this->myCurve = new Geom_BSplineCurve(poles, knots, mults, 1); } -GeomBSplineCurve::GeomBSplineCurve(const Handle_Geom_BSplineCurve& b) +GeomBSplineCurve::GeomBSplineCurve(const Handle(Geom_BSplineCurve)& b) { setHandle(b); } @@ -698,12 +698,12 @@ GeomBSplineCurve::~GeomBSplineCurve() { } -void GeomBSplineCurve::setHandle(const Handle_Geom_BSplineCurve& c) +void GeomBSplineCurve::setHandle(const Handle(Geom_BSplineCurve)& c) { - myCurve = Handle_Geom_BSplineCurve::DownCast(c->Copy()); + myCurve = Handle(Geom_BSplineCurve)::DownCast(c->Copy()); } -const Handle_Geom_Geometry& GeomBSplineCurve::handle() const +const Handle(Geom_Geometry)& GeomBSplineCurve::handle() const { return myCurve; } @@ -735,7 +735,7 @@ void GeomBSplineCurve::setPole(int index, const Base::Vector3d& pole, double wei myCurve->SetPole(index,pnt,weight); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -799,7 +799,7 @@ void GeomBSplineCurve::setWeights(const std::vector& weights) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -813,7 +813,7 @@ void GeomBSplineCurve::setKnot(int index, const double val, int mult) myCurve->SetKnot(index, val, mult); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -873,7 +873,7 @@ int GeomBSplineCurve::getMultiplicity(int index) const return myCurve->Multiplicity(index); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -888,7 +888,7 @@ bool GeomBSplineCurve::isPeriodic() const return myCurve->IsPeriodic()==Standard_True; } -bool GeomBSplineCurve::join(const Handle_Geom_BSplineCurve& spline) +bool GeomBSplineCurve::join(const Handle(Geom_BSplineCurve)& spline) { GeomConvert_CompCurveToBSplineCurve ccbc(this->myCurve); if (!ccbc.Add(spline, Precision::Approximation())) @@ -906,13 +906,13 @@ void GeomBSplineCurve::interpolate(const std::vector& p, Standard_ConstructionError::Raise(); double tol3d = Precision::Approximation(); - Handle_TColgp_HArray1OfPnt pts = new TColgp_HArray1OfPnt(1, p.size()); + Handle(TColgp_HArray1OfPnt) pts = new TColgp_HArray1OfPnt(1, p.size()); for (std::size_t i=0; iSetValue(i+1, p[i]); } TColgp_Array1OfVec tgs(1, t.size()); - Handle_TColStd_HArray1OfBoolean fgs = new TColStd_HArray1OfBoolean(1, t.size()); + Handle(TColStd_HArray1OfBoolean) fgs = new TColStd_HArray1OfBoolean(1, t.size()); for (std::size_t i=0; iSetValue(i+1, Standard_True); @@ -989,12 +989,12 @@ void GeomBSplineCurve::makeC1Continuous(double tol, double ang_tol) void GeomBSplineCurve::increaseDegree(double degree) { try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast(this->handle()); + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast(this->handle()); curve->IncreaseDegree(degree); return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1002,12 +1002,12 @@ void GeomBSplineCurve::increaseDegree(double degree) void GeomBSplineCurve::increaseMultiplicity(int index, int multiplicity) { try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast(this->handle()); + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast(this->handle()); curve->IncreaseMultiplicity(index, multiplicity); return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1015,11 +1015,11 @@ void GeomBSplineCurve::increaseMultiplicity(int index, int multiplicity) bool GeomBSplineCurve::removeKnot(int index, int multiplicity, double tolerance) { try { - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast(this->handle()); + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast(this->handle()); return curve->RemoveKnot(index, multiplicity, tolerance) == Standard_True; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1096,7 +1096,7 @@ void GeomBSplineCurve::Restore(Base::XMLReader& reader) int degree = reader.getAttributeAsInteger("Degree"); bool isperiodic = (bool) reader.getAttributeAsInteger("IsPeriodic"); - // Handle_Geom_BSplineCurve spline = new + // Handle(Geom_BSplineCurve) spline = new // Geom_BSplineCurve(occpoles,occweights,occknots,occmults,degree, // PyObject_IsTrue(periodic) ? Standard_True : Standard_False, // PyObject_IsTrue(CheckRational) ? Standard_True : Standard_False); @@ -1128,7 +1128,7 @@ void GeomBSplineCurve::Restore(Base::XMLReader& reader) // Geom_BSplineCurve(occpoles,occweights,occknots,occmults,degree,periodic,CheckRational try { - Handle_Geom_BSplineCurve spline = new Geom_BSplineCurve(p, w, k, m, degree, isperiodic ? Standard_True : Standard_False, Standard_False); + Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(p, w, k, m, degree, isperiodic ? Standard_True : Standard_False, Standard_False); if (!spline.IsNull()) this->myCurve = spline; @@ -1136,7 +1136,7 @@ void GeomBSplineCurve::Restore(Base::XMLReader& reader) throw Base::RuntimeError("BSpline restore failed"); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1161,7 +1161,7 @@ GeomConic::~GeomConic() Base::Vector3d GeomConic::getLocation(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); const gp_Pnt& loc = axis.Location(); return Base::Vector3d(loc.X(),loc.Y(),loc.Z()); @@ -1170,20 +1170,20 @@ Base::Vector3d GeomConic::getLocation(void) const void GeomConic::setLocation(const Base::Vector3d& Center) { gp_Pnt p1(Center.x,Center.y,Center.z); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); try { conic->SetLocation(p1); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } Base::Vector3d GeomConic::getCenter(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); const gp_Pnt& loc = axis.Location(); return Base::Vector3d(loc.X(),loc.Y(),loc.Z()); @@ -1192,13 +1192,13 @@ Base::Vector3d GeomConic::getCenter(void) const void GeomConic::setCenter(const Base::Vector3d& Center) { gp_Pnt p1(Center.x,Center.y,Center.z); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); try { conic->SetLocation(p1); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1215,7 +1215,7 @@ void GeomConic::setCenter(const Base::Vector3d& Center) */ double GeomConic::getAngleXU(void) const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Pnt center = conic->Axis().Location(); gp_Dir normal = conic->Axis().Direction(); @@ -1234,7 +1234,7 @@ double GeomConic::getAngleXU(void) const */ void GeomConic::setAngleXU(double angle) { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle());; + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle());; try { gp_Pnt center = conic->Axis().Location(); @@ -1247,7 +1247,7 @@ void GeomConic::setAngleXU(double angle) conic->SetPosition(xdirref); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1260,7 +1260,7 @@ void GeomConic::setAngleXU(double angle) */ bool GeomConic::isReversed() const { - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); assert(!conic.IsNull()); return conic->Axis().Direction().Z() < 0; } @@ -1285,7 +1285,7 @@ GeomArcOfConic::~GeomArcOfConic() */ Base::Vector3d GeomArcOfConic::getStartPoint(bool emulateCCWXY) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); gp_Pnt pnt = curve->StartPoint(); if (emulateCCWXY) { if (isReversed()) @@ -1302,7 +1302,7 @@ Base::Vector3d GeomArcOfConic::getStartPoint(bool emulateCCWXY) const */ Base::Vector3d GeomArcOfConic::getEndPoint(bool emulateCCWXY) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); gp_Pnt pnt = curve->EndPoint(); if (emulateCCWXY) { if (isReversed()) @@ -1313,8 +1313,8 @@ Base::Vector3d GeomArcOfConic::getEndPoint(bool emulateCCWXY) const Base::Vector3d GeomArcOfConic::getCenter(void) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); gp_Ax1 axis = conic->Axis(); const gp_Pnt& loc = axis.Location(); return Base::Vector3d(loc.X(),loc.Y(),loc.Z()); @@ -1322,8 +1322,8 @@ Base::Vector3d GeomArcOfConic::getCenter(void) const Base::Vector3d GeomArcOfConic::getLocation(void) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); gp_Ax1 axis = conic->Axis(); const gp_Pnt& loc = axis.Location(); return Base::Vector3d(loc.X(),loc.Y(),loc.Z()); @@ -1332,14 +1332,14 @@ Base::Vector3d GeomArcOfConic::getLocation(void) const void GeomArcOfConic::setCenter(const Base::Vector3d& Center) { gp_Pnt p1(Center.x,Center.y,Center.z); - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); try { conic->SetLocation(p1); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1347,14 +1347,14 @@ void GeomArcOfConic::setCenter(const Base::Vector3d& Center) void GeomArcOfConic::setLocation(const Base::Vector3d& Center) { gp_Pnt p1(Center.x,Center.y,Center.z); - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); try { conic->SetLocation(p1); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1367,8 +1367,8 @@ void GeomArcOfConic::setLocation(const Base::Vector3d& Center) */ bool GeomArcOfConic::isReversed() const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); assert(!conic.IsNull()); return conic->Axis().Direction().Z() < 0; } @@ -1385,8 +1385,8 @@ bool GeomArcOfConic::isReversed() const */ double GeomArcOfConic::getAngleXU(void) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); gp_Pnt center = conic->Axis().Location(); gp_Dir normal = conic->Axis().Direction(); @@ -1402,8 +1402,8 @@ double GeomArcOfConic::getAngleXU(void) const */ void GeomArcOfConic::setAngleXU(double angle) { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); try { gp_Pnt center = conic->Axis().Location(); @@ -1416,7 +1416,7 @@ void GeomArcOfConic::setAngleXU(double angle) conic->SetPosition(xdirref); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1428,8 +1428,8 @@ void GeomArcOfConic::setAngleXU(double angle) */ Base::Vector3d GeomArcOfConic::getXAxisDir() const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic c = Handle_Geom_Conic::DownCast( curve->BasisCurve() ); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) c = Handle(Geom_Conic)::DownCast( curve->BasisCurve() ); assert(!c.IsNull()); gp_Dir xdir = c->XAxis().Direction(); return Base::Vector3d(xdir.X(), xdir.Y(), xdir.Z()); @@ -1445,8 +1445,8 @@ Base::Vector3d GeomArcOfConic::getXAxisDir() const */ void GeomArcOfConic::setXAxisDir(const Base::Vector3d& newdir) { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Conic c = Handle_Geom_Conic::DownCast( curve->BasisCurve() ); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Conic) c = Handle(Geom_Conic)::DownCast( curve->BasisCurve() ); assert(!c.IsNull()); #if OCC_VERSION_HEX >= 0x060504 if (newdir.Sqr() < Precision::SquareConfusion()) @@ -1462,7 +1462,7 @@ void GeomArcOfConic::setXAxisDir(const Base::Vector3d& newdir) c->SetPosition(pos); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1473,11 +1473,11 @@ TYPESYSTEM_SOURCE(Part::GeomCircle,Part::GeomConic) GeomCircle::GeomCircle() { - Handle_Geom_Circle c = new Geom_Circle(gp_Circ()); + Handle(Geom_Circle) c = new Geom_Circle(gp_Circ()); this->myCurve = c; } -GeomCircle::GeomCircle(const Handle_Geom_Circle& c) +GeomCircle::GeomCircle(const Handle(Geom_Circle)& c) { setHandle(c); } @@ -1486,15 +1486,15 @@ GeomCircle::~GeomCircle() { } -const Handle_Geom_Geometry& GeomCircle::handle() const +const Handle(Geom_Geometry)& GeomCircle::handle() const { return myCurve; } -void GeomCircle::setHandle(const Handle_Geom_Circle& c) +void GeomCircle::setHandle(const Handle(Geom_Circle)& c) { - myCurve = Handle_Geom_Circle::DownCast(c->Copy()); + myCurve = Handle(Geom_Circle)::DownCast(c->Copy()); } Geometry *GeomCircle::copy(void) const @@ -1507,7 +1507,7 @@ Geometry *GeomCircle::copy(void) const GeomBSplineCurve* GeomCircle::toNurbs(double first, double last) const { double radius = getRadius(); - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(handle()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); //gp_Dir xdir = conic->XAxis().Direction(); //Standard_Real angle = gp_Dir(1,0,0).Angle(xdir) + first; @@ -1545,7 +1545,7 @@ GeomBSplineCurve* GeomCircle::toNurbs(double first, double last) const knots(2) = M_PI; knots(3) = 2*M_PI; - Handle_Geom_BSplineCurve spline = new Geom_BSplineCurve(poles, weights,knots, mults, 3, + Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(poles, weights,knots, mults, 3, Standard_False, Standard_True); spline->Segment(0, last-first); return new GeomBSplineCurve(spline); @@ -1553,13 +1553,13 @@ GeomBSplineCurve* GeomCircle::toNurbs(double first, double last) const double GeomCircle::getRadius(void) const { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(handle()); return circle->Radius(); } void GeomCircle::setRadius(double Radius) { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(handle()); try { gp_Circ c = circle->Circ(); @@ -1567,7 +1567,7 @@ void GeomCircle::setRadius(double Radius) circle->SetCirc(c); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1627,7 +1627,7 @@ void GeomCircle::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1643,11 +1643,11 @@ TYPESYSTEM_SOURCE(Part::GeomArcOfCircle,Part::GeomArcOfConic) GeomArcOfCircle::GeomArcOfCircle() { - Handle_Geom_Circle c = new Geom_Circle(gp_Circ()); + Handle(Geom_Circle) c = new Geom_Circle(gp_Circ()); this->myCurve = new Geom_TrimmedCurve(c, c->FirstParameter(),c->LastParameter()); } -GeomArcOfCircle::GeomArcOfCircle(const Handle_Geom_Circle& c) +GeomArcOfCircle::GeomArcOfCircle(const Handle(Geom_Circle)& c) { setHandle(c); } @@ -1656,21 +1656,21 @@ GeomArcOfCircle::~GeomArcOfCircle() { } -void GeomArcOfCircle::setHandle(const Handle_Geom_TrimmedCurve& c) +void GeomArcOfCircle::setHandle(const Handle(Geom_TrimmedCurve)& c) { - Handle_Geom_Circle basis = Handle_Geom_Circle::DownCast(c->BasisCurve()); + Handle(Geom_Circle) basis = Handle(Geom_Circle)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not a circle"); - this->myCurve = Handle_Geom_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_TrimmedCurve)::DownCast(c->Copy()); } -void GeomArcOfCircle::setHandle(const Handle_Geom_Circle& c) +void GeomArcOfCircle::setHandle(const Handle(Geom_Circle)& c) { this->myCurve = new Geom_TrimmedCurve(c, c->FirstParameter(),c->LastParameter()); } -const Handle_Geom_Geometry& GeomArcOfCircle::handle() const +const Handle(Geom_Geometry)& GeomArcOfCircle::handle() const { return myCurve; } @@ -1685,20 +1685,20 @@ Geometry *GeomArcOfCircle::copy(void) const GeomBSplineCurve* GeomArcOfCircle::toNurbs(double first, double last) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(curve->BasisCurve()); return GeomCircle(circle).toNurbs(first, last); } double GeomArcOfCircle::getRadius(void) const { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(myCurve->BasisCurve()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(myCurve->BasisCurve()); return circle->Radius(); } void GeomArcOfCircle::setRadius(double Radius) { - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(myCurve->BasisCurve()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(myCurve->BasisCurve()); try { gp_Circ c = circle->Circ(); @@ -1706,7 +1706,7 @@ void GeomArcOfCircle::setRadius(double Radius) circle->SetCirc(c); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1722,11 +1722,11 @@ void GeomArcOfCircle::setRadius(double Radius) */ void GeomArcOfCircle::getRange(double& u, double& v, bool emulateCCWXY) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); u = curve->FirstParameter(); v = curve->LastParameter(); if (emulateCCWXY){ - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); double angleXU = -conic->Position().XDirection().AngleWithRef(gp_Dir(1.0,0.0,0.0), gp_Dir(0.0,0.0,1.0)); double u1 = u, v1 = v;//the true arc curve parameters, cached. u,v will contain the rotation-corrected and swapped angles. if (conic->Axis().Direction().Z() > 0.0){ @@ -1759,9 +1759,9 @@ void GeomArcOfCircle::getRange(double& u, double& v, bool emulateCCWXY) const void GeomArcOfCircle::setRange(double u, double v, bool emulateCCWXY) { try { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); if (emulateCCWXY){ - Handle_Geom_Conic conic = Handle_Geom_Conic::DownCast(curve->BasisCurve()); + Handle(Geom_Conic) conic = Handle(Geom_Conic)::DownCast(curve->BasisCurve()); double angleXU = -conic->Position().XDirection().AngleWithRef(gp_Dir(1.0,0.0,0.0), gp_Dir(0.0,0.0,1.0)); double u1 = u, v1 = v;//the values that were passed, ccw angles from X axis. u,v will contain the rotation-corrected and swapped angles. if (conic->Axis().Direction().Z() > 0.0){ @@ -1779,7 +1779,7 @@ void GeomArcOfCircle::setRange(double u, double v, bool emulateCCWXY) curve->SetTrim(u, v); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1795,7 +1795,7 @@ void GeomArcOfCircle::Save(Base::Writer &writer) const // save the attributes of the father class Geometry::Save(writer); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(this->myCurve->BasisCurve()); gp_Pnt center = circle->Axis().Location(); gp_Dir norm = circle->Axis().Direction(); @@ -1845,15 +1845,15 @@ void GeomArcOfCircle::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom_Circle tmpcircle = Handle_Geom_Circle::DownCast(tmpcurve->BasisCurve()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom_Circle) tmpcircle = Handle(Geom_Circle)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(this->myCurve->BasisCurve()); circle->SetCirc(tmpcircle->Circ()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -1869,11 +1869,11 @@ TYPESYSTEM_SOURCE(Part::GeomEllipse,Part::GeomConic) GeomEllipse::GeomEllipse() { - Handle_Geom_Ellipse e = new Geom_Ellipse(gp_Elips()); + Handle(Geom_Ellipse) e = new Geom_Ellipse(gp_Elips()); this->myCurve = e; } -GeomEllipse::GeomEllipse(const Handle_Geom_Ellipse& e) +GeomEllipse::GeomEllipse(const Handle(Geom_Ellipse)& e) { setHandle(e); } @@ -1882,14 +1882,14 @@ GeomEllipse::~GeomEllipse() { } -const Handle_Geom_Geometry& GeomEllipse::handle() const +const Handle(Geom_Geometry)& GeomEllipse::handle() const { return myCurve; } -void GeomEllipse::setHandle(const Handle_Geom_Ellipse &e) +void GeomEllipse::setHandle(const Handle(Geom_Ellipse) &e) { - this->myCurve = Handle_Geom_Ellipse::DownCast(e->Copy()); + this->myCurve = Handle(Geom_Ellipse)::DownCast(e->Copy()); } Geometry *GeomEllipse::copy(void) const @@ -1906,7 +1906,7 @@ GeomBSplineCurve* GeomEllipse::toNurbs(double first, double last) const return GeomCurve::toNurbs(first, last); } - Handle_Geom_Ellipse conic = Handle_Geom_Ellipse::DownCast(handle()); + Handle(Geom_Ellipse) conic = Handle(Geom_Ellipse)::DownCast(handle()); gp_Ax1 axis = conic->Axis(); Standard_Real majorRadius = conic->MajorRadius(); Standard_Real minorRadius = conic->MinorRadius(); @@ -1942,45 +1942,45 @@ GeomBSplineCurve* GeomEllipse::toNurbs(double first, double last) const knots(2) = 1; knots(3) = 2; - Handle_Geom_BSplineCurve spline = new Geom_BSplineCurve(poles, weights,knots, mults, 3, + Handle(Geom_BSplineCurve) spline = new Geom_BSplineCurve(poles, weights,knots, mults, 3, Standard_False, Standard_True); return new GeomBSplineCurve(spline); } double GeomEllipse::getMajorRadius(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(handle()); return ellipse->MajorRadius(); } void GeomEllipse::setMajorRadius(double Radius) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(handle()); try { ellipse->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } double GeomEllipse::getMinorRadius(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(handle()); return ellipse->MinorRadius(); } void GeomEllipse::setMinorRadius(double Radius) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(handle()); try { ellipse->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2018,7 +2018,7 @@ void GeomEllipse::setMajorAxisDir(Base::Vector3d newdir) myCurve->SetPosition(pos); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2100,7 +2100,7 @@ void GeomEllipse::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2116,11 +2116,11 @@ TYPESYSTEM_SOURCE(Part::GeomArcOfEllipse,Part::GeomArcOfConic) GeomArcOfEllipse::GeomArcOfEllipse() { - Handle_Geom_Ellipse e = new Geom_Ellipse(gp_Elips()); + Handle(Geom_Ellipse) e = new Geom_Ellipse(gp_Elips()); this->myCurve = new Geom_TrimmedCurve(e, e->FirstParameter(),e->LastParameter()); } -GeomArcOfEllipse::GeomArcOfEllipse(const Handle_Geom_Ellipse& e) +GeomArcOfEllipse::GeomArcOfEllipse(const Handle(Geom_Ellipse)& e) { setHandle(e); } @@ -2129,20 +2129,20 @@ GeomArcOfEllipse::~GeomArcOfEllipse() { } -void GeomArcOfEllipse::setHandle(const Handle_Geom_TrimmedCurve& c) +void GeomArcOfEllipse::setHandle(const Handle(Geom_TrimmedCurve)& c) { - Handle_Geom_Ellipse basis = Handle_Geom_Ellipse::DownCast(c->BasisCurve()); + Handle(Geom_Ellipse) basis = Handle(Geom_Ellipse)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not an ellipse"); - this->myCurve = Handle_Geom_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_TrimmedCurve)::DownCast(c->Copy()); } -void GeomArcOfEllipse::setHandle(const Handle_Geom_Ellipse& e) +void GeomArcOfEllipse::setHandle(const Handle(Geom_Ellipse)& e) { this->myCurve = new Geom_TrimmedCurve(e, e->FirstParameter(),e->LastParameter()); } -const Handle_Geom_Geometry& GeomArcOfEllipse::handle() const +const Handle(Geom_Geometry)& GeomArcOfEllipse::handle() const { return myCurve; } @@ -2157,45 +2157,45 @@ Geometry *GeomArcOfEllipse::copy(void) const GeomBSplineCurve* GeomArcOfEllipse::toNurbs(double first, double last) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(curve->BasisCurve()); return GeomEllipse(ellipse).toNurbs(first, last); } double GeomArcOfEllipse::getMajorRadius(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MajorRadius(); } void GeomArcOfEllipse::setMajorRadius(double Radius) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(myCurve->BasisCurve()); try { ellipse->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } double GeomArcOfEllipse::getMinorRadius(void) const { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MinorRadius(); } void GeomArcOfEllipse::setMinorRadius(double Radius) { - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(myCurve->BasisCurve()); try { ellipse->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2207,7 +2207,7 @@ void GeomArcOfEllipse::setMinorRadius(double Radius) */ Base::Vector3d GeomArcOfEllipse::getMajorAxisDir() const { - Handle_Geom_Ellipse c = Handle_Geom_Ellipse::DownCast( myCurve->BasisCurve() ); + Handle(Geom_Ellipse) c = Handle(Geom_Ellipse)::DownCast( myCurve->BasisCurve() ); assert(!c.IsNull()); gp_Dir xdir = c->XAxis().Direction(); return Base::Vector3d(xdir.X(), xdir.Y(), xdir.Z()); @@ -2223,7 +2223,7 @@ Base::Vector3d GeomArcOfEllipse::getMajorAxisDir() const */ void GeomArcOfEllipse::setMajorAxisDir(Base::Vector3d newdir) { - Handle_Geom_Ellipse c = Handle_Geom_Ellipse::DownCast( myCurve->BasisCurve() ); + Handle(Geom_Ellipse) c = Handle(Geom_Ellipse)::DownCast( myCurve->BasisCurve() ); assert(!c.IsNull()); #if OCC_VERSION_HEX >= 0x060504 if (newdir.Sqr() < Precision::SquareConfusion()) @@ -2237,7 +2237,7 @@ void GeomArcOfEllipse::setMajorAxisDir(Base::Vector3d newdir) c->SetPosition(pos); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2284,7 +2284,7 @@ void GeomArcOfEllipse::setRange(double u, double v, bool emulateCCWXY) myCurve->SetTrim(u, v); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2300,7 +2300,7 @@ void GeomArcOfEllipse::Save(Base::Writer &writer) const // save the attributes of the father class GeomCurve::Save(writer); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(this->myCurve->BasisCurve()); gp_Pnt center = ellipse->Axis().Location(); gp_Dir normal = ellipse->Axis().Direction(); @@ -2369,15 +2369,15 @@ void GeomArcOfEllipse::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom_Ellipse tmpellipse = Handle_Geom_Ellipse::DownCast(tmpcurve->BasisCurve()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom_Ellipse) tmpellipse = Handle(Geom_Ellipse)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(this->myCurve->BasisCurve()); ellipse->SetElips(tmpellipse->Elips()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2393,11 +2393,11 @@ TYPESYSTEM_SOURCE(Part::GeomHyperbola,Part::GeomConic) GeomHyperbola::GeomHyperbola() { - Handle_Geom_Hyperbola h = new Geom_Hyperbola(gp_Hypr()); + Handle(Geom_Hyperbola) h = new Geom_Hyperbola(gp_Hypr()); this->myCurve = h; } -GeomHyperbola::GeomHyperbola(const Handle_Geom_Hyperbola& h) +GeomHyperbola::GeomHyperbola(const Handle(Geom_Hyperbola)& h) { setHandle(h); } @@ -2406,15 +2406,15 @@ GeomHyperbola::~GeomHyperbola() { } -const Handle_Geom_Geometry& GeomHyperbola::handle() const +const Handle(Geom_Geometry)& GeomHyperbola::handle() const { return myCurve; } -void GeomHyperbola::setHandle(const Handle_Geom_Hyperbola& c) +void GeomHyperbola::setHandle(const Handle(Geom_Hyperbola)& c) { - myCurve = Handle_Geom_Hyperbola::DownCast(c->Copy()); + myCurve = Handle(Geom_Hyperbola)::DownCast(c->Copy()); } Geometry *GeomHyperbola::copy(void) const @@ -2431,38 +2431,38 @@ GeomBSplineCurve* GeomHyperbola::toNurbs(double first, double last) const double GeomHyperbola::getMajorRadius(void) const { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(handle()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(handle()); return h->MajorRadius(); } void GeomHyperbola::setMajorRadius(double Radius) { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(handle()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(handle()); try { h->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } double GeomHyperbola::getMinorRadius(void) const { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(handle()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(handle()); return h->MinorRadius(); } void GeomHyperbola::setMinorRadius(double Radius) { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(handle()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(handle()); try { h->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2538,7 +2538,7 @@ void GeomHyperbola::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2554,11 +2554,11 @@ TYPESYSTEM_SOURCE(Part::GeomArcOfHyperbola,Part::GeomArcOfConic) GeomArcOfHyperbola::GeomArcOfHyperbola() { gp_Ax2 ax2 = gp_Ax2(); - Handle_Geom_Hyperbola h = new Geom_Hyperbola(gp_Hypr(ax2, 1,1)); + Handle(Geom_Hyperbola) h = new Geom_Hyperbola(gp_Hypr(ax2, 1,1)); this->myCurve = new Geom_TrimmedCurve(h, h->FirstParameter(),h->LastParameter()); } -GeomArcOfHyperbola::GeomArcOfHyperbola(const Handle_Geom_Hyperbola& h) +GeomArcOfHyperbola::GeomArcOfHyperbola(const Handle(Geom_Hyperbola)& h) { setHandle(h); } @@ -2567,20 +2567,20 @@ GeomArcOfHyperbola::~GeomArcOfHyperbola() { } -void GeomArcOfHyperbola::setHandle(const Handle_Geom_TrimmedCurve& c) +void GeomArcOfHyperbola::setHandle(const Handle(Geom_TrimmedCurve)& c) { - Handle_Geom_Hyperbola basis = Handle_Geom_Hyperbola::DownCast(c->BasisCurve()); + Handle(Geom_Hyperbola) basis = Handle(Geom_Hyperbola)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not an hyperbola"); - this->myCurve = Handle_Geom_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_TrimmedCurve)::DownCast(c->Copy()); } -void GeomArcOfHyperbola::setHandle(const Handle_Geom_Hyperbola& h) +void GeomArcOfHyperbola::setHandle(const Handle(Geom_Hyperbola)& h) { this->myCurve = new Geom_TrimmedCurve(h, h->FirstParameter(),h->LastParameter()); } -const Handle_Geom_Geometry& GeomArcOfHyperbola::handle() const +const Handle(Geom_Geometry)& GeomArcOfHyperbola::handle() const { return myCurve; } @@ -2595,45 +2595,45 @@ Geometry *GeomArcOfHyperbola::copy(void) const GeomBSplineCurve* GeomArcOfHyperbola::toNurbs(double first, double last) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(curve->BasisCurve()); return GeomHyperbola(hyperbola).toNurbs(first, last); } double GeomArcOfHyperbola::getMajorRadius(void) const { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MajorRadius(); } void GeomArcOfHyperbola::setMajorRadius(double Radius) { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); try { h->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } double GeomArcOfHyperbola::getMinorRadius(void) const { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MinorRadius(); } void GeomArcOfHyperbola::setMinorRadius(double Radius) { - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); try { h->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2645,7 +2645,7 @@ void GeomArcOfHyperbola::setMinorRadius(double Radius) */ Base::Vector3d GeomArcOfHyperbola::getMajorAxisDir() const { - Handle_Geom_Hyperbola c = Handle_Geom_Hyperbola::DownCast( myCurve->BasisCurve() ); + Handle(Geom_Hyperbola) c = Handle(Geom_Hyperbola)::DownCast( myCurve->BasisCurve() ); assert(!c.IsNull()); gp_Dir xdir = c->XAxis().Direction(); return Base::Vector3d(xdir.X(), xdir.Y(), xdir.Z()); @@ -2661,7 +2661,7 @@ Base::Vector3d GeomArcOfHyperbola::getMajorAxisDir() const */ void GeomArcOfHyperbola::setMajorAxisDir(Base::Vector3d newdir) { - Handle_Geom_Hyperbola c = Handle_Geom_Hyperbola::DownCast( myCurve->BasisCurve() ); + Handle(Geom_Hyperbola) c = Handle(Geom_Hyperbola)::DownCast( myCurve->BasisCurve() ); assert(!c.IsNull()); #if OCC_VERSION_HEX >= 0x060504 if (newdir.Sqr() < Precision::SquareConfusion()) @@ -2676,7 +2676,7 @@ void GeomArcOfHyperbola::setMajorAxisDir(Base::Vector3d newdir) c->SetPosition(pos); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2686,14 +2686,14 @@ void GeomArcOfHyperbola::getRange(double& u, double& v, bool emulateCCWXY) const try { if (emulateCCWXY){ if (isReversed()) { - Handle_Geom_Hyperbola c = Handle_Geom_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Hyperbola) c = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); assert(!c.IsNull()); c->Reverse(); } } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } @@ -2708,14 +2708,14 @@ void GeomArcOfHyperbola::setRange(double u, double v, bool emulateCCWXY) if (emulateCCWXY) { if (isReversed()) { - Handle_Geom_Hyperbola c = Handle_Geom_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Hyperbola) c = Handle(Geom_Hyperbola)::DownCast(myCurve->BasisCurve()); assert(!c.IsNull()); c->Reverse(); } } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2731,7 +2731,7 @@ void GeomArcOfHyperbola::Save(Base::Writer &writer) const // save the attributes of the father class GeomCurve::Save(writer); - Handle_Geom_Hyperbola h = Handle_Geom_Hyperbola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_Hyperbola) h = Handle(Geom_Hyperbola)::DownCast(this->myCurve->BasisCurve()); gp_Pnt center = h->Axis().Location(); gp_Dir normal = h->Axis().Direction(); @@ -2799,15 +2799,15 @@ void GeomArcOfHyperbola::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom_Hyperbola tmphyperbola = Handle_Geom_Hyperbola::DownCast(tmpcurve->BasisCurve()); - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom_Hyperbola) tmphyperbola = Handle(Geom_Hyperbola)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(this->myCurve->BasisCurve()); hyperbola->SetHypr(tmphyperbola->Hypr()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2822,11 +2822,11 @@ TYPESYSTEM_SOURCE(Part::GeomParabola,Part::GeomConic) GeomParabola::GeomParabola() { - Handle_Geom_Parabola p = new Geom_Parabola(gp_Parab()); + Handle(Geom_Parabola) p = new Geom_Parabola(gp_Parab()); this->myCurve = p; } -GeomParabola::GeomParabola(const Handle_Geom_Parabola& p) +GeomParabola::GeomParabola(const Handle(Geom_Parabola)& p) { setHandle(p); } @@ -2835,14 +2835,14 @@ GeomParabola::~GeomParabola() { } -const Handle_Geom_Geometry& GeomParabola::handle() const +const Handle(Geom_Geometry)& GeomParabola::handle() const { return myCurve; } -void GeomParabola::setHandle(const Handle_Geom_Parabola& c) +void GeomParabola::setHandle(const Handle(Geom_Parabola)& c) { - myCurve = Handle_Geom_Parabola::DownCast(c->Copy()); + myCurve = Handle(Geom_Parabola)::DownCast(c->Copy()); } Geometry *GeomParabola::copy(void) const @@ -2861,19 +2861,19 @@ GeomBSplineCurve* GeomParabola::toNurbs(double first, double last) const double GeomParabola::getFocal(void) const { - Handle_Geom_Parabola p = Handle_Geom_Parabola::DownCast(handle()); + Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(handle()); return p->Focal(); } void GeomParabola::setFocal(double length) { - Handle_Geom_Parabola p = Handle_Geom_Parabola::DownCast(handle()); + Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(handle()); try { p->SetFocal(length); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2947,7 +2947,7 @@ void GeomParabola::Restore(Base::XMLReader& reader) this->myCurve = new Geom_Parabola(mc.Value()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -2963,11 +2963,11 @@ TYPESYSTEM_SOURCE(Part::GeomArcOfParabola,Part::GeomArcOfConic) GeomArcOfParabola::GeomArcOfParabola() { - Handle_Geom_Parabola p = new Geom_Parabola(gp_Parab()); + Handle(Geom_Parabola) p = new Geom_Parabola(gp_Parab()); this->myCurve = new Geom_TrimmedCurve(p, p->FirstParameter(),p->LastParameter()); } -GeomArcOfParabola::GeomArcOfParabola(const Handle_Geom_Parabola& h) +GeomArcOfParabola::GeomArcOfParabola(const Handle(Geom_Parabola)& h) { setHandle(h); } @@ -2976,20 +2976,20 @@ GeomArcOfParabola::~GeomArcOfParabola() { } -void GeomArcOfParabola::setHandle(const Handle_Geom_TrimmedCurve& c) +void GeomArcOfParabola::setHandle(const Handle(Geom_TrimmedCurve)& c) { - Handle_Geom_Parabola basis = Handle_Geom_Parabola::DownCast(c->BasisCurve()); + Handle(Geom_Parabola) basis = Handle(Geom_Parabola)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not a parabola"); - this->myCurve = Handle_Geom_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_TrimmedCurve)::DownCast(c->Copy()); } -void GeomArcOfParabola::setHandle(const Handle_Geom_Parabola& h) +void GeomArcOfParabola::setHandle(const Handle(Geom_Parabola)& h) { this->myCurve = new Geom_TrimmedCurve(h, h->FirstParameter(),h->LastParameter()); } -const Handle_Geom_Geometry& GeomArcOfParabola::handle() const +const Handle(Geom_Geometry)& GeomArcOfParabola::handle() const { return myCurve; } @@ -3004,33 +3004,33 @@ Geometry *GeomArcOfParabola::copy(void) const GeomBSplineCurve* GeomArcOfParabola::toNurbs(double first, double last) const { - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(handle()); - Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(curve->BasisCurve()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast(curve->BasisCurve()); return GeomParabola(parabola).toNurbs(first, last); } double GeomArcOfParabola::getFocal(void) const { - Handle_Geom_Parabola p = Handle_Geom_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); return p->Focal(); } void GeomArcOfParabola::setFocal(double length) { - Handle_Geom_Parabola p = Handle_Geom_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); try { p->SetFocal(length); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } Base::Vector3d GeomArcOfParabola::getFocus(void) const { - Handle_Geom_Parabola p = Handle_Geom_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); gp_Pnt gp = p->Focus(); return Base::Vector3d(gp.X(),gp.Y(),gp.Z()); @@ -3041,14 +3041,14 @@ void GeomArcOfParabola::getRange(double& u, double& v, bool emulateCCWXY) const try { if (emulateCCWXY) { if (isReversed()) { - Handle_Geom_Parabola c = Handle_Geom_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Parabola) c = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); assert(!c.IsNull()); c->Reverse(); } } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } @@ -3062,14 +3062,14 @@ void GeomArcOfParabola::setRange(double u, double v, bool emulateCCWXY) myCurve->SetTrim(u, v); if (emulateCCWXY) { if (isReversed()) { - Handle_Geom_Parabola c = Handle_Geom_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom_Parabola) c = Handle(Geom_Parabola)::DownCast(myCurve->BasisCurve()); assert(!c.IsNull()); c->Reverse(); } } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -3085,7 +3085,7 @@ void GeomArcOfParabola::Save(Base::Writer &writer) const // save the attributes of the father class GeomCurve::Save(writer); - Handle_Geom_Parabola p = Handle_Geom_Parabola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_Parabola) p = Handle(Geom_Parabola)::DownCast(this->myCurve->BasisCurve()); gp_Pnt center = p->Axis().Location(); gp_Dir normal = p->Axis().Direction(); @@ -3151,15 +3151,15 @@ void GeomArcOfParabola::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom_Parabola tmpparabola = Handle_Geom_Parabola::DownCast(tmpcurve->BasisCurve()); - Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom_Parabola) tmpparabola = Handle(Geom_Parabola)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast(this->myCurve->BasisCurve()); parabola->SetParab(tmpparabola->Parab()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -3175,11 +3175,11 @@ TYPESYSTEM_SOURCE(Part::GeomLine,Part::GeomCurve) GeomLine::GeomLine() { - Handle_Geom_Line c = new Geom_Line(gp_Lin()); + Handle(Geom_Line) c = new Geom_Line(gp_Lin()); this->myCurve = c; } -GeomLine::GeomLine(const Handle_Geom_Line& l) +GeomLine::GeomLine(const Handle(Geom_Line)& l) { setHandle(l); } @@ -3212,15 +3212,15 @@ Base::Vector3d GeomLine::getDir(void) const return Base::Vector3d(Dir.X(),Dir.Y(),Dir.Z()); } -const Handle_Geom_Geometry& GeomLine::handle() const +const Handle(Geom_Geometry)& GeomLine::handle() const { return myCurve; } -void GeomLine::setHandle(const Handle_Geom_Line& l) +void GeomLine::setHandle(const Handle(Geom_Line)& l) { - this->myCurve = Handle_Geom_Line::DownCast(l->Copy()); + this->myCurve = Handle(Geom_Line)::DownCast(l->Copy()); } Geometry *GeomLine::copy(void) const @@ -3289,11 +3289,11 @@ GeomLineSegment::GeomLineSegment() gp_Lin line; line.SetLocation(gp_Pnt(0.0,0.0,0.0)); line.SetDirection(gp_Dir(0.0,0.0,1.0)); - Handle_Geom_Line c = new Geom_Line(line); + Handle(Geom_Line) c = new Geom_Line(line); this->myCurve = new Geom_TrimmedCurve(c, 0.0,1.0); } -GeomLineSegment::GeomLineSegment(const Handle_Geom_Line& l) +GeomLineSegment::GeomLineSegment(const Handle(Geom_Line)& l) { setHandle(l); } @@ -3302,20 +3302,20 @@ GeomLineSegment::~GeomLineSegment() { } -void GeomLineSegment::setHandle(const Handle_Geom_TrimmedCurve& c) +void GeomLineSegment::setHandle(const Handle(Geom_TrimmedCurve)& c) { - Handle_Geom_Line basis = Handle_Geom_Line::DownCast(c->BasisCurve()); + Handle(Geom_Line) basis = Handle(Geom_Line)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not a line"); - this->myCurve = Handle_Geom_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_TrimmedCurve)::DownCast(c->Copy()); } -void GeomLineSegment::setHandle(const Handle_Geom_Line& l) +void GeomLineSegment::setHandle(const Handle(Geom_Line)& l) { this->myCurve = new Geom_TrimmedCurve(l, l->FirstParameter(),l->LastParameter()); } -const Handle_Geom_Geometry& GeomLineSegment::handle() const +const Handle(Geom_Geometry)& GeomLineSegment::handle() const { return myCurve; } @@ -3323,21 +3323,21 @@ const Handle_Geom_Geometry& GeomLineSegment::handle() const Geometry *GeomLineSegment::copy(void)const { GeomLineSegment *tempCurve = new GeomLineSegment(); - tempCurve->myCurve = Handle_Geom_TrimmedCurve::DownCast(myCurve->Copy()); + tempCurve->myCurve = Handle(Geom_TrimmedCurve)::DownCast(myCurve->Copy()); tempCurve->Construction = this->Construction; return tempCurve; } Base::Vector3d GeomLineSegment::getStartPoint() const { - Handle_Geom_TrimmedCurve this_curve = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); gp_Pnt pnt = this_curve->StartPoint(); return Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z()); } Base::Vector3d GeomLineSegment::getEndPoint() const { - Handle_Geom_TrimmedCurve this_curve = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast(handle()); gp_Pnt pnt = this_curve->EndPoint(); return Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z()); } @@ -3345,7 +3345,7 @@ Base::Vector3d GeomLineSegment::getEndPoint() const void GeomLineSegment::setPoints(const Base::Vector3d& Start, const Base::Vector3d& End) { gp_Pnt p1(Start.x,Start.y,Start.z), p2(End.x,End.y,End.z); - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast(handle()); + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast(handle()); try { // Create line out of two points @@ -3357,15 +3357,15 @@ void GeomLineSegment::setPoints(const Base::Vector3d& Start, const Base::Vector3 } // get Geom_Line of line segment - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom_TrimmedCurve that_curv = ms.Value(); - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin(that_line->Lin()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::RuntimeError(e->GetMessageString()); } } @@ -3429,12 +3429,12 @@ GeomOffsetCurve::GeomOffsetCurve() { } -GeomOffsetCurve::GeomOffsetCurve(const Handle_Geom_Curve& c, double offset, const gp_Dir& dir) +GeomOffsetCurve::GeomOffsetCurve(const Handle(Geom_Curve)& c, double offset, const gp_Dir& dir) { this->myCurve = new Geom_OffsetCurve(c, offset, dir); } -GeomOffsetCurve::GeomOffsetCurve(const Handle_Geom_OffsetCurve& c) +GeomOffsetCurve::GeomOffsetCurve(const Handle(Geom_OffsetCurve)& c) { setHandle(c); } @@ -3450,12 +3450,12 @@ Geometry *GeomOffsetCurve::copy(void) const return newCurve; } -void GeomOffsetCurve::setHandle(const Handle_Geom_OffsetCurve& c) +void GeomOffsetCurve::setHandle(const Handle(Geom_OffsetCurve)& c) { - this->myCurve = Handle_Geom_OffsetCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_OffsetCurve)::DownCast(c->Copy()); } -const Handle_Geom_Geometry& GeomOffsetCurve::handle() const +const Handle(Geom_Geometry)& GeomOffsetCurve::handle() const { return this->myCurve; } @@ -3478,7 +3478,7 @@ GeomTrimmedCurve::GeomTrimmedCurve() { } -GeomTrimmedCurve::GeomTrimmedCurve(const Handle_Geom_TrimmedCurve& c) +GeomTrimmedCurve::GeomTrimmedCurve(const Handle(Geom_TrimmedCurve)& c) { setHandle(c); } @@ -3487,12 +3487,12 @@ GeomTrimmedCurve::~GeomTrimmedCurve() { } -void GeomTrimmedCurve::setHandle(const Handle_Geom_TrimmedCurve& c) +void GeomTrimmedCurve::setHandle(const Handle(Geom_TrimmedCurve)& c) { - this->myCurve = Handle_Geom_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom_Geometry& GeomTrimmedCurve::handle() const +const Handle(Geom_Geometry)& GeomTrimmedCurve::handle() const { return myCurve; } @@ -3528,7 +3528,7 @@ GeomSurface::~GeomSurface() TopoDS_Shape GeomSurface::toShape() const { - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle()); + Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(handle()); Standard_Real u1,u2,v1,v2; s->Bounds(u1,u2,v1,v2); BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2 @@ -3541,7 +3541,7 @@ TopoDS_Shape GeomSurface::toShape() const bool GeomSurface::tangentU(double u, double v, gp_Dir& dirU) const { - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle()); + Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(handle()); GeomLProp_SLProps prop(s,u,v,1,Precision::Confusion()); if (prop.IsTangentUDefined()) { prop.TangentU(dirU); @@ -3553,7 +3553,7 @@ bool GeomSurface::tangentU(double u, double v, gp_Dir& dirU) const bool GeomSurface::tangentV(double u, double v, gp_Dir& dirV) const { - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle()); + Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(handle()); GeomLProp_SLProps prop(s,u,v,1,Precision::Confusion()); if (prop.IsTangentVDefined()) { prop.TangentV(dirV); @@ -3577,7 +3577,7 @@ GeomBezierSurface::GeomBezierSurface() this->mySurface = new Geom_BezierSurface(poles); } -GeomBezierSurface::GeomBezierSurface(const Handle_Geom_BezierSurface& b) +GeomBezierSurface::GeomBezierSurface(const Handle(Geom_BezierSurface)& b) { setHandle(b); } @@ -3586,14 +3586,14 @@ GeomBezierSurface::~GeomBezierSurface() { } -const Handle_Geom_Geometry& GeomBezierSurface::handle() const +const Handle(Geom_Geometry)& GeomBezierSurface::handle() const { return mySurface; } -void GeomBezierSurface::setHandle(const Handle_Geom_BezierSurface& b) +void GeomBezierSurface::setHandle(const Handle(Geom_BezierSurface)& b) { - this->mySurface = Handle_Geom_BezierSurface::DownCast(b->Copy()); + this->mySurface = Handle(Geom_BezierSurface)::DownCast(b->Copy()); } Geometry *GeomBezierSurface::copy(void) const @@ -3636,7 +3636,7 @@ GeomBSplineSurface::GeomBSplineSurface() this->mySurface = new Geom_BSplineSurface(poles, knots, knots, mults, mults, 1, 1); } -GeomBSplineSurface::GeomBSplineSurface(const Handle_Geom_BSplineSurface& b) +GeomBSplineSurface::GeomBSplineSurface(const Handle(Geom_BSplineSurface)& b) { setHandle(b); } @@ -3645,12 +3645,12 @@ GeomBSplineSurface::~GeomBSplineSurface() { } -void GeomBSplineSurface::setHandle(const Handle_Geom_BSplineSurface& s) +void GeomBSplineSurface::setHandle(const Handle(Geom_BSplineSurface)& s) { - mySurface = Handle_Geom_BSplineSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_BSplineSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomBSplineSurface::handle() const +const Handle(Geom_Geometry)& GeomBSplineSurface::handle() const { return mySurface; } @@ -3678,11 +3678,11 @@ TYPESYSTEM_SOURCE(Part::GeomCylinder,Part::GeomSurface) GeomCylinder::GeomCylinder() { - Handle_Geom_CylindricalSurface s = new Geom_CylindricalSurface(gp_Cylinder()); + Handle(Geom_CylindricalSurface) s = new Geom_CylindricalSurface(gp_Cylinder()); this->mySurface = s; } -GeomCylinder::GeomCylinder(const Handle_Geom_CylindricalSurface& c) +GeomCylinder::GeomCylinder(const Handle(Geom_CylindricalSurface)& c) { setHandle(c); } @@ -3691,12 +3691,12 @@ GeomCylinder::~GeomCylinder() { } -void GeomCylinder::setHandle(const Handle_Geom_CylindricalSurface& s) +void GeomCylinder::setHandle(const Handle(Geom_CylindricalSurface)& s) { - mySurface = Handle_Geom_CylindricalSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_CylindricalSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomCylinder::handle() const +const Handle(Geom_Geometry)& GeomCylinder::handle() const { return mySurface; } @@ -3704,7 +3704,7 @@ const Handle_Geom_Geometry& GeomCylinder::handle() const Geometry *GeomCylinder::copy(void) const { GeomCylinder *tempCurve = new GeomCylinder(); - tempCurve->mySurface = Handle_Geom_CylindricalSurface::DownCast(mySurface->Copy()); + tempCurve->mySurface = Handle(Geom_CylindricalSurface)::DownCast(mySurface->Copy()); tempCurve->Construction = this->Construction; return tempCurve; } @@ -3725,11 +3725,11 @@ TYPESYSTEM_SOURCE(Part::GeomCone,Part::GeomSurface) GeomCone::GeomCone() { - Handle_Geom_ConicalSurface s = new Geom_ConicalSurface(gp_Cone()); + Handle(Geom_ConicalSurface) s = new Geom_ConicalSurface(gp_Cone()); this->mySurface = s; } -GeomCone::GeomCone(const Handle_Geom_ConicalSurface& c) +GeomCone::GeomCone(const Handle(Geom_ConicalSurface)& c) { setHandle(c); } @@ -3738,12 +3738,12 @@ GeomCone::~GeomCone() { } -void GeomCone::setHandle(const Handle_Geom_ConicalSurface& s) +void GeomCone::setHandle(const Handle(Geom_ConicalSurface)& s) { - mySurface = Handle_Geom_ConicalSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_ConicalSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomCone::handle() const +const Handle(Geom_Geometry)& GeomCone::handle() const { return mySurface; } @@ -3751,7 +3751,7 @@ const Handle_Geom_Geometry& GeomCone::handle() const Geometry *GeomCone::copy(void) const { GeomCone *tempCurve = new GeomCone(); - tempCurve->mySurface = Handle_Geom_ConicalSurface::DownCast(mySurface->Copy()); + tempCurve->mySurface = Handle(Geom_ConicalSurface)::DownCast(mySurface->Copy()); tempCurve->Construction = this->Construction; return tempCurve; } @@ -3772,11 +3772,11 @@ TYPESYSTEM_SOURCE(Part::GeomToroid,Part::GeomSurface) GeomToroid::GeomToroid() { - Handle_Geom_ToroidalSurface s = new Geom_ToroidalSurface(gp_Torus()); + Handle(Geom_ToroidalSurface) s = new Geom_ToroidalSurface(gp_Torus()); this->mySurface = s; } -GeomToroid::GeomToroid(const Handle_Geom_ToroidalSurface& t) +GeomToroid::GeomToroid(const Handle(Geom_ToroidalSurface)& t) { setHandle(t); } @@ -3785,12 +3785,12 @@ GeomToroid::~GeomToroid() { } -void GeomToroid::setHandle(const Handle_Geom_ToroidalSurface& s) +void GeomToroid::setHandle(const Handle(Geom_ToroidalSurface)& s) { - mySurface = Handle_Geom_ToroidalSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_ToroidalSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomToroid::handle() const +const Handle(Geom_Geometry)& GeomToroid::handle() const { return mySurface; } @@ -3798,7 +3798,7 @@ const Handle_Geom_Geometry& GeomToroid::handle() const Geometry *GeomToroid::copy(void) const { GeomToroid *tempCurve = new GeomToroid(); - tempCurve->mySurface = Handle_Geom_ToroidalSurface::DownCast(mySurface->Copy()); + tempCurve->mySurface = Handle(Geom_ToroidalSurface)::DownCast(mySurface->Copy()); tempCurve->Construction = this->Construction; return tempCurve; } @@ -3819,11 +3819,11 @@ TYPESYSTEM_SOURCE(Part::GeomSphere,Part::GeomSurface) GeomSphere::GeomSphere() { - Handle_Geom_SphericalSurface s = new Geom_SphericalSurface(gp_Sphere()); + Handle(Geom_SphericalSurface) s = new Geom_SphericalSurface(gp_Sphere()); this->mySurface = s; } -GeomSphere::GeomSphere(const Handle_Geom_SphericalSurface& s) +GeomSphere::GeomSphere(const Handle(Geom_SphericalSurface)& s) { setHandle(s); } @@ -3832,12 +3832,12 @@ GeomSphere::~GeomSphere() { } -void GeomSphere::setHandle(const Handle_Geom_SphericalSurface& s) +void GeomSphere::setHandle(const Handle(Geom_SphericalSurface)& s) { - mySurface = Handle_Geom_SphericalSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_SphericalSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomSphere::handle() const +const Handle(Geom_Geometry)& GeomSphere::handle() const { return mySurface; } @@ -3845,7 +3845,7 @@ const Handle_Geom_Geometry& GeomSphere::handle() const Geometry *GeomSphere::copy(void) const { GeomSphere *tempCurve = new GeomSphere(); - tempCurve->mySurface = Handle_Geom_SphericalSurface::DownCast(mySurface->Copy()); + tempCurve->mySurface = Handle(Geom_SphericalSurface)::DownCast(mySurface->Copy()); tempCurve->Construction = this->Construction; return tempCurve; } @@ -3866,11 +3866,11 @@ TYPESYSTEM_SOURCE(Part::GeomPlane,Part::GeomSurface) GeomPlane::GeomPlane() { - Handle_Geom_Plane s = new Geom_Plane(gp_Pln()); + Handle(Geom_Plane) s = new Geom_Plane(gp_Pln()); this->mySurface = s; } -GeomPlane::GeomPlane(const Handle_Geom_Plane& p) +GeomPlane::GeomPlane(const Handle(Geom_Plane)& p) { setHandle(p); } @@ -3879,12 +3879,12 @@ GeomPlane::~GeomPlane() { } -void GeomPlane::setHandle(const Handle_Geom_Plane& s) +void GeomPlane::setHandle(const Handle(Geom_Plane)& s) { - mySurface = Handle_Geom_Plane::DownCast(s->Copy()); + mySurface = Handle(Geom_Plane)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomPlane::handle() const +const Handle(Geom_Geometry)& GeomPlane::handle() const { return mySurface; } @@ -3892,7 +3892,7 @@ const Handle_Geom_Geometry& GeomPlane::handle() const Geometry *GeomPlane::copy(void) const { GeomPlane *tempCurve = new GeomPlane(); - tempCurve->mySurface = Handle_Geom_Plane::DownCast(mySurface->Copy()); + tempCurve->mySurface = Handle(Geom_Plane)::DownCast(mySurface->Copy()); tempCurve->Construction = this->Construction; return tempCurve; } @@ -3915,12 +3915,12 @@ GeomOffsetSurface::GeomOffsetSurface() { } -GeomOffsetSurface::GeomOffsetSurface(const Handle_Geom_Surface& s, double offset) +GeomOffsetSurface::GeomOffsetSurface(const Handle(Geom_Surface)& s, double offset) { this->mySurface = new Geom_OffsetSurface(s, offset); } -GeomOffsetSurface::GeomOffsetSurface(const Handle_Geom_OffsetSurface& s) +GeomOffsetSurface::GeomOffsetSurface(const Handle(Geom_OffsetSurface)& s) { setHandle(s); } @@ -3929,12 +3929,12 @@ GeomOffsetSurface::~GeomOffsetSurface() { } -void GeomOffsetSurface::setHandle(const Handle_Geom_OffsetSurface& s) +void GeomOffsetSurface::setHandle(const Handle(Geom_OffsetSurface)& s) { - mySurface = Handle_Geom_OffsetSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_OffsetSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomOffsetSurface::handle() const +const Handle(Geom_Geometry)& GeomOffsetSurface::handle() const { return mySurface; } @@ -3964,18 +3964,18 @@ GeomPlateSurface::GeomPlateSurface() { } -GeomPlateSurface::GeomPlateSurface(const Handle_Geom_Surface& s, const Plate_Plate& plate) +GeomPlateSurface::GeomPlateSurface(const Handle(Geom_Surface)& s, const Plate_Plate& plate) { this->mySurface = new GeomPlate_Surface(s, plate); } GeomPlateSurface::GeomPlateSurface(const GeomPlate_BuildPlateSurface& buildPlate) { - Handle_GeomPlate_Surface s = buildPlate.Surface(); - this->mySurface = Handle_GeomPlate_Surface::DownCast(s->Copy()); + Handle(GeomPlate_Surface) s = buildPlate.Surface(); + this->mySurface = Handle(GeomPlate_Surface)::DownCast(s->Copy()); } -GeomPlateSurface::GeomPlateSurface(const Handle_GeomPlate_Surface& s) +GeomPlateSurface::GeomPlateSurface(const Handle(GeomPlate_Surface)& s) { setHandle(s); } @@ -3984,12 +3984,12 @@ GeomPlateSurface::~GeomPlateSurface() { } -void GeomPlateSurface::setHandle(const Handle_GeomPlate_Surface& s) +void GeomPlateSurface::setHandle(const Handle(GeomPlate_Surface)& s) { - mySurface = Handle_GeomPlate_Surface::DownCast(s->Copy()); + mySurface = Handle(GeomPlate_Surface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomPlateSurface::handle() const +const Handle(Geom_Geometry)& GeomPlateSurface::handle() const { return mySurface; } @@ -4030,7 +4030,7 @@ GeomTrimmedSurface::GeomTrimmedSurface() { } -GeomTrimmedSurface::GeomTrimmedSurface(const Handle_Geom_RectangularTrimmedSurface& s) +GeomTrimmedSurface::GeomTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)& s) { setHandle(s); } @@ -4039,12 +4039,12 @@ GeomTrimmedSurface::~GeomTrimmedSurface() { } -void GeomTrimmedSurface::setHandle(const Handle_Geom_RectangularTrimmedSurface& s) +void GeomTrimmedSurface::setHandle(const Handle(Geom_RectangularTrimmedSurface)& s) { - mySurface = Handle_Geom_RectangularTrimmedSurface::DownCast(s->Copy()); + mySurface = Handle(Geom_RectangularTrimmedSurface)::DownCast(s->Copy()); } -const Handle_Geom_Geometry& GeomTrimmedSurface::handle() const +const Handle(Geom_Geometry)& GeomTrimmedSurface::handle() const { return mySurface; } @@ -4074,12 +4074,12 @@ GeomSurfaceOfRevolution::GeomSurfaceOfRevolution() { } -GeomSurfaceOfRevolution::GeomSurfaceOfRevolution(const Handle_Geom_Curve& c, const gp_Ax1& a) +GeomSurfaceOfRevolution::GeomSurfaceOfRevolution(const Handle(Geom_Curve)& c, const gp_Ax1& a) { this->mySurface = new Geom_SurfaceOfRevolution(c,a); } -GeomSurfaceOfRevolution::GeomSurfaceOfRevolution(const Handle_Geom_SurfaceOfRevolution& s) +GeomSurfaceOfRevolution::GeomSurfaceOfRevolution(const Handle(Geom_SurfaceOfRevolution)& s) { setHandle(s); } @@ -4088,12 +4088,12 @@ GeomSurfaceOfRevolution::~GeomSurfaceOfRevolution() { } -void GeomSurfaceOfRevolution::setHandle(const Handle_Geom_SurfaceOfRevolution& c) +void GeomSurfaceOfRevolution::setHandle(const Handle(Geom_SurfaceOfRevolution)& c) { - mySurface = Handle_Geom_SurfaceOfRevolution::DownCast(c->Copy()); + mySurface = Handle(Geom_SurfaceOfRevolution)::DownCast(c->Copy()); } -const Handle_Geom_Geometry& GeomSurfaceOfRevolution::handle() const +const Handle(Geom_Geometry)& GeomSurfaceOfRevolution::handle() const { return mySurface; } @@ -4123,12 +4123,12 @@ GeomSurfaceOfExtrusion::GeomSurfaceOfExtrusion() { } -GeomSurfaceOfExtrusion::GeomSurfaceOfExtrusion(const Handle_Geom_Curve& c, const gp_Dir& d) +GeomSurfaceOfExtrusion::GeomSurfaceOfExtrusion(const Handle(Geom_Curve)& c, const gp_Dir& d) { this->mySurface = new Geom_SurfaceOfLinearExtrusion(c,d); } -GeomSurfaceOfExtrusion::GeomSurfaceOfExtrusion(const Handle_Geom_SurfaceOfLinearExtrusion& s) +GeomSurfaceOfExtrusion::GeomSurfaceOfExtrusion(const Handle(Geom_SurfaceOfLinearExtrusion)& s) { setHandle(s); } @@ -4137,12 +4137,12 @@ GeomSurfaceOfExtrusion::~GeomSurfaceOfExtrusion() { } -void GeomSurfaceOfExtrusion::setHandle(const Handle_Geom_SurfaceOfLinearExtrusion& c) +void GeomSurfaceOfExtrusion::setHandle(const Handle(Geom_SurfaceOfLinearExtrusion)& c) { - mySurface = Handle_Geom_SurfaceOfLinearExtrusion::DownCast(c->Copy()); + mySurface = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(c->Copy()); } -const Handle_Geom_Geometry& GeomSurfaceOfExtrusion::handle() const +const Handle(Geom_Geometry)& GeomSurfaceOfExtrusion::handle() const { return mySurface; } @@ -4336,54 +4336,54 @@ GeomArcOfCircle *createFilletGeometry(const GeomLineSegment *lineSeg1, const Geo return arc; } -GeomSurface* makeFromSurface(const Handle_Geom_Surface& s) +GeomSurface* makeFromSurface(const Handle(Geom_Surface)& s) { if (s->IsKind(STANDARD_TYPE(Geom_ToroidalSurface))) { - Handle_Geom_ToroidalSurface hSurf = Handle_Geom_ToroidalSurface::DownCast(s); + Handle(Geom_ToroidalSurface) hSurf = Handle(Geom_ToroidalSurface)::DownCast(s); return new GeomToroid(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_BezierSurface))) { - Handle_Geom_BezierSurface hSurf = Handle_Geom_BezierSurface::DownCast(s); + Handle(Geom_BezierSurface) hSurf = Handle(Geom_BezierSurface)::DownCast(s); return new GeomBezierSurface(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_BSplineSurface))) { - Handle_Geom_BSplineSurface hSurf = Handle_Geom_BSplineSurface::DownCast(s); + Handle(Geom_BSplineSurface) hSurf = Handle(Geom_BSplineSurface)::DownCast(s); return new GeomBSplineSurface(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_CylindricalSurface))) { - Handle_Geom_CylindricalSurface hSurf = Handle_Geom_CylindricalSurface::DownCast(s); + Handle(Geom_CylindricalSurface) hSurf = Handle(Geom_CylindricalSurface)::DownCast(s); return new GeomCylinder(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_ConicalSurface))) { - Handle_Geom_ConicalSurface hSurf = Handle_Geom_ConicalSurface::DownCast(s); + Handle(Geom_ConicalSurface) hSurf = Handle(Geom_ConicalSurface)::DownCast(s); return new GeomCone(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_SphericalSurface))) { - Handle_Geom_SphericalSurface hSurf = Handle_Geom_SphericalSurface::DownCast(s); + Handle(Geom_SphericalSurface) hSurf = Handle(Geom_SphericalSurface)::DownCast(s); return new GeomSphere(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_Plane))) { - Handle_Geom_Plane hSurf = Handle_Geom_Plane::DownCast(s); + Handle(Geom_Plane) hSurf = Handle(Geom_Plane)::DownCast(s); return new GeomPlane(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_OffsetSurface))) { - Handle_Geom_OffsetSurface hSurf = Handle_Geom_OffsetSurface::DownCast(s); + Handle(Geom_OffsetSurface) hSurf = Handle(Geom_OffsetSurface)::DownCast(s); return new GeomOffsetSurface(hSurf); } else if (s->IsKind(STANDARD_TYPE(GeomPlate_Surface))) { - Handle_GeomPlate_Surface hSurf = Handle_GeomPlate_Surface::DownCast(s); + Handle(GeomPlate_Surface) hSurf = Handle(GeomPlate_Surface)::DownCast(s); return new GeomPlateSurface(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) { - Handle_Geom_RectangularTrimmedSurface hSurf = Handle_Geom_RectangularTrimmedSurface::DownCast(s); + Handle(Geom_RectangularTrimmedSurface) hSurf = Handle(Geom_RectangularTrimmedSurface)::DownCast(s); return new GeomTrimmedSurface(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_SurfaceOfRevolution))) { - Handle_Geom_SurfaceOfRevolution hSurf = Handle_Geom_SurfaceOfRevolution::DownCast(s); + Handle(Geom_SurfaceOfRevolution) hSurf = Handle(Geom_SurfaceOfRevolution)::DownCast(s); return new GeomSurfaceOfRevolution(hSurf); } else if (s->IsKind(STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion))) { - Handle_Geom_SurfaceOfLinearExtrusion hSurf = Handle_Geom_SurfaceOfLinearExtrusion::DownCast(s); + Handle(Geom_SurfaceOfLinearExtrusion) hSurf = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(s); return new GeomSurfaceOfExtrusion(hSurf); } diff --git a/src/Mod/Part/App/Geometry.h b/src/Mod/Part/App/Geometry.h index 54c40683a3..40b0db1c1c 100644 --- a/src/Mod/Part/App/Geometry.h +++ b/src/Mod/Part/App/Geometry.h @@ -71,7 +71,7 @@ public: virtual ~Geometry(); virtual TopoDS_Shape toShape() const = 0; - virtual const Handle_Geom_Geometry& handle() const = 0; + virtual const Handle(Geom_Geometry)& handle() const = 0; // Persistence implementer --------------------- virtual unsigned int getMemSize(void) const; virtual void Save(Base::Writer &/*writer*/) const; @@ -115,7 +115,7 @@ class PartExport GeomPoint : public Geometry TYPESYSTEM_HEADER(); public: GeomPoint(); - GeomPoint(const Handle_Geom_CartesianPoint&); + GeomPoint(const Handle(Geom_CartesianPoint)&); GeomPoint(const Base::Vector3d&); virtual ~GeomPoint(); virtual Geometry *copy(void) const; @@ -128,14 +128,14 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom_Geometry& handle() const; - void setHandle(const Handle_Geom_CartesianPoint&); + const Handle(Geom_Geometry)& handle() const; + void setHandle(const Handle(Geom_CartesianPoint)&); Base::Vector3d getPoint(void)const; void setPoint(const Base::Vector3d&); private: - Handle_Geom_CartesianPoint myPoint; + Handle(Geom_CartesianPoint) myPoint; }; class GeomBSplineCurve; @@ -192,7 +192,7 @@ class PartExport GeomBezierCurve : public GeomBoundedCurve TYPESYSTEM_HEADER(); public: GeomBezierCurve(); - GeomBezierCurve(const Handle_Geom_BezierCurve&); + GeomBezierCurve(const Handle(Geom_BezierCurve)&); virtual ~GeomBezierCurve(); virtual Geometry *copy(void) const; @@ -203,11 +203,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_BezierCurve&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_BezierCurve)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_BezierCurve myCurve; + Handle(Geom_BezierCurve) myCurve; }; class PartExport GeomBSplineCurve : public GeomBoundedCurve @@ -215,7 +215,7 @@ class PartExport GeomBSplineCurve : public GeomBoundedCurve TYPESYSTEM_HEADER(); public: GeomBSplineCurve(); - GeomBSplineCurve(const Handle_Geom_BSplineCurve&); + GeomBSplineCurve(const Handle(Geom_BSplineCurve)&); GeomBSplineCurve( const std::vector& poles, const std::vector& weights, const std::vector& knots, const std::vector& multiplicities, @@ -259,7 +259,7 @@ public: int getMultiplicity(int index) const; int getDegree() const; bool isPeriodic() const; - bool join(const Handle_Geom_BSplineCurve&); + bool join(const Handle(Geom_BSplineCurve)&); void makeC1Continuous(double, double); std::list toBiArcs(double tolerance) const; @@ -275,8 +275,8 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_BSplineCurve&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_BSplineCurve)&); + const Handle(Geom_Geometry)& handle() const; private: void createArcs(double tolerance, std::list& new_spans, @@ -286,7 +286,7 @@ private: const gp_Pnt& p4, gp_Vec v_end, gp_Pnt& p1, gp_Pnt& p2, gp_Pnt& p3) const; private: - Handle_Geom_BSplineCurve myCurve; + Handle(Geom_BSplineCurve) myCurve; }; class PartExport GeomConic : public GeomCurve @@ -319,7 +319,7 @@ public: virtual unsigned int getMemSize(void) const = 0; virtual PyObject *getPyObject(void) = 0; - const Handle_Geom_Geometry& handle() const = 0; + const Handle(Geom_Geometry)& handle() const = 0; }; class PartExport GeomArcOfConic : public GeomCurve @@ -362,7 +362,7 @@ public: virtual unsigned int getMemSize(void) const = 0; virtual PyObject *getPyObject(void) = 0; - const Handle_Geom_Geometry& handle() const = 0; + const Handle(Geom_Geometry)& handle() const = 0; }; class PartExport GeomCircle : public GeomConic @@ -370,7 +370,7 @@ class PartExport GeomCircle : public GeomConic TYPESYSTEM_HEADER(); public: GeomCircle(); - GeomCircle(const Handle_Geom_Circle&); + GeomCircle(const Handle(Geom_Circle)&); virtual ~GeomCircle(); virtual Geometry *copy(void) const; @@ -385,12 +385,12 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - const Handle_Geom_Geometry& handle() const; + const Handle(Geom_Geometry)& handle() const; - void setHandle(const Handle_Geom_Circle&); + void setHandle(const Handle(Geom_Circle)&); private: - Handle_Geom_Circle myCurve; + Handle(Geom_Circle) myCurve; }; class PartExport GeomArcOfCircle : public GeomArcOfConic @@ -398,7 +398,7 @@ class PartExport GeomArcOfCircle : public GeomArcOfConic TYPESYSTEM_HEADER(); public: GeomArcOfCircle(); - GeomArcOfCircle(const Handle_Geom_Circle&); + GeomArcOfCircle(const Handle(Geom_Circle)&); virtual ~GeomArcOfCircle(); virtual Geometry *copy(void) const; @@ -416,12 +416,12 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - void setHandle(const Handle_Geom_TrimmedCurve&); - void setHandle(const Handle_Geom_Circle&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_TrimmedCurve)&); + void setHandle(const Handle(Geom_Circle)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_TrimmedCurve myCurve; + Handle(Geom_TrimmedCurve) myCurve; }; class PartExport GeomEllipse : public GeomConic @@ -429,7 +429,7 @@ class PartExport GeomEllipse : public GeomConic TYPESYSTEM_HEADER(); public: GeomEllipse(); - GeomEllipse(const Handle_Geom_Ellipse&); + GeomEllipse(const Handle(Geom_Ellipse)&); virtual ~GeomEllipse(); virtual Geometry *copy(void) const; @@ -448,11 +448,11 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - void setHandle(const Handle_Geom_Ellipse &e); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_Ellipse) &e); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_Ellipse myCurve; + Handle(Geom_Ellipse) myCurve; }; class PartExport GeomArcOfEllipse : public GeomArcOfConic @@ -460,7 +460,7 @@ class PartExport GeomArcOfEllipse : public GeomArcOfConic TYPESYSTEM_HEADER(); public: GeomArcOfEllipse(); - GeomArcOfEllipse(const Handle_Geom_Ellipse&); + GeomArcOfEllipse(const Handle(Geom_Ellipse)&); virtual ~GeomArcOfEllipse(); virtual Geometry *copy(void) const; @@ -482,12 +482,12 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - void setHandle(const Handle_Geom_TrimmedCurve&); - void setHandle(const Handle_Geom_Ellipse&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_TrimmedCurve)&); + void setHandle(const Handle(Geom_Ellipse)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_TrimmedCurve myCurve; + Handle(Geom_TrimmedCurve) myCurve; }; @@ -496,7 +496,7 @@ class PartExport GeomHyperbola : public GeomConic TYPESYSTEM_HEADER(); public: GeomHyperbola(); - GeomHyperbola(const Handle_Geom_Hyperbola&); + GeomHyperbola(const Handle(Geom_Hyperbola)&); virtual ~GeomHyperbola(); virtual Geometry *copy(void) const; @@ -513,11 +513,11 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - const Handle_Geom_Geometry& handle() const; - void setHandle(const Handle_Geom_Hyperbola&); + const Handle(Geom_Geometry)& handle() const; + void setHandle(const Handle(Geom_Hyperbola)&); private: - Handle_Geom_Hyperbola myCurve; + Handle(Geom_Hyperbola) myCurve; }; class PartExport GeomArcOfHyperbola : public GeomArcOfConic @@ -525,7 +525,7 @@ class PartExport GeomArcOfHyperbola : public GeomArcOfConic TYPESYSTEM_HEADER(); public: GeomArcOfHyperbola(); - GeomArcOfHyperbola(const Handle_Geom_Hyperbola&); + GeomArcOfHyperbola(const Handle(Geom_Hyperbola)&); virtual ~GeomArcOfHyperbola(); virtual Geometry *copy(void) const; @@ -547,12 +547,12 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - void setHandle(const Handle_Geom_TrimmedCurve&); - void setHandle(const Handle_Geom_Hyperbola&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_TrimmedCurve)&); + void setHandle(const Handle(Geom_Hyperbola)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_TrimmedCurve myCurve; + Handle(Geom_TrimmedCurve) myCurve; }; class PartExport GeomParabola : public GeomConic @@ -560,7 +560,7 @@ class PartExport GeomParabola : public GeomConic TYPESYSTEM_HEADER(); public: GeomParabola(); - GeomParabola(const Handle_Geom_Parabola&); + GeomParabola(const Handle(Geom_Parabola)&); virtual ~GeomParabola(); virtual Geometry *copy(void) const; @@ -575,11 +575,11 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - const Handle_Geom_Geometry& handle() const; - void setHandle(const Handle_Geom_Parabola&); + const Handle(Geom_Geometry)& handle() const; + void setHandle(const Handle(Geom_Parabola)&); private: - Handle_Geom_Parabola myCurve; + Handle(Geom_Parabola) myCurve; }; class PartExport GeomArcOfParabola : public GeomArcOfConic @@ -587,7 +587,7 @@ class PartExport GeomArcOfParabola : public GeomArcOfConic TYPESYSTEM_HEADER(); public: GeomArcOfParabola(); - GeomArcOfParabola(const Handle_Geom_Parabola&); + GeomArcOfParabola(const Handle(Geom_Parabola)&); virtual ~GeomArcOfParabola(); virtual Geometry *copy(void) const; @@ -607,12 +607,12 @@ public: virtual PyObject *getPyObject(void); virtual GeomBSplineCurve* toNurbs(double first, double last) const; - void setHandle(const Handle_Geom_TrimmedCurve&); - void setHandle(const Handle_Geom_Parabola&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_TrimmedCurve)&); + void setHandle(const Handle(Geom_Parabola)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_TrimmedCurve myCurve; + Handle(Geom_TrimmedCurve) myCurve; }; class PartExport GeomLine : public GeomCurve @@ -620,7 +620,7 @@ class PartExport GeomLine : public GeomCurve TYPESYSTEM_HEADER(); public: GeomLine(); - GeomLine(const Handle_Geom_Line&); + GeomLine(const Handle(Geom_Line)&); GeomLine(const Base::Vector3d& Pos, const Base::Vector3d& Dir); virtual ~GeomLine(); virtual Geometry *copy(void) const; @@ -636,11 +636,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom_Geometry& handle() const; - void setHandle(const Handle_Geom_Line&); + const Handle(Geom_Geometry)& handle() const; + void setHandle(const Handle(Geom_Line)&); private: - Handle_Geom_Line myCurve; + Handle(Geom_Line) myCurve; }; class PartExport GeomLineSegment : public GeomCurve @@ -648,7 +648,7 @@ class PartExport GeomLineSegment : public GeomCurve TYPESYSTEM_HEADER(); public: GeomLineSegment(); - GeomLineSegment(const Handle_Geom_Line& l); + GeomLineSegment(const Handle(Geom_Line)& l); virtual ~GeomLineSegment(); virtual Geometry *copy(void) const; @@ -665,12 +665,12 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_TrimmedCurve&); - void setHandle(const Handle_Geom_Line&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_TrimmedCurve)&); + void setHandle(const Handle(Geom_Line)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_TrimmedCurve myCurve; + Handle(Geom_TrimmedCurve) myCurve; }; class PartExport GeomOffsetCurve : public GeomCurve @@ -678,8 +678,8 @@ class PartExport GeomOffsetCurve : public GeomCurve TYPESYSTEM_HEADER(); public: GeomOffsetCurve(); - GeomOffsetCurve(const Handle_Geom_Curve&, double, const gp_Dir&); - GeomOffsetCurve(const Handle_Geom_OffsetCurve&); + GeomOffsetCurve(const Handle(Geom_Curve)&, double, const gp_Dir&); + GeomOffsetCurve(const Handle(Geom_OffsetCurve)&); virtual ~GeomOffsetCurve(); virtual Geometry *copy(void) const; @@ -690,11 +690,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_OffsetCurve& c); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_OffsetCurve)& c); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_OffsetCurve myCurve; + Handle(Geom_OffsetCurve) myCurve; }; class PartExport GeomTrimmedCurve : public GeomCurve @@ -702,7 +702,7 @@ class PartExport GeomTrimmedCurve : public GeomCurve TYPESYSTEM_HEADER(); public: GeomTrimmedCurve(); - GeomTrimmedCurve(const Handle_Geom_TrimmedCurve&); + GeomTrimmedCurve(const Handle(Geom_TrimmedCurve)&); virtual ~GeomTrimmedCurve(); virtual Geometry *copy(void) const; @@ -713,11 +713,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_TrimmedCurve&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_TrimmedCurve)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_TrimmedCurve myCurve; + Handle(Geom_TrimmedCurve) myCurve; }; class PartExport GeomSurface : public Geometry @@ -737,7 +737,7 @@ class PartExport GeomBezierSurface : public GeomSurface TYPESYSTEM_HEADER(); public: GeomBezierSurface(); - GeomBezierSurface(const Handle_Geom_BezierSurface&); + GeomBezierSurface(const Handle(Geom_BezierSurface)&); virtual ~GeomBezierSurface(); virtual Geometry *copy(void) const; @@ -748,11 +748,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_BezierSurface& b); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_BezierSurface)& b); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_BezierSurface mySurface; + Handle(Geom_BezierSurface) mySurface; }; class PartExport GeomBSplineSurface : public GeomSurface @@ -760,7 +760,7 @@ class PartExport GeomBSplineSurface : public GeomSurface TYPESYSTEM_HEADER(); public: GeomBSplineSurface(); - GeomBSplineSurface(const Handle_Geom_BSplineSurface&); + GeomBSplineSurface(const Handle(Geom_BSplineSurface)&); virtual ~GeomBSplineSurface(); virtual Geometry *copy(void) const; @@ -771,11 +771,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_BSplineSurface&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_BSplineSurface)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_BSplineSurface mySurface; + Handle(Geom_BSplineSurface) mySurface; }; class PartExport GeomCylinder : public GeomSurface @@ -783,7 +783,7 @@ class PartExport GeomCylinder : public GeomSurface TYPESYSTEM_HEADER(); public: GeomCylinder(); - GeomCylinder(const Handle_Geom_CylindricalSurface&); + GeomCylinder(const Handle(Geom_CylindricalSurface)&); virtual ~GeomCylinder(); virtual Geometry *copy(void) const; @@ -794,11 +794,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_CylindricalSurface&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_CylindricalSurface)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_CylindricalSurface mySurface; + Handle(Geom_CylindricalSurface) mySurface; }; class PartExport GeomCone : public GeomSurface @@ -806,7 +806,7 @@ class PartExport GeomCone : public GeomSurface TYPESYSTEM_HEADER(); public: GeomCone(); - GeomCone(const Handle_Geom_ConicalSurface&); + GeomCone(const Handle(Geom_ConicalSurface)&); virtual ~GeomCone(); virtual Geometry *copy(void) const; @@ -817,11 +817,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_ConicalSurface&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_ConicalSurface)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_ConicalSurface mySurface; + Handle(Geom_ConicalSurface) mySurface; }; class PartExport GeomSphere : public GeomSurface @@ -829,7 +829,7 @@ class PartExport GeomSphere : public GeomSurface TYPESYSTEM_HEADER(); public: GeomSphere(); - GeomSphere(const Handle_Geom_SphericalSurface&); + GeomSphere(const Handle(Geom_SphericalSurface)&); virtual ~GeomSphere(); virtual Geometry *copy(void) const; @@ -840,11 +840,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_SphericalSurface&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_SphericalSurface)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_SphericalSurface mySurface; + Handle(Geom_SphericalSurface) mySurface; }; class PartExport GeomToroid : public GeomSurface @@ -852,7 +852,7 @@ class PartExport GeomToroid : public GeomSurface TYPESYSTEM_HEADER(); public: GeomToroid(); - GeomToroid(const Handle_Geom_ToroidalSurface&); + GeomToroid(const Handle(Geom_ToroidalSurface)&); virtual ~GeomToroid(); virtual Geometry *copy(void) const; @@ -863,11 +863,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_ToroidalSurface&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_ToroidalSurface)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_ToroidalSurface mySurface; + Handle(Geom_ToroidalSurface) mySurface; }; class PartExport GeomPlane : public GeomSurface @@ -875,7 +875,7 @@ class PartExport GeomPlane : public GeomSurface TYPESYSTEM_HEADER(); public: GeomPlane(); - GeomPlane(const Handle_Geom_Plane&); + GeomPlane(const Handle(Geom_Plane)&); virtual ~GeomPlane(); virtual Geometry *copy(void) const; @@ -886,11 +886,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_Plane&); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_Plane)&); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_Plane mySurface; + Handle(Geom_Plane) mySurface; }; class PartExport GeomOffsetSurface : public GeomSurface @@ -898,8 +898,8 @@ class PartExport GeomOffsetSurface : public GeomSurface TYPESYSTEM_HEADER(); public: GeomOffsetSurface(); - GeomOffsetSurface(const Handle_Geom_Surface&, double); - GeomOffsetSurface(const Handle_Geom_OffsetSurface&); + GeomOffsetSurface(const Handle(Geom_Surface)&, double); + GeomOffsetSurface(const Handle(Geom_OffsetSurface)&); virtual ~GeomOffsetSurface(); virtual Geometry *copy(void) const; @@ -910,11 +910,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_OffsetSurface& s); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_OffsetSurface)& s); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_OffsetSurface mySurface; + Handle(Geom_OffsetSurface) mySurface; }; class PartExport GeomPlateSurface : public GeomSurface @@ -922,9 +922,9 @@ class PartExport GeomPlateSurface : public GeomSurface TYPESYSTEM_HEADER(); public: GeomPlateSurface(); - GeomPlateSurface(const Handle_Geom_Surface&, const Plate_Plate&); + GeomPlateSurface(const Handle(Geom_Surface)&, const Plate_Plate&); GeomPlateSurface(const GeomPlate_BuildPlateSurface&); - GeomPlateSurface(const Handle_GeomPlate_Surface&); + GeomPlateSurface(const Handle(GeomPlate_Surface)&); virtual ~GeomPlateSurface(); virtual Geometry *copy(void) const; @@ -935,11 +935,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_GeomPlate_Surface& s); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(GeomPlate_Surface)& s); + const Handle(Geom_Geometry)& handle() const; private: - Handle_GeomPlate_Surface mySurface; + Handle(GeomPlate_Surface) mySurface; }; class PartExport GeomTrimmedSurface : public GeomSurface @@ -947,7 +947,7 @@ class PartExport GeomTrimmedSurface : public GeomSurface TYPESYSTEM_HEADER(); public: GeomTrimmedSurface(); - GeomTrimmedSurface(const Handle_Geom_RectangularTrimmedSurface&); + GeomTrimmedSurface(const Handle(Geom_RectangularTrimmedSurface)&); virtual ~GeomTrimmedSurface(); virtual Geometry *copy(void) const; @@ -958,11 +958,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_RectangularTrimmedSurface& s); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_RectangularTrimmedSurface)& s); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_RectangularTrimmedSurface mySurface; + Handle(Geom_RectangularTrimmedSurface) mySurface; }; class PartExport GeomSurfaceOfRevolution : public GeomSurface @@ -970,8 +970,8 @@ class PartExport GeomSurfaceOfRevolution : public GeomSurface TYPESYSTEM_HEADER(); public: GeomSurfaceOfRevolution(); - GeomSurfaceOfRevolution(const Handle_Geom_Curve&, const gp_Ax1&); - GeomSurfaceOfRevolution(const Handle_Geom_SurfaceOfRevolution&); + GeomSurfaceOfRevolution(const Handle(Geom_Curve)&, const gp_Ax1&); + GeomSurfaceOfRevolution(const Handle(Geom_SurfaceOfRevolution)&); virtual ~GeomSurfaceOfRevolution(); virtual Geometry *copy(void) const; @@ -982,11 +982,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_SurfaceOfRevolution& c); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_SurfaceOfRevolution)& c); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_SurfaceOfRevolution mySurface; + Handle(Geom_SurfaceOfRevolution) mySurface; }; class PartExport GeomSurfaceOfExtrusion : public GeomSurface @@ -994,8 +994,8 @@ class PartExport GeomSurfaceOfExtrusion : public GeomSurface TYPESYSTEM_HEADER(); public: GeomSurfaceOfExtrusion(); - GeomSurfaceOfExtrusion(const Handle_Geom_Curve&, const gp_Dir&); - GeomSurfaceOfExtrusion(const Handle_Geom_SurfaceOfLinearExtrusion&); + GeomSurfaceOfExtrusion(const Handle(Geom_Curve)&, const gp_Dir&); + GeomSurfaceOfExtrusion(const Handle(Geom_SurfaceOfLinearExtrusion)&); virtual ~GeomSurfaceOfExtrusion(); virtual Geometry *copy(void) const; @@ -1006,11 +1006,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom_SurfaceOfLinearExtrusion& c); - const Handle_Geom_Geometry& handle() const; + void setHandle(const Handle(Geom_SurfaceOfLinearExtrusion)& c); + const Handle(Geom_Geometry)& handle() const; private: - Handle_Geom_SurfaceOfLinearExtrusion mySurface; + Handle(Geom_SurfaceOfLinearExtrusion) mySurface; }; @@ -1036,7 +1036,7 @@ PartExport GeomArcOfCircle *createFilletGeometry(const GeomLineSegment *lineSeg1, const GeomLineSegment *lineSeg2, const Base::Vector3d ¢er, double radius); PartExport -GeomSurface *makeFromSurface(const Handle_Geom_Surface&); +GeomSurface *makeFromSurface(const Handle(Geom_Surface)&); } #endif // PART_GEOMETRY_H diff --git a/src/Mod/Part/App/Geometry2d.cpp b/src/Mod/Part/App/Geometry2d.cpp index ffcad7efb5..a29a87ff42 100644 --- a/src/Mod/Part/App/Geometry2d.cpp +++ b/src/Mod/Part/App/Geometry2d.cpp @@ -121,9 +121,9 @@ Geom2dPoint::Geom2dPoint() this->myPoint = new Geom2d_CartesianPoint(0,0); } -Geom2dPoint::Geom2dPoint(const Handle_Geom2d_CartesianPoint& p) +Geom2dPoint::Geom2dPoint(const Handle(Geom2d_CartesianPoint)& p) { - this->myPoint = Handle_Geom2d_CartesianPoint::DownCast(p->Copy()); + this->myPoint = Handle(Geom2d_CartesianPoint)::DownCast(p->Copy()); } Geom2dPoint::Geom2dPoint(const Base::Vector2d& p) @@ -137,7 +137,7 @@ Geom2dPoint::~Geom2dPoint() TopoDS_Shape Geom2dPoint::toShape() const { - Handle_Geom2d_CartesianPoint c = Handle_Geom2d_CartesianPoint::DownCast(handle()); + Handle(Geom2d_CartesianPoint) c = Handle(Geom2d_CartesianPoint)::DownCast(handle()); gp_Pnt2d xy = c->Pnt2d(); gp_Pnt pnt; pnt.SetX(xy.X()); @@ -146,7 +146,7 @@ TopoDS_Shape Geom2dPoint::toShape() const return mkBuilder.Shape(); } -const Handle_Geom2d_Geometry& Geom2dPoint::handle() const +const Handle(Geom2d_Geometry)& Geom2dPoint::handle() const { return myPoint; } @@ -204,7 +204,7 @@ void Geom2dPoint::Restore(Base::XMLReader &reader) PyObject *Geom2dPoint::getPyObject(void) { - Handle_Geom2d_CartesianPoint c = Handle_Geom2d_CartesianPoint::DownCast(handle()); + Handle(Geom2d_CartesianPoint) c = Handle(Geom2d_CartesianPoint)::DownCast(handle()); gp_Pnt2d xy = c->Pnt2d(); Py::Tuple tuple(2); @@ -227,14 +227,14 @@ Geom2dCurve::~Geom2dCurve() TopoDS_Shape Geom2dCurve::toShape() const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); BRepBuilderAPI_MakeEdge2d mkBuilder(c); return mkBuilder.Shape(); } bool Geom2dCurve::tangent(double u, gp_Dir2d& dir) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); Geom2dLProp_CLProps2d prop(c,u,2,Precision::Confusion()); if (prop.IsTangentDefined()) { prop.Tangent(dir); @@ -246,7 +246,7 @@ bool Geom2dCurve::tangent(double u, gp_Dir2d& dir) const Base::Vector2d Geom2dCurve::pointAtParameter(double u) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); Geom2dLProp_CLProps2d prop(c,u,0,Precision::Confusion()); const gp_Pnt2d &point=prop.Value(); @@ -255,7 +255,7 @@ Base::Vector2d Geom2dCurve::pointAtParameter(double u) const Base::Vector2d Geom2dCurve::firstDerivativeAtParameter(double u) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); Geom2dLProp_CLProps2d prop(c,u,1,Precision::Confusion()); const gp_Vec2d &vec=prop.D1(); @@ -264,7 +264,7 @@ Base::Vector2d Geom2dCurve::firstDerivativeAtParameter(double u) const Base::Vector2d Geom2dCurve::secondDerivativeAtParameter(double u) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); Geom2dLProp_CLProps2d prop(c,u,2,Precision::Confusion()); const gp_Vec2d &vec=prop.D2(); @@ -273,7 +273,7 @@ Base::Vector2d Geom2dCurve::secondDerivativeAtParameter(double u) const bool Geom2dCurve::normal(double u, gp_Dir2d& dir) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); Geom2dLProp_CLProps2d prop(c,u,2,Precision::Confusion()); if (prop.IsTangentDefined()) { prop.Normal(dir); @@ -285,7 +285,7 @@ bool Geom2dCurve::normal(double u, gp_Dir2d& dir) const bool Geom2dCurve::closestParameter(const Base::Vector2d& point, double &u) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); try { if (!c.IsNull()) { gp_Pnt2d pnt(point.x,point.y); @@ -295,7 +295,7 @@ bool Geom2dCurve::closestParameter(const Base::Vector2d& point, double &u) const } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::cout << e->GetMessageString() << std::endl; return false; } @@ -305,11 +305,11 @@ bool Geom2dCurve::closestParameter(const Base::Vector2d& point, double &u) const bool Geom2dCurve::closestParameterToBasicCurve(const Base::Vector2d& point, double &u) const { - Handle_Geom2d_Curve c = Handle_Geom2d_Curve::DownCast(handle()); + Handle(Geom2d_Curve) c = Handle(Geom2d_Curve)::DownCast(handle()); if (c->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))){ - Handle_Geom2d_TrimmedCurve tc = Handle_Geom2d_TrimmedCurve::DownCast(handle()); - Handle_Geom2d_Curve bc = tc->BasisCurve(); + Handle(Geom2d_TrimmedCurve) tc = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); + Handle(Geom2d_Curve) bc = tc->BasisCurve(); try { if (!bc.IsNull()) { gp_Pnt2d pnt(point.x,point.y); @@ -319,7 +319,7 @@ bool Geom2dCurve::closestParameterToBasicCurve(const Base::Vector2d& point, doub } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::cout << e->GetMessageString() << std::endl; return false; } @@ -341,25 +341,25 @@ Geom2dBezierCurve::Geom2dBezierCurve() TColgp_Array1OfPnt2d poles(1,2); poles(1) = gp_Pnt2d(0.0,0.0); poles(2) = gp_Pnt2d(0.0,1.0); - Handle_Geom2d_BezierCurve b = new Geom2d_BezierCurve(poles); + Handle(Geom2d_BezierCurve) b = new Geom2d_BezierCurve(poles); this->myCurve = b; } -Geom2dBezierCurve::Geom2dBezierCurve(const Handle_Geom2d_BezierCurve& b) +Geom2dBezierCurve::Geom2dBezierCurve(const Handle(Geom2d_BezierCurve)& b) { - this->myCurve = Handle_Geom2d_BezierCurve::DownCast(b->Copy()); + this->myCurve = Handle(Geom2d_BezierCurve)::DownCast(b->Copy()); } Geom2dBezierCurve::~Geom2dBezierCurve() { } -void Geom2dBezierCurve::setHandle(const Handle_Geom2d_BezierCurve& c) +void Geom2dBezierCurve::setHandle(const Handle(Geom2d_BezierCurve)& c) { - myCurve = Handle_Geom2d_BezierCurve::DownCast(c->Copy()); + myCurve = Handle(Geom2d_BezierCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dBezierCurve::handle() const +const Handle(Geom2d_Geometry)& Geom2dBezierCurve::handle() const { return myCurve; } @@ -411,21 +411,21 @@ Geom2dBSplineCurve::Geom2dBSplineCurve() this->myCurve = new Geom2d_BSplineCurve(poles, knots, mults, 1); } -Geom2dBSplineCurve::Geom2dBSplineCurve(const Handle_Geom2d_BSplineCurve& b) +Geom2dBSplineCurve::Geom2dBSplineCurve(const Handle(Geom2d_BSplineCurve)& b) { - this->myCurve = Handle_Geom2d_BSplineCurve::DownCast(b->Copy()); + this->myCurve = Handle(Geom2d_BSplineCurve)::DownCast(b->Copy()); } Geom2dBSplineCurve::~Geom2dBSplineCurve() { } -void Geom2dBSplineCurve::setHandle(const Handle_Geom2d_BSplineCurve& c) +void Geom2dBSplineCurve::setHandle(const Handle(Geom2d_BSplineCurve)& c) { - myCurve = Handle_Geom2d_BSplineCurve::DownCast(c->Copy()); + myCurve = Handle(Geom2d_BSplineCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dBSplineCurve::handle() const +const Handle(Geom2d_Geometry)& Geom2dBSplineCurve::handle() const { return myCurve; } @@ -451,7 +451,7 @@ void Geom2dBSplineCurve::setPole(int index, const Base::Vector2d& pole, double w myCurve->SetPole(index+1,pnt,weight); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::cout << e->GetMessageString() << std::endl; } } @@ -470,7 +470,7 @@ std::vector Geom2dBSplineCurve::getPoles() const return poles; } -bool Geom2dBSplineCurve::join(const Handle_Geom2d_BSplineCurve& spline) +bool Geom2dBSplineCurve::join(const Handle(Geom2d_BSplineCurve)& spline) { Geom2dConvert_CompCurveToBSplineCurve ccbc(this->myCurve); if (!ccbc.Add(spline, Precision::Approximation())) @@ -488,13 +488,13 @@ void Geom2dBSplineCurve::interpolate(const std::vector& p, Standard_ConstructionError::Raise(); double tol3d = Precision::Approximation(); - Handle_TColgp_HArray1OfPnt2d pts = new TColgp_HArray1OfPnt2d(1, p.size()); + Handle(TColgp_HArray1OfPnt2d) pts = new TColgp_HArray1OfPnt2d(1, p.size()); for (std::size_t i=0; iSetValue(i+1, p[i]); } TColgp_Array1OfVec2d tgs(1, t.size()); - Handle_TColStd_HArray1OfBoolean fgs = new TColStd_HArray1OfBoolean(1, t.size()); + Handle(TColStd_HArray1OfBoolean) fgs = new TColStd_HArray1OfBoolean(1, t.size()); for (std::size_t i=0; iSetValue(i+1, Standard_True); @@ -608,7 +608,7 @@ Geom2dConic::~Geom2dConic() Base::Vector2d Geom2dConic::getLocation(void) const { - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(handle()); const gp_Pnt2d& loc = conic->Location(); return Base::Vector2d(loc.X(),loc.Y()); } @@ -616,20 +616,20 @@ Base::Vector2d Geom2dConic::getLocation(void) const void Geom2dConic::setLocation(const Base::Vector2d& Center) { gp_Pnt2d p1(Center.x,Center.y); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(handle()); try { conic->SetLocation(p1); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } bool Geom2dConic::isReversed() const { - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(handle()); gp_Dir2d xdir = conic->XAxis().Direction(); gp_Dir2d ydir = conic->YAxis().Direction(); @@ -686,8 +686,8 @@ Geom2dArcOfConic::~Geom2dArcOfConic() Base::Vector2d Geom2dArcOfConic::getLocation(void) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); const gp_Pnt2d& loc = conic->Location(); return Base::Vector2d(loc.X(),loc.Y()); } @@ -695,22 +695,22 @@ Base::Vector2d Geom2dArcOfConic::getLocation(void) const void Geom2dArcOfConic::setLocation(const Base::Vector2d& Center) { gp_Pnt2d p1(Center.x,Center.y); - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); try { conic->SetLocation(p1); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } bool Geom2dArcOfConic::isReversed() const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); - Handle_Geom2d_Conic conic = Handle_Geom2d_Conic::DownCast(curve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); + Handle(Geom2d_Conic) conic = Handle(Geom2d_Conic)::DownCast(curve->BasisCurve()); gp_Dir2d xdir = conic->XAxis().Direction(); gp_Dir2d ydir = conic->YAxis().Direction(); @@ -726,7 +726,7 @@ bool Geom2dArcOfConic::isReversed() const */ Base::Vector2d Geom2dArcOfConic::getStartPoint() const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); gp_Pnt2d pnt = curve->StartPoint(); return Base::Vector2d(pnt.X(), pnt.Y()); } @@ -737,7 +737,7 @@ Base::Vector2d Geom2dArcOfConic::getStartPoint() const */ Base::Vector2d Geom2dArcOfConic::getEndPoint() const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); gp_Pnt2d pnt = curve->EndPoint(); return Base::Vector2d(pnt.X(), pnt.Y()); } @@ -749,7 +749,7 @@ Base::Vector2d Geom2dArcOfConic::getEndPoint() const */ void Geom2dArcOfConic::getRange(double& u, double& v) const { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); u = curve->FirstParameter(); v = curve->LastParameter(); } @@ -762,11 +762,11 @@ void Geom2dArcOfConic::getRange(double& u, double& v) const void Geom2dArcOfConic::setRange(double u, double v) { try { - Handle_Geom2d_TrimmedCurve curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); curve->SetTrim(u, v); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -814,20 +814,20 @@ TYPESYSTEM_SOURCE(Part::Geom2dCircle, Part::Geom2dConic) Geom2dCircle::Geom2dCircle() { - Handle_Geom2d_Circle c = new Geom2d_Circle(gp_Circ2d()); + Handle(Geom2d_Circle) c = new Geom2d_Circle(gp_Circ2d()); this->myCurve = c; } -Geom2dCircle::Geom2dCircle(const Handle_Geom2d_Circle& c) +Geom2dCircle::Geom2dCircle(const Handle(Geom2d_Circle)& c) { - this->myCurve = Handle_Geom2d_Circle::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_Circle)::DownCast(c->Copy()); } Geom2dCircle::~Geom2dCircle() { } -const Handle_Geom2d_Geometry& Geom2dCircle::handle() const +const Handle(Geom2d_Geometry)& Geom2dCircle::handle() const { return myCurve; } @@ -840,13 +840,13 @@ Geometry2d *Geom2dCircle::clone(void) const double Geom2dCircle::getRadius(void) const { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(handle()); return circle->Radius(); } void Geom2dCircle::setRadius(double Radius) { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(handle()); try { gp_Circ2d c = circle->Circ2d(); @@ -854,7 +854,7 @@ void Geom2dCircle::setRadius(double Radius) circle->SetCirc2d(c); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -869,7 +869,7 @@ void Geom2dCircle::Save(Base::Writer& writer) const // save the attributes of the father class Geom2dCurve::Save(writer); - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(handle()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(handle()); gp_Circ2d c = circle->Circ2d(); gp_Ax22d axis = c.Axis(); @@ -903,7 +903,7 @@ void Geom2dCircle::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -919,11 +919,11 @@ TYPESYSTEM_SOURCE(Part::Geom2dArcOfCircle, Part::Geom2dArcOfConic) Geom2dArcOfCircle::Geom2dArcOfCircle() { - Handle_Geom2d_Circle c = new Geom2d_Circle(gp_Circ2d()); + Handle(Geom2d_Circle) c = new Geom2d_Circle(gp_Circ2d()); this->myCurve = new Geom2d_TrimmedCurve(c, c->FirstParameter(),c->LastParameter()); } -Geom2dArcOfCircle::Geom2dArcOfCircle(const Handle_Geom2d_Circle& c) +Geom2dArcOfCircle::Geom2dArcOfCircle(const Handle(Geom2d_Circle)& c) { this->myCurve = new Geom2d_TrimmedCurve(c, c->FirstParameter(),c->LastParameter()); } @@ -932,15 +932,15 @@ Geom2dArcOfCircle::~Geom2dArcOfCircle() { } -void Geom2dArcOfCircle::setHandle(const Handle_Geom2d_TrimmedCurve& c) +void Geom2dArcOfCircle::setHandle(const Handle(Geom2d_TrimmedCurve)& c) { - Handle_Geom2d_Circle basis = Handle_Geom2d_Circle::DownCast(c->BasisCurve()); + Handle(Geom2d_Circle) basis = Handle(Geom2d_Circle)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not a circle"); - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dArcOfCircle::handle() const +const Handle(Geom2d_Geometry)& Geom2dArcOfCircle::handle() const { return myCurve; } @@ -954,13 +954,13 @@ Geometry2d *Geom2dArcOfCircle::clone(void) const double Geom2dArcOfCircle::getRadius(void) const { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(myCurve->BasisCurve()); return circle->Radius(); } void Geom2dArcOfCircle::setRadius(double Radius) { - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(myCurve->BasisCurve()); try { gp_Circ2d c = circle->Circ2d(); @@ -968,7 +968,7 @@ void Geom2dArcOfCircle::setRadius(double Radius) circle->SetCirc2d(c); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -983,7 +983,7 @@ void Geom2dArcOfCircle::Save(Base::Writer &writer) const // save the attributes of the father class Geom2dCurve::Save(writer); - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(this->myCurve->BasisCurve()); gp_Circ2d c = circle->Circ2d(); gp_Ax22d axis = c.Axis(); @@ -1020,15 +1020,15 @@ void Geom2dArcOfCircle::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom2d_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom2d_Circle tmpcircle = Handle_Geom2d_Circle::DownCast(tmpcurve->BasisCurve()); - Handle_Geom2d_Circle circle = Handle_Geom2d_Circle::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom2d_Circle) tmpcircle = Handle(Geom2d_Circle)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom2d_Circle) circle = Handle(Geom2d_Circle)::DownCast(this->myCurve->BasisCurve()); circle->SetCirc2d(tmpcircle->Circ2d()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1044,20 +1044,20 @@ TYPESYSTEM_SOURCE(Part::Geom2dEllipse, Part::Geom2dConic) Geom2dEllipse::Geom2dEllipse() { - Handle_Geom2d_Ellipse e = new Geom2d_Ellipse(gp_Elips2d()); + Handle(Geom2d_Ellipse) e = new Geom2d_Ellipse(gp_Elips2d()); this->myCurve = e; } -Geom2dEllipse::Geom2dEllipse(const Handle_Geom2d_Ellipse& e) +Geom2dEllipse::Geom2dEllipse(const Handle(Geom2d_Ellipse)& e) { - this->myCurve = Handle_Geom2d_Ellipse::DownCast(e->Copy()); + this->myCurve = Handle(Geom2d_Ellipse)::DownCast(e->Copy()); } Geom2dEllipse::~Geom2dEllipse() { } -const Handle_Geom2d_Geometry& Geom2dEllipse::handle() const +const Handle(Geom2d_Geometry)& Geom2dEllipse::handle() const { return myCurve; } @@ -1070,38 +1070,38 @@ Geometry2d *Geom2dEllipse::clone(void) const double Geom2dEllipse::getMajorRadius(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(handle()); return ellipse->MajorRadius(); } void Geom2dEllipse::setMajorRadius(double Radius) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(handle()); try { ellipse->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } double Geom2dEllipse::getMinorRadius(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(handle()); return ellipse->MinorRadius(); } void Geom2dEllipse::setMinorRadius(double Radius) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(handle()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(handle()); try { ellipse->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1137,7 +1137,7 @@ void Geom2dEllipse::setMajorAxisDir(Base::Vector2d newdir) myCurve->SetElips2d(e); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1187,7 +1187,7 @@ void Geom2dEllipse::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1197,9 +1197,9 @@ PyObject *Geom2dEllipse::getPyObject(void) return new Ellipse2dPy(static_cast(this->clone())); } -void Geom2dEllipse::setHandle(const Handle_Geom2d_Ellipse &e) +void Geom2dEllipse::setHandle(const Handle(Geom2d_Ellipse) &e) { - this->myCurve = Handle_Geom2d_Ellipse::DownCast(e->Copy()); + this->myCurve = Handle(Geom2d_Ellipse)::DownCast(e->Copy()); } // ------------------------------------------------- @@ -1208,11 +1208,11 @@ TYPESYSTEM_SOURCE(Part::Geom2dArcOfEllipse, Part::Geom2dArcOfConic) Geom2dArcOfEllipse::Geom2dArcOfEllipse() { - Handle_Geom2d_Ellipse e = new Geom2d_Ellipse(gp_Elips2d()); + Handle(Geom2d_Ellipse) e = new Geom2d_Ellipse(gp_Elips2d()); this->myCurve = new Geom2d_TrimmedCurve(e, e->FirstParameter(),e->LastParameter()); } -Geom2dArcOfEllipse::Geom2dArcOfEllipse(const Handle_Geom2d_Ellipse& e) +Geom2dArcOfEllipse::Geom2dArcOfEllipse(const Handle(Geom2d_Ellipse)& e) { this->myCurve = new Geom2d_TrimmedCurve(e, e->FirstParameter(),e->LastParameter()); } @@ -1221,15 +1221,15 @@ Geom2dArcOfEllipse::~Geom2dArcOfEllipse() { } -void Geom2dArcOfEllipse::setHandle(const Handle_Geom2d_TrimmedCurve& c) +void Geom2dArcOfEllipse::setHandle(const Handle(Geom2d_TrimmedCurve)& c) { - Handle_Geom2d_Ellipse basis = Handle_Geom2d_Ellipse::DownCast(c->BasisCurve()); + Handle(Geom2d_Ellipse) basis = Handle(Geom2d_Ellipse)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not an ellipse"); - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dArcOfEllipse::handle() const +const Handle(Geom2d_Geometry)& Geom2dArcOfEllipse::handle() const { return myCurve; } @@ -1243,38 +1243,38 @@ Geometry2d *Geom2dArcOfEllipse::clone(void) const double Geom2dArcOfEllipse::getMajorRadius(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MajorRadius(); } void Geom2dArcOfEllipse::setMajorRadius(double Radius) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); try { ellipse->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } double Geom2dArcOfEllipse::getMinorRadius(void) const { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); return ellipse->MinorRadius(); } void Geom2dArcOfEllipse::setMinorRadius(double Radius) { - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); try { ellipse->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1286,7 +1286,7 @@ void Geom2dArcOfEllipse::setMinorRadius(double Radius) */ Base::Vector2d Geom2dArcOfEllipse::getMajorAxisDir() const { - Handle_Geom2d_Ellipse c = Handle_Geom2d_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) c = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); assert(!c.IsNull()); gp_Dir2d xdir = c->XAxis().Direction(); return Base::Vector2d(xdir.X(), xdir.Y()); @@ -1302,7 +1302,7 @@ Base::Vector2d Geom2dArcOfEllipse::getMajorAxisDir() const */ void Geom2dArcOfEllipse::setMajorAxisDir(Base::Vector2d newdir) { - Handle_Geom2d_Ellipse c = Handle_Geom2d_Ellipse::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) c = Handle(Geom2d_Ellipse)::DownCast(myCurve->BasisCurve()); assert(!c.IsNull()); if (newdir.Length() < Precision::Confusion()) return;//zero vector was passed. Keep the old orientation. @@ -1314,7 +1314,7 @@ void Geom2dArcOfEllipse::setMajorAxisDir(Base::Vector2d newdir) c->SetElips2d(e); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1329,7 +1329,7 @@ void Geom2dArcOfEllipse::Save(Base::Writer &writer) const // save the attributes of the father class Geom2dCurve::Save(writer); - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(this->myCurve->BasisCurve()); gp_Elips2d e = ellipse->Elips2d(); gp_Ax22d axis = e.Axis(); @@ -1369,15 +1369,15 @@ void Geom2dArcOfEllipse::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom2d_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom2d_Ellipse tmpellipse = Handle_Geom2d_Ellipse::DownCast(tmpcurve->BasisCurve()); - Handle_Geom2d_Ellipse ellipse = Handle_Geom2d_Ellipse::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom2d_Ellipse) tmpellipse = Handle(Geom2d_Ellipse)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom2d_Ellipse) ellipse = Handle(Geom2d_Ellipse)::DownCast(this->myCurve->BasisCurve()); ellipse->SetElips2d(tmpellipse->Elips2d()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1393,20 +1393,20 @@ TYPESYSTEM_SOURCE(Part::Geom2dHyperbola, Part::Geom2dConic) Geom2dHyperbola::Geom2dHyperbola() { - Handle_Geom2d_Hyperbola h = new Geom2d_Hyperbola(gp_Hypr2d()); + Handle(Geom2d_Hyperbola) h = new Geom2d_Hyperbola(gp_Hypr2d()); this->myCurve = h; } -Geom2dHyperbola::Geom2dHyperbola(const Handle_Geom2d_Hyperbola& h) +Geom2dHyperbola::Geom2dHyperbola(const Handle(Geom2d_Hyperbola)& h) { - this->myCurve = Handle_Geom2d_Hyperbola::DownCast(h->Copy()); + this->myCurve = Handle(Geom2d_Hyperbola)::DownCast(h->Copy()); } Geom2dHyperbola::~Geom2dHyperbola() { } -const Handle_Geom2d_Geometry& Geom2dHyperbola::handle() const +const Handle(Geom2d_Geometry)& Geom2dHyperbola::handle() const { return myCurve; } @@ -1419,38 +1419,38 @@ Geometry2d *Geom2dHyperbola::clone(void) const double Geom2dHyperbola::getMajorRadius(void) const { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(handle()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(handle()); return h->MajorRadius(); } void Geom2dHyperbola::setMajorRadius(double Radius) { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(handle()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(handle()); try { h->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } double Geom2dHyperbola::getMinorRadius(void) const { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(handle()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(handle()); return h->MinorRadius(); } void Geom2dHyperbola::setMinorRadius(double Radius) { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(handle()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(handle()); try { h->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1500,7 +1500,7 @@ void Geom2dHyperbola::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1516,11 +1516,11 @@ TYPESYSTEM_SOURCE(Part::Geom2dArcOfHyperbola, Part::Geom2dArcOfConic) Geom2dArcOfHyperbola::Geom2dArcOfHyperbola() { - Handle_Geom2d_Hyperbola h = new Geom2d_Hyperbola(gp_Hypr2d()); + Handle(Geom2d_Hyperbola) h = new Geom2d_Hyperbola(gp_Hypr2d()); this->myCurve = new Geom2d_TrimmedCurve(h, h->FirstParameter(),h->LastParameter()); } -Geom2dArcOfHyperbola::Geom2dArcOfHyperbola(const Handle_Geom2d_Hyperbola& h) +Geom2dArcOfHyperbola::Geom2dArcOfHyperbola(const Handle(Geom2d_Hyperbola)& h) { this->myCurve = new Geom2d_TrimmedCurve(h, h->FirstParameter(),h->LastParameter()); } @@ -1529,15 +1529,15 @@ Geom2dArcOfHyperbola::~Geom2dArcOfHyperbola() { } -void Geom2dArcOfHyperbola::setHandle(const Handle_Geom2d_TrimmedCurve& c) +void Geom2dArcOfHyperbola::setHandle(const Handle(Geom2d_TrimmedCurve)& c) { - Handle_Geom2d_Hyperbola basis = Handle_Geom2d_Hyperbola::DownCast(c->BasisCurve()); + Handle(Geom2d_Hyperbola) basis = Handle(Geom2d_Hyperbola)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not an hyperbola"); - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dArcOfHyperbola::handle() const +const Handle(Geom2d_Geometry)& Geom2dArcOfHyperbola::handle() const { return myCurve; } @@ -1551,38 +1551,38 @@ Geometry2d *Geom2dArcOfHyperbola::clone(void) const double Geom2dArcOfHyperbola::getMajorRadius(void) const { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MajorRadius(); } void Geom2dArcOfHyperbola::setMajorRadius(double Radius) { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(myCurve->BasisCurve()); try { h->SetMajorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } double Geom2dArcOfHyperbola::getMinorRadius(void) const { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(myCurve->BasisCurve()); return h->MinorRadius(); } void Geom2dArcOfHyperbola::setMinorRadius(double Radius) { - Handle_Geom2d_Hyperbola h = Handle_Geom2d_Hyperbola::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Hyperbola) h = Handle(Geom2d_Hyperbola)::DownCast(myCurve->BasisCurve()); try { h->SetMinorRadius(Radius); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1597,7 +1597,7 @@ void Geom2dArcOfHyperbola::Save(Base::Writer &writer) const // save the attributes of the father class Geom2dCurve::Save(writer); - Handle_Geom2d_Hyperbola hh = Handle_Geom2d_Hyperbola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_Hyperbola) hh = Handle(Geom2d_Hyperbola)::DownCast(this->myCurve->BasisCurve()); gp_Hypr2d h = hh->Hypr2d(); gp_Ax22d axis = h.Axis(); @@ -1637,15 +1637,15 @@ void Geom2dArcOfHyperbola::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom2d_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom2d_Hyperbola tmphyperbola = Handle_Geom2d_Hyperbola::DownCast(tmpcurve->BasisCurve()); - Handle_Geom2d_Hyperbola hyperbola = Handle_Geom2d_Hyperbola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom2d_Hyperbola) tmphyperbola = Handle(Geom2d_Hyperbola)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom2d_Hyperbola) hyperbola = Handle(Geom2d_Hyperbola)::DownCast(this->myCurve->BasisCurve()); hyperbola->SetHypr2d(tmphyperbola->Hypr2d()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1661,20 +1661,20 @@ TYPESYSTEM_SOURCE(Part::Geom2dParabola, Part::Geom2dConic) Geom2dParabola::Geom2dParabola() { - Handle_Geom2d_Parabola p = new Geom2d_Parabola(gp_Parab2d()); + Handle(Geom2d_Parabola) p = new Geom2d_Parabola(gp_Parab2d()); this->myCurve = p; } -Geom2dParabola::Geom2dParabola(const Handle_Geom2d_Parabola& p) +Geom2dParabola::Geom2dParabola(const Handle(Geom2d_Parabola)& p) { - this->myCurve = Handle_Geom2d_Parabola::DownCast(p->Copy()); + this->myCurve = Handle(Geom2d_Parabola)::DownCast(p->Copy()); } Geom2dParabola::~Geom2dParabola() { } -const Handle_Geom2d_Geometry& Geom2dParabola::handle() const +const Handle(Geom2d_Geometry)& Geom2dParabola::handle() const { return myCurve; } @@ -1687,19 +1687,19 @@ Geometry2d *Geom2dParabola::clone(void) const double Geom2dParabola::getFocal(void) const { - Handle_Geom2d_Parabola p = Handle_Geom2d_Parabola::DownCast(handle()); + Handle(Geom2d_Parabola) p = Handle(Geom2d_Parabola)::DownCast(handle()); return p->Focal(); } void Geom2dParabola::setFocal(double length) { - Handle_Geom2d_Parabola p = Handle_Geom2d_Parabola::DownCast(handle()); + Handle(Geom2d_Parabola) p = Handle(Geom2d_Parabola)::DownCast(handle()); try { p->SetFocal(length); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1748,7 +1748,7 @@ void Geom2dParabola::Restore(Base::XMLReader& reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1764,11 +1764,11 @@ TYPESYSTEM_SOURCE(Part::Geom2dArcOfParabola, Part::Geom2dArcOfConic) Geom2dArcOfParabola::Geom2dArcOfParabola() { - Handle_Geom2d_Parabola p = new Geom2d_Parabola(gp_Parab2d()); + Handle(Geom2d_Parabola) p = new Geom2d_Parabola(gp_Parab2d()); this->myCurve = new Geom2d_TrimmedCurve(p, p->FirstParameter(),p->LastParameter()); } -Geom2dArcOfParabola::Geom2dArcOfParabola(const Handle_Geom2d_Parabola& h) +Geom2dArcOfParabola::Geom2dArcOfParabola(const Handle(Geom2d_Parabola)& h) { this->myCurve = new Geom2d_TrimmedCurve(h, h->FirstParameter(),h->LastParameter()); } @@ -1777,15 +1777,15 @@ Geom2dArcOfParabola::~Geom2dArcOfParabola() { } -void Geom2dArcOfParabola::setHandle(const Handle_Geom2d_TrimmedCurve& c) +void Geom2dArcOfParabola::setHandle(const Handle(Geom2d_TrimmedCurve)& c) { - Handle_Geom2d_Parabola basis = Handle_Geom2d_Parabola::DownCast(c->BasisCurve()); + Handle(Geom2d_Parabola) basis = Handle(Geom2d_Parabola)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not a parabola"); - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dArcOfParabola::handle() const +const Handle(Geom2d_Geometry)& Geom2dArcOfParabola::handle() const { return myCurve; } @@ -1799,19 +1799,19 @@ Geometry2d *Geom2dArcOfParabola::clone(void) const double Geom2dArcOfParabola::getFocal(void) const { - Handle_Geom2d_Parabola p = Handle_Geom2d_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Parabola) p = Handle(Geom2d_Parabola)::DownCast(myCurve->BasisCurve()); return p->Focal(); } void Geom2dArcOfParabola::setFocal(double length) { - Handle_Geom2d_Parabola p = Handle_Geom2d_Parabola::DownCast(myCurve->BasisCurve()); + Handle(Geom2d_Parabola) p = Handle(Geom2d_Parabola)::DownCast(myCurve->BasisCurve()); try { p->SetFocal(length); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1826,7 +1826,7 @@ void Geom2dArcOfParabola::Save(Base::Writer &writer) const // save the attributes of the father class Geom2dCurve::Save(writer); - Handle_Geom2d_Parabola hp = Handle_Geom2d_Parabola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_Parabola) hp = Handle(Geom2d_Parabola)::DownCast(this->myCurve->BasisCurve()); gp_Parab2d p = hp->Parab2d(); gp_Ax22d axis = p.Axis(); double u = this->myCurve->FirstParameter(); @@ -1864,15 +1864,15 @@ void Geom2dArcOfParabola::Restore(Base::XMLReader &reader) if (!ma.IsDone()) throw Base::Exception(gce_ErrorStatusText(ma.Status())); - Handle_Geom2d_TrimmedCurve tmpcurve = ma.Value(); - Handle_Geom2d_Parabola tmpparabola = Handle_Geom2d_Parabola::DownCast(tmpcurve->BasisCurve()); - Handle_Geom2d_Parabola parabola = Handle_Geom2d_Parabola::DownCast(this->myCurve->BasisCurve()); + Handle(Geom2d_TrimmedCurve) tmpcurve = ma.Value(); + Handle(Geom2d_Parabola) tmpparabola = Handle(Geom2d_Parabola)::DownCast(tmpcurve->BasisCurve()); + Handle(Geom2d_Parabola) parabola = Handle(Geom2d_Parabola)::DownCast(this->myCurve->BasisCurve()); parabola->SetParab2d(tmpparabola->Parab2d()); this->myCurve->SetTrim(tmpcurve->FirstParameter(), tmpcurve->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -1888,13 +1888,13 @@ TYPESYSTEM_SOURCE(Part::Geom2dLine, Part::Geom2dCurve) Geom2dLine::Geom2dLine() { - Handle_Geom2d_Line c = new Geom2d_Line(gp_Lin2d()); + Handle(Geom2d_Line) c = new Geom2d_Line(gp_Lin2d()); this->myCurve = c; } -Geom2dLine::Geom2dLine(const Handle_Geom2d_Line& l) +Geom2dLine::Geom2dLine(const Handle(Geom2d_Line)& l) { - this->myCurve = Handle_Geom2d_Line::DownCast(l->Copy()); + this->myCurve = Handle(Geom2d_Line)::DownCast(l->Copy()); } Geom2dLine::Geom2dLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir) @@ -1924,7 +1924,7 @@ Base::Vector2d Geom2dLine::getDir(void) const return Base::Vector2d(Dir.X(),Dir.Y()); } -const Handle_Geom2d_Geometry& Geom2dLine::handle() const +const Handle(Geom2d_Geometry)& Geom2dLine::handle() const { return myCurve; } @@ -1982,7 +1982,7 @@ void Geom2dLine::Restore(Base::XMLReader &reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -2001,7 +2001,7 @@ Geom2dLineSegment::Geom2dLineSegment() gp_Lin2d line; line.SetLocation(gp_Pnt2d(0.0,0.0)); line.SetDirection(gp_Dir2d(0.0,1.0)); - Handle_Geom2d_Line c = new Geom2d_Line(line); + Handle(Geom2d_Line) c = new Geom2d_Line(line); this->myCurve = new Geom2d_TrimmedCurve(c, 0.0,1.0); } @@ -2009,15 +2009,15 @@ Geom2dLineSegment::~Geom2dLineSegment() { } -void Geom2dLineSegment::setHandle(const Handle_Geom2d_TrimmedCurve& c) +void Geom2dLineSegment::setHandle(const Handle(Geom2d_TrimmedCurve)& c) { - Handle_Geom2d_Line basis = Handle_Geom2d_Line::DownCast(c->BasisCurve()); + Handle(Geom2d_Line) basis = Handle(Geom2d_Line)::DownCast(c->BasisCurve()); if (basis.IsNull()) Standard_Failure::Raise("Basis curve is not a line"); - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dLineSegment::handle() const +const Handle(Geom2d_Geometry)& Geom2dLineSegment::handle() const { return myCurve; } @@ -2025,20 +2025,20 @@ const Handle_Geom2d_Geometry& Geom2dLineSegment::handle() const Geometry2d *Geom2dLineSegment::clone(void)const { Geom2dLineSegment *tempCurve = new Geom2dLineSegment(); - tempCurve->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(myCurve->Copy()); + tempCurve->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(myCurve->Copy()); return tempCurve; } Base::Vector2d Geom2dLineSegment::getStartPoint() const { - Handle_Geom2d_TrimmedCurve this_curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); gp_Pnt2d pnt = this_curve->StartPoint(); return Base::Vector2d(pnt.X(), pnt.Y()); } Base::Vector2d Geom2dLineSegment::getEndPoint() const { - Handle_Geom2d_TrimmedCurve this_curve = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) this_curve = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); gp_Pnt2d pnt = this_curve->EndPoint(); return Base::Vector2d(pnt.X(), pnt.Y()); } @@ -2046,7 +2046,7 @@ Base::Vector2d Geom2dLineSegment::getEndPoint() const void Geom2dLineSegment::setPoints(const Base::Vector2d& Start, const Base::Vector2d& End) { gp_Pnt2d p1(Start.x,Start.y), p2(End.x,End.y); - Handle_Geom2d_TrimmedCurve this_curv = Handle_Geom2d_TrimmedCurve::DownCast(handle()); + Handle(Geom2d_TrimmedCurve) this_curv = Handle(Geom2d_TrimmedCurve)::DownCast(handle()); try { // Create line out of two points @@ -2058,15 +2058,15 @@ void Geom2dLineSegment::setPoints(const Base::Vector2d& Start, const Base::Vecto } // get Geom_Line of line segment - Handle_Geom2d_Line this_line = Handle_Geom2d_Line::DownCast + Handle(Geom2d_Line) this_line = Handle(Geom2d_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom2d_TrimmedCurve that_curv = ms.Value(); - Handle_Geom2d_Line that_line = Handle_Geom2d_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom2d_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom2d_Line) that_line = Handle(Geom2d_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin2d(that_line->Lin2d()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -2119,7 +2119,7 @@ void Geom2dLineSegment::Restore(Base::XMLReader &reader) this->myCurve = mc.Value(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } @@ -2137,14 +2137,14 @@ Geom2dOffsetCurve::Geom2dOffsetCurve() { } -Geom2dOffsetCurve::Geom2dOffsetCurve(const Handle_Geom2d_Curve& c, double offset) +Geom2dOffsetCurve::Geom2dOffsetCurve(const Handle(Geom2d_Curve)& c, double offset) { this->myCurve = new Geom2d_OffsetCurve(c, offset); } -Geom2dOffsetCurve::Geom2dOffsetCurve(const Handle_Geom2d_OffsetCurve& c) +Geom2dOffsetCurve::Geom2dOffsetCurve(const Handle(Geom2d_OffsetCurve)& c) { - this->myCurve = Handle_Geom2d_OffsetCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_OffsetCurve)::DownCast(c->Copy()); } Geom2dOffsetCurve::~Geom2dOffsetCurve() @@ -2157,12 +2157,12 @@ Geometry2d *Geom2dOffsetCurve::clone(void) const return newCurve; } -void Geom2dOffsetCurve::setHandle(const Handle_Geom2d_OffsetCurve& c) +void Geom2dOffsetCurve::setHandle(const Handle(Geom2d_OffsetCurve)& c) { - this->myCurve = Handle_Geom2d_OffsetCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_OffsetCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dOffsetCurve::handle() const +const Handle(Geom2d_Geometry)& Geom2dOffsetCurve::handle() const { return this->myCurve; } @@ -2195,21 +2195,21 @@ Geom2dTrimmedCurve::Geom2dTrimmedCurve() { } -Geom2dTrimmedCurve::Geom2dTrimmedCurve(const Handle_Geom2d_TrimmedCurve& c) +Geom2dTrimmedCurve::Geom2dTrimmedCurve(const Handle(Geom2d_TrimmedCurve)& c) { - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } Geom2dTrimmedCurve::~Geom2dTrimmedCurve() { } -void Geom2dTrimmedCurve::setHandle(const Handle_Geom2d_TrimmedCurve& c) +void Geom2dTrimmedCurve::setHandle(const Handle(Geom2d_TrimmedCurve)& c) { - this->myCurve = Handle_Geom2d_TrimmedCurve::DownCast(c->Copy()); + this->myCurve = Handle(Geom2d_TrimmedCurve)::DownCast(c->Copy()); } -const Handle_Geom2d_Geometry& Geom2dTrimmedCurve::handle() const +const Handle(Geom2d_Geometry)& Geom2dTrimmedCurve::handle() const { return myCurve; } @@ -2237,7 +2237,7 @@ void Geom2dTrimmedCurve::Restore(Base::XMLReader &/*reader*/) PyObject *Geom2dTrimmedCurve::getPyObject(void) { - Handle_Geom2d_Curve basis = this->myCurve->BasisCurve(); + Handle(Geom2d_Curve) basis = this->myCurve->BasisCurve(); if (basis.IsNull()) Py_Return; if (basis->IsKind(STANDARD_TYPE (Geom2d_Parabola))) { @@ -2267,12 +2267,12 @@ PyObject *Geom2dTrimmedCurve::getPyObject(void) } if (basis->IsKind(STANDARD_TYPE (Geom2d_BSplineCurve))) { Geom2dBSplineCurve c; - c.setHandle(Handle_Geom2d_BSplineCurve::DownCast(basis)); + c.setHandle(Handle(Geom2d_BSplineCurve)::DownCast(basis)); return c.getPyObject(); } if (basis->IsKind(STANDARD_TYPE (Geom2d_BezierCurve))) { Geom2dBezierCurve c; - c.setHandle(Handle_Geom2d_BezierCurve::DownCast(basis)); + c.setHandle(Handle(Geom2d_BezierCurve)::DownCast(basis)); return c.getPyObject(); } @@ -2283,34 +2283,34 @@ PyObject *Geom2dTrimmedCurve::getPyObject(void) // ------------------------------------------------------------------ namespace Part { -std::unique_ptr getCurve2dFromGeom2d(Handle_Geom2d_Curve curve) +std::unique_ptr getCurve2dFromGeom2d(Handle(Geom2d_Curve) curve) { std::unique_ptr geo2d; if (curve.IsNull()) return geo2d; if (curve->IsKind(STANDARD_TYPE (Geom2d_Parabola))) { - geo2d.reset(new Geom2dParabola(Handle_Geom2d_Parabola::DownCast(curve))); + geo2d.reset(new Geom2dParabola(Handle(Geom2d_Parabola)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_Hyperbola))) { - geo2d.reset(new Geom2dHyperbola(Handle_Geom2d_Hyperbola::DownCast(curve))); + geo2d.reset(new Geom2dHyperbola(Handle(Geom2d_Hyperbola)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_Ellipse))) { - geo2d.reset(new Geom2dEllipse(Handle_Geom2d_Ellipse::DownCast(curve))); + geo2d.reset(new Geom2dEllipse(Handle(Geom2d_Ellipse)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_Circle))) { - geo2d.reset(new Geom2dCircle(Handle_Geom2d_Circle::DownCast(curve))); + geo2d.reset(new Geom2dCircle(Handle(Geom2d_Circle)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_Line))) { - geo2d.reset(new Geom2dLine(Handle_Geom2d_Line::DownCast(curve))); + geo2d.reset(new Geom2dLine(Handle(Geom2d_Line)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_BSplineCurve))) { - geo2d.reset(new Geom2dBSplineCurve(Handle_Geom2d_BSplineCurve::DownCast(curve))); + geo2d.reset(new Geom2dBSplineCurve(Handle(Geom2d_BSplineCurve)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_BezierCurve))) { - geo2d.reset(new Geom2dBezierCurve(Handle_Geom2d_BezierCurve::DownCast(curve))); + geo2d.reset(new Geom2dBezierCurve(Handle(Geom2d_BezierCurve)::DownCast(curve))); } else if (curve->IsKind(STANDARD_TYPE (Geom2d_TrimmedCurve))) { - geo2d.reset(new Geom2dTrimmedCurve(Handle_Geom2d_TrimmedCurve::DownCast(curve))); + geo2d.reset(new Geom2dTrimmedCurve(Handle(Geom2d_TrimmedCurve)::DownCast(curve))); } return geo2d; diff --git a/src/Mod/Part/App/Geometry2d.h b/src/Mod/Part/App/Geometry2d.h index fb7c2d1d9f..2457cb9712 100644 --- a/src/Mod/Part/App/Geometry2d.h +++ b/src/Mod/Part/App/Geometry2d.h @@ -52,7 +52,7 @@ public: virtual ~Geometry2d(); virtual TopoDS_Shape toShape() const = 0; - virtual const Handle_Geom2d_Geometry& handle() const = 0; + virtual const Handle(Geom2d_Geometry)& handle() const = 0; // Persistence implementer --------------------- virtual unsigned int getMemSize(void) const; virtual void Save(Base::Writer &/*writer*/) const; @@ -73,7 +73,7 @@ class PartExport Geom2dPoint : public Geometry2d TYPESYSTEM_HEADER(); public: Geom2dPoint(); - Geom2dPoint(const Handle_Geom2d_CartesianPoint&); + Geom2dPoint(const Handle(Geom2d_CartesianPoint)&); Geom2dPoint(const Base::Vector2d&); virtual ~Geom2dPoint(); virtual Geometry2d *clone(void) const; @@ -86,13 +86,13 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom2d_Geometry& handle() const; + const Handle(Geom2d_Geometry)& handle() const; Base::Vector2d getPoint(void)const; void setPoint(const Base::Vector2d&); private: - Handle_Geom2d_CartesianPoint myPoint; + Handle(Geom2d_CartesianPoint) myPoint; }; class PartExport Geom2dCurve : public Geometry2d @@ -117,7 +117,7 @@ class PartExport Geom2dBezierCurve : public Geom2dCurve TYPESYSTEM_HEADER(); public: Geom2dBezierCurve(); - Geom2dBezierCurve(const Handle_Geom2d_BezierCurve&); + Geom2dBezierCurve(const Handle(Geom2d_BezierCurve)&); virtual ~Geom2dBezierCurve(); virtual Geometry2d *clone(void) const; @@ -128,11 +128,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_BezierCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_BezierCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_BezierCurve myCurve; + Handle(Geom2d_BezierCurve) myCurve; }; class PartExport Geom2dBSplineCurve : public Geom2dCurve @@ -140,7 +140,7 @@ class PartExport Geom2dBSplineCurve : public Geom2dCurve TYPESYSTEM_HEADER(); public: Geom2dBSplineCurve(); - Geom2dBSplineCurve(const Handle_Geom2d_BSplineCurve&); + Geom2dBSplineCurve(const Handle(Geom2d_BSplineCurve)&); virtual ~Geom2dBSplineCurve(); virtual Geometry2d *clone(void) const; @@ -166,7 +166,7 @@ public: int countPoles() const; void setPole(int index, const Base::Vector2d&, double weight=-1); std::vector getPoles() const; - bool join(const Handle_Geom2d_BSplineCurve&); + bool join(const Handle(Geom2d_BSplineCurve)&); void makeC1Continuous(double); std::list toBiArcs(double tolerance) const; @@ -177,8 +177,8 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_BSplineCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_BSplineCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: void createArcs(double tolerance, std::list& new_spans, @@ -188,7 +188,7 @@ private: const gp_Pnt2d& p4, gp_Vec2d v_end, gp_Pnt2d& p1, gp_Pnt2d& p2, gp_Pnt2d& p3) const; private: - Handle_Geom2d_BSplineCurve myCurve; + Handle(Geom2d_BSplineCurve) myCurve; }; class PartExport Geom2dConic : public Geom2dCurve @@ -208,7 +208,7 @@ public: virtual unsigned int getMemSize(void) const = 0; virtual PyObject *getPyObject(void) = 0; - const Handle_Geom2d_Geometry& handle() const = 0; + const Handle(Geom2d_Geometry)& handle() const = 0; protected: void SaveAxis(Base::Writer& writer, const gp_Ax22d&) const; @@ -238,7 +238,7 @@ public: virtual unsigned int getMemSize(void) const = 0; virtual PyObject *getPyObject(void) = 0; - const Handle_Geom2d_Geometry& handle() const = 0; + const Handle(Geom2d_Geometry)& handle() const = 0; protected: void SaveAxis(Base::Writer& writer, const gp_Ax22d&, double u, double v) const; @@ -250,7 +250,7 @@ class PartExport Geom2dCircle : public Geom2dConic TYPESYSTEM_HEADER(); public: Geom2dCircle(); - Geom2dCircle(const Handle_Geom2d_Circle&); + Geom2dCircle(const Handle(Geom2d_Circle)&); virtual ~Geom2dCircle(); virtual Geometry2d *clone(void) const; @@ -264,10 +264,10 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom2d_Geometry& handle() const; + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_Circle myCurve; + Handle(Geom2d_Circle) myCurve; }; class PartExport Geom2dArcOfCircle : public Geom2dArcOfConic @@ -275,7 +275,7 @@ class PartExport Geom2dArcOfCircle : public Geom2dArcOfConic TYPESYSTEM_HEADER(); public: Geom2dArcOfCircle(); - Geom2dArcOfCircle(const Handle_Geom2d_Circle&); + Geom2dArcOfCircle(const Handle(Geom2d_Circle)&); virtual ~Geom2dArcOfCircle(); virtual Geometry2d *clone(void) const; @@ -289,11 +289,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_TrimmedCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_TrimmedCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_TrimmedCurve myCurve; + Handle(Geom2d_TrimmedCurve) myCurve; }; class PartExport Geom2dEllipse : public Geom2dConic @@ -301,7 +301,7 @@ class PartExport Geom2dEllipse : public Geom2dConic TYPESYSTEM_HEADER(); public: Geom2dEllipse(); - Geom2dEllipse(const Handle_Geom2d_Ellipse&); + Geom2dEllipse(const Handle(Geom2d_Ellipse)&); virtual ~Geom2dEllipse(); virtual Geometry2d *clone(void) const; @@ -319,11 +319,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_Ellipse &e); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_Ellipse) &e); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_Ellipse myCurve; + Handle(Geom2d_Ellipse) myCurve; }; class PartExport Geom2dArcOfEllipse : public Geom2dArcOfConic @@ -331,7 +331,7 @@ class PartExport Geom2dArcOfEllipse : public Geom2dArcOfConic TYPESYSTEM_HEADER(); public: Geom2dArcOfEllipse(); - Geom2dArcOfEllipse(const Handle_Geom2d_Ellipse&); + Geom2dArcOfEllipse(const Handle(Geom2d_Ellipse)&); virtual ~Geom2dArcOfEllipse(); virtual Geometry2d *clone(void) const; @@ -349,11 +349,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_TrimmedCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_TrimmedCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_TrimmedCurve myCurve; + Handle(Geom2d_TrimmedCurve) myCurve; }; class PartExport Geom2dHyperbola : public Geom2dConic @@ -361,7 +361,7 @@ class PartExport Geom2dHyperbola : public Geom2dConic TYPESYSTEM_HEADER(); public: Geom2dHyperbola(); - Geom2dHyperbola(const Handle_Geom2d_Hyperbola&); + Geom2dHyperbola(const Handle(Geom2d_Hyperbola)&); virtual ~Geom2dHyperbola(); virtual Geometry2d *clone(void) const; @@ -377,10 +377,10 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom2d_Geometry& handle() const; + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_Hyperbola myCurve; + Handle(Geom2d_Hyperbola) myCurve; }; class PartExport Geom2dArcOfHyperbola : public Geom2dArcOfConic @@ -388,7 +388,7 @@ class PartExport Geom2dArcOfHyperbola : public Geom2dArcOfConic TYPESYSTEM_HEADER(); public: Geom2dArcOfHyperbola(); - Geom2dArcOfHyperbola(const Handle_Geom2d_Hyperbola&); + Geom2dArcOfHyperbola(const Handle(Geom2d_Hyperbola)&); virtual ~Geom2dArcOfHyperbola(); virtual Geometry2d *clone(void) const; @@ -404,11 +404,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_TrimmedCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_TrimmedCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_TrimmedCurve myCurve; + Handle(Geom2d_TrimmedCurve) myCurve; }; class PartExport Geom2dParabola : public Geom2dConic @@ -416,7 +416,7 @@ class PartExport Geom2dParabola : public Geom2dConic TYPESYSTEM_HEADER(); public: Geom2dParabola(); - Geom2dParabola(const Handle_Geom2d_Parabola&); + Geom2dParabola(const Handle(Geom2d_Parabola)&); virtual ~Geom2dParabola(); virtual Geometry2d *clone(void) const; @@ -430,10 +430,10 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom2d_Geometry& handle() const; + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_Parabola myCurve; + Handle(Geom2d_Parabola) myCurve; }; class PartExport Geom2dArcOfParabola : public Geom2dArcOfConic @@ -441,7 +441,7 @@ class PartExport Geom2dArcOfParabola : public Geom2dArcOfConic TYPESYSTEM_HEADER(); public: Geom2dArcOfParabola(); - Geom2dArcOfParabola(const Handle_Geom2d_Parabola&); + Geom2dArcOfParabola(const Handle(Geom2d_Parabola)&); virtual ~Geom2dArcOfParabola(); virtual Geometry2d *clone(void) const; @@ -455,11 +455,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_TrimmedCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_TrimmedCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_TrimmedCurve myCurve; + Handle(Geom2d_TrimmedCurve) myCurve; }; class PartExport Geom2dLine : public Geom2dCurve @@ -467,7 +467,7 @@ class PartExport Geom2dLine : public Geom2dCurve TYPESYSTEM_HEADER(); public: Geom2dLine(); - Geom2dLine(const Handle_Geom2d_Line&); + Geom2dLine(const Handle(Geom2d_Line)&); Geom2dLine(const Base::Vector2d& Pos, const Base::Vector2d& Dir); virtual ~Geom2dLine(); virtual Geometry2d *clone(void) const; @@ -483,10 +483,10 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - const Handle_Geom2d_Geometry& handle() const; + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_Line myCurve; + Handle(Geom2d_Line) myCurve; }; class PartExport Geom2dLineSegment : public Geom2dCurve @@ -510,11 +510,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_TrimmedCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_TrimmedCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_TrimmedCurve myCurve; + Handle(Geom2d_TrimmedCurve) myCurve; }; class PartExport Geom2dOffsetCurve : public Geom2dCurve @@ -522,8 +522,8 @@ class PartExport Geom2dOffsetCurve : public Geom2dCurve TYPESYSTEM_HEADER(); public: Geom2dOffsetCurve(); - Geom2dOffsetCurve(const Handle_Geom2d_Curve&, double); - Geom2dOffsetCurve(const Handle_Geom2d_OffsetCurve&); + Geom2dOffsetCurve(const Handle(Geom2d_Curve)&, double); + Geom2dOffsetCurve(const Handle(Geom2d_OffsetCurve)&); virtual ~Geom2dOffsetCurve(); virtual Geometry2d *clone(void) const; @@ -534,11 +534,11 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_OffsetCurve& c); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_OffsetCurve)& c); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_OffsetCurve myCurve; + Handle(Geom2d_OffsetCurve) myCurve; }; class PartExport Geom2dTrimmedCurve : public Geom2dCurve @@ -546,7 +546,7 @@ class PartExport Geom2dTrimmedCurve : public Geom2dCurve TYPESYSTEM_HEADER(); public: Geom2dTrimmedCurve(); - Geom2dTrimmedCurve(const Handle_Geom2d_TrimmedCurve&); + Geom2dTrimmedCurve(const Handle(Geom2d_TrimmedCurve)&); virtual ~Geom2dTrimmedCurve(); virtual Geometry2d *clone(void) const; @@ -557,14 +557,14 @@ public: // Base implementer ---------------------------- virtual PyObject *getPyObject(void); - void setHandle(const Handle_Geom2d_TrimmedCurve&); - const Handle_Geom2d_Geometry& handle() const; + void setHandle(const Handle(Geom2d_TrimmedCurve)&); + const Handle(Geom2d_Geometry)& handle() const; private: - Handle_Geom2d_TrimmedCurve myCurve; + Handle(Geom2d_TrimmedCurve) myCurve; }; -std::unique_ptr getCurve2dFromGeom2d(Handle_Geom2d_Curve); +std::unique_ptr getCurve2dFromGeom2d(Handle(Geom2d_Curve)); } diff --git a/src/Mod/Part/App/GeometryCurvePyImp.cpp b/src/Mod/Part/App/GeometryCurvePyImp.cpp index dd5432c6ed..ce675943bf 100644 --- a/src/Mod/Part/App/GeometryCurvePyImp.cpp +++ b/src/Mod/Part/App/GeometryCurvePyImp.cpp @@ -73,7 +73,7 @@ #include "TopoShapeEdgePy.h" namespace Part { -extern const Py::Object makeGeometryCurvePy(const Handle_Geom_Curve& c); +extern const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c); } using namespace Part; @@ -100,8 +100,8 @@ int GeometryCurvePy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) PyObject* GeometryCurvePy::toShape(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u,v; @@ -115,7 +115,7 @@ PyObject* GeometryCurvePy::toShape(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -127,8 +127,8 @@ PyObject* GeometryCurvePy::toShape(PyObject *args) PyObject* GeometryCurvePy::discretize(PyObject *args, PyObject *kwds) { try { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); if (c.IsNull()) { PyErr_SetString(PartExceptionOCCError, "Geometry is not a curve"); return 0; @@ -306,8 +306,8 @@ PyObject* GeometryCurvePy::discretize(PyObject *args, PyObject *kwds) PyObject* GeometryCurvePy::length(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u=c->FirstParameter(); @@ -321,7 +321,7 @@ PyObject* GeometryCurvePy::length(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -332,8 +332,8 @@ PyObject* GeometryCurvePy::length(PyObject *args) PyObject* GeometryCurvePy::parameterAtDistance(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double abscissa; @@ -347,7 +347,7 @@ PyObject* GeometryCurvePy::parameterAtDistance(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -358,8 +358,8 @@ PyObject* GeometryCurvePy::parameterAtDistance(PyObject *args) PyObject* GeometryCurvePy::value(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -370,7 +370,7 @@ PyObject* GeometryCurvePy::value(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -381,8 +381,8 @@ PyObject* GeometryCurvePy::value(PyObject *args) PyObject* GeometryCurvePy::tangent(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -400,7 +400,7 @@ PyObject* GeometryCurvePy::tangent(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -411,8 +411,8 @@ PyObject* GeometryCurvePy::tangent(PyObject *args) PyObject* GeometryCurvePy::normal(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -425,7 +425,7 @@ PyObject* GeometryCurvePy::normal(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -436,8 +436,8 @@ PyObject* GeometryCurvePy::normal(PyObject *args) PyObject* GeometryCurvePy::curvature(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -449,7 +449,7 @@ PyObject* GeometryCurvePy::curvature(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -460,8 +460,8 @@ PyObject* GeometryCurvePy::curvature(PyObject *args) PyObject* GeometryCurvePy::centerOfCurvature(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u; @@ -474,7 +474,7 @@ PyObject* GeometryCurvePy::centerOfCurvature(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -485,8 +485,8 @@ PyObject* GeometryCurvePy::centerOfCurvature(PyObject *args) PyObject* GeometryCurvePy::parameter(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { PyObject *p; @@ -500,7 +500,7 @@ PyObject* GeometryCurvePy::parameter(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -516,23 +516,23 @@ PyObject* GeometryCurvePy::makeRuledSurface(PyObject *args) return 0; try { - Handle_Geom_Curve aCrv1 = Handle_Geom_Curve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) aCrv1 = Handle(Geom_Curve)::DownCast(getGeometryPtr()->handle()); GeometryCurvePy* c = static_cast(curve); - Handle_Geom_Curve aCrv2 = Handle_Geom_Curve::DownCast(c->getGeometryPtr()->handle()); - Handle_Geom_Surface aSurf = GeomFill::Surface (aCrv1, aCrv2); + Handle(Geom_Curve) aCrv2 = Handle(Geom_Curve)::DownCast(c->getGeometryPtr()->handle()); + Handle(Geom_Surface) aSurf = GeomFill::Surface (aCrv1, aCrv2); if (aSurf.IsNull()) { PyErr_SetString(PartExceptionOCCError, "Failed to create ruled surface"); return 0; } // check the result surface type if (aSurf->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) { - Handle_Geom_RectangularTrimmedSurface aTSurf = - Handle_Geom_RectangularTrimmedSurface::DownCast(aSurf); + Handle(Geom_RectangularTrimmedSurface) aTSurf = + Handle(Geom_RectangularTrimmedSurface)::DownCast(aSurf); return new RectangularTrimmedSurfacePy(new GeomTrimmedSurface(aTSurf)); } else if (aSurf->IsKind(STANDARD_TYPE(Geom_BSplineSurface))) { - Handle_Geom_BSplineSurface aBSurf = - Handle_Geom_BSplineSurface::DownCast(aSurf); + Handle(Geom_BSplineSurface) aBSurf = + Handle(Geom_BSplineSurface)::DownCast(aSurf); return new BSplineSurfacePy(new GeomBSplineSurface(aBSurf)); } else { @@ -542,7 +542,7 @@ PyObject* GeometryCurvePy::makeRuledSurface(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -556,14 +556,14 @@ PyObject* GeometryCurvePy::intersect2d(PyObject *args) return 0; try { - Handle_Geom_Curve self = Handle_Geom_Curve::DownCast(getGeometryPtr()->handle()); - Handle_Geom_Curve curv = Handle_Geom_Curve::DownCast(static_cast(c)-> + Handle(Geom_Curve) self = Handle(Geom_Curve)::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) curv = Handle(Geom_Curve)::DownCast(static_cast(c)-> getGeometryPtr()->handle()); - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast(static_cast(p)-> + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast(static_cast(p)-> getGeometryPtr()->handle()); - Handle_Geom2d_Curve curv1 = GeomAPI::To2d(self, plane->Pln()); - Handle_Geom2d_Curve curv2 = GeomAPI::To2d(curv, plane->Pln()); + Handle(Geom2d_Curve) curv1 = GeomAPI::To2d(self, plane->Pln()); + Handle(Geom2d_Curve) curv2 = GeomAPI::To2d(curv, plane->Pln()); Geom2dAPI_InterCurveCurve intCC(curv1, curv2); int nbPoints = intCC.NbPoints(); Py::List list; @@ -577,7 +577,7 @@ PyObject* GeometryCurvePy::intersect2d(PyObject *args) return Py::new_reference_to(list); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -585,8 +585,8 @@ PyObject* GeometryCurvePy::intersect2d(PyObject *args) PyObject* GeometryCurvePy::toBSpline(PyObject * args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u,v; @@ -599,7 +599,7 @@ PyObject* GeometryCurvePy::toBSpline(PyObject * args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -610,8 +610,8 @@ PyObject* GeometryCurvePy::toBSpline(PyObject * args) PyObject* GeometryCurvePy::toNurbs(PyObject * args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Curve c = Handle_Geom_Curve::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Curve) c = Handle(Geom_Curve)::DownCast(g); try { if (!c.IsNull()) { double u,v; @@ -624,7 +624,7 @@ PyObject* GeometryCurvePy::toNurbs(PyObject * args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -661,7 +661,7 @@ PyObject* GeometryCurvePy::approximateBSpline(PyObject *args) absShape = GeomAbs_C2; try { - Handle_Geom_Curve self = Handle_Geom_Curve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) self = Handle(Geom_Curve)::DownCast(getGeometryPtr()->handle()); GeomConvert_ApproxCurve approx(self, tolerance, absShape, maxSegment, maxDegree); if (approx.IsDone()) { return new BSplineCurvePy(new GeomBSplineCurve(approx.Curve())); @@ -678,7 +678,7 @@ PyObject* GeometryCurvePy::approximateBSpline(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -686,7 +686,7 @@ PyObject* GeometryCurvePy::approximateBSpline(PyObject *args) Py::String GeometryCurvePy::getContinuity(void) const { - GeomAbs_Shape c = Handle_Geom_Curve::DownCast + GeomAbs_Shape c = Handle(Geom_Curve)::DownCast (getGeometryPtr()->handle())->Continuity(); std::string str; switch (c) { @@ -720,13 +720,13 @@ Py::String GeometryCurvePy::getContinuity(void) const Py::Float GeometryCurvePy::getFirstParameter(void) const { - return Py::Float(Handle_Geom_Curve::DownCast + return Py::Float(Handle(Geom_Curve)::DownCast (getGeometryPtr()->handle())->FirstParameter()); } Py::Float GeometryCurvePy::getLastParameter(void) const { - return Py::Float(Handle_Geom_Curve::DownCast + return Py::Float(Handle(Geom_Curve)::DownCast (getGeometryPtr()->handle())->LastParameter()); } @@ -744,14 +744,14 @@ int GeometryCurvePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/ PyObject* GeometryCurvePy::intersectCS(PyObject *args) { - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast(getGeometryPtr()->handle()); try { if (!curve.IsNull()) { PyObject *p; double prec = Precision::Confusion(); if (!PyArg_ParseTuple(args, "O!|d", &(Part::GeometrySurfacePy::Type), &p, &prec)) return 0; - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast(static_cast(p)->getGeometryPtr()->handle()); + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast(static_cast(p)->getGeometryPtr()->handle()); GeomAPI_IntCS intersector(curve, surf); if (!intersector.IsDone()) { PyErr_SetString(PyExc_Exception, "Intersection of curve and surface failed"); @@ -765,7 +765,7 @@ PyObject* GeometryCurvePy::intersectCS(PyObject *args) } Py::List segments; for (int i = 1; i <= intersector.NbSegments(); i++) { - Handle_Geom_Curve seg = intersector.Segment(i); + Handle(Geom_Curve) seg = intersector.Segment(i); segments.append(makeGeometryCurvePy(seg)); } @@ -776,7 +776,7 @@ PyObject* GeometryCurvePy::intersectCS(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } @@ -787,14 +787,14 @@ PyObject* GeometryCurvePy::intersectCS(PyObject *args) PyObject* GeometryCurvePy::intersectCC(PyObject *args) { - Handle_Geom_Curve curve1 = Handle_Geom_Curve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) curve1 = Handle(Geom_Curve)::DownCast(getGeometryPtr()->handle()); try { if (!curve1.IsNull()) { PyObject *p; double prec = Precision::Confusion(); if (!PyArg_ParseTuple(args, "O!|d", &(Part::GeometryCurvePy::Type), &p, &prec)) return 0; - Handle_Geom_Curve curve2 = Handle_Geom_Curve::DownCast(static_cast(p)->getGeometryPtr()->handle()); + Handle(Geom_Curve) curve2 = Handle(Geom_Curve)::DownCast(static_cast(p)->getGeometryPtr()->handle()); GeomAPI_ExtremaCurveCurve intersector(curve1, curve2); if (intersector.LowerDistance() > Precision::Confusion()) { // No intersection @@ -814,7 +814,7 @@ PyObject* GeometryCurvePy::intersectCC(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } @@ -827,7 +827,7 @@ PyObject* GeometryCurvePy::intersectCC(PyObject *args) PyObject* GeometryCurvePy::intersect(PyObject *args) { - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast(getGeometryPtr()->handle()); try { if (!curve.IsNull()) { PyObject *p; @@ -845,7 +845,7 @@ PyObject* GeometryCurvePy::intersect(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/GeometrySurfacePyImp.cpp b/src/Mod/Part/App/GeometrySurfacePyImp.cpp index 95d36aae8e..19b5350938 100644 --- a/src/Mod/Part/App/GeometrySurfacePyImp.cpp +++ b/src/Mod/Part/App/GeometrySurfacePyImp.cpp @@ -62,46 +62,46 @@ #include namespace Part { -const Py::Object makeGeometryCurvePy(const Handle_Geom_Curve& c) +const Py::Object makeGeometryCurvePy(const Handle(Geom_Curve)& c) { if (c->IsKind(STANDARD_TYPE(Geom_Circle))) { - Handle_Geom_Circle circ = Handle_Geom_Circle::DownCast(c); + Handle(Geom_Circle) circ = Handle(Geom_Circle)::DownCast(c); return Py::asObject(new CirclePy(new GeomCircle(circ))); } else if (c->IsKind(STANDARD_TYPE(Geom_Ellipse))) { - Handle_Geom_Ellipse ell = Handle_Geom_Ellipse::DownCast(c); + Handle(Geom_Ellipse) ell = Handle(Geom_Ellipse)::DownCast(c); return Py::asObject(new EllipsePy(new GeomEllipse(ell))); } else if (c->IsKind(STANDARD_TYPE(Geom_Hyperbola))) { - Handle_Geom_Hyperbola hyp = Handle_Geom_Hyperbola::DownCast(c); + Handle(Geom_Hyperbola) hyp = Handle(Geom_Hyperbola)::DownCast(c); return Py::asObject(new HyperbolaPy(new GeomHyperbola(hyp))); } else if (c->IsKind(STANDARD_TYPE(Geom_Line))) { - Handle_Geom_Line lin = Handle_Geom_Line::DownCast(c); + Handle(Geom_Line) lin = Handle(Geom_Line)::DownCast(c); return Py::asObject(new GeometryCurvePy(new GeomLine(lin))); } else if (c->IsKind(STANDARD_TYPE(Geom_OffsetCurve))) { - Handle_Geom_OffsetCurve oc = Handle_Geom_OffsetCurve::DownCast(c); + Handle(Geom_OffsetCurve) oc = Handle(Geom_OffsetCurve)::DownCast(c); return Py::asObject(new OffsetCurvePy(new GeomOffsetCurve(oc))); } else if (c->IsKind(STANDARD_TYPE(Geom_Parabola))) { - Handle_Geom_Parabola par = Handle_Geom_Parabola::DownCast(c); + Handle(Geom_Parabola) par = Handle(Geom_Parabola)::DownCast(c); return Py::asObject(new ParabolaPy(new GeomParabola(par))); } else if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { - Handle_Geom_TrimmedCurve trc = Handle_Geom_TrimmedCurve::DownCast(c); + Handle(Geom_TrimmedCurve) trc = Handle(Geom_TrimmedCurve)::DownCast(c); return Py::asObject(new GeometryCurvePy(new GeomTrimmedCurve(trc))); } /*else if (c->IsKind(STANDARD_TYPE(Geom_BoundedCurve))) { - Handle_Geom_BoundedCurve bc = Handle_Geom_BoundedCurve::DownCast(c); + Handle(Geom_BoundedCurve) bc = Handle(Geom_BoundedCurve)::DownCast(c); return Py::asObject(new GeometryCurvePy(new GeomBoundedCurve(bc))); }*/ else if (c->IsKind(STANDARD_TYPE(Geom_BezierCurve))) { - Handle_Geom_BezierCurve bezier = Handle_Geom_BezierCurve::DownCast(c); + Handle(Geom_BezierCurve) bezier = Handle(Geom_BezierCurve)::DownCast(c); return Py::asObject(new BezierCurvePy(new GeomBezierCurve(bezier))); } else if (c->IsKind(STANDARD_TYPE(Geom_BSplineCurve))) { - Handle_Geom_BSplineCurve bspline = Handle_Geom_BSplineCurve::DownCast(c); + Handle(Geom_BSplineCurve) bspline = Handle(Geom_BSplineCurve)::DownCast(c); return Py::asObject(new BSplineCurvePy(new GeomBSplineCurve(bspline))); } @@ -138,8 +138,8 @@ int GeometrySurfacePy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) PyObject* GeometrySurfacePy::toShape(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(g); try { if (!s.IsNull()) { double u1,u2,v1,v2; @@ -156,7 +156,7 @@ PyObject* GeometrySurfacePy::toShape(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -167,8 +167,8 @@ PyObject* GeometrySurfacePy::toShape(PyObject *args) PyObject* GeometrySurfacePy::value(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(g); try { if (!s.IsNull()) { double u,v; @@ -179,7 +179,7 @@ PyObject* GeometrySurfacePy::value(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -190,8 +190,8 @@ PyObject* GeometrySurfacePy::value(PyObject *args) PyObject* GeometrySurfacePy::tangent(PyObject *args) { - Handle_Geom_Geometry g = getGeometryPtr()->handle(); - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(g); + Handle(Geom_Geometry) g = getGeometryPtr()->handle(); + Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(g); try { if (!s.IsNull()) { double u,v; @@ -213,7 +213,7 @@ PyObject* GeometrySurfacePy::tangent(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -224,7 +224,7 @@ PyObject* GeometrySurfacePy::tangent(PyObject *args) PyObject* GeometrySurfacePy::parameter(PyObject *args) { - Handle_Geom_Surface surf = Handle_Geom_Surface + Handle(Geom_Surface) surf = Handle(Geom_Surface) ::DownCast(getGeometryPtr()->handle()); try { if (!surf.IsNull()) { @@ -243,7 +243,7 @@ PyObject* GeometrySurfacePy::parameter(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -257,7 +257,7 @@ PyObject* GeometrySurfacePy::bounds(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_Surface surf = Handle_Geom_Surface + Handle(Geom_Surface) surf = Handle(Geom_Surface) ::DownCast(getGeometryPtr()->handle()); Py::Tuple bound(4); Standard_Real u1,u2,v1,v2; @@ -276,18 +276,18 @@ PyObject* GeometrySurfacePy::uIso(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->UIso(v); + Handle(Geom_Curve) c = surf->UIso(v); if (c.IsNull()) { PyErr_SetString(PyExc_RuntimeError, "failed to create u iso curve"); return 0; } if (c->IsKind(STANDARD_TYPE(Geom_Line))) { - Handle_Geom_Line aLine = Handle_Geom_Line::DownCast(c); + Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(c); 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(aLine->Lin()); return new LinePy(line); @@ -297,7 +297,7 @@ PyObject* GeometrySurfacePy::uIso(PyObject * args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -310,18 +310,18 @@ PyObject* GeometrySurfacePy::vIso(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->VIso(v); + Handle(Geom_Curve) c = surf->VIso(v); if (c.IsNull()) { PyErr_SetString(PyExc_RuntimeError, "failed to create v iso curve"); return 0; } if (c->IsKind(STANDARD_TYPE(Geom_Line))) { - Handle_Geom_Line aLine = Handle_Geom_Line::DownCast(c); + Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(c); 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(aLine->Lin()); return new LinePy(line); @@ -331,7 +331,7 @@ PyObject* GeometrySurfacePy::vIso(PyObject * args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -342,7 +342,7 @@ PyObject* GeometrySurfacePy::isUPeriodic(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsUPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -353,7 +353,7 @@ PyObject* GeometrySurfacePy::isVPeriodic(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVPeriodic(); return PyBool_FromLong(val ? 1 : 0); @@ -364,7 +364,7 @@ PyObject* GeometrySurfacePy::isUClosed(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsUClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -375,7 +375,7 @@ PyObject* GeometrySurfacePy::isVClosed(PyObject * args) if (!PyArg_ParseTuple(args, "")) return 0; - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); Standard_Boolean val = surf->IsVClosed(); return PyBool_FromLong(val ? 1 : 0); @@ -387,13 +387,13 @@ PyObject* GeometrySurfacePy::UPeriod(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); Standard_Real val = surf->UPeriod(); return PyFloat_FromDouble(val); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -405,13 +405,13 @@ PyObject* GeometrySurfacePy::VPeriod(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); Standard_Real val = surf->VPeriod(); return PyFloat_FromDouble(val); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -419,7 +419,7 @@ PyObject* GeometrySurfacePy::VPeriod(PyObject * args) Py::String GeometrySurfacePy::getContinuity(void) const { - GeomAbs_Shape c = Handle_Geom_Surface::DownCast + GeomAbs_Shape c = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle())->Continuity(); std::string str; switch (c) { @@ -494,7 +494,7 @@ PyObject* GeometrySurfacePy::toBSpline(PyObject * args) absV = GeomAbs_G2; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); GeomConvert_ApproxSurface cvt(surf, tol3d, absU, absV, maxDegU, maxDegV, maxSegm, prec); if (cvt.IsDone() && cvt.HasResult()) { @@ -505,7 +505,7 @@ PyObject* GeometrySurfacePy::toBSpline(PyObject * args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); } @@ -526,14 +526,14 @@ int GeometrySurfacePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj PyObject* GeometrySurfacePy::intersectSS(PyObject *args) { - Handle_Geom_Surface surf1 = Handle_Geom_Surface::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Surface) surf1 = Handle(Geom_Surface)::DownCast(getGeometryPtr()->handle()); try { if (!surf1.IsNull()) { PyObject *p; double prec = Precision::Confusion(); if (!PyArg_ParseTuple(args, "O!|d", &(Part::GeometrySurfacePy::Type), &p, &prec)) return 0; - Handle_Geom_Surface surf2 = Handle_Geom_Surface::DownCast(static_cast(p)->getGeometryPtr()->handle()); + Handle(Geom_Surface) surf2 = Handle(Geom_Surface)::DownCast(static_cast(p)->getGeometryPtr()->handle()); GeomAPI_IntSS intersector(surf1, surf2, prec); if (!intersector.IsDone()) { PyErr_SetString(PyExc_Exception, "Intersection of surfaces failed"); @@ -542,7 +542,7 @@ PyObject* GeometrySurfacePy::intersectSS(PyObject *args) Py::List result; for (int i = 1; i <= intersector.NbLines(); i++) { - Handle_Geom_Curve line = intersector.Line(i); + Handle(Geom_Curve) line = intersector.Line(i); result.append(makeGeometryCurvePy(line)); } @@ -550,7 +550,7 @@ PyObject* GeometrySurfacePy::intersectSS(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } @@ -563,7 +563,7 @@ PyObject* GeometrySurfacePy::intersectSS(PyObject *args) PyObject* GeometrySurfacePy::intersect(PyObject *args) { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast(getGeometryPtr()->handle()); try { if (!surf.IsNull()) { PyObject *p; @@ -587,7 +587,7 @@ PyObject* GeometrySurfacePy::intersect(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PyExc_Exception, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/HyperbolaPyImp.cpp b/src/Mod/Part/App/HyperbolaPyImp.cpp index 268ed8d9bd..5a6b503529 100644 --- a/src/Mod/Part/App/HyperbolaPyImp.cpp +++ b/src/Mod/Part/App/HyperbolaPyImp.cpp @@ -57,7 +57,7 @@ int HyperbolaPy::PyInit(PyObject* args, PyObject* kwds) { char* keywords_n[] = {NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); hyperbola->SetMajorRadius(2.0); hyperbola->SetMinorRadius(1.0); return 0; @@ -68,9 +68,9 @@ int HyperbolaPy::PyInit(PyObject* args, PyObject* kwds) PyObject *pHypr; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!",keywords_e, &(HyperbolaPy::Type), &pHypr)) { HyperbolaPy* pHyperbola = static_cast(pHypr); - Handle_Geom_Hyperbola Hypr1 = Handle_Geom_Hyperbola::DownCast + Handle(Geom_Hyperbola) Hypr1 = Handle(Geom_Hyperbola)::DownCast (pHyperbola->getGeomHyperbolaPtr()->handle()); - Handle_Geom_Hyperbola Hypr2 = Handle_Geom_Hyperbola::DownCast + Handle(Geom_Hyperbola) Hypr2 = Handle(Geom_Hyperbola)::DownCast (this->getGeomHyperbolaPtr()->handle()); Hypr2->SetHypr(Hypr1->Hypr()); return 0; @@ -94,7 +94,7 @@ int HyperbolaPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); hyperbola->SetHypr(me.Value()->Hypr()); return 0; } @@ -114,7 +114,7 @@ int HyperbolaPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); hyperbola->SetHypr(me.Value()->Hypr()); return 0; } @@ -129,44 +129,44 @@ int HyperbolaPy::PyInit(PyObject* args, PyObject* kwds) Py::Float HyperbolaPy::getMajorRadius(void) const { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); return Py::Float(hyperbola->MajorRadius()); } void HyperbolaPy::setMajorRadius(Py::Float arg) { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); hyperbola->SetMajorRadius((double)arg); } Py::Float HyperbolaPy::getMinorRadius(void) const { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); return Py::Float(hyperbola->MinorRadius()); } void HyperbolaPy::setMinorRadius(Py::Float arg) { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); hyperbola->SetMinorRadius((double)arg); } Py::Float HyperbolaPy::getFocal(void) const { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); return Py::Float(hyperbola->Focal()); } Py::Object HyperbolaPy::getFocus1(void) const { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); gp_Pnt loc = hyperbola->Focus1(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } Py::Object HyperbolaPy::getFocus2(void) const { - Handle_Geom_Hyperbola hyperbola = Handle_Geom_Hyperbola::DownCast(getGeomHyperbolaPtr()->handle()); + Handle(Geom_Hyperbola) hyperbola = Handle(Geom_Hyperbola)::DownCast(getGeomHyperbolaPtr()->handle()); gp_Pnt loc = hyperbola->Focus2(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); } diff --git a/src/Mod/Part/App/ImportIges.cpp b/src/Mod/Part/App/ImportIges.cpp index 674171041b..90c89f1baa 100644 --- a/src/Mod/Part/App/ImportIges.cpp +++ b/src/Mod/Part/App/ImportIges.cpp @@ -90,7 +90,7 @@ int Part::ImportIgesParts(App::Document *pcDoc, const char* FileName) #if 1 std::string aName = fi.fileNamePure(); - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); pi->NewScope(100, "Reading IGES file..."); pi->Show(); aReader.WS()->MapReader()->SetProgress(pi); @@ -137,7 +137,7 @@ int Part::ImportIgesParts(App::Document *pcDoc, const char* FileName) builder.MakeCompound(comp); // get all entities - Handle_TColStd_HSequenceOfTransient aRootList=aReader.GiveList("xst-transferrable-roots"); + Handle(TColStd_HSequenceOfTransient) aRootList=aReader.GiveList("xst-transferrable-roots"); Base::SequencerLauncher seq("Reading IGES file...", aRootList->Length()); Standard_Integer j; for (j=1; j<=aRootList->Length(); j++) { diff --git a/src/Mod/Part/App/ImportStep.cpp b/src/Mod/Part/App/ImportStep.cpp index ad73959164..ea201e17b3 100644 --- a/src/Mod/Part/App/ImportStep.cpp +++ b/src/Mod/Part/App/ImportStep.cpp @@ -105,7 +105,7 @@ int Part::ImportStepParts(App::Document *pcDoc, const char* Name) throw Base::Exception("Cannot open STEP file"); } - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); aReader.WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading STEP file..."); pi->Show(); @@ -126,8 +126,8 @@ int Part::ImportStepParts(App::Document *pcDoc, const char* Name) } else { //Handle(StepData_StepModel) Model = aReader.StepModel(); - //Handle_XSControl_WorkSession ws = aReader.WS(); - //Handle_XSControl_TransferReader tr = ws->TransferReader(); + //Handle(XSControl_WorkSession) ws = aReader.WS(); + //Handle(XSControl_TransferReader) tr = ws->TransferReader(); std::map hash_col; //ReadColors(aReader.WS(), hash_col); @@ -145,7 +145,7 @@ int Part::ImportStepParts(App::Document *pcDoc, const char* Name) const TopoDS_Solid& aSolid = TopoDS::Solid(ex.Current()); std::string name = fi.fileNamePure(); - //Handle_Standard_Transient ent = tr->EntityFromShapeResult(aSolid, 3); + //Handle(Standard_Transient) ent = tr->EntityFromShapeResult(aSolid, 3); //if (!ent.IsNull()) { // name += ws->Model()->StringLabel(ent)->ToCString(); //} @@ -181,7 +181,7 @@ int Part::ImportStepParts(App::Document *pcDoc, const char* Name) const TopoDS_Shell& aShell = TopoDS::Shell(ex.Current()); std::string name = fi.fileNamePure(); - //Handle_Standard_Transient ent = tr->EntityFromShapeResult(aShell, 3); + //Handle(Standard_Transient) ent = tr->EntityFromShapeResult(aShell, 3); //if (!ent.IsNull()) { // name += ws->Model()->StringLabel(ent)->ToCString(); //} @@ -275,7 +275,7 @@ bool Part::ReadColors (const Handle(XSControl_WorkSession) &WS, std::mapModel(); - Handle_XSControl_TransferReader TR = WS->TransferReader(); - Handle_Transfer_TransientProcess TP = TR->TransientProcess(); + Handle(XSControl_TransferReader) TR = WS->TransferReader(); + Handle(Transfer_TransientProcess) TP = TR->TransientProcess(); Interface_EntityIterator subs = WS->HGraph()->Graph().Sharings( aSR ); - Handle_StepShape_ShapeDefinitionRepresentation aSDR; + Handle(StepShape_ShapeDefinitionRepresentation) aSDR; for (subs.Start(); subs.More(); subs.Next()) { aSDR = Handle(StepShape_ShapeDefinitionRepresentation)::DownCast(subs.Value()); if (aSDR.IsNull()) diff --git a/src/Mod/Part/App/LinePyImp.cpp b/src/Mod/Part/App/LinePyImp.cpp index d67dcab3f8..f2082bfa7e 100644 --- a/src/Mod/Part/App/LinePyImp.cpp +++ b/src/Mod/Part/App/LinePyImp.cpp @@ -69,10 +69,10 @@ int LinePy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line LinePy* pcLine = static_cast(pLine); // get Geom_Line of line - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast (pcLine->getGeomLinePtr()->handle()); // get Geom_Line of line - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); // Assign the lines @@ -99,14 +99,14 @@ int LinePy::PyInit(PyObject* args, PyObject* /*kwd*/) } // get Geom_Line of line - Handle_Geom_Line this_curv = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_curv = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); - Handle_Geom_Line that_curv = ms.Value(); + Handle(Geom_Line) that_curv = ms.Value(); this_curv->SetLin(that_curv->Lin()); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -125,7 +125,7 @@ int LinePy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Object LinePy::getLocation(void) const { - Handle_Geom_Line this_curve = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_curve = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); gp_Pnt pnt = this_curve->Position().Location(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -135,7 +135,7 @@ void LinePy::setLocation(Py::Object arg) { gp_Pnt pnt; gp_Dir dir; - Handle_Geom_Line this_curv = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_curv = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); dir = this_curv->Position().Direction(); @@ -165,18 +165,18 @@ void LinePy::setLocation(Py::Object arg) } // get Geom_Line of line - Handle_Geom_Line that_curv = ms.Value(); + Handle(Geom_Line) that_curv = ms.Value(); this_curv->SetLin(that_curv->Lin()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Object LinePy::getDirection(void) const { - Handle_Geom_Line this_curve = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_curve = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); gp_Dir dir = this_curve->Position().Direction(); return Py::Vector(Base::Vector3d(dir.X(), dir.Y(), dir.Z())); @@ -186,7 +186,7 @@ void LinePy::setDirection(Py::Object arg) { gp_Pnt pnt; gp_Dir dir; - Handle_Geom_Line this_curv = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_curv = Handle(Geom_Line)::DownCast (this->getGeomLinePtr()->handle()); pnt = this_curv->Position().Location(); @@ -215,11 +215,11 @@ void LinePy::setDirection(Py::Object arg) } // get Geom_Line of line - Handle_Geom_Line that_curv = ms.Value(); + Handle(Geom_Line) that_curv = ms.Value(); this_curv->SetLin(that_curv->Lin()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/LineSegmentPyImp.cpp b/src/Mod/Part/App/LineSegmentPyImp.cpp index ecb7ecd368..aab0d88960 100644 --- a/src/Mod/Part/App/LineSegmentPyImp.cpp +++ b/src/Mod/Part/App/LineSegmentPyImp.cpp @@ -77,14 +77,14 @@ int LineSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line LineSegmentPy* pcLine = static_cast(pLine); // get Geom_Line of line segment - Handle_Geom_TrimmedCurve that_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) that_curv = Handle(Geom_TrimmedCurve)::DownCast (pcLine->getGeomLineSegmentPtr()->handle()); - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast (that_curv->BasisCurve()); // get Geom_Line of line segment - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); // Assign the lines @@ -99,14 +99,14 @@ int LineSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line LineSegmentPy* pcLine = static_cast(pLine); // get Geom_Line of line segment - Handle_Geom_TrimmedCurve that_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) that_curv = Handle(Geom_TrimmedCurve)::DownCast (pcLine->getGeomLineSegmentPtr()->handle()); - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast (that_curv->BasisCurve()); // get Geom_Line of line segment - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); // Assign the lines @@ -120,12 +120,12 @@ int LineSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy line LinePy* pcLine = static_cast(pLine); // get Geom_Line of line segment - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast (pcLine->getGeomLinePtr()->handle()); // get Geom_Line of line segment - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); // Assign the lines @@ -153,19 +153,19 @@ int LineSegmentPy::PyInit(PyObject* args, PyObject* /*kwd*/) } // get Geom_Line of line segment - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom_TrimmedCurve that_curv = ms.Value(); - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin(that_line->Lin()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -191,12 +191,12 @@ PyObject* LineSegmentPy::setParameterRange(PyObject *args) return NULL; try { - Handle_Geom_TrimmedCurve this_curve = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); this_curve->SetTrim(first, last); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -206,7 +206,7 @@ PyObject* LineSegmentPy::setParameterRange(PyObject *args) Py::Object LineSegmentPy::getStartPoint(void) const { - Handle_Geom_TrimmedCurve this_curve = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); gp_Pnt pnt = this_curve->StartPoint(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -215,7 +215,7 @@ Py::Object LineSegmentPy::getStartPoint(void) const void LineSegmentPy::setStartPoint(Py::Object arg) { gp_Pnt p1, p2; - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); p2 = this_curv->EndPoint(); @@ -248,22 +248,22 @@ void LineSegmentPy::setStartPoint(Py::Object arg) } // get Geom_Line of line segment - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom_TrimmedCurve that_curv = ms.Value(); - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin(that_line->Lin()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Object LineSegmentPy::getEndPoint(void) const { - Handle_Geom_TrimmedCurve this_curve = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); gp_Pnt pnt = this_curve->EndPoint(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -272,7 +272,7 @@ Py::Object LineSegmentPy::getEndPoint(void) const void LineSegmentPy::setEndPoint(Py::Object arg) { gp_Pnt p1, p2; - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); p1 = this_curv->StartPoint(); @@ -305,15 +305,15 @@ void LineSegmentPy::setEndPoint(Py::Object arg) } // get Geom_Line of line segment - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); - Handle_Geom_TrimmedCurve that_curv = ms.Value(); - Handle_Geom_Line that_line = Handle_Geom_Line::DownCast(that_curv->BasisCurve()); + Handle(Geom_TrimmedCurve) that_curv = ms.Value(); + Handle(Geom_Line) that_line = Handle(Geom_Line)::DownCast(that_curv->BasisCurve()); this_line->SetLin(that_line->Lin()); this_curv->SetTrim(that_curv->FirstParameter(), that_curv->LastParameter()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/OffsetCurvePyImp.cpp b/src/Mod/Part/App/OffsetCurvePyImp.cpp index 1ad440f4c9..6d83451202 100644 --- a/src/Mod/Part/App/OffsetCurvePyImp.cpp +++ b/src/Mod/Part/App/OffsetCurvePyImp.cpp @@ -62,7 +62,7 @@ int OffsetCurvePy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; GeometryPy* pcGeo = static_cast(pGeom); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a curve"); @@ -71,12 +71,12 @@ int OffsetCurvePy::PyInit(PyObject* args, PyObject* /*kwd*/) try { Base::Vector3d dir = static_cast(pDir)->value(); - Handle_Geom_OffsetCurve curve2 = new Geom_OffsetCurve(curve, offset, gp_Dir(dir.x,dir.y,dir.z)); + Handle(Geom_OffsetCurve) curve2 = new Geom_OffsetCurve(curve, offset, gp_Dir(dir.x,dir.y,dir.z)); getGeomOffsetCurvePtr()->setHandle(curve2); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -84,19 +84,19 @@ int OffsetCurvePy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Float OffsetCurvePy::getOffsetValue(void) const { - Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); return Py::Float(curve->Offset()); } void OffsetCurvePy::setOffsetValue(Py::Float arg) { - Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); curve->SetOffsetValue((double)arg); } Py::Object OffsetCurvePy::getOffsetDirection(void) const { - Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle()); + 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())); } @@ -106,12 +106,12 @@ void OffsetCurvePy::setOffsetDirection(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d dir = static_cast(p)->value(); - Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z)); } else if (PyObject_TypeCheck(p, &PyTuple_Type)) { Base::Vector3d dir = Base::getVectorFromTuple(p); - Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle()); + Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z)); } else { @@ -123,8 +123,8 @@ void OffsetCurvePy::setOffsetDirection(Py::Object arg) Py::Object OffsetCurvePy::getBasisCurve(void) const { - Handle_Geom_OffsetCurve curve = Handle_Geom_OffsetCurve::DownCast(getGeometryPtr()->handle()); - Handle_Geom_Curve basis = curve->BasisCurve(); + Handle(Geom_OffsetCurve) curve = Handle(Geom_OffsetCurve)::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Curve) basis = curve->BasisCurve(); throw Py::Exception(PyExc_NotImplementedError, "Not yet implemented"); } @@ -133,19 +133,19 @@ void OffsetCurvePy::setBasisCurve(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(GeometryPy::Type))) { GeometryPy* pcGeo = static_cast(p); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { throw Py::TypeError("geometry is not a curve"); } try { - Handle_Geom_OffsetCurve curve2 = Handle_Geom_OffsetCurve::DownCast + Handle(Geom_OffsetCurve) curve2 = Handle(Geom_OffsetCurve)::DownCast (getGeometryPtr()->handle()); curve2->SetBasisCurve(curve); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/OffsetSurfacePyImp.cpp b/src/Mod/Part/App/OffsetSurfacePyImp.cpp index 77e058ac54..c31f86a6ad 100644 --- a/src/Mod/Part/App/OffsetSurfacePyImp.cpp +++ b/src/Mod/Part/App/OffsetSurfacePyImp.cpp @@ -60,7 +60,7 @@ int OffsetSurfacePy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; GeometryPy* pcGeo = static_cast(pGeom); - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (pcGeo->getGeometryPtr()->handle()); if (surf.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a surface"); @@ -68,12 +68,12 @@ int OffsetSurfacePy::PyInit(PyObject* args, PyObject* /*kwd*/) } try { - Handle_Geom_OffsetSurface surf2 = new Geom_OffsetSurface(surf, offset); + Handle(Geom_OffsetSurface) surf2 = new Geom_OffsetSurface(surf, offset); getGeomOffsetSurfacePtr()->setHandle(surf2); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -81,19 +81,19 @@ int OffsetSurfacePy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Float OffsetSurfacePy::getOffsetValue(void) const { - Handle_Geom_OffsetSurface surf = Handle_Geom_OffsetSurface::DownCast(getGeometryPtr()->handle()); + Handle(Geom_OffsetSurface) surf = Handle(Geom_OffsetSurface)::DownCast(getGeometryPtr()->handle()); return Py::Float(surf->Offset()); } void OffsetSurfacePy::setOffsetValue(Py::Float arg) { - Handle_Geom_OffsetSurface surf = Handle_Geom_OffsetSurface::DownCast(getGeometryPtr()->handle()); + Handle(Geom_OffsetSurface) surf = Handle(Geom_OffsetSurface)::DownCast(getGeometryPtr()->handle()); surf->SetOffsetValue((double)arg); } Py::Object OffsetSurfacePy::getBasisSurface(void) const { - Handle_Geom_OffsetSurface surf = Handle_Geom_OffsetSurface::DownCast + Handle(Geom_OffsetSurface) surf = Handle(Geom_OffsetSurface)::DownCast (getGeometryPtr()->handle()); if (surf.IsNull()) { throw Py::TypeError("geometry is not a surface"); @@ -108,19 +108,19 @@ void OffsetSurfacePy::setBasisSurface(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(GeometryPy::Type))) { GeometryPy* pcGeo = static_cast(p); - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (pcGeo->getGeometryPtr()->handle()); if (surf.IsNull()) { throw Py::TypeError("geometry is not a surface"); } try { - Handle_Geom_OffsetSurface surf2 = Handle_Geom_OffsetSurface::DownCast + Handle(Geom_OffsetSurface) surf2 = Handle(Geom_OffsetSurface)::DownCast (getGeometryPtr()->handle()); surf2->SetBasisSurface(surf); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/ParabolaPyImp.cpp b/src/Mod/Part/App/ParabolaPyImp.cpp index 8835039050..1b0edf63b6 100644 --- a/src/Mod/Part/App/ParabolaPyImp.cpp +++ b/src/Mod/Part/App/ParabolaPyImp.cpp @@ -57,7 +57,7 @@ int ParabolaPy::PyInit(PyObject* args, PyObject* kwds) { char* keywords_n[] = {NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "", keywords_n)) { - Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(getGeomParabolaPtr()->handle()); + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast(getGeomParabolaPtr()->handle()); parabola->SetFocal(1.0); return 0; } @@ -67,9 +67,9 @@ int ParabolaPy::PyInit(PyObject* args, PyObject* kwds) PyObject *pParab; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!",keywords_e, &(ParabolaPy::Type), &pParab)) { ParabolaPy* pParabola = static_cast(pParab); - Handle_Geom_Parabola Parab1 = Handle_Geom_Parabola::DownCast + Handle(Geom_Parabola) Parab1 = Handle(Geom_Parabola)::DownCast (pParabola->getGeomParabolaPtr()->handle()); - Handle_Geom_Parabola Parab2 = Handle_Geom_Parabola::DownCast + Handle(Geom_Parabola) Parab2 = Handle(Geom_Parabola)::DownCast (this->getGeomParabolaPtr()->handle()); Parab2->SetParab(Parab1->Parab()); return 0; @@ -101,7 +101,7 @@ int ParabolaPy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Parabola parabola = Handle_Geom_Parabola::DownCast(getGeomParabolaPtr()->handle()); + Handle(Geom_Parabola) parabola = Handle(Geom_Parabola)::DownCast(getGeomParabolaPtr()->handle()); parabola->SetParab(mc.Value()); return 0; } @@ -152,7 +152,7 @@ PyObject* ParabolaPy::compute(PyObject *args) double a10 = -0.5; double a20 = v.y/2.0; double a00 = v.z; - Handle_Geom_Parabola curve = Handle_Geom_Parabola::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Parabola) curve = Handle(Geom_Parabola)::DownCast(getGeometryPtr()->handle()); curve->SetFocal(0.5*fabs(a10/a22)); curve->SetLocation(gp_Pnt((a20*a20-a22*a00)/(2*a22*a10), -a20/a22, zValue)); @@ -161,19 +161,19 @@ PyObject* ParabolaPy::compute(PyObject *args) Py::Float ParabolaPy::getFocal(void) const { - Handle_Geom_Parabola curve = Handle_Geom_Parabola::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Parabola) curve = Handle(Geom_Parabola)::DownCast(getGeometryPtr()->handle()); return Py::Float(curve->Focal()); } void ParabolaPy::setFocal(Py::Float arg) { - Handle_Geom_Parabola curve = Handle_Geom_Parabola::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Parabola) curve = Handle(Geom_Parabola)::DownCast(getGeometryPtr()->handle()); curve->SetFocal((double)arg); } Py::Object ParabolaPy::getFocus(void) const { - Handle_Geom_Parabola c = Handle_Geom_Parabola::DownCast + Handle(Geom_Parabola) c = Handle(Geom_Parabola)::DownCast (getGeometryPtr()->handle()); gp_Pnt loc = c->Focus(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); @@ -181,7 +181,7 @@ Py::Object ParabolaPy::getFocus(void) const Py::Float ParabolaPy::getParameter(void) const { - Handle_Geom_Parabola curve = Handle_Geom_Parabola::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Parabola) curve = Handle(Geom_Parabola)::DownCast(getGeometryPtr()->handle()); return Py::Float(curve->Parameter()); } diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp index 2df617c1f3..f572e97c81 100644 --- a/src/Mod/Part/App/Part2DObject.cpp +++ b/src/Mod/Part/App/Part2DObject.cpp @@ -118,9 +118,9 @@ bool Part2DObject::seekTrimPoints(const std::vector &geomlist, Standard_Boolean periodic=Standard_False; double period = 0; - Handle_Geom2d_Curve primaryCurve; - Handle_Geom_Geometry geom = (geomlist[GeoId])->handle(); - Handle_Geom_Curve curve3d = Handle_Geom_Curve::DownCast(geom); + Handle(Geom2d_Curve) primaryCurve; + Handle(Geom_Geometry) geom = (geomlist[GeoId])->handle(); + Handle(Geom_Curve) curve3d = Handle(Geom_Curve)::DownCast(geom); if (curve3d.IsNull()) return false; else { @@ -143,12 +143,12 @@ bool Part2DObject::seekTrimPoints(const std::vector &geomlist, GeoId2 = -1; double param1=-1e10,param2=1e10; gp_Pnt2d p1,p2; - Handle_Geom2d_Curve secondaryCurve; + Handle(Geom2d_Curve) secondaryCurve; for (int id=0; id < int(geomlist.size()); id++) { // #0000624: Trim tool doesn't work with construction lines if (id != GeoId/* && !geomlist[id]->Construction*/) { geom = (geomlist[id])->handle(); - curve3d = Handle_Geom_Curve::DownCast(geom); + curve3d = Handle(Geom_Curve)::DownCast(geom); if (!curve3d.IsNull()) { secondaryCurve = GeomAPI::To2d(curve3d, plane); // perform the curves intersection diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp index 5b132e9d9f..e3fbacebf7 100644 --- a/src/Mod/Part/App/PartFeature.cpp +++ b/src/Mod/Part/App/PartFeature.cpp @@ -83,7 +83,7 @@ App::DocumentObjectExecReturn *Feature::recompute(void) return App::GeoFeature::recompute(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); App::DocumentObjectExecReturn* ret = new App::DocumentObjectExecReturn(e->GetMessageString()); if (ret->Why.empty()) ret->Why = "Unknown OCC exception"; return ret; diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp index 163febc0ee..643171a8e8 100644 --- a/src/Mod/Part/App/PartFeatures.cpp +++ b/src/Mod/Part/App/PartFeatures.cpp @@ -127,8 +127,8 @@ App::DocumentObjectExecReturn *RuledSurface::execute(void) if (Orientation.getValue() == 0) { // Automatic - Handle_Adaptor3d_HCurve a1; - Handle_Adaptor3d_HCurve a2; + Handle(Adaptor3d_HCurve) a1; + Handle(Adaptor3d_HCurve) a2; if (curve1.ShapeType() == TopAbs_EDGE && curve2.ShapeType() == TopAbs_EDGE) { BRepAdaptor_Curve adapt1(TopoDS::Edge(curve1)); BRepAdaptor_Curve adapt2(TopoDS::Edge(curve2)); @@ -192,7 +192,7 @@ App::DocumentObjectExecReturn *RuledSurface::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } catch (...) { @@ -286,7 +286,7 @@ App::DocumentObjectExecReturn *Loft::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } @@ -466,7 +466,7 @@ App::DocumentObjectExecReturn *Sweep::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } catch (...) { diff --git a/src/Mod/Part/App/PlanePyImp.cpp b/src/Mod/Part/App/PlanePyImp.cpp index c8580ce922..e24d2b6635 100644 --- a/src/Mod/Part/App/PlanePyImp.cpp +++ b/src/Mod/Part/App/PlanePyImp.cpp @@ -69,7 +69,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) static char* keywords_pd[] = {"Plane","Distance",NULL}; if (PyArg_ParseTupleAndKeywords(args, kwds, "O!d", keywords_pd, &(PlanePy::Type), &pPlane, &dist)) { PlanePy* pcPlane = static_cast(pPlane); - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast (pcPlane->getGeometryPtr()->handle()); GC_MakePlane mc(plane->Pln(), dist); if (!mc.IsDone()) { @@ -77,7 +77,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Plane plan = Handle_Geom_Plane::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Plane) plan = Handle(Geom_Plane)::DownCast(getGeometryPtr()->handle()); plan->SetPln(mc.Value()->Pln()); return 0; } @@ -94,7 +94,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast(getGeometryPtr()->handle()); plane->SetPln(mc.Value()->Pln()); return 0; } @@ -117,7 +117,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast(getGeometryPtr()->handle()); plane->SetPln(mc.Value()->Pln()); return 0; } @@ -137,7 +137,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast(getGeometryPtr()->handle()); + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast(getGeometryPtr()->handle()); plane->SetPln(mc.Value()->Pln()); return 0; } @@ -146,9 +146,9 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) PyErr_Clear(); if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", keywords_p, &(PlanePy::Type), &pPlane)) { PlanePy* pcPlane = static_cast(pPlane); - Handle_Geom_Plane plane1 = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) plane1 = Handle(Geom_Plane)::DownCast (pcPlane->getGeometryPtr()->handle()); - Handle_Geom_Plane plane2 = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) plane2 = Handle(Geom_Plane)::DownCast (this->getGeometryPtr()->handle()); plane2->SetPln(plane1->Pln()); return 0; @@ -174,7 +174,7 @@ int PlanePy::PyInit(PyObject* args, PyObject* kwds) Py::Object PlanePy::getPosition(void) const { - Handle_Geom_Plane this_surf = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) this_surf = Handle(Geom_Plane)::DownCast (this->getGeomPlanePtr()->handle()); gp_Pnt pnt = this_surf->Location(); return Py::Vector(Base::Vector3d(pnt.X(), pnt.Y(), pnt.Z())); @@ -203,19 +203,19 @@ void PlanePy::setPosition(Py::Object arg) } try { - Handle_Geom_Plane this_surf = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) this_surf = Handle(Geom_Plane)::DownCast (this->getGeomPlanePtr()->handle()); this_surf->SetLocation(loc); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Object PlanePy::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())); @@ -244,7 +244,7 @@ void PlanePy::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()); @@ -263,17 +263,17 @@ PyObject* PlanePy::uIso(PyObject * args) return 0; try { - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast (getGeomPlanePtr()->handle()); - Handle_Geom_Line c = Handle_Geom_Line::DownCast(plane->UIso(u)); + Handle(Geom_Line) c = Handle(Geom_Line)::DownCast(plane->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; } @@ -286,17 +286,17 @@ PyObject* PlanePy::vIso(PyObject * args) return 0; try { - Handle_Geom_Plane plane = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) plane = Handle(Geom_Plane)::DownCast (getGeomPlanePtr()->handle()); - Handle_Geom_Line c = Handle_Geom_Line::DownCast(plane->VIso(v)); + Handle(Geom_Line) c = Handle(Geom_Line)::DownCast(plane->VIso(v)); 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; } diff --git a/src/Mod/Part/App/PlateSurfacePyImp.cpp b/src/Mod/Part/App/PlateSurfacePyImp.cpp index 860bdce45b..18e0f4e97f 100644 --- a/src/Mod/Part/App/PlateSurfacePyImp.cpp +++ b/src/Mod/Part/App/PlateSurfacePyImp.cpp @@ -83,10 +83,10 @@ int PlateSurfacePy::PyInit(PyObject* args, PyObject* kwds) return -1; } - Handle_Geom_Surface surf; + Handle(Geom_Surface) surf; if (surface) { GeometryPy* pcGeo = static_cast(surface); - surf = Handle_Geom_Surface::DownCast + surf = Handle(Geom_Surface)::DownCast (pcGeo->getGeometryPtr()->handle()); if (surf.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a surface"); @@ -131,7 +131,7 @@ int PlateSurfacePy::PyInit(PyObject* args, PyObject* kwds) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -172,9 +172,9 @@ PyObject* PlateSurfacePy::makeApprox(PyObject *args, PyObject* kwds) continuity = GeomAbs_C1; PY_TRY { - GeomPlate_MakeApprox approx(Handle_GeomPlate_Surface::DownCast(getGeomPlateSurfacePtr()->handle()), + GeomPlate_MakeApprox approx(Handle(GeomPlate_Surface)::DownCast(getGeomPlateSurfacePtr()->handle()), tol3d, maxSeg, maxDegree, dmax, critOrder, continuity, enlargeCoeff); - Handle_Geom_BSplineSurface hSurf = approx.Surface(); + Handle(Geom_BSplineSurface) hSurf = approx.Surface(); if (!hSurf.IsNull()) { return new Part::BSplineSurfacePy(new Part::GeomBSplineSurface(hSurf)); diff --git a/src/Mod/Part/App/PointPyImp.cpp b/src/Mod/Part/App/PointPyImp.cpp index 4219bbd0df..8748fd7bff 100644 --- a/src/Mod/Part/App/PointPyImp.cpp +++ b/src/Mod/Part/App/PointPyImp.cpp @@ -76,10 +76,10 @@ int PointPy::PyInit(PyObject* args, PyObject* /*kwd*/) // Copy point PointPy* pcPoint = static_cast(pPoint); // get Geom_CartesianPoint of that point - Handle_Geom_CartesianPoint that_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) that_point = Handle(Geom_CartesianPoint)::DownCast (pcPoint->getGeomPointPtr()->handle()); // get Geom_CartesianPoint of this point - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); // Assign the coordinates @@ -91,7 +91,7 @@ int PointPy::PyInit(PyObject* args, PyObject* /*kwd*/) PyObject *pV; if (PyArg_ParseTuple(args, "O!", &(Base::VectorPy::Type), &pV)) { Base::Vector3d v = static_cast(pV)->value(); - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); this_point->SetCoord(v.x,v.y,v.z); return 0; @@ -106,7 +106,7 @@ int PointPy::PyInit(PyObject* args, PyObject* /*kwd*/) PyObject* PointPy::toShape(PyObject *args) { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); try { if (!this_point.IsNull()) { @@ -119,7 +119,7 @@ PyObject* PointPy::toShape(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -130,63 +130,63 @@ PyObject* PointPy::toShape(PyObject *args) Py::Float PointPy::getX(void) const { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); return Py::Float(this_point->X()); } void PointPy::setX(Py::Float X) { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); try { this_point->SetX(double(X)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Float PointPy::getY(void) const { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); return Py::Float(this_point->Y()); } void PointPy::setY(Py::Float Y) { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); try { this_point->SetY(double(Y)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } Py::Float PointPy::getZ(void) const { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); return Py::Float(this_point->Z()); } void PointPy::setZ(Py::Float Z) { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (this->getGeomPointPtr()->handle()); try { this_point->SetZ(double(Z)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/PrimitiveFeature.cpp b/src/Mod/Part/App/PrimitiveFeature.cpp index 68a0e5dd18..91484cddb0 100644 --- a/src/Mod/Part/App/PrimitiveFeature.cpp +++ b/src/Mod/Part/App/PrimitiveFeature.cpp @@ -337,7 +337,7 @@ App::DocumentObjectExecReturn *Plane::execute(void) gp_Pnt pnt(0.0,0.0,0.0); gp_Dir dir(0.0,0.0,1.0); - Handle_Geom_Plane aPlane = new Geom_Plane(pnt, dir); + Handle(Geom_Plane) aPlane = new Geom_Plane(pnt, dir); BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W #if OCC_VERSION_HEX >= 0x060502 , Precision::Confusion() @@ -421,7 +421,7 @@ App::DocumentObjectExecReturn *Sphere::execute(void) this->Shape.setValue(ResultShape); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -503,7 +503,7 @@ App::DocumentObjectExecReturn *Ellipsoid::execute(void) this->Shape.setValue(ResultShape); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -546,7 +546,7 @@ App::DocumentObjectExecReturn *Cylinder::execute(void) this->Shape.setValue(ResultShape); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -604,7 +604,7 @@ App::DocumentObjectExecReturn *Prism::execute(void) this->Shape.setValue(mkPrism.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -656,7 +656,7 @@ App::DocumentObjectExecReturn *RegularPolygon::execute(void) this->Shape.setValue(mkPoly.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -706,7 +706,7 @@ App::DocumentObjectExecReturn *Cone::execute(void) this->Shape.setValue(ResultShape); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -778,7 +778,7 @@ App::DocumentObjectExecReturn *Torus::execute(void) this->Shape.setValue(ResultShape); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -859,7 +859,7 @@ App::DocumentObjectExecReturn *Helix::execute(void) // this->Shape.setValue(helix.makeHelix(myPitch, myHeight, myRadius, myAngle, myLocalCS, myStyle)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -922,7 +922,7 @@ App::DocumentObjectExecReturn *Spiral::execute(void) Standard_Failure::Raise("Number of rotations too small"); gp_Ax2 cylAx2(gp_Pnt(0.0,0.0,0.0) , gp::DZ()); - Handle_Geom_Surface surf = new Geom_ConicalSurface(gp_Ax3(cylAx2), myAngle, myRadius); + Handle(Geom_Surface) surf = new Geom_ConicalSurface(gp_Ax3(cylAx2), myAngle, myRadius); gp_Pnt2d aPnt(0, 0); gp_Dir2d aDir(2. * M_PI, myPitch); @@ -944,7 +944,7 @@ App::DocumentObjectExecReturn *Spiral::execute(void) TopoDS_Wire wire = BRepBuilderAPI_MakeWire(edgeOnSurf); BRepLib::BuildCurves3d(wire); - Handle_Geom_Plane aPlane = new Geom_Plane(gp_Pnt(0.0,0.0,0.0), gp::DZ()); + Handle(Geom_Plane) aPlane = new Geom_Plane(gp_Pnt(0.0,0.0,0.0), gp::DZ()); Standard_Real range = (myNumRot+1) * myGrowth + 1 + myRadius; BRepBuilderAPI_MakeFace mkFace(aPlane, -range, range, -range, range #if OCC_VERSION_HEX >= 0x060502 @@ -957,7 +957,7 @@ App::DocumentObjectExecReturn *Spiral::execute(void) Primitive::execute(); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -1044,7 +1044,7 @@ App::DocumentObjectExecReturn *Wedge::execute(void) this->Shape.setValue(mkSolid.Solid()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } diff --git a/src/Mod/Part/App/ProgressIndicator.cpp b/src/Mod/Part/App/ProgressIndicator.cpp index 1733754099..c5f9d64261 100644 --- a/src/Mod/Part/App/ProgressIndicator.cpp +++ b/src/Mod/Part/App/ProgressIndicator.cpp @@ -34,7 +34,7 @@ using namespace Part; #include STEPControl_Reader aReader; - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); pi->NewScope(20, "Loading STEP file..."); pi->Show(); diff --git a/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp b/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp index d7d391635e..347853abb2 100644 --- a/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp +++ b/src/Mod/Part/App/RectangularTrimmedSurfacePyImp.cpp @@ -58,7 +58,7 @@ int RectangularTrimmedSurfacePy::PyInit(PyObject* args, PyObject* /*kwd*/) if (PyArg_ParseTuple(args, "O!dddd|O!O!",&(Part::GeometrySurfacePy::Type),&surf, &u1,&u2,&v1,&v2,&PyBool_Type,&usense,&PyBool_Type,&vsense)) { getGeomTrimmedSurfacePtr()->setHandle(new Geom_RectangularTrimmedSurface( - Handle_Geom_Surface::DownCast(static_cast(surf)-> + Handle(Geom_Surface)::DownCast(static_cast(surf)-> getGeomSurfacePtr()->handle()), u1, u2, v1, v2, PyObject_IsTrue(usense) ? Standard_True : Standard_False, @@ -75,7 +75,7 @@ int RectangularTrimmedSurfacePy::PyInit(PyObject* args, PyObject* /*kwd*/) Standard_Boolean UTrim = PyObject_IsTrue(utrim) ? Standard_True : Standard_False; Standard_Boolean Sense = PyObject_IsTrue(sense) ? Standard_True : Standard_False; getGeomTrimmedSurfacePtr()->setHandle(new Geom_RectangularTrimmedSurface( - Handle_Geom_Surface::DownCast(static_cast(surf)-> + Handle(Geom_Surface)::DownCast(static_cast(surf)-> getGeomSurfacePtr()->handle()), param1, param2, UTrim, Sense )); @@ -93,11 +93,11 @@ PyObject* RectangularTrimmedSurfacePy::uIso(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->UIso(v); + Handle(Geom_Curve) c = surf->UIso(v); if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { - Handle_Geom_TrimmedCurve aCurve = Handle_Geom_TrimmedCurve::DownCast(c); + Handle(Geom_TrimmedCurve) aCurve = Handle(Geom_TrimmedCurve)::DownCast(c); return new GeometryCurvePy(new GeomTrimmedCurve(aCurve)); } @@ -106,7 +106,7 @@ PyObject* RectangularTrimmedSurfacePy::uIso(PyObject * args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -119,11 +119,11 @@ PyObject* RectangularTrimmedSurfacePy::vIso(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->VIso(v); + Handle(Geom_Curve) c = surf->VIso(v); if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { - Handle_Geom_TrimmedCurve aCurve = Handle_Geom_TrimmedCurve::DownCast(c); + Handle(Geom_TrimmedCurve) aCurve = Handle(Geom_TrimmedCurve)::DownCast(c); return new GeometryCurvePy(new GeomTrimmedCurve(aCurve)); } @@ -132,7 +132,7 @@ PyObject* RectangularTrimmedSurfacePy::vIso(PyObject * args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/SpherePyImp.cpp b/src/Mod/Part/App/SpherePyImp.cpp index 839a1abfb4..13f93577b4 100644 --- a/src/Mod/Part/App/SpherePyImp.cpp +++ b/src/Mod/Part/App/SpherePyImp.cpp @@ -44,7 +44,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python std::string SpherePy::representation(void) const { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); gp_Ax1 axis = sphere->Axis(); gp_Dir dir = axis.Direction(); @@ -71,7 +71,7 @@ PyObject *SpherePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Pyt int SpherePy::PyInit(PyObject* args, PyObject* /*kwd*/) { if (PyArg_ParseTuple(args, "")) { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); sphere->SetRadius(1.0); return 0; @@ -82,35 +82,35 @@ int SpherePy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Float SpherePy::getRadius(void) const { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); return Py::Float(sphere->Radius()); } void SpherePy::setRadius(Py::Float arg) { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); sphere->SetRadius((double)arg); } Py::Float SpherePy::getArea(void) const { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); return Py::Float(sphere->Area()); } Py::Float SpherePy::getVolume(void) const { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); return Py::Float(sphere->Volume()); } Py::Object SpherePy::getCenter(void) const { - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); gp_Pnt loc = sphere->Location(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); @@ -121,13 +121,13 @@ void SpherePy::setCenter(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d loc = static_cast(p)->value(); - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); sphere->SetLocation(gp_Pnt(loc.x, loc.y, loc.z)); } else if (PyObject_TypeCheck(p, &PyTuple_Type)) { Base::Vector3d loc = Base::getVectorFromTuple(p); - Handle_Geom_SphericalSurface sphere = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) sphere = Handle(Geom_SphericalSurface)::DownCast (getGeomSpherePtr()->handle()); sphere->SetLocation(gp_Pnt(loc.x, loc.y, loc.z)); } @@ -140,7 +140,7 @@ void SpherePy::setCenter(Py::Object arg) Py::Object SpherePy::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())); @@ -169,7 +169,7 @@ void SpherePy::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()); diff --git a/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp b/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp index 68d4ab97e7..ad5765dd14 100644 --- a/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp +++ b/src/Mod/Part/App/SurfaceOfExtrusionPyImp.cpp @@ -66,7 +66,7 @@ int SurfaceOfExtrusionPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; GeometryPy* pcGeo = static_cast(pGeom); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a curve"); @@ -75,13 +75,13 @@ int SurfaceOfExtrusionPy::PyInit(PyObject* args, PyObject* /*kwd*/) try { Base::Vector3d dir = static_cast(pDir)->value(); - Handle_Geom_SurfaceOfLinearExtrusion curve2 = new Geom_SurfaceOfLinearExtrusion(curve, + Handle(Geom_SurfaceOfLinearExtrusion) curve2 = new Geom_SurfaceOfLinearExtrusion(curve, gp_Dir(dir.x,dir.y,dir.z)); getGeomSurfaceOfExtrusionPtr()->setHandle(curve2); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -89,7 +89,7 @@ int SurfaceOfExtrusionPy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Object SurfaceOfExtrusionPy::getDirection(void) const { - Handle_Geom_SurfaceOfLinearExtrusion curve = Handle_Geom_SurfaceOfLinearExtrusion::DownCast + Handle(Geom_SurfaceOfLinearExtrusion) curve = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast (getGeometryPtr()->handle()); const gp_Dir& dir = curve->Direction(); return Py::Vector(Base::Vector3d(dir.X(),dir.Y(),dir.Z())); @@ -100,13 +100,13 @@ void SurfaceOfExtrusionPy::setDirection(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d dir = static_cast(p)->value(); - Handle_Geom_SurfaceOfLinearExtrusion curve = Handle_Geom_SurfaceOfLinearExtrusion::DownCast + Handle(Geom_SurfaceOfLinearExtrusion) curve = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast (getGeometryPtr()->handle()); curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z)); } else if (PyObject_TypeCheck(p, &PyTuple_Type)) { Base::Vector3d dir = Base::getVectorFromTuple(p); - Handle_Geom_SurfaceOfLinearExtrusion curve = Handle_Geom_SurfaceOfLinearExtrusion::DownCast + Handle(Geom_SurfaceOfLinearExtrusion) curve = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast (getGeometryPtr()->handle()); curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z)); } @@ -127,19 +127,19 @@ void SurfaceOfExtrusionPy::setBasisCurve(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(GeometryPy::Type))) { GeometryPy* pcGeo = static_cast(p); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { throw Py::TypeError("geometry is not a curve"); } try { - Handle_Geom_SurfaceOfLinearExtrusion curve2 = Handle_Geom_SurfaceOfLinearExtrusion::DownCast + Handle(Geom_SurfaceOfLinearExtrusion) curve2 = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast (getGeometryPtr()->handle()); curve2->SetBasisCurve(curve); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } @@ -152,25 +152,25 @@ PyObject* SurfaceOfExtrusionPy::uIso(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->UIso(v); + Handle(Geom_Curve) c = surf->UIso(v); if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { - Handle_Geom_TrimmedCurve aCurve = Handle_Geom_TrimmedCurve::DownCast(c); + Handle(Geom_TrimmedCurve) aCurve = Handle(Geom_TrimmedCurve)::DownCast(c); return new GeometryCurvePy(new GeomTrimmedCurve(aCurve)); } if (c->IsKind(STANDARD_TYPE(Geom_BezierCurve))) { - Handle_Geom_BezierCurve aCurve = Handle_Geom_BezierCurve::DownCast(c); + Handle(Geom_BezierCurve) aCurve = Handle(Geom_BezierCurve)::DownCast(c); return new BezierCurvePy(new GeomBezierCurve(aCurve)); } if (c->IsKind(STANDARD_TYPE(Geom_BSplineCurve))) { - Handle_Geom_BSplineCurve aCurve = Handle_Geom_BSplineCurve::DownCast(c); + Handle(Geom_BSplineCurve) aCurve = Handle(Geom_BSplineCurve)::DownCast(c); return new BSplineCurvePy(new GeomBSplineCurve(aCurve)); } if (c->IsKind(STANDARD_TYPE(Geom_Line))) { - Handle_Geom_Line aLine = Handle_Geom_Line::DownCast(c); + Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(c); GeomLine* line = new GeomLine(); - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (line->handle()); this_line->SetLin(aLine->Lin()); return new LinePy(line); @@ -180,7 +180,7 @@ PyObject* SurfaceOfExtrusionPy::uIso(PyObject * args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -193,25 +193,25 @@ PyObject* SurfaceOfExtrusionPy::vIso(PyObject * args) return 0; try { - Handle_Geom_Surface surf = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) surf = Handle(Geom_Surface)::DownCast (getGeometryPtr()->handle()); - Handle_Geom_Curve c = surf->VIso(v); + Handle(Geom_Curve) c = surf->VIso(v); if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { - Handle_Geom_TrimmedCurve aCurve = Handle_Geom_TrimmedCurve::DownCast(c); + Handle(Geom_TrimmedCurve) aCurve = Handle(Geom_TrimmedCurve)::DownCast(c); return new GeometryCurvePy(new GeomTrimmedCurve(aCurve)); } if (c->IsKind(STANDARD_TYPE(Geom_BezierCurve))) { - Handle_Geom_BezierCurve aCurve = Handle_Geom_BezierCurve::DownCast(c); + Handle(Geom_BezierCurve) aCurve = Handle(Geom_BezierCurve)::DownCast(c); return new BezierCurvePy(new GeomBezierCurve(aCurve)); } if (c->IsKind(STANDARD_TYPE(Geom_BSplineCurve))) { - Handle_Geom_BSplineCurve aCurve = Handle_Geom_BSplineCurve::DownCast(c); + Handle(Geom_BSplineCurve) aCurve = Handle(Geom_BSplineCurve)::DownCast(c); return new BSplineCurvePy(new GeomBSplineCurve(aCurve)); } if (c->IsKind(STANDARD_TYPE(Geom_Line))) { - Handle_Geom_Line aLine = Handle_Geom_Line::DownCast(c); + Handle(Geom_Line) aLine = Handle(Geom_Line)::DownCast(c); 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(aLine->Lin()); return new LinePy(line); @@ -221,7 +221,7 @@ PyObject* SurfaceOfExtrusionPy::vIso(PyObject * args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp b/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp index 3e9c70c9c2..87a9c29dfd 100644 --- a/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp +++ b/src/Mod/Part/App/SurfaceOfRevolutionPyImp.cpp @@ -61,7 +61,7 @@ int SurfaceOfRevolutionPy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; GeometryPy* pcGeo = static_cast(pGeom); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a curve"); @@ -71,14 +71,14 @@ int SurfaceOfRevolutionPy::PyInit(PyObject* args, PyObject* /*kwd*/) try { Base::Vector3d pnt = static_cast(pPnt)->value(); Base::Vector3d dir = static_cast(pDir)->value(); - Handle_Geom_SurfaceOfRevolution curve2 = new Geom_SurfaceOfRevolution(curve, + Handle(Geom_SurfaceOfRevolution) curve2 = new Geom_SurfaceOfRevolution(curve, gp_Ax1(gp_Pnt(pnt.x,pnt.y,pnt.z), gp_Dir(dir.x,dir.y,dir.z))); getGeomSurfaceOfRevolutionPtr()->setHandle(curve2); return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -86,7 +86,7 @@ int SurfaceOfRevolutionPy::PyInit(PyObject* args, PyObject* /*kwd*/) Py::Object SurfaceOfRevolutionPy::getLocation(void) const { - Handle_Geom_SurfaceOfRevolution curve = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); const gp_Pnt& pnt = curve->Location(); return Py::Vector(Base::Vector3d(pnt.X(),pnt.Y(),pnt.Z())); @@ -97,13 +97,13 @@ void SurfaceOfRevolutionPy::setLocation(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d pnt = static_cast(p)->value(); - Handle_Geom_SurfaceOfRevolution curve = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); curve->SetLocation(gp_Pnt(pnt.x,pnt.y,pnt.z)); } else if (PyObject_TypeCheck(p, &PyTuple_Type)) { Base::Vector3d pnt = Base::getVectorFromTuple(p); - Handle_Geom_SurfaceOfRevolution curve = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); curve->SetLocation(gp_Pnt(pnt.x,pnt.y,pnt.z)); } @@ -116,7 +116,7 @@ void SurfaceOfRevolutionPy::setLocation(Py::Object arg) Py::Object SurfaceOfRevolutionPy::getDirection(void) const { - Handle_Geom_SurfaceOfRevolution curve = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); const gp_Dir& dir = curve->Direction(); return Py::Vector(Base::Vector3d(dir.X(),dir.Y(),dir.Z())); @@ -127,13 +127,13 @@ void SurfaceOfRevolutionPy::setDirection(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d dir = static_cast(p)->value(); - Handle_Geom_SurfaceOfRevolution curve = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z)); } else if (PyObject_TypeCheck(p, &PyTuple_Type)) { Base::Vector3d dir = Base::getVectorFromTuple(p); - Handle_Geom_SurfaceOfRevolution curve = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); curve->SetDirection(gp_Dir(dir.x,dir.y,dir.z)); } @@ -154,19 +154,19 @@ void SurfaceOfRevolutionPy::setBasisCurve(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(GeometryPy::Type))) { GeometryPy* pcGeo = static_cast(p); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast (pcGeo->getGeometryPtr()->handle()); if (curve.IsNull()) { throw Py::TypeError("geometry is not a curve"); } try { - Handle_Geom_SurfaceOfRevolution curve2 = Handle_Geom_SurfaceOfRevolution::DownCast + Handle(Geom_SurfaceOfRevolution) curve2 = Handle(Geom_SurfaceOfRevolution)::DownCast (getGeometryPtr()->handle()); curve2->SetBasisCurve(curve); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Part/App/Tools.cpp b/src/Mod/Part/App/Tools.cpp index ff60a6d62e..b02c056045 100644 --- a/src/Mod/Part/App/Tools.cpp +++ b/src/Mod/Part/App/Tools.cpp @@ -89,8 +89,8 @@ bool Part::intersect(const gp_Pln& pln1, const gp_Pln& pln2, gp_Lin& lin) if (intSS.IsDone()) { int numSol = intSS.NbLines(); if (numSol > 0) { - Handle_Geom_Curve curve = intSS.Line(1); - lin = Handle_Geom_Line::DownCast(curve)->Lin(); + Handle(Geom_Curve) curve = intSS.Line(1); + lin = Handle(Geom_Line)::DownCast(curve)->Lin(); found = true; } } @@ -107,7 +107,7 @@ If the \a theBoundaries list is empty then Standard_ConstructionError is thrown. If the algorithm fails it returns a null surface. \see http://opencascade.blogspot.com/2010/03/surface-modeling-part6.html */ -Handle_Geom_Surface +Handle(Geom_Surface) Part::Tools::makeSurface(const TColStd_ListOfTransient &theBoundaries, const Standard_Real theTol, const Standard_Integer theNbPnts, @@ -140,19 +140,19 @@ Part::Tools::makeSurface(const TColStd_ListOfTransient &theBoundaries, } else if (aCur->IsKind (STANDARD_TYPE (Adaptor3d_HCurveOnSurface))) { //G1 constraint - const Handle(Adaptor3d_HCurveOnSurface)& aHCOS = Handle(Adaptor3d_HCurveOnSurface)::DownCast (aCur); + Handle(Adaptor3d_HCurveOnSurface) aHCOS (Handle(Adaptor3d_HCurveOnSurface)::DownCast (aCur)); Handle (GeomPlate_CurveConstraint) aConst = new GeomPlate_CurveConstraint (aHCOS, 1 /*GeomAbs_G1*/,aNbPnts, aTol3d, anAngTol, aCurvTol); aPlateBuilder.Add (aConst); } else if (aCur->IsKind (STANDARD_TYPE (GeomAdaptor_HCurve))) { //G0 constraint - const Handle(GeomAdaptor_HCurve)& aHC = Handle(GeomAdaptor_HCurve)::DownCast (aCur); + Handle(GeomAdaptor_HCurve) aHC (Handle(GeomAdaptor_HCurve)::DownCast (aCur)); Handle (GeomPlate_CurveConstraint) aConst = new GeomPlate_CurveConstraint (aHC, 0 /*GeomAbs_G0*/, aNbPnts, aTol3d); aPlateBuilder.Add (aConst); } else if (aCur->IsKind (STANDARD_TYPE (Geom_Point))) { //Point constraint - const Handle(Geom_Point)& aGP = Handle(Geom_Point)::DownCast (aCur); + Handle(Geom_Point) aGP (Handle(Geom_Point)::DownCast (aCur)); Handle(GeomPlate_PointConstraint) aConst = new GeomPlate_PointConstraint(aGP->Pnt(),0); aPlateBuilder.Add(aConst); } diff --git a/src/Mod/Part/App/Tools.h b/src/Mod/Part/App/Tools.h index ba167fb6ce..78a4b66fd6 100644 --- a/src/Mod/Part/App/Tools.h +++ b/src/Mod/Part/App/Tools.h @@ -98,7 +98,7 @@ bool tangentialArc(const gp_Pnt& p0, const gp_Vec& v0, const gp_Pnt& p1, gp_Pnt& class PartExport Tools { public: - Handle_Geom_Surface makeSurface (const TColStd_ListOfTransient& theBoundaries, + Handle(Geom_Surface) makeSurface (const TColStd_ListOfTransient& theBoundaries, const Standard_Real theTol, const Standard_Integer theNbPnts, const Standard_Integer theNbIter, diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index da9731beff..965580ddec 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -454,19 +454,16 @@ void TopoShape::read(const char *FileName) /*! Example code to get the labels for each face in an IGES file. \code -#include -#include #include #include -#include #include #include IGESControl_Reader aReader; ... // Gets the labels of all face items if defined in the IGES file -Handle_XSControl_WorkSession ws = aReader.WS(); -Handle_XSControl_TransferReader tr = ws->TransferReader(); +Handle(XSControl_WorkSession) ws = aReader.WS(); +Handle(XSControl_TransferReader) tr = ws->TransferReader(); std::string name; Handle(IGESData_IGESModel) aModel = aReader.IGESModel(); @@ -476,11 +473,11 @@ TopExp_Explorer ex; for (ex.Init(this->_Shape, TopAbs_FACE); ex.More(); ex.Next()) { const TopoDS_Face& aFace = TopoDS::Face(ex.Current()); - Handle_Standard_Transient ent = tr->EntityFromShapeResult(aFace, 1); + Handle(Standard_Transient) ent = tr->EntityFromShapeResult(aFace, 1); if (!ent.IsNull()) { int i = aModel->Number(ent); if (i > 0) { - Handle_IGESData_IGESEntity ie = aModel->Entity(i); + Handle(IGESData_IGESEntity) ie = aModel->Entity(i); if (ie->HasShortLabel()) name = ie->ShortLabel()->ToCString(); } @@ -500,7 +497,7 @@ void TopoShape::importIges(const char *FileName) if (aReader.ReadFile(encodeFilename(FileName).c_str()) != IFSelect_RetDone) throw Base::Exception("Error in reading IGES"); - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); pi->NewScope(100, "Reading IGES file..."); pi->Show(); aReader.WS()->MapReader()->SetProgress(pi); @@ -525,7 +522,7 @@ void TopoShape::importStep(const char *FileName) if (aReader.ReadFile(encodeFilename(FileName).c_str()) != IFSelect_RetDone) throw Base::Exception("Error in reading STEP"); - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); aReader.WS()->MapReader()->SetProgress(pi); pi->NewScope(100, "Reading STEP file..."); pi->Show(); @@ -549,7 +546,7 @@ void TopoShape::importBrep(const char *FileName) BRep_Builder aBuilder; TopoDS_Shape aShape; #if OCC_VERSION_HEX >= 0x060300 - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); pi->NewScope(100, "Reading BREP file..."); pi->Show(); BRepTools::Read(aShape,encodeFilename(FileName).c_str(),aBuilder,pi); @@ -572,7 +569,7 @@ void TopoShape::importBrep(std::istream& str) BRep_Builder aBuilder; TopoDS_Shape aShape; #if OCC_VERSION_HEX >= 0x060300 - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); pi->NewScope(100, "Reading BREP file..."); pi->Show(); BRepTools::Read(aShape,str,aBuilder,pi); @@ -666,9 +663,9 @@ void TopoShape::exportStep(const char *filename) const // write step file STEPControl_Writer aWriter; - const Handle_XSControl_TransferWriter& hTransferWriter = aWriter.WS()->TransferWriter(); - Handle_Transfer_FinderProcess hFinder = hTransferWriter->FinderProcess(); - Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); + const Handle(XSControl_TransferWriter)& hTransferWriter = aWriter.WS()->TransferWriter(); + Handle(Transfer_FinderProcess) hFinder = hTransferWriter->FinderProcess(); + Handle(Message_ProgressIndicator) pi = new ProgressIndicator(100); hFinder->SetProgress(pi); pi->NewScope(100, "Writing STEP file..."); pi->Show(); @@ -1174,7 +1171,7 @@ bool TopoShape::analyze(std::ostream& str) const for (std::vector::iterator xp = shapes.begin(); xp != shapes.end(); ++xp) { if (!aChecker.IsValid(*xp)) { - const Handle_BRepCheck_Result& result = aChecker.Result(*xp); + const Handle(BRepCheck_Result)& result = aChecker.Result(*xp); if (result.IsNull()) continue; const BRepCheck_ListOfStatus& status = result->StatusOnShape(*xp); @@ -1648,11 +1645,11 @@ TopoDS_Shape TopoShape::makeTube() const BRepAdaptor_Curve path_adapt(path_edge); double umin = path_adapt.FirstParameter(); double umax = path_adapt.LastParameter(); - Handle_Geom_Curve hPath = path_adapt.Curve().Curve(); + Handle(Geom_Curve) hPath = path_adapt.Curve().Curve(); // Apply placement of the shape to the curve TopLoc_Location loc1 = path_edge.Location(); - hPath = Handle_Geom_Curve::DownCast(hPath->Transformed(loc1.Transformation())); + hPath = Handle(Geom_Curve)::DownCast(hPath->Transformed(loc1.Transformation())); if (hPath.IsNull()) Standard_Failure::Raise("Invalid curve in path edge"); @@ -1660,7 +1657,7 @@ TopoDS_Shape TopoShape::makeTube() const GeomFill_Pipe mkTube(hPath, radius); mkTube.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000); - const Handle_Geom_Surface& surf = mkTube.Surface(); + const Handle(Geom_Surface)& surf = mkTube.Surface(); double u1,u2,v1,v2; surf->Bounds(u1,u2,v1,v2); @@ -1675,9 +1672,9 @@ TopoDS_Shape TopoShape::makeTube() const static Handle(Law_Function) CreateBsFunction (const Standard_Real theFirst, const Standard_Real theLast, const Standard_Real theRadius) { (void)theRadius; - //Handle_Law_BSpline aBs; - //Handle_Law_BSpFunc aFunc = new Law_BSpFunc (aBs, theFirst, theLast); - Handle_Law_Constant aFunc = new Law_Constant(); + //Handle(Law_BSpline) aBs; + //Handle(Law_BSpFunc) aFunc = new Law_BSpFunc (aBs, theFirst, theLast); + Handle(Law_Constant) aFunc = new Law_Constant(); aFunc->Set(1, theFirst, theLast); return aFunc; } @@ -1728,7 +1725,7 @@ TopoDS_Shape TopoShape::makeTube(double radius, double tol, int cont, int maxdeg mkSweep.SetTolerance (theTol); mkSweep.Build (aSec, GeomFill_Location, theContinuity, theMaxDegree, theMaxSegment); if (mkSweep.IsDone()) { - Handle_Geom_Surface mySurface = mkSweep.Surface(); + Handle(Geom_Surface) mySurface = mkSweep.Surface(); //Standard_Real myError = mkSweep.ErrorOnSurface(); Standard_Real u1,u2,v1,v2; @@ -1764,11 +1761,11 @@ TopoDS_Shape TopoShape::makeSweep(const TopoDS_Shape& profile, double tol, int f BRepAdaptor_Curve path_adapt(path_edge); double umin = path_adapt.FirstParameter(); double umax = path_adapt.LastParameter(); - Handle_Geom_Curve hPath = path_adapt.Curve().Curve(); + Handle(Geom_Curve) hPath = path_adapt.Curve().Curve(); // Apply placement of the shape to the curve TopLoc_Location loc1 = path_edge.Location(); - hPath = Handle_Geom_Curve::DownCast(hPath->Transformed(loc1.Transformation())); + hPath = Handle(Geom_Curve)::DownCast(hPath->Transformed(loc1.Transformation())); if (hPath.IsNull()) Standard_Failure::Raise("invalid curve in path edge"); @@ -1776,11 +1773,11 @@ TopoDS_Shape TopoShape::makeSweep(const TopoDS_Shape& profile, double tol, int f BRepAdaptor_Curve prof_adapt(prof_edge); double vmin = prof_adapt.FirstParameter(); double vmax = prof_adapt.LastParameter(); - Handle_Geom_Curve hProfile = prof_adapt.Curve().Curve(); + Handle(Geom_Curve) hProfile = prof_adapt.Curve().Curve(); // Apply placement of the shape to the curve TopLoc_Location loc2 = prof_edge.Location(); - hProfile = Handle_Geom_Curve::DownCast(hProfile->Transformed(loc2.Transformation())); + hProfile = Handle(Geom_Curve)::DownCast(hProfile->Transformed(loc2.Transformation())); if (hProfile.IsNull()) Standard_Failure::Raise("invalid curve in profile edge"); @@ -1789,7 +1786,7 @@ TopoDS_Shape TopoShape::makeSweep(const TopoDS_Shape& profile, double tol, int f mkSweep.GenerateParticularCase(Standard_True); mkSweep.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000); - const Handle_Geom_Surface& surf = mkSweep.Surface(); + const Handle(Geom_Surface)& surf = mkSweep.Surface(); BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax #if OCC_VERSION_HEX >= 0x060502 , Precision::Confusion() @@ -1813,7 +1810,7 @@ TopoDS_Shape TopoShape::makeHelix(Standard_Real pitch, Standard_Real height, Standard_Failure::Raise("Pitch and height of helix not compatible"); gp_Ax2 cylAx2(gp_Pnt(0.0,0.0,0.0) , gp::DZ()); - Handle_Geom_Surface surf; + Handle(Geom_Surface) surf; if (angle < Precision::Confusion()) { if (radius < Precision::Confusion()) Standard_Failure::Raise("Radius of helix too small"); @@ -1873,7 +1870,7 @@ TopoDS_Shape TopoShape::makeLongHelix(Standard_Real pitch, Standard_Real height, Standard_Failure::Raise("Height of helix too small"); gp_Ax2 cylAx2(gp_Pnt(0.0,0.0,0.0) , gp::DZ()); - Handle_Geom_Surface surf; + Handle(Geom_Surface) surf; Standard_Boolean isCylinder; if (angle < Precision::Confusion()) { // Cylindrical helix @@ -2372,7 +2369,7 @@ TopoDS_Shape TopoShape::makeOffset2D(double offset, short joinType, bool fill, b std::list offsetWires; //interestingly, if wires are removed, empty compounds are returned by MakeOffset (as of OCC 7.0.0) //so, we just extract all nesting - Handle_TopTools_HSequenceOfShape seq = ShapeExtend_Explorer().SeqFromCompound(offsetShape, Standard_True); + Handle(TopTools_HSequenceOfShape) seq = ShapeExtend_Explorer().SeqFromCompound(offsetShape, Standard_True); TopoDS_Iterator it(offsetShape); for(int i = 0; i < seq->Length(); ++i){ offsetWires.push_back(TopoDS::Wire(seq->Value(i+1))); @@ -2507,7 +2504,7 @@ TopoDS_Shape TopoShape::makeOffset2D(double offset, short joinType, bool fill, b result.Orientation(shapesToProcess[0].Orientation()); ShapeExtend_Explorer xp; - Handle_TopTools_HSequenceOfShape result_leaves = xp.SeqFromCompound(result, Standard_True); + Handle(TopTools_HSequenceOfShape) result_leaves = xp.SeqFromCompound(result, Standard_True); for(int i = 0; i < result_leaves->Length(); ++i) shapesToReturn.push_back(result_leaves->Value(i+1)); } @@ -2826,7 +2823,7 @@ void TopoShape::getFaces(std::vector &aPoints, Standard_Real x2, y2, z2; Standard_Real x3, y3, z3; - Handle_StlMesh_Mesh aMesh = new StlMesh_Mesh(); + Handle(StlMesh_Mesh) aMesh = new StlMesh_Mesh(); #if OCC_VERSION_HEX >= 0x060801 BRepMesh_IncrementalMesh bMesh(this->_Shape, accuracy); StlTransfer::RetrieveMesh(this->_Shape,aMesh); @@ -3080,7 +3077,7 @@ void TopoShape::getFacesFromSubelement(const Data::Segment* element, Standard_Real x2, y2, z2; Standard_Real x3, y3, z3; - Handle_StlMesh_Mesh aMesh = new StlMesh_Mesh(); + Handle(StlMesh_Mesh) aMesh = new StlMesh_Mesh(); #if OCC_VERSION_HEX >= 0x060801 StlTransfer::RetrieveMesh(shape, aMesh); #else diff --git a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp index fa0d023327..0888c62169 100644 --- a/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp @@ -72,7 +72,7 @@ int TopoShapeCompSolidPy::PyInit(PyObject* args, PyObject* /*kwd*/) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -99,7 +99,7 @@ PyObject* TopoShapeCompSolidPy::add(PyObject *args) Standard_Failure::Raise("Cannot empty shape to compound solid"); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp index 77c356133e..4c44c8f092 100644 --- a/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeCompoundPyImp.cpp @@ -76,7 +76,7 @@ int TopoShapeCompoundPy::PyInit(PyObject* args, PyObject* /*kwd*/) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -101,7 +101,7 @@ PyObject* TopoShapeCompoundPy::add(PyObject *args) builder.Add(comp, sh); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -141,7 +141,7 @@ PyObject* TopoShapeCompoundPy::connectEdgesToWires(PyObject *args) return new TopoShapeCompoundPy(new TopoShape(comp)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp index 0b04263d56..e21927663e 100644 --- a/src/Mod/Part/App/TopoShapeEdgePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeEdgePyImp.cpp @@ -116,7 +116,7 @@ int TopoShapeEdgePy::PyInit(PyObject* args, PyObject* /*kwd*/) double first=DBL_MAX, last=DBL_MAX; if (PyArg_ParseTuple(args, "O!|dd", &(Part::GeometryPy::Type), &pcObj, &first, &last)) { Geometry* geom = static_cast(pcObj)->getGeometryPtr(); - Handle_Geom_Curve curve = Handle_Geom_Curve::DownCast(geom->handle()); + Handle(Geom_Curve) curve = Handle(Geom_Curve)::DownCast(geom->handle()); if (curve.IsNull()) { PyErr_SetString(PartExceptionOCCError, "geometry is not a curve type"); return -1; @@ -133,7 +133,7 @@ int TopoShapeEdgePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -166,7 +166,7 @@ int TopoShapeEdgePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -244,7 +244,7 @@ PyObject* TopoShapeEdgePy::parameterAt(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -287,7 +287,7 @@ PyObject* TopoShapeEdgePy::normalAt(PyObject *args) return new Base::VectorPy(new Base::Vector3d(V.X(),V.Y(),V.Z())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -308,7 +308,7 @@ PyObject* TopoShapeEdgePy::curvatureAt(PyObject *args) return Py::new_reference_to(Py::Float(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; } @@ -330,7 +330,7 @@ PyObject* TopoShapeEdgePy::centerOfCurvatureAt(PyObject *args) return new Base::VectorPy(new Base::Vector3d(V.X(),V.Y(),V.Z())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -351,7 +351,7 @@ PyObject* TopoShapeEdgePy::derivative1At(PyObject *args) return new Base::VectorPy(new Base::Vector3d(V.X(),V.Y(),V.Z())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -372,7 +372,7 @@ PyObject* TopoShapeEdgePy::derivative2At(PyObject *args) return new Base::VectorPy(new Base::Vector3d(V.X(),V.Y(),V.Z())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -393,7 +393,7 @@ PyObject* TopoShapeEdgePy::derivative3At(PyObject *args) return new Base::VectorPy(new Base::Vector3d(V.X(),V.Y(),V.Z())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -621,7 +621,7 @@ PyObject* TopoShapeEdgePy::split(PyObject *args) std::sort(par.begin(), par.end()); BRepBuilderAPI_MakeWire mkWire; - Handle_Geom_Curve c = adapt.Curve().Curve(); + Handle(Geom_Curve) c = adapt.Curve().Curve(); std::vector::iterator end = par.end() - 1; for (std::vector::iterator it = par.begin(); it != end; ++it) { BRepBuilderAPI_MakeEdge mkBuilder(c, it[0], it[1]); @@ -631,7 +631,7 @@ PyObject* TopoShapeEdgePy::split(PyObject *args) return new TopoShapeWirePy(new TopoShape(mkWire.Shape())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -652,7 +652,7 @@ PyObject* TopoShapeEdgePy::isSeam(PyObject *args) return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -734,9 +734,9 @@ Py::Object TopoShapeEdgePy::getCurve() const if (LineOld) { GeomLineSegment* line = new GeomLineSegment(); - Handle_Geom_TrimmedCurve this_curv = Handle_Geom_TrimmedCurve::DownCast + Handle(Geom_TrimmedCurve) this_curv = Handle(Geom_TrimmedCurve)::DownCast (line->handle()); - Handle_Geom_Line this_line = Handle_Geom_Line::DownCast + Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast (this_curv->BasisCurve()); this_line->SetLin(adapt.Line()); this_curv->SetTrim(adapt.FirstParameter(), adapt.LastParameter()); @@ -752,7 +752,7 @@ Py::Object TopoShapeEdgePy::getCurve() const } else { 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(adapt.Line()); return Py::Object(new LinePy(line),true); @@ -761,7 +761,7 @@ Py::Object TopoShapeEdgePy::getCurve() const case GeomAbs_Circle: { GeomCircle* circle = new GeomCircle(); - Handle_Geom_Circle this_curv = Handle_Geom_Circle::DownCast + Handle(Geom_Circle) this_curv = Handle(Geom_Circle)::DownCast (circle->handle()); this_curv->SetCirc(adapt.Circle()); //Standard_Real dd = adapt.FirstParameter(); @@ -771,7 +771,7 @@ Py::Object TopoShapeEdgePy::getCurve() const case GeomAbs_Ellipse: { GeomEllipse* elips = new GeomEllipse(); - Handle_Geom_Ellipse this_curv = Handle_Geom_Ellipse::DownCast + Handle(Geom_Ellipse) this_curv = Handle(Geom_Ellipse)::DownCast (elips->handle()); this_curv->SetElips(adapt.Ellipse()); return Py::Object(new EllipsePy(elips),true); @@ -779,7 +779,7 @@ Py::Object TopoShapeEdgePy::getCurve() const case GeomAbs_Hyperbola: { GeomHyperbola* hypr = new GeomHyperbola(); - Handle_Geom_Hyperbola this_curv = Handle_Geom_Hyperbola::DownCast + Handle(Geom_Hyperbola) this_curv = Handle(Geom_Hyperbola)::DownCast (hypr->handle()); this_curv->SetHypr(adapt.Hyperbola()); return Py::Object(new HyperbolaPy(hypr),true); @@ -787,7 +787,7 @@ Py::Object TopoShapeEdgePy::getCurve() const case GeomAbs_Parabola: { GeomParabola* parab = new GeomParabola(); - Handle_Geom_Parabola this_curv = Handle_Geom_Parabola::DownCast + Handle(Geom_Parabola) this_curv = Handle(Geom_Parabola)::DownCast (parab->handle()); this_curv->SetParab(adapt.Parabola()); return Py::Object(new ParabolaPy(parab),true); @@ -806,8 +806,8 @@ Py::Object TopoShapeEdgePy::getCurve() const case GeomAbs_OffsetCurve: { Standard_Real first, last; - Handle_Geom_Curve c = BRep_Tool::Curve(e, first, last); - Handle_Geom_OffsetCurve off = Handle_Geom_OffsetCurve::DownCast(c); + Handle(Geom_Curve) c = BRep_Tool::Curve(e, first, last); + Handle(Geom_OffsetCurve) off = Handle(Geom_OffsetCurve)::DownCast(c); if (!off.IsNull()) { GeomOffsetCurve* curve = new GeomOffsetCurve(off); return Py::Object(new OffsetCurvePy(curve),true); diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index 1bc339db14..69d47f7bd3 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -140,7 +140,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -173,7 +173,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -184,7 +184,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) if (PyArg_ParseTuple(args, "O!O!", &(Part::GeometrySurfacePy::Type), &surf, &(Part::TopoShapeWirePy::Type), &wire)) { try { - Handle_Geom_Surface S = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) S = Handle(Geom_Surface)::DownCast (static_cast(surf)->getGeometryPtr()->handle()); if (S.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a valid surface"); @@ -206,7 +206,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -216,7 +216,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) PyObject *bound=0; if (PyArg_ParseTuple(args, "O!|O!", &(GeometryPy::Type), &surf, &(PyList_Type), &bound)) { try { - Handle_Geom_Surface S = Handle_Geom_Surface::DownCast + Handle(Geom_Surface) S = Handle(Geom_Surface)::DownCast (static_cast(surf)->getGeometryPtr()->handle()); if (S.IsNull()) { PyErr_SetString(PyExc_TypeError, "geometry is not a valid surface"); @@ -252,7 +252,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -312,7 +312,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -359,7 +359,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) PyErr_SetString(Base::BaseExceptionFreeCADError, e.what()); return -1; } catch (Standard_Failure){ - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -507,7 +507,7 @@ PyObject* TopoShapeFacePy::derivative1At(PyObject *args) return Py::new_reference_to(tuple); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -532,7 +532,7 @@ PyObject* TopoShapeFacePy::derivative2At(PyObject *args) return Py::new_reference_to(tuple); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -559,7 +559,7 @@ PyObject* TopoShapeFacePy::isPartOfDomain(PyObject *args) return PyBool_FromLong((state == TopAbs_ON || state == TopAbs_IN) ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -577,7 +577,7 @@ PyObject* TopoShapeFacePy::makeHalfSpace(PyObject *args) return new TopoShapeSolidPy(new TopoShape(mkHS.Solid())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -630,7 +630,7 @@ PyObject* TopoShapeFacePy::validate(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -653,7 +653,7 @@ PyObject* TopoShapeFacePy::curveOnSurface(PyObject *args) const TopoDS_Face& face = TopoDS::Face(getTopoShapePtr()->getShape()); Standard_Real first, last; - Handle_Geom2d_Curve curve = BRep_Tool::CurveOnSurface(edge, face, first, last); + Handle(Geom2d_Curve) curve = BRep_Tool::CurveOnSurface(edge, face, first, last); std::unique_ptr geo2d = getCurve2dFromGeom2d(curve); if (!geo2d) Py_Return; @@ -665,7 +665,7 @@ PyObject* TopoShapeFacePy::curveOnSurface(PyObject *args) return Py::new_reference_to(tuple); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -680,7 +680,7 @@ Py::Object TopoShapeFacePy::getSurface() const case GeomAbs_Plane: { GeomPlane* plane = new GeomPlane(); - Handle_Geom_Plane this_surf = Handle_Geom_Plane::DownCast + Handle(Geom_Plane) this_surf = Handle(Geom_Plane)::DownCast (plane->handle()); this_surf->SetPln(adapt.Plane()); return Py::Object(new PlanePy(plane),true); @@ -688,7 +688,7 @@ Py::Object TopoShapeFacePy::getSurface() const case GeomAbs_Cylinder: { GeomCylinder* cylinder = new GeomCylinder(); - Handle_Geom_CylindricalSurface this_surf = Handle_Geom_CylindricalSurface::DownCast + Handle(Geom_CylindricalSurface) this_surf = Handle(Geom_CylindricalSurface)::DownCast (cylinder->handle()); this_surf->SetCylinder(adapt.Cylinder()); return Py::Object(new CylinderPy(cylinder),true); @@ -696,7 +696,7 @@ Py::Object TopoShapeFacePy::getSurface() const case GeomAbs_Cone: { GeomCone* cone = new GeomCone(); - Handle_Geom_ConicalSurface this_surf = Handle_Geom_ConicalSurface::DownCast + Handle(Geom_ConicalSurface) this_surf = Handle(Geom_ConicalSurface)::DownCast (cone->handle()); this_surf->SetCone(adapt.Cone()); return Py::Object(new ConePy(cone),true); @@ -704,7 +704,7 @@ Py::Object TopoShapeFacePy::getSurface() const case GeomAbs_Sphere: { GeomSphere* sphere = new GeomSphere(); - Handle_Geom_SphericalSurface this_surf = Handle_Geom_SphericalSurface::DownCast + Handle(Geom_SphericalSurface) this_surf = Handle(Geom_SphericalSurface)::DownCast (sphere->handle()); this_surf->SetSphere(adapt.Sphere()); return Py::Object(new SpherePy(sphere),true); @@ -712,7 +712,7 @@ Py::Object TopoShapeFacePy::getSurface() const case GeomAbs_Torus: { GeomToroid* toroid = new GeomToroid(); - Handle_Geom_ToroidalSurface this_surf = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) this_surf = Handle(Geom_ToroidalSurface)::DownCast (toroid->handle()); this_surf->SetTorus(adapt.Torus()); return Py::Object(new ToroidPy(toroid),true); @@ -729,11 +729,11 @@ Py::Object TopoShapeFacePy::getSurface() const } case GeomAbs_SurfaceOfRevolution: { - Handle_Geom_Surface s = BRep_Tool::Surface(f); - Handle_Geom_SurfaceOfRevolution rev = Handle_Geom_SurfaceOfRevolution::DownCast(s); + Handle(Geom_Surface) s = BRep_Tool::Surface(f); + Handle(Geom_SurfaceOfRevolution) rev = Handle(Geom_SurfaceOfRevolution)::DownCast(s); if (rev.IsNull()) { - Handle_Geom_RectangularTrimmedSurface rect = Handle_Geom_RectangularTrimmedSurface::DownCast(s); - rev = Handle_Geom_SurfaceOfRevolution::DownCast(rect->BasisSurface()); + Handle(Geom_RectangularTrimmedSurface) rect = Handle(Geom_RectangularTrimmedSurface)::DownCast(s); + rev = Handle(Geom_SurfaceOfRevolution)::DownCast(rect->BasisSurface()); } if (!rev.IsNull()) { GeomSurfaceOfRevolution* surf = new GeomSurfaceOfRevolution(rev); @@ -745,11 +745,11 @@ Py::Object TopoShapeFacePy::getSurface() const } case GeomAbs_SurfaceOfExtrusion: { - Handle_Geom_Surface s = BRep_Tool::Surface(f); - Handle_Geom_SurfaceOfLinearExtrusion ext = Handle_Geom_SurfaceOfLinearExtrusion::DownCast(s); + Handle(Geom_Surface) s = BRep_Tool::Surface(f); + Handle(Geom_SurfaceOfLinearExtrusion) ext = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(s); if (ext.IsNull()) { - Handle_Geom_RectangularTrimmedSurface rect = Handle_Geom_RectangularTrimmedSurface::DownCast(s); - ext = Handle_Geom_SurfaceOfLinearExtrusion::DownCast(rect->BasisSurface()); + Handle(Geom_RectangularTrimmedSurface) rect = Handle(Geom_RectangularTrimmedSurface)::DownCast(s); + ext = Handle(Geom_SurfaceOfLinearExtrusion)::DownCast(rect->BasisSurface()); } if (!ext.IsNull()) { GeomSurfaceOfExtrusion* surf = new GeomSurfaceOfExtrusion(ext); @@ -761,11 +761,11 @@ Py::Object TopoShapeFacePy::getSurface() const } case GeomAbs_OffsetSurface: { - Handle_Geom_Surface s = BRep_Tool::Surface(f); - Handle_Geom_OffsetSurface off = Handle_Geom_OffsetSurface::DownCast(s); + Handle(Geom_Surface) s = BRep_Tool::Surface(f); + Handle(Geom_OffsetSurface) off = Handle(Geom_OffsetSurface)::DownCast(s); if (off.IsNull()) { - Handle_Geom_RectangularTrimmedSurface rect = Handle_Geom_RectangularTrimmedSurface::DownCast(s); - off = Handle_Geom_OffsetSurface::DownCast(rect->BasisSurface()); + Handle(Geom_RectangularTrimmedSurface) rect = Handle(Geom_RectangularTrimmedSurface)::DownCast(s); + off = Handle(Geom_OffsetSurface)::DownCast(rect->BasisSurface()); } if (!off.IsNull()) { GeomOffsetSurface* surf = new GeomOffsetSurface(off); diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp index 274f1e19bf..b217294eee 100644 --- a/src/Mod/Part/App/TopoShapePyImp.cpp +++ b/src/Mod/Part/App/TopoShapePyImp.cpp @@ -146,7 +146,7 @@ int TopoShapePy::PyInit(PyObject* args, PyObject*) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -470,7 +470,7 @@ PyObject* TopoShapePy::dumpToString(PyObject *args) return NULL; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -496,7 +496,7 @@ PyObject* TopoShapePy::exportBrepToString(PyObject *args) return NULL; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -583,7 +583,7 @@ PyObject* TopoShapePy::importBrepFromString(PyObject *args) return NULL; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -624,7 +624,7 @@ PyObject* TopoShapePy::exportStl(PyObject *args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -668,7 +668,7 @@ PyObject* TopoShapePy::extrude(PyObject *args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -734,7 +734,7 @@ PyObject* TopoShapePy::revolve(PyObject *args) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -769,7 +769,7 @@ PyObject* TopoShapePy::fuse(PyObject *args) return new TopoShapePy(new TopoShape(fusShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -799,7 +799,7 @@ PyObject* TopoShapePy::fuse(PyObject *args) return new TopoShapePy(new TopoShape(multiFusedShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -836,7 +836,7 @@ PyObject* TopoShapePy::multiFuse(PyObject *args) return new TopoShapePy(new TopoShape(multiFusedShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -859,7 +859,7 @@ PyObject* TopoShapePy::oldFuse(PyObject *args) return new TopoShapePy(new TopoShape(fusShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -880,7 +880,7 @@ PyObject* TopoShapePy::common(PyObject *args) return new TopoShapePy(new TopoShape(comShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -910,7 +910,7 @@ PyObject* TopoShapePy::common(PyObject *args) return new TopoShapePy(new TopoShape(multiCommonShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -935,7 +935,7 @@ PyObject* TopoShapePy::section(PyObject *args) return new TopoShapePy(new TopoShape(secShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -965,7 +965,7 @@ PyObject* TopoShapePy::section(PyObject *args) return new TopoShapePy(new TopoShape(multiSectionShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -997,7 +997,7 @@ PyObject* TopoShapePy::slice(PyObject *args) return Py::new_reference_to(wire); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1024,7 +1024,7 @@ PyObject* TopoShapePy::slices(PyObject *args) return new TopoShapeCompoundPy(new TopoShape(slice)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1045,7 +1045,7 @@ PyObject* TopoShapePy::cut(PyObject *args) return new TopoShapePy(new TopoShape(cutShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1075,7 +1075,7 @@ PyObject* TopoShapePy::cut(PyObject *args) return new TopoShapePy(new TopoShape(multiCutShape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1127,7 +1127,7 @@ PyObject* TopoShapePy::generalFuse(PyObject *args) return Py::new_reference_to(ret); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1147,7 +1147,7 @@ PyObject* TopoShapePy::sewShape(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1211,7 +1211,7 @@ PyObject* TopoShapePy::childShapes(PyObject *args) return Py::new_reference_to(list); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1230,7 +1230,7 @@ PyObject* TopoShapePy::removeInternalWires(PyObject *args) return ret; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1252,7 +1252,7 @@ PyObject* TopoShapePy::mirror(PyObject *args) return new TopoShapePy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1270,7 +1270,7 @@ PyObject* TopoShapePy::transformGeometry(PyObject *args) return new TopoShapePy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1289,7 +1289,7 @@ PyObject* TopoShapePy::transformShape(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1383,7 +1383,7 @@ PyObject* TopoShapePy::scale(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1411,7 +1411,7 @@ PyObject* TopoShapePy::makeFillet(PyObject *args) return new TopoShapePy(new TopoShape(mkFillet.Shape())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1437,7 +1437,7 @@ PyObject* TopoShapePy::makeFillet(PyObject *args) return new TopoShapePy(new TopoShape(mkFillet.Shape())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1476,7 +1476,7 @@ PyObject* TopoShapePy::makeChamfer(PyObject *args) return new TopoShapePy(new TopoShape(mkChamfer.Shape())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1507,7 +1507,7 @@ PyObject* TopoShapePy::makeChamfer(PyObject *args) return new TopoShapePy(new TopoShape(mkChamfer.Shape())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1549,7 +1549,7 @@ PyObject* TopoShapePy::makeThickness(PyObject *args) return new TopoShapeSolidPy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1579,7 +1579,7 @@ PyObject* TopoShapePy::makeOffsetShape(PyObject *args, PyObject *keywds) return new TopoShapePy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1767,7 +1767,7 @@ PyObject* TopoShapePy::tessellate(PyObject *args) return Py::new_reference_to(tuple); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1818,7 +1818,7 @@ PyObject* TopoShapePy::makeParallelProjection(PyObject *args) return new TopoShapePy(new TopoShape(projected)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1840,7 +1840,7 @@ PyObject* TopoShapePy::makePerspectiveProjection(PyObject *args) return new TopoShapePy(new TopoShape(projected)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -1901,7 +1901,7 @@ PyObject* TopoShapePy::toNurbs(PyObject *args) return new TopoShapePy(new TopoShape(nurbs)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1927,7 +1927,7 @@ PyObject* TopoShapePy::isInside(PyObject *args) return Py_BuildValue("O", (test ? Py_True : Py_False)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1948,7 +1948,7 @@ PyObject* TopoShapePy::removeSplitter(PyObject *args) return new TopoShapePy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -1982,7 +1982,7 @@ PyObject* TopoShapePy::getElement(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -2027,7 +2027,7 @@ PyObject* TopoShapePy::getTolerance(PyObject *args) return PyFloat_FromDouble(tolerance); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -2077,7 +2077,7 @@ PyObject* TopoShapePy::overTolerance(PyObject *args) return Py::new_reference_to(tuple); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -2128,7 +2128,7 @@ PyObject* TopoShapePy::inTolerance(PyObject *args) return Py::new_reference_to(tuple); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -2149,7 +2149,7 @@ PyObject* TopoShapePy::globalTolerance(PyObject *args) return PyFloat_FromDouble(tolerance); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -2189,7 +2189,7 @@ PyObject* TopoShapePy::fixTolerance(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -2230,7 +2230,7 @@ PyObject* TopoShapePy::limitTolerance(PyObject *args) return PyBool_FromLong(ok ? 1 : 0); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -2838,7 +2838,7 @@ PyObject *TopoShapePy::getCustomAttributes(const char* attr) const } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/TopoShapeShellPyImp.cpp b/src/Mod/Part/App/TopoShapeShellPyImp.cpp index 0df4343e07..521b0ba81c 100644 --- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp @@ -112,7 +112,7 @@ int TopoShapeShellPy::PyInit(PyObject* args, PyObject* /*kwd*/) Standard_Failure::Raise("Shape is not a shell"); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -146,7 +146,7 @@ PyObject* TopoShapeShellPy::add(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -198,7 +198,7 @@ PyObject* TopoShapeShellPy::makeHalfSpace(PyObject *args) return new TopoShapeSolidPy(new TopoShape(mkHS.Solid())); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp index ec6d77311c..16ddd1a82b 100644 --- a/src/Mod/Part/App/TopoShapeSolidPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeSolidPyImp.cpp @@ -235,7 +235,7 @@ PyObject* TopoShapeSolidPy::getMomentOfInertia(PyObject *args) return PyFloat_FromDouble(r); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -258,7 +258,7 @@ PyObject* TopoShapeSolidPy::getRadiusOfGyration(PyObject *args) return PyFloat_FromDouble(r); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -318,7 +318,7 @@ PyObject* TopoShapeSolidPy::offsetFaces(PyObject *args) return new TopoShapeSolidPy(new TopoShape(offsetshape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } diff --git a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp index dc803e8bc3..4c32480845 100644 --- a/src/Mod/Part/App/TopoShapeVertexPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeVertexPyImp.cpp @@ -98,7 +98,7 @@ int TopoShapeVertexPy::PyInit(PyObject* args, PyObject* /*kwd*/) if (!success) { PyErr_Clear(); // set by PyArg_ParseTuple() if (PyArg_ParseTuple(args,"O!",&(PointPy::Type), &object)) { - Handle_Geom_CartesianPoint this_point = Handle_Geom_CartesianPoint::DownCast + Handle(Geom_CartesianPoint) this_point = Handle(Geom_CartesianPoint)::DownCast (static_cast(object)->getGeomPointPtr()->handle()); gp_Pnt pnt = this_point->Pnt(); x = pnt.X(); diff --git a/src/Mod/Part/App/TopoShapeWirePyImp.cpp b/src/Mod/Part/App/TopoShapeWirePyImp.cpp index b46d5d172a..9857cd5f20 100644 --- a/src/Mod/Part/App/TopoShapeWirePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeWirePyImp.cpp @@ -102,7 +102,7 @@ int TopoShapeWirePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -145,7 +145,7 @@ int TopoShapeWirePy::PyInit(PyObject* args, PyObject* /*kwd*/) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return -1; } @@ -182,7 +182,7 @@ PyObject* TopoShapeWirePy::add(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -216,7 +216,7 @@ PyObject* TopoShapeWirePy::fixWire(PyObject *args) Py_Return; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -250,7 +250,7 @@ PyObject* TopoShapeWirePy::makePipe(PyObject *args) return new TopoShapePy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -286,7 +286,7 @@ PyObject* TopoShapeWirePy::makePipeShell(PyObject *args) return new TopoShapePy(new TopoShape(shape)); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return NULL; } @@ -315,7 +315,7 @@ PyObject* TopoShapeWirePy::makeHomogenousWires(PyObject *args) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); PyErr_SetString(PartExceptionOCCError, e->GetMessageString()); return 0; } @@ -330,7 +330,7 @@ PyObject* TopoShapeWirePy::approximate(PyObject *args) return 0; try { BRepAdaptor_CompCurve adapt(TopoDS::Wire(getTopoShapePtr()->getShape())); - Handle_Adaptor3d_HCurve hcurve = adapt.Trim(adapt.FirstParameter(), + Handle(Adaptor3d_HCurve) hcurve = adapt.Trim(adapt.FirstParameter(), adapt.LastParameter(), tol2d); Approx_Curve3d approx(hcurve, tol3d, GeomAbs_C0, maxseg, maxdeg); diff --git a/src/Mod/Part/App/TopologyPy.cpp b/src/Mod/Part/App/TopologyPy.cpp index ad5e6598cf..01f885e9de 100644 --- a/src/Mod/Part/App/TopologyPy.cpp +++ b/src/Mod/Part/App/TopologyPy.cpp @@ -272,7 +272,7 @@ PyObject *TopoShapePyOld::analyze(PyObject *args) { if (!aChecker.IsValid(it.Value())) { - const Handle_BRepCheck_Result& result = aChecker.Result(it.Value()); + const Handle(BRepCheck_Result)& result = aChecker.Result(it.Value()); const BRepCheck_ListOfStatus& status = result->StatusOnShape(it.Value()); BRepCheck_ListIteratorOfListOfStatus it(status); @@ -403,11 +403,9 @@ PyObject *TopoShapePyOld::analyze(PyObject *args) #include #include #include -#include #include #include #include -#include #include #include #include @@ -437,7 +435,7 @@ public: Standard_Integer scopes = GetNbScopes(); const MoniTool_ProgressScale& scale = GetScope(scopes); - Handle_TCollection_HAsciiString name = scale.GetName(); + Handle(TCollection_HAsciiString) name = scale.GetName(); if ( val < 2.0 ) Base::Sequencer().start(name->ToCString(), (unsigned long)max); @@ -478,7 +476,7 @@ PyObject *TopoShapePyOld::importIGES(PyObject *args) for (Standard_Integer j=1; j<=aList->Length(); j++) { Handle(IGESData_IGESEntity) igesEntity=Handle(IGESData_IGESEntity)::DownCast(aList->Value(j)); // get names - Handle_TCollection_HAsciiString name = igesEntity->NameValue(); + Handle(TCollection_HAsciiString) name = igesEntity->NameValue(); if ( !name.IsNull() ) { const char* cname = name->ToCString(); } @@ -586,7 +584,7 @@ PyObject *TopoShapePyOld::importSTEP(PyObject *args) for (Standard_Integer j=1; j<=aList->Length(); j++) { Handle(IGESData_IGESEntity) igesEntity=Handle(IGESData_IGESEntity)::DownCast(aList->Value(j)); // get names - Handle_TCollection_HAsciiString name = igesEntity->NameValue(); + Handle(TCollection_HAsciiString) name = igesEntity->NameValue(); if ( !name.IsNull() ) { const char* cname = name->ToCString(); } @@ -604,10 +602,10 @@ PyObject *TopoShapePyOld::importSTEP(PyObject *args) _cTopoShape = aReader.OneShape(); #if 0 // Some interesting stuff - Handle_XSControl_WorkSession ws = aReader.WS(); + Handle(XSControl_WorkSession) ws = aReader.WS(); //SetModel( reader.StepModel() ); - Handle_XSControl_TransferReader tr = ws->TransferReader(); - Handle_Standard_Transient ent = tr->EntityFromShapeResult(_cTopoShape, 3); + Handle(XSControl_TransferReader) tr = ws->TransferReader(); + Handle(Standard_Transient) ent = tr->EntityFromShapeResult(_cTopoShape, 3); if ( ! ent.IsNull() ) { //printf( "Name of STEP-Model: %s\n", ws->Model()->StringLabel(ent)->String() ); } @@ -615,7 +613,7 @@ PyObject *TopoShapePyOld::importSTEP(PyObject *args) TopExp::MapShapes( _cTopoShape, smap); for ( Standard_Integer k = 1; k <= smap.Extent(); k++ ) { const TopoDS_Shape& tsh = smap(k); - Handle_Standard_Transient ent = tr->EntityFromShapeResult(tsh, 3); + Handle(Standard_Transient) ent = tr->EntityFromShapeResult(tsh, 3); if ( ! ent.IsNull() ) { //printf( "Part %s ", ws->Model()->StringLabel(ent)->String() ); //printf( "is a %s\n", ws->Model()->TypeName(ent) ); diff --git a/src/Mod/Part/App/ToroidPyImp.cpp b/src/Mod/Part/App/ToroidPyImp.cpp index 716ad533ee..3b3bb04076 100644 --- a/src/Mod/Part/App/ToroidPyImp.cpp +++ b/src/Mod/Part/App/ToroidPyImp.cpp @@ -56,7 +56,7 @@ PyObject *ToroidPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Pyt int ToroidPy::PyInit(PyObject* args, PyObject* /*kwd*/) { if (PyArg_ParseTuple(args, "")) { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); torus->SetMajorRadius(5.0); torus->SetMinorRadius(1.0); @@ -73,13 +73,13 @@ PyObject* ToroidPy::uIso(PyObject * args) return 0; try { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); - Handle_Geom_Circle c = Handle_Geom_Circle::DownCast(torus->UIso(u)); + Handle(Geom_Circle) c = Handle(Geom_Circle)::DownCast(torus->UIso(u)); return new CirclePy(new GeomCircle(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; } @@ -92,13 +92,13 @@ PyObject* ToroidPy::vIso(PyObject * args) return 0; try { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); - Handle_Geom_Circle c = Handle_Geom_Circle::DownCast(torus->VIso(v)); + Handle(Geom_Circle) c = Handle(Geom_Circle)::DownCast(torus->VIso(v)); return new CirclePy(new GeomCircle(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; } @@ -106,7 +106,7 @@ PyObject* ToroidPy::vIso(PyObject * args) Py::Float ToroidPy::getMajorRadius(void) const { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); return Py::Float(torus->MajorRadius()); } @@ -114,7 +114,7 @@ Py::Float ToroidPy::getMajorRadius(void) const void ToroidPy::setMajorRadius(Py::Float arg) { try { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); torus->SetMajorRadius((double)arg); } @@ -125,7 +125,7 @@ void ToroidPy::setMajorRadius(Py::Float arg) Py::Float ToroidPy::getMinorRadius(void) const { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); return Py::Float(torus->MinorRadius()); } @@ -133,7 +133,7 @@ Py::Float ToroidPy::getMinorRadius(void) const void ToroidPy::setMinorRadius(Py::Float arg) { try { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); torus->SetMinorRadius((double)arg); } @@ -144,7 +144,7 @@ void ToroidPy::setMinorRadius(Py::Float arg) Py::Object ToroidPy::getCenter(void) const { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); gp_Pnt loc = torus->Location(); return Py::Vector(Base::Vector3d(loc.X(), loc.Y(), loc.Z())); @@ -155,7 +155,7 @@ void ToroidPy::setCenter(Py::Object arg) PyObject* p = arg.ptr(); if (PyObject_TypeCheck(p, &(Base::VectorPy::Type))) { Base::Vector3d loc = static_cast(p)->value(); - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); torus->SetLocation(gp_Pnt(loc.x, loc.y, loc.z)); } @@ -168,7 +168,7 @@ void ToroidPy::setCenter(Py::Object arg) Py::Object ToroidPy::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())); @@ -197,7 +197,7 @@ void ToroidPy::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()); @@ -211,14 +211,14 @@ void ToroidPy::setAxis(Py::Object arg) Py::Float ToroidPy::getArea(void) const { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); return Py::Float(torus->Area()); } Py::Float ToroidPy::getVolume(void) const { - Handle_Geom_ToroidalSurface torus = Handle_Geom_ToroidalSurface::DownCast + Handle(Geom_ToroidalSurface) torus = Handle(Geom_ToroidalSurface)::DownCast (getGeomToroidPtr()->handle()); return Py::Float(torus->Volume()); } diff --git a/src/Mod/Part/App/modelRefine.cpp b/src/Mod/Part/App/modelRefine.cpp index 05216d8bad..720a36b37c 100644 --- a/src/Mod/Part/App/modelRefine.cpp +++ b/src/Mod/Part/App/modelRefine.cpp @@ -346,14 +346,14 @@ FaceTypedPlane::FaceTypedPlane() : FaceTypedBase(GeomAbs_Plane) static Handle(Geom_Plane) getGeomPlane(const TopoDS_Face &faceIn) { - Handle_Geom_Plane planeSurfaceOut; - Handle_Geom_Surface surface = BRep_Tool::Surface(faceIn); + Handle(Geom_Plane) planeSurfaceOut; + Handle(Geom_Surface) surface = BRep_Tool::Surface(faceIn); if (!surface.IsNull()) { planeSurfaceOut = Handle(Geom_Plane)::DownCast(surface); if (planeSurfaceOut.IsNull()) { - Handle_Geom_RectangularTrimmedSurface trimmedSurface = Handle(Geom_RectangularTrimmedSurface)::DownCast(surface); + Handle(Geom_RectangularTrimmedSurface) trimmedSurface = Handle(Geom_RectangularTrimmedSurface)::DownCast(surface); if (!trimmedSurface.IsNull()) planeSurfaceOut = Handle(Geom_Plane)::DownCast(trimmedSurface->BasisSurface()); } @@ -437,14 +437,14 @@ FaceTypedCylinder::FaceTypedCylinder() : FaceTypedBase(GeomAbs_Cylinder) static Handle(Geom_CylindricalSurface) getGeomCylinder(const TopoDS_Face &faceIn) { - Handle_Geom_CylindricalSurface cylinderSurfaceOut; - Handle_Geom_Surface surface = BRep_Tool::Surface(faceIn); + Handle(Geom_CylindricalSurface) cylinderSurfaceOut; + Handle(Geom_Surface) surface = BRep_Tool::Surface(faceIn); if (!surface.IsNull()) { cylinderSurfaceOut = Handle(Geom_CylindricalSurface)::DownCast(surface); if (cylinderSurfaceOut.IsNull()) { - Handle_Geom_RectangularTrimmedSurface trimmedSurface = Handle(Geom_RectangularTrimmedSurface)::DownCast(surface); + Handle(Geom_RectangularTrimmedSurface) trimmedSurface = Handle(Geom_RectangularTrimmedSurface)::DownCast(surface); if (!trimmedSurface.IsNull()) cylinderSurfaceOut = Handle(Geom_CylindricalSurface)::DownCast(trimmedSurface->BasisSurface()); } @@ -504,7 +504,7 @@ bool wireEncirclesAxis(const TopoDS_Wire& wire, const Handle(Geom_CylindricalSur gp_Ax1 cylAxis = cylinder->Axis(); gp_Vec cv(cylAxis.Location().X(), cylAxis.Location().Y(), cylAxis.Location().Z()); // center of cylinder gp_Vec av(cylAxis.Direction().X(), cylAxis.Direction().Y(), cylAxis.Direction().Z()); // axis of cylinder - Handle_Geom_Plane plane = new Geom_Plane(gp_Ax3(cylAxis.Location(), cylAxis.Direction())); + Handle(Geom_Plane) plane = new Geom_Plane(gp_Ax3(cylAxis.Location(), cylAxis.Direction())); double totalArc = 0.0; bool firstSegment = false; bool secondSegment = false; @@ -792,7 +792,7 @@ void collectConicEdges(const TopoDS_Shell &shell, TopTools_IndexedMapOfShape &ma continue; TopLoc_Location location; Standard_Real first, last; - const Handle_Geom_Curve &curve = BRep_Tool::Curve(currentEdge, location, first, last); + const Handle(Geom_Curve) &curve = BRep_Tool::Curve(currentEdge, location, first, last); if (curve.IsNull()) continue; if (curve->IsKind(STANDARD_TYPE(Geom_Conic))) diff --git a/src/Mod/Part/Gui/DlgExtrusion.cpp b/src/Mod/Part/Gui/DlgExtrusion.cpp index c91841b886..2178e74cf1 100644 --- a/src/Mod/Part/Gui/DlgExtrusion.cpp +++ b/src/Mod/Part/Gui/DlgExtrusion.cpp @@ -319,7 +319,7 @@ void DlgExtrusion::autoSolid() if (sh.IsNull()) return; ShapeExtend_Explorer xp; - Handle_TopTools_HSequenceOfShape leaves = xp.SeqFromCompound(sh, /*recursive= */Standard_True); + Handle(TopTools_HSequenceOfShape) leaves = xp.SeqFromCompound(sh, /*recursive= */Standard_True); int cntClosedWires = 0; for(int i = 0; i < leaves->Length(); i++){ const TopoDS_Shape &leaf = leaves->Value(i+1); diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index a378788bba..447c20da2d 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -154,8 +154,8 @@ public: GC_MakeArcOfCircle arc(points[0], points[1], points[2]); if (!arc.IsDone()) throw Base::Exception(gce_ErrorStatusText(arc.Status())); - Handle_Geom_TrimmedCurve trim = arc.Value(); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(trim->BasisCurve()); + Handle(Geom_TrimmedCurve) trim = arc.Value(); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(trim->BasisCurve()); QString name = QString::fromLatin1(doc->getUniqueObjectName("Circle").c_str()); return QString::fromLatin1( diff --git a/src/Mod/Part/Gui/DlgRevolution.cpp b/src/Mod/Part/Gui/DlgRevolution.cpp index 0d3f5973df..ca8352ba61 100644 --- a/src/Mod/Part/Gui/DlgRevolution.cpp +++ b/src/Mod/Part/Gui/DlgRevolution.cpp @@ -520,7 +520,7 @@ void DlgRevolution::autoSolid() if (sh.IsNull()) return; ShapeExtend_Explorer xp; - Handle_TopTools_HSequenceOfShape leaves = xp.SeqFromCompound(sh, /*recursive= */Standard_True); + Handle(TopTools_HSequenceOfShape) leaves = xp.SeqFromCompound(sh, /*recursive= */Standard_True); int cntClosedWires = 0; for (int i = 0; i < leaves->Length(); i++) { const TopoDS_Shape &leaf = leaves->Value(i+1); diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index 34525e42e3..eb6ccf22df 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -638,10 +638,10 @@ PartGui::VectorAdapter::VectorAdapter() : status(false), vector() PartGui::VectorAdapter::VectorAdapter(const TopoDS_Face &faceIn, const gp_Vec &pickedPointIn) : status(false), vector(), origin(pickedPointIn) { - Handle_Geom_Surface surface = BRep_Tool::Surface(faceIn); + Handle(Geom_Surface) surface = BRep_Tool::Surface(faceIn); if (surface->IsKind(STANDARD_TYPE(Geom_ElementarySurface))) { - Handle_Geom_ElementarySurface eSurface = Handle(Geom_ElementarySurface)::DownCast(surface); + Handle(Geom_ElementarySurface) eSurface = Handle(Geom_ElementarySurface)::DownCast(surface); gp_Dir direction = eSurface->Axis().Direction(); vector = direction; vector.Normalize(); @@ -708,7 +708,7 @@ PartGui::VectorAdapter::VectorAdapter(const gp_Vec &vector1, const gp_Vec &vecto void PartGui::VectorAdapter::projectOriginOntoVector(const gp_Vec &pickedPointIn) { - Handle_Geom_Curve heapLine = new Geom_Line(origin.XYZ(), vector.XYZ()); + Handle(Geom_Curve) heapLine = new Geom_Line(origin.XYZ(), vector.XYZ()); gp_Pnt tempPoint(pickedPointIn.XYZ()); GeomAPI_ProjectPointOnCurve projection(tempPoint, heapLine); if (projection.NbPoints() < 1) @@ -869,7 +869,7 @@ void PartGui::goDimensionAngularNoTask(const VectorAdapter &vector1Adapter, cons if (vector1.IsParallel(vector2, Precision::Angular())) { //take first point project it onto second vector. - Handle_Geom_Curve heapLine2 = new Geom_Line(vector2Adapter); + Handle(Geom_Curve) heapLine2 = new Geom_Line(vector2Adapter); gp_Pnt tempPoint(vector1Adapter.getPickPoint().XYZ()); GeomAPI_ProjectPointOnCurve projection(tempPoint, heapLine2); @@ -926,8 +926,8 @@ void PartGui::goDimensionAngularNoTask(const VectorAdapter &vector1Adapter, cons } else { - Handle_Geom_Curve heapLine1 = new Geom_Line(vector1Adapter); - Handle_Geom_Curve heapLine2 = new Geom_Line(vector2Adapter); + Handle(Geom_Curve) heapLine1 = new Geom_Line(vector1Adapter); + Handle(Geom_Curve) heapLine2 = new Geom_Line(vector2Adapter); GeomAPI_ExtremaCurveCurve extrema(heapLine1, heapLine2); diff --git a/src/Mod/PartDesign/App/FeatureChamfer.cpp b/src/Mod/PartDesign/App/FeatureChamfer.cpp index b52fa47d8d..c1b776c51b 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.cpp +++ b/src/Mod/PartDesign/App/FeatureChamfer.cpp @@ -119,7 +119,7 @@ App::DocumentObjectExecReturn *Chamfer::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index 4b7571d512..342f499c01 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -171,14 +171,14 @@ App::DocumentObjectExecReturn *Draft::execute(void) // Edge is linear // Find midpoint of edge and create auxiliary plane through midpoint normal to edge gp_Pnt pm = c.Value((c.FirstParameter() + c.LastParameter()) / 2.0); - Handle_Geom_Plane aux = new Geom_Plane(pm, gp_Dir(p2.X() - p1.X(), p2.Y() - p1.Y(), p2.Z() - p1.Z())); + Handle(Geom_Plane) aux = new Geom_Plane(pm, gp_Dir(p2.X() - p1.X(), p2.Y() - p1.Y(), p2.Z() - p1.Z())); // Intersect plane with face. Is there no easier way? BRepAdaptor_Surface adapt(TopoDS::Face(face), Standard_False); - Handle_Geom_Surface sf = adapt.Surface().Surface(); + Handle(Geom_Surface) sf = adapt.Surface().Surface(); GeomAPI_IntSS intersector(aux, sf, Precision::Confusion()); if (!intersector.IsDone()) continue; - Handle_Geom_Curve icurve = intersector.Line(1); + Handle(Geom_Curve) icurve = intersector.Line(1); if (!icurve->IsKind(STANDARD_TYPE(Geom_Line))) continue; // TODO: How to extract the line from icurve without creating an edge first? @@ -306,7 +306,7 @@ App::DocumentObjectExecReturn *Draft::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/PartDesign/App/FeatureFillet.cpp b/src/Mod/PartDesign/App/FeatureFillet.cpp index 09850234d5..e0313e213c 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.cpp +++ b/src/Mod/PartDesign/App/FeatureFillet.cpp @@ -110,7 +110,7 @@ App::DocumentObjectExecReturn *Fillet::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/PartDesign/App/FeatureGroove.cpp b/src/Mod/PartDesign/App/FeatureGroove.cpp index 058df6db1e..32c085eec7 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.cpp +++ b/src/Mod/PartDesign/App/FeatureGroove.cpp @@ -165,7 +165,7 @@ App::DocumentObjectExecReturn *Groove::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); if (std::string(e->GetMessageString()) == "TopoDS::Face") return new App::DocumentObjectExecReturn("Could not create face from sketch.\n" "Intersecting sketch entities in a sketch are not allowed."); diff --git a/src/Mod/PartDesign/App/FeatureLoft.cpp b/src/Mod/PartDesign/App/FeatureLoft.cpp index e591a9b405..a646f8cfb2 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.cpp +++ b/src/Mod/PartDesign/App/FeatureLoft.cpp @@ -215,7 +215,7 @@ App::DocumentObjectExecReturn *Loft::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } catch (...) { diff --git a/src/Mod/PartDesign/App/FeaturePad.cpp b/src/Mod/PartDesign/App/FeaturePad.cpp index cbd33bcc56..47c4b90bfc 100644 --- a/src/Mod/PartDesign/App/FeaturePad.cpp +++ b/src/Mod/PartDesign/App/FeaturePad.cpp @@ -234,7 +234,7 @@ App::DocumentObjectExecReturn *Pad::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); if (std::string(e->GetMessageString()) == "TopoDS::Face") return new App::DocumentObjectExecReturn("Could not create face from sketch.\n" "Intersecting sketch entities or multiple faces in a sketch are not allowed."); diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 608351d2fd..860a3e09e7 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -322,7 +322,7 @@ App::DocumentObjectExecReturn *Pipe::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } catch (...) { diff --git a/src/Mod/PartDesign/App/FeaturePocket.cpp b/src/Mod/PartDesign/App/FeaturePocket.cpp index cada4bdf1e..dc80973b23 100644 --- a/src/Mod/PartDesign/App/FeaturePocket.cpp +++ b/src/Mod/PartDesign/App/FeaturePocket.cpp @@ -204,7 +204,7 @@ App::DocumentObjectExecReturn *Pocket::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); if (std::string(e->GetMessageString()) == "TopoDS::Face" && (std::string(Type.getValueAsString()) == "UpToFirst" || std::string(Type.getValueAsString()) == "UpToFace")) return new App::DocumentObjectExecReturn("Could not create face from sketch.\n" diff --git a/src/Mod/PartDesign/App/FeaturePrimitive.cpp b/src/Mod/PartDesign/App/FeaturePrimitive.cpp index a8a99d15b9..f8fdd78909 100644 --- a/src/Mod/PartDesign/App/FeaturePrimitive.cpp +++ b/src/Mod/PartDesign/App/FeaturePrimitive.cpp @@ -143,7 +143,7 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -202,7 +202,7 @@ App::DocumentObjectExecReturn* Box::execute(void) return FeaturePrimitive::execute(mkBox.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } @@ -250,7 +250,7 @@ App::DocumentObjectExecReturn* Cylinder::execute(void) return FeaturePrimitive::execute(mkCylr.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -300,7 +300,7 @@ App::DocumentObjectExecReturn* Sphere::execute(void) return FeaturePrimitive::execute(mkSphere.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -356,7 +356,7 @@ App::DocumentObjectExecReturn* Cone::execute(void) return FeaturePrimitive::execute(mkCone.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -438,7 +438,7 @@ App::DocumentObjectExecReturn* Ellipsoid::execute(void) return FeaturePrimitive::execute(mkTrsf.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -501,7 +501,7 @@ App::DocumentObjectExecReturn* Torus::execute(void) return FeaturePrimitive::execute(mkTorus.Solid()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -567,7 +567,7 @@ App::DocumentObjectExecReturn* Prism::execute(void) return FeaturePrimitive::execute(mkPrism.Shape()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } @@ -654,7 +654,7 @@ App::DocumentObjectExecReturn* Wedge::execute(void) return FeaturePrimitive::execute(mkSolid.Solid()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } diff --git a/src/Mod/PartDesign/App/FeatureRevolution.cpp b/src/Mod/PartDesign/App/FeatureRevolution.cpp index d615aa466b..483e56372a 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.cpp +++ b/src/Mod/PartDesign/App/FeatureRevolution.cpp @@ -165,7 +165,7 @@ App::DocumentObjectExecReturn *Revolution::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); if (std::string(e->GetMessageString()) == "TopoDS::Face") return new App::DocumentObjectExecReturn("Could not create face from sketch.\n" "Intersecting sketch entities in a sketch are not allowed."); diff --git a/src/Mod/PartDesign/App/FeatureTransformed.cpp b/src/Mod/PartDesign/App/FeatureTransformed.cpp index 300bbfdfef..69d23c9c12 100644 --- a/src/Mod/PartDesign/App/FeatureTransformed.cpp +++ b/src/Mod/PartDesign/App/FeatureTransformed.cpp @@ -289,7 +289,7 @@ App::DocumentObjectExecReturn *Transformed::execute(void) } catch (Standard_Failure) { // Note: Ignoring this failure is probably pointless because if the intersection check fails, the later // fuse operation of the transformation result will also fail - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); std::string msg("Transformation: Intersection check failed"); if (e->GetMessageString() != NULL) msg += std::string(": '") + e->GetMessageString() + "'"; diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 72a69de8c0..489382823b 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -1520,7 +1520,7 @@ struct ShapeInfo{ // PointProjectionFailed. Why?? Standard_Real first,last; - const Handle_Geom_Curve & curve = BRep_Tool::Curve(edge, first, last); + const Handle(Geom_Curve) & curve = BRep_Tool::Curve(edge, first, last); pt = curve->Value(last); bool reversed; if(pprev.Distance(pt)second); } - Handle_Geom_BSplineSurface spline = new Geom_BSplineSurface(poles,weights, + Handle(Geom_BSplineSurface) spline = new Geom_BSplineSurface(poles,weights, uKnotArray, vKnotArray, uMultArray, vMultArray, uDegree, vDegree, uPeriodic, vPeriodic); return spline; #else - return Handle_Geom_BSplineSurface(); + return Handle(Geom_BSplineSurface)(); #endif } #endif // HAVE_PCL_OPENNURBS diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 7159c05356..aebe0fc3d2 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -595,9 +595,9 @@ bool SketchObject::isSupportedGeometry(const Part::Geometry *geo) const return true; } if (geo->getTypeId() == Part::GeomTrimmedCurve::getClassTypeId()) { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast(geo->handle()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(trim->BasisCurve()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(trim->BasisCurve()); + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast(geo->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(trim->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(trim->BasisCurve()); if (!circle.IsNull() || !ellipse.IsNull()) { return true; } @@ -4063,7 +4063,7 @@ bool SketchObject::increaseBSplineDegree(int GeoId, int degreeincrement /*= 1*/) const Part::GeomBSplineCurve *bsp = static_cast(geo); - const Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast(bsp->handle()); + const Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast(bsp->handle()); Part::GeomBSplineCurve *bspline = new Part::GeomBSplineCurve(curve); @@ -4255,9 +4255,9 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m //#2 0x7f4b033f9582 in Geom_BSplineCurve::ValidateCache(double) from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0x202 //#3 0x7f4b033f2a7e in Geom_BSplineCurve::D0(double, gp_Pnt&) const from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0xde //#4 0x7f4b033de1b5 in Geom_Curve::Value(double) const from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0x25 - //#5 0x7f4b03423d73 in GeomLProp_CurveTool::Value(Handle_Geom_Curve const&, double, gp_Pnt&) from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0x13 + //#5 0x7f4b03423d73 in GeomLProp_CurveTool::Value(Handle(Geom_Curve) const&, double, gp_Pnt&) from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0x13 //#6 0x7f4b03427175 in GeomLProp_CLProps::SetParameter(double) from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0x75 - //#7 0x7f4b0342727d in GeomLProp_CLProps::GeomLProp_CLProps(Handle_Geom_Curve const&, double, int, double) from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0xcd + //#7 0x7f4b0342727d in GeomLProp_CLProps::GeomLProp_CLProps(Handle(Geom_Curve) const&, double, int, double) from /usr/lib/x86_64-linux-gnu/libTKG3d.so.10+0xcd //#8 0x7f4b11924b53 in Part::GeomCurve::pointAtParameter(double) const from /home/abdullah/github/freecad-build/Mod/Part/Part.so+0xa7 @@ -4758,7 +4758,7 @@ void SketchObject::rebuildExternalGeometry(void) refSubShape = refShape.getSubShape(SubElement.c_str()); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } else if (Obj->getTypeId().isDerivedFrom(App::Plane::getClassTypeId())) { @@ -4843,8 +4843,8 @@ void SketchObject::rebuildExternalGeometry(void) } else { Part::GeomArcOfCircle* gArc = new Part::GeomArcOfCircle(); - Handle_Geom_Curve hCircle = new Geom_Circle(circle); - Handle_Geom_TrimmedCurve tCurve = new Geom_TrimmedCurve(hCircle, curve.FirstParameter(), + Handle(Geom_Curve) hCircle = new Geom_Circle(circle); + Handle(Geom_TrimmedCurve) tCurve = new Geom_TrimmedCurve(hCircle, curve.FirstParameter(), curve.LastParameter()); gArc->setHandle(tCurve); gArc->Construction = true; @@ -4904,8 +4904,8 @@ void SketchObject::rebuildExternalGeometry(void) } else { Part::GeomArcOfCircle* arc = new Part::GeomArcOfCircle(); - Handle_Geom_Curve curve = new Geom_Circle(c); - Handle_Geom_TrimmedCurve tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), + Handle(Geom_Curve) curve = new Geom_Circle(c); + Handle(Geom_TrimmedCurve) tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), projCurve.LastParameter()); arc->setHandle(tCurve); arc->Construction = true; @@ -4924,7 +4924,7 @@ void SketchObject::rebuildExternalGeometry(void) gp_Pnt p2 = projCurve.Value(splits(2)); gp_Pnt p3 = projCurve.Value(0.5 * (splits(1) + splits(2))); GC_MakeCircle circleMaker(p1, p2, p3); - Handle_Geom_Circle circ = circleMaker.Value(); + Handle(Geom_Circle) circ = circleMaker.Value(); Part::GeomCircle* circle = new Part::GeomCircle(); circle->setRadius(circ->Radius()); gp_Pnt center = circ->Axis().Location(); @@ -4958,8 +4958,8 @@ void SketchObject::rebuildExternalGeometry(void) } else { Part::GeomArcOfHyperbola* aoh = new Part::GeomArcOfHyperbola(); - Handle_Geom_Curve curve = new Geom_Hyperbola(e); - Handle_Geom_TrimmedCurve tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), + Handle(Geom_Curve) curve = new Geom_Hyperbola(e); + Handle(Geom_TrimmedCurve) tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), projCurve.LastParameter()); aoh->setHandle(tCurve); aoh->Construction = true; @@ -4985,8 +4985,8 @@ void SketchObject::rebuildExternalGeometry(void) } else { Part::GeomArcOfParabola* aop = new Part::GeomArcOfParabola(); - Handle_Geom_Curve curve = new Geom_Parabola(e); - Handle_Geom_TrimmedCurve tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), + Handle(Geom_Curve) curve = new Geom_Parabola(e); + Handle(Geom_TrimmedCurve) tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), projCurve.LastParameter()); aop->setHandle(tCurve); aop->Construction = true; @@ -5005,15 +5005,15 @@ void SketchObject::rebuildExternalGeometry(void) if (P1.SquareDistance(P2) < Precision::Confusion()) { Part::GeomEllipse* ellipse = new Part::GeomEllipse(); - Handle_Geom_Ellipse curve = new Geom_Ellipse(e); + Handle(Geom_Ellipse) curve = new Geom_Ellipse(e); ellipse->setHandle(curve); ellipse->Construction = true; ExternalGeo.push_back(ellipse); } else { Part::GeomArcOfEllipse* aoe = new Part::GeomArcOfEllipse(); - Handle_Geom_Curve curve = new Geom_Ellipse(e); - Handle_Geom_TrimmedCurve tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), + Handle(Geom_Curve) curve = new Geom_Ellipse(e); + Handle(Geom_TrimmedCurve) tCurve = new Geom_TrimmedCurve(curve, projCurve.FirstParameter(), projCurve.LastParameter()); aoe->setHandle(tCurve); aoe->Construction = true; @@ -5027,7 +5027,7 @@ void SketchObject::rebuildExternalGeometry(void) } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Base::Exception(e->GetMessageString()); } } diff --git a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp index 6e73ef0b6b..8ebde17e82 100644 --- a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp +++ b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp @@ -85,9 +85,9 @@ PyObject* SketchObjectPy::addGeometry(PyObject *args) int ret; // An arc created with Part.Arc will be converted into a Part.ArcOfCircle if (geo->getTypeId() == Part::GeomTrimmedCurve::getClassTypeId()) { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast(geo->handle()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(trim->BasisCurve()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(trim->BasisCurve()); + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast(geo->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(trim->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(trim->BasisCurve()); if (!circle.IsNull()) { // create the definition struct for that geom Part::GeomArcOfCircle aoc; @@ -137,9 +137,9 @@ PyObject* SketchObjectPy::addGeometry(PyObject *args) // An arc created with Part.Arc will be converted into a Part.ArcOfCircle if (geo->getTypeId() == Part::GeomTrimmedCurve::getClassTypeId()) { - Handle_Geom_TrimmedCurve trim = Handle_Geom_TrimmedCurve::DownCast(geo->handle()); - Handle_Geom_Circle circle = Handle_Geom_Circle::DownCast(trim->BasisCurve()); - Handle_Geom_Ellipse ellipse = Handle_Geom_Ellipse::DownCast(trim->BasisCurve()); + Handle(Geom_TrimmedCurve) trim = Handle(Geom_TrimmedCurve)::DownCast(geo->handle()); + Handle(Geom_Circle) circle = Handle(Geom_Circle)::DownCast(trim->BasisCurve()); + Handle(Geom_Ellipse) ellipse = Handle(Geom_Ellipse)::DownCast(trim->BasisCurve()); if (!circle.IsNull()) { // create the definition struct for that geom boost::shared_ptr aoc(new Part::GeomArcOfCircle()); diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index aa069b2fa3..b363e0099f 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -3265,7 +3265,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer } else if ((*it)->getTypeId() == Part::GeomCircle::getClassTypeId()) { // add a circle const Part::GeomCircle *circle = static_cast(*it); - Handle_Geom_Circle curve = Handle_Geom_Circle::DownCast(circle->handle()); + Handle(Geom_Circle) curve = Handle(Geom_Circle)::DownCast(circle->handle()); int countSegments = stdcountsegments; Base::Vector3d center = circle->getCenter(); @@ -3284,7 +3284,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer } else if ((*it)->getTypeId() == Part::GeomEllipse::getClassTypeId()) { // add an ellipse const Part::GeomEllipse *ellipse = static_cast(*it); - Handle_Geom_Ellipse curve = Handle_Geom_Ellipse::DownCast(ellipse->handle()); + Handle(Geom_Ellipse) curve = Handle(Geom_Ellipse)::DownCast(ellipse->handle()); int countSegments = stdcountsegments; Base::Vector3d center = ellipse->getCenter(); @@ -3303,7 +3303,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer } else if ((*it)->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()) { // add an arc const Part::GeomArcOfCircle *arc = static_cast(*it); - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(arc->handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(arc->handle()); double startangle, endangle; arc->getRange(startangle, endangle, /*emulateCCW=*/false); @@ -3336,7 +3336,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer } else if ((*it)->getTypeId() == Part::GeomArcOfEllipse::getClassTypeId()) { // add an arc const Part::GeomArcOfEllipse *arc = static_cast(*it); - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(arc->handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(arc->handle()); double startangle, endangle; arc->getRange(startangle, endangle, /*emulateCCW=*/false); @@ -3369,7 +3369,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer } else if ((*it)->getTypeId() == Part::GeomArcOfHyperbola::getClassTypeId()) { const Part::GeomArcOfHyperbola *aoh = dynamic_cast(*it); - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(aoh->handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(aoh->handle()); double startangle, endangle; aoh->getRange(startangle, endangle, /*emulateCCW=*/true); @@ -3402,7 +3402,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer } else if ((*it)->getTypeId() == Part::GeomArcOfParabola::getClassTypeId()) { const Part::GeomArcOfParabola *aop = dynamic_cast(*it); - Handle_Geom_TrimmedCurve curve = Handle_Geom_TrimmedCurve::DownCast(aop->handle()); + Handle(Geom_TrimmedCurve) curve = Handle(Geom_TrimmedCurve)::DownCast(aop->handle()); double startangle, endangle; aop->getRange(startangle, endangle, /*emulateCCW=*/true); @@ -3436,7 +3436,7 @@ void ViewProviderSketch::draw(bool temp /*=false*/, bool rebuildinformationlayer else if ((*it)->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) { // add a bspline bsplineGeoIds.push_back(GeoId); const Part::GeomBSplineCurve *spline = static_cast(*it); - Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast(spline->handle()); + Handle(Geom_BSplineCurve) curve = Handle(Geom_BSplineCurve)::DownCast(spline->handle()); Base::Vector3d startp = spline->getStartPoint(); Base::Vector3d endp = spline->getEndPoint(); diff --git a/src/Mod/Surface/App/FeatureCut.cpp b/src/Mod/Surface/App/FeatureCut.cpp index 6a7acda131..d992797977 100644 --- a/src/Mod/Surface/App/FeatureCut.cpp +++ b/src/Mod/Surface/App/FeatureCut.cpp @@ -97,7 +97,7 @@ App::DocumentObjectExecReturn *Cut::execute(void) return 0; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Surface/App/FeatureFilling.cpp b/src/Mod/Surface/App/FeatureFilling.cpp index 951225b501..9d96a4fa1b 100644 --- a/src/Mod/Surface/App/FeatureFilling.cpp +++ b/src/Mod/Surface/App/FeatureFilling.cpp @@ -249,7 +249,7 @@ App::DocumentObjectExecReturn *Filling::execute(void) return App::DocumentObject::StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp index 3d0983af1b..0e8818cf66 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp @@ -78,8 +78,8 @@ void ShapeValidator::checkEdge(const TopoDS_Shape& shape) TopLoc_Location heloc; // this will be output Standard_Real u0;// contains output Standard_Real u1;// contains output - Handle_Geom_Curve c_geom = BRep_Tool::Curve(etmp,heloc,u0,u1); //The geometric curve - Handle_Geom_BezierCurve bez_geom = Handle_Geom_BezierCurve::DownCast(c_geom); //Try to get Bezier curve + Handle(Geom_Curve) c_geom = BRep_Tool::Curve(etmp,heloc,u0,u1); //The geometric curve + Handle(Geom_BezierCurve) bez_geom = Handle(Geom_BezierCurve)::DownCast(c_geom); //Try to get Bezier curve // if not a Bezier then try to create a B-spline surface from the edges if (bez_geom.IsNull()) { @@ -167,7 +167,7 @@ App::DocumentObjectExecReturn *GeomFillSurface::execute(void) return new App::DocumentObjectExecReturn("A curve was not a b-spline and could not be converted into one."); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } @@ -233,7 +233,7 @@ bool GeomFillSurface::getWire(TopoDS_Wire& aWire) return validator.isBezier(); } -void GeomFillSurface::createFace(const Handle_Geom_BoundedSurface &aSurface) +void GeomFillSurface::createFace(const Handle(Geom_BoundedSurface) &aSurface) { BRepBuilderAPI_MakeFace aFaceBuilder; Standard_Real u1, u2, v1, v2; @@ -254,7 +254,7 @@ void GeomFillSurface::createFace(const Handle_Geom_BoundedSurface &aSurface) void GeomFillSurface::createBezierSurface(TopoDS_Wire& aWire) { - std::vector crvs; + std::vector crvs; crvs.reserve(4); Standard_Real u1, u2; // contains output @@ -262,8 +262,8 @@ void GeomFillSurface::createBezierSurface(TopoDS_Wire& aWire) for (; anExp.More(); anExp.Next()) { const TopoDS_Edge hedge = TopoDS::Edge (anExp.Current()); TopLoc_Location heloc; // this will be output - Handle_Geom_Curve c_geom = BRep_Tool::Curve(hedge, heloc, u1, u2); //The geometric curve - Handle_Geom_BezierCurve b_geom = Handle_Geom_BezierCurve::DownCast(c_geom); //Try to get Bezier curve + Handle(Geom_Curve) c_geom = BRep_Tool::Curve(hedge, heloc, u1, u2); //The geometric curve + Handle(Geom_BezierCurve) b_geom = Handle(Geom_BezierCurve)::DownCast(c_geom); //Try to get Bezier curve if (!b_geom.IsNull()) { gp_Trsf transf = heloc.Transformation(); @@ -295,15 +295,15 @@ void GeomFillSurface::createBezierSurface(TopoDS_Wire& aWire) void GeomFillSurface::createBSplineSurface(TopoDS_Wire& aWire) { - std::vector crvs; + std::vector crvs; crvs.reserve(4); Standard_Real u1, u2; // contains output TopExp_Explorer anExp (aWire, TopAbs_EDGE); for (; anExp.More(); anExp.Next()) { const TopoDS_Edge& edge = TopoDS::Edge (anExp.Current()); TopLoc_Location heloc; // this will be output - Handle_Geom_Curve c_geom = BRep_Tool::Curve(edge, heloc, u1, u2); //The geometric curve - Handle_Geom_BSplineCurve b_geom = Handle_Geom_BSplineCurve::DownCast(c_geom); //Try to get BSpline curve + Handle(Geom_Curve) c_geom = BRep_Tool::Curve(edge, heloc, u1, u2); //The geometric curve + Handle(Geom_BSplineCurve) b_geom = Handle(Geom_BSplineCurve)::DownCast(c_geom); //Try to get BSpline curve if (!b_geom.IsNull()) { gp_Trsf transf = heloc.Transformation(); @@ -317,8 +317,8 @@ void GeomFillSurface::createBSplineSurface(TopoDS_Wire& aWire) TopoDS_Edge nurbs = TopoDS::Edge(mkNurbs.Shape()); // avoid copying TopLoc_Location heloc2; // this will be output - Handle_Geom_Curve c_geom2 = BRep_Tool::Curve(nurbs, heloc2, u1, u2); //The geometric curve - Handle_Geom_BSplineCurve b_geom2 = Handle_Geom_BSplineCurve::DownCast(c_geom2); //Try to get BSpline curve + Handle(Geom_Curve) c_geom2 = BRep_Tool::Curve(nurbs, heloc2, u1, u2); //The geometric curve + Handle(Geom_BSplineCurve) b_geom2 = Handle(Geom_BSplineCurve)::DownCast(c_geom2); //Try to get BSpline curve if (!b_geom2.IsNull()) { gp_Trsf transf = heloc2.Transformation(); @@ -329,7 +329,7 @@ void GeomFillSurface::createBSplineSurface(TopoDS_Wire& aWire) else { // BRepBuilderAPI_NurbsConvert failed, try ShapeConstruct_Curve now ShapeConstruct_Curve scc; - Handle_Geom_BSplineCurve spline = scc.ConvertToBSpline(c_geom, u1, u2, Precision::Confusion()); + Handle(Geom_BSplineCurve) spline = scc.ConvertToBSpline(c_geom, u1, u2, Precision::Confusion()); if (spline.IsNull()) Standard_Failure::Raise("A curve was not a b-spline and could not be converted into one."); gp_Trsf transf = heloc2.Transformation(); diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.h b/src/Mod/Surface/App/FeatureGeomFillSurface.h index 4e3762ce4e..a47d1e737f 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.h +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.h @@ -78,7 +78,7 @@ protected: GeomFill_FillingStyle getFillingStyle(); /// True means that all edges have Bezier curves bool getWire(TopoDS_Wire& aWire); - void createFace(const Handle_Geom_BoundedSurface &aSurface); + void createFace(const Handle(Geom_BoundedSurface) &aSurface); void createBezierSurface(TopoDS_Wire& aWire); void createBSplineSurface(TopoDS_Wire& aWire); diff --git a/src/Mod/Surface/App/FeatureSewing.cpp b/src/Mod/Surface/App/FeatureSewing.cpp index 5c4955664f..4b25a7f10f 100644 --- a/src/Mod/Surface/App/FeatureSewing.cpp +++ b/src/Mod/Surface/App/FeatureSewing.cpp @@ -103,7 +103,7 @@ App::DocumentObjectExecReturn *Sewing::execute(void) return StdReturn; } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); return new App::DocumentObjectExecReturn(e->GetMessageString()); } } diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index a684bee4b0..eb49f06b28 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -136,7 +136,7 @@ private: } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Part::PartExceptionOCCError, e->GetMessageString()); } @@ -194,7 +194,7 @@ private: } } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Part::PartExceptionOCCError, e->GetMessageString()); } @@ -258,7 +258,7 @@ private: edgeList = DrawProjectSplit::getEdgesForWalker(shape,scale,dir); } catch (Standard_Failure) { - Handle_Standard_Failure e = Standard_Failure::Caught(); + Handle(Standard_Failure) e = Standard_Failure::Caught(); throw Py::Exception(Part::PartExceptionOCCError, e->GetMessageString()); } diff --git a/src/Mod/TechDraw/App/DrawProjectSplit.cpp b/src/Mod/TechDraw/App/DrawProjectSplit.cpp index 15741db62e..1cc183af39 100644 --- a/src/Mod/TechDraw/App/DrawProjectSplit.cpp +++ b/src/Mod/TechDraw/App/DrawProjectSplit.cpp @@ -261,7 +261,7 @@ bool DrawProjectSplit::isOnEdge(TopoDS_Edge e, TopoDS_Vertex v, double& param, b } else if (dist < Precision::Confusion()) { const gp_Pnt pt = BRep_Tool::Pnt(v); //have to duplicate method 3 to get param BRepAdaptor_Curve adapt(e); - const Handle_Geom_Curve c = adapt.Curve().Curve(); + const Handle(Geom_Curve) c = adapt.Curve().Curve(); double maxDist = 0.000001; //magic number. less than this gives false positives. //bool found = (void) GeomLib_Tool::Parameter(c,pt,maxDist,param); //already know point it on curve @@ -334,7 +334,7 @@ std::vector DrawProjectSplit::split1Edge(TopoDS_Edge e, std::vector } BRepAdaptor_Curve adapt(e); - Handle_Geom_Curve c = adapt.Curve().Curve(); + Handle(Geom_Curve) c = adapt.Curve().Curve(); double first = BRepLProp_CurveTool::FirstParameter(adapt); double last = BRepLProp_CurveTool::LastParameter(adapt); if (first > last) { diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp index ffd126f84e..6b04ef377a 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.cpp +++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp @@ -249,7 +249,7 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) extractFaces(); } catch (Standard_Failure) { - Handle_Standard_Failure e4 = Standard_Failure::Caught(); + Handle(Standard_Failure) e4 = Standard_Failure::Caught(); Base::Console().Log("LOG - DVD::execute - extractFaces failed for %s - %s **\n",getNameInDocument(),e4->GetMessageString()); return new App::DocumentObjectExecReturn(e4->GetMessageString()); } @@ -258,7 +258,7 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void) #endif //#if MOD_TECHDRAW_HANDLE_FACES } catch (Standard_Failure) { - Handle_Standard_Failure e1 = Standard_Failure::Caught(); + Handle(Standard_Failure) e1 = Standard_Failure::Caught(); Base::Console().Log("LOG - DVD::execute - base shape failed for %s - %s **\n",getNameInDocument(),e1->GetMessageString()); return new App::DocumentObjectExecReturn(e1->GetMessageString()); } diff --git a/src/Mod/TechDraw/App/DrawViewMulti.cpp b/src/Mod/TechDraw/App/DrawViewMulti.cpp index a4ac2c5ec9..bb1d7716d5 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.cpp +++ b/src/Mod/TechDraw/App/DrawViewMulti.cpp @@ -154,7 +154,7 @@ App::DocumentObjectExecReturn *DrawViewMulti::execute(void) #endif //#if MOD_TECHDRAW_HANDLE_FACES } catch (Standard_Failure) { - Handle_Standard_Failure e1 = Standard_Failure::Caught(); + Handle(Standard_Failure) e1 = Standard_Failure::Caught(); Base::Console().Log("LOG - DVM::execute - projection failed for %s - %s **\n",getNameInDocument(),e1->GetMessageString()); return new App::DocumentObjectExecReturn(e1->GetMessageString()); } diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index a3981a1977..c9588b8490 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -192,7 +192,7 @@ App::DocumentObjectExecReturn *DrawViewPart::execute(void) extractFaces(); } catch (Standard_Failure) { - Handle_Standard_Failure e4 = Standard_Failure::Caught(); + Handle(Standard_Failure) e4 = Standard_Failure::Caught(); Base::Console().Log("LOG - DVP::execute - extractFaces failed for %s - %s **\n",getNameInDocument(),e4->GetMessageString()); return new App::DocumentObjectExecReturn(e4->GetMessageString()); } diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index 135bedb690..eb232361e0 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -265,7 +265,7 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void) #endif //#if MOD_TECHDRAW_HANDLE_FACES } catch (Standard_Failure) { - Handle_Standard_Failure e1 = Standard_Failure::Caught(); + Handle(Standard_Failure) e1 = Standard_Failure::Caught(); Base::Console().Log("LOG - DVS::execute - base shape failed for %s - %s **\n",getNameInDocument(),e1->GetMessageString()); return new App::DocumentObjectExecReturn(e1->GetMessageString()); } @@ -296,7 +296,7 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void) sectionFaces = newFaces; } catch (Standard_Failure) { - Handle_Standard_Failure e2 = Standard_Failure::Caught(); + Handle(Standard_Failure) e2 = Standard_Failure::Caught(); Base::Console().Log("LOG - DVS::execute - failed building section faces for %s - %s **\n",getNameInDocument(),e2->GetMessageString()); return new App::DocumentObjectExecReturn(e2->GetMessageString()); } diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp index 84418050fa..c24dd13658 100644 --- a/src/Mod/TechDraw/App/Geometry.cpp +++ b/src/Mod/TechDraw/App/Geometry.cpp @@ -216,7 +216,7 @@ BaseGeom* BaseGeom::baseFactory(TopoDS_Edge edge) } } break; case GeomAbs_BezierCurve: { - Handle_Geom_BezierCurve bez = adapt.Bezier(); + Handle(Geom_BezierCurve) bez = adapt.Bezier(); //if (bez->Degree() < 4) { result = new BezierSegment(edge); //} @@ -401,7 +401,7 @@ Generic::Generic(const TopoDS_Edge &e) BRepLib::BuildCurve3d(occEdge); TopLoc_Location location; - Handle_Poly_Polygon3D polygon = BRep_Tool::Polygon3D(occEdge, location); + Handle(Poly_Polygon3D) polygon = BRep_Tool::Polygon3D(occEdge, location); if (!polygon.IsNull()) { const TColgp_Array1OfPnt &nodes = polygon->Nodes(); @@ -429,7 +429,7 @@ BSpline::BSpline(const TopoDS_Edge &e) geomType = BSPLINE; BRepAdaptor_Curve c(e); occEdge = e; - Handle_Geom_BSplineCurve spline = c.BSpline(); + Handle(Geom_BSplineCurve) spline = c.BSpline(); bool fail = false; double f,l; gp_Pnt s,m,ePt; @@ -440,7 +440,7 @@ BSpline::BSpline(const TopoDS_Edge &e) if (spline->Degree() > 3) { //if spline is too complex, approximate it Standard_Real tol3D = 0.001; //1/1000 of a mm? screen can't resolve this Standard_Integer maxDegree = 3, maxSegment = 10; - Handle_BRepAdaptor_HCurve hCurve = new BRepAdaptor_HCurve(c); + Handle(BRepAdaptor_HCurve) hCurve = new BRepAdaptor_HCurve(c); // approximate the curve using a tolerance //Approx_Curve3d approx(hCurve, tol3D, GeomAbs_C2, maxSegment, maxDegree); //gives degree == 5 ==> too many poles ==> buffer overrun Approx_Curve3d approx(hCurve, tol3D, GeomAbs_C0, maxSegment, maxDegree); @@ -478,7 +478,7 @@ BSpline::BSpline(const TopoDS_Edge &e) } else { for (Standard_Integer i = 1; i <= crt.NbArcs(); ++i) { BezierSegment tempSegment; - Handle_Geom_BezierCurve bezier = crt.Arc(i); + Handle(Geom_BezierCurve) bezier = crt.Arc(i); if (bezier->Degree() > 3) { Base::Console().Log("Geometry::BSpline - converted curve degree > 3\n"); } @@ -499,7 +499,7 @@ bool BSpline::isLine() { bool result = false; BRepAdaptor_Curve c(occEdge); - Handle_Geom_BSplineCurve spline = c.BSpline(); + Handle(Geom_BSplineCurve) spline = c.BSpline(); if (spline->NbPoles() == 2) { result = true; } @@ -511,7 +511,7 @@ BezierSegment::BezierSegment(const TopoDS_Edge &e) geomType = BEZIER; occEdge = e; BRepAdaptor_Curve c(e); - Handle_Geom_BezierCurve bez = c.Bezier(); + Handle(Geom_BezierCurve) bez = c.Bezier(); poles = bez->NbPoles(); degree = bez->Degree(); if (poles > 4) { diff --git a/src/Mod/TechDraw/App/GeometryObject.cpp b/src/Mod/TechDraw/App/GeometryObject.cpp index 3e5dc53adb..96217c8016 100644 --- a/src/Mod/TechDraw/App/GeometryObject.cpp +++ b/src/Mod/TechDraw/App/GeometryObject.cpp @@ -154,7 +154,7 @@ void GeometryObject::projectShape(const TopoDS_Shape& input, auto start = chrono::high_resolution_clock::now(); - Handle_HLRBRep_Algo brep_hlr = NULL; + Handle(HLRBRep_Algo) brep_hlr = NULL; try { brep_hlr = new HLRBRep_Algo(); brep_hlr->Add(input, m_isoCount);