From 47e260a9746423b69d6f29e941c845d851da64c7 Mon Sep 17 00:00:00 2001 From: asl Date: Mon, 26 Jun 2017 11:49:43 +0300 Subject: [PATCH] 0023450: Fields are not displayed in GEOM + IPAL54211: SALOME-8.3.0: Geometry fields are displayed incorrectly + Clean-up deprecated OCCT-related code --- .../AdvancedEngine_DividedDiskDriver.cxx | 8 +- .../AdvancedEngine_DividedDiskDriver.hxx | 8 +- .../AdvancedEngine_IOperations.cxx | 2 - .../AdvancedEngine_PipeTShapeDriver.cxx | 8 +- .../AdvancedEngine_PipeTShapeDriver.hxx | 8 +- .../AdvancedEngine_SmoothingSurfaceDriver.cxx | 8 +- .../AdvancedEngine_SmoothingSurfaceDriver.hxx | 8 +- src/BREPPlugin/BREPPlugin_ExportDriver.cxx | 4 +- src/BREPPlugin/BREPPlugin_ExportDriver.hxx | 8 +- src/BREPPlugin/BREPPlugin_ImportDriver.cxx | 8 +- src/BREPPlugin/BREPPlugin_ImportDriver.hxx | 8 +- src/BlockFix/BlockFix_BlockFixAPI.cxx | 4 +- src/BlockFix/BlockFix_BlockFixAPI.hxx | 10 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 2 +- .../BlockFix_PeriodicSurfaceModifier.hxx | 4 +- src/BlockFix/BlockFix_SphereSpaceModifier.cxx | 2 +- src/BlockFix/BlockFix_SphereSpaceModifier.hxx | 4 +- src/BlockFix/BlockFix_UnionFaces.cxx | 2 - src/CurveCreator/CurveCreator_Utils.cxx | 6 - src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 6 +- .../EntityGUI_FeatureDetectorDlg.cxx | 3 +- src/GEOM/CMakeLists.txt | 6 +- src/GEOM/GEOM_Application.cxx | 18 +- src/GEOM/GEOM_Application.hxx | 7 +- src/GEOM/GEOM_BaseDriver.cxx | 2 +- src/GEOM/GEOM_BaseDriver.hxx | 10 +- src/GEOM/GEOM_BaseObject.cxx | 2 +- src/GEOM/GEOM_BaseObject.hxx | 2 +- src/GEOM/GEOM_Engine.cxx | 12 - src/GEOM/GEOM_Engine.hxx | 2 - src/GEOM/GEOM_Field.cxx | 4 +- src/GEOM/GEOM_Field.hxx | 4 +- src/GEOM/GEOM_Function.cxx | 4 +- src/GEOM/GEOM_Function.hxx | 4 +- src/GEOM/GEOM_Object.cxx | 2 +- src/GEOM/GEOM_Object.hxx | 2 +- src/GEOM/GEOM_PythonDump.hxx | 2 - src/GEOM/GEOM_Solver.cxx | 4 - src/GEOM/GEOM_SubShapeDriver.cxx | 8 +- src/GEOM/GEOM_SubShapeDriver.hxx | 8 +- src/GEOMAlgo/FILES | 2 - src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx | 46 +-- src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx | 69 +--- src/GEOMAlgo/GEOMAlgo_Clsf.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Clsf.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx | 2 - src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 5 - src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx | 12 - src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 6 - src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx | 17 - src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx | 19 - src/GEOMAlgo/GEOMAlgo_HAlgo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_HAlgo.hxx | 10 +- src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx | 18 - src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx | 16 - src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 29 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 64 ---- src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx | 6 - src/GEOMAlgo/GEOMAlgo_Splitter.cxx | 6 - src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 14 - src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 16 - src/GEOMFiltersSelection/GEOM_OCCFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 4 +- src/GEOMGUI/GEOMGUI_OCCSelector.cxx | 6 - src/GEOMGUI/GEOM_Displayer.cxx | 145 ++------ src/GEOMGUI/GEOM_Displayer.h | 21 +- src/GEOMGUI/GeometryGUI.cxx | 1 - src/GEOMGUI/GeometryGUI.h | 2 - src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ArcDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 4 - src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_BlockDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 40 +-- src/GEOMImpl/GEOMImpl_BooleanDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_BoxDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_BoxDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ChamferDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_CircleDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_CircleDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ConeDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ConeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_CopyDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_CopyDriver.hxx | 10 +- src/GEOMImpl/GEOMImpl_CylinderDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_CylinderDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_DiskDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_DiskDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_EllipseDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_EllipseDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ExportDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FaceDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_FaceDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FieldDriver.cxx | 4 +- src/GEOMImpl/GEOMImpl_FieldDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet1d.cxx | 28 -- src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_FilletDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_FillingDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_GlueDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_HealingDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 6 - src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IInsertOperations.hxx | 2 - src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 33 -- .../GEOMImpl_ITransformOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ImportDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_LineDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_LineDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_MarkerDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_MarkerDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_MeasureDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_MirrorDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_MirrorDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_OffsetDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 18 +- src/GEOMImpl/GEOMImpl_PartitionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PipeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PipePathDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PipePathDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PlaneDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_PlaneDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PointDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PolylineDriver.cxx | 14 +- src/GEOMImpl/GEOMImpl_PolylineDriver.hxx | 10 +- src/GEOMImpl/GEOMImpl_PositionDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PositionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PrismDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx | 12 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_RotateDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_RotateDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ScaleDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ScaleDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 12 +- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_SketcherDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_SketcherDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_SphereDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_SphereDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_SplineDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_TorusDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_TranslateDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_TranslateDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_VectorDriver.hxx | 8 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 2 - src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 2 - src/GEOMUtils/GEOMUtils.cxx | 4 - src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx | 2 +- src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx | 2 +- src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx | 4 - src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx | 2 - src/GEOM_I/GEOM_BaseObject_i.cc | 10 +- src/GEOM_I/GEOM_BaseObject_i.hh | 6 +- src/GEOM_I/GEOM_Field_i.cc | 24 +- src/GEOM_I/GEOM_Field_i.hh | 16 +- src/GEOM_I/GEOM_GEOM_I.hxx | 17 +- src/GEOM_I/GEOM_Gen_i.cc | 101 +++--- src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 206 +++++------ src/GEOM_I/GEOM_IBasicOperations_i.cc | 114 +++--- src/GEOM_I/GEOM_IBlocksOperations_i.cc | 176 +++++----- src/GEOM_I/GEOM_IBooleanOperations_i.cc | 30 +- src/GEOM_I/GEOM_ICurvesOperations_i.cc | 104 +++--- src/GEOM_I/GEOM_IFieldOperations_i.cc | 16 +- src/GEOM_I/GEOM_IGroupOperations_i.cc | 60 ++-- src/GEOM_I/GEOM_IHealingOperations_i.cc | 68 ++-- src/GEOM_I/GEOM_IInsertOperations_i.cc | 17 +- src/GEOM_I/GEOM_ILocalOperations_i.cc | 64 ++-- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 88 ++--- src/GEOM_I/GEOM_IOperations_i.cc | 18 +- src/GEOM_I/GEOM_IOperations_i.hh | 10 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 324 +++++++++--------- src/GEOM_I/GEOM_ITransformOperations_i.cc | 210 ++++++------ src/GEOM_I/GEOM_Object_i.cc | 14 +- src/GEOM_I/GEOM_Object_i.hh | 6 +- src/IGESPlugin/IGESPlugin_ExportDriver.cxx | 4 +- src/IGESPlugin/IGESPlugin_ExportDriver.hxx | 8 +- src/IGESPlugin/IGESPlugin_ImportDriver.cxx | 8 +- src/IGESPlugin/IGESPlugin_ImportDriver.hxx | 8 +- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 2 - src/MeasureGUI/MeasureGUI_DimensionFilter.cxx | 2 +- src/MeasureGUI/MeasureGUI_DimensionFilter.h | 5 +- .../MeasureGUI_DimensionInteractor.cxx | 3 - src/OBJECT/GEOM_AISDimension.cxx | 6 +- src/OBJECT/GEOM_AISDimension.hxx | 8 +- src/OBJECT/GEOM_AISShape.cxx | 55 +-- src/OBJECT/GEOM_AISShape.hxx | 2 +- src/OBJECT/GEOM_AISTrihedron.cxx | 2 +- src/OBJECT/GEOM_AISTrihedron.hxx | 2 +- src/OBJECT/GEOM_AISVector.cxx | 2 +- src/OBJECT/GEOM_AISVector.hxx | 2 +- src/OBJECT/GEOM_Annotation.cxx | 33 -- src/OBJECT/GEOM_Annotation.hxx | 6 - src/OBJECT/GEOM_InteractiveObject.cxx | 2 +- src/OBJECT/GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.cxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.hxx | 2 +- src/STEPPlugin/STEPPlugin_ExportDriver.cxx | 4 +- src/STEPPlugin/STEPPlugin_ExportDriver.hxx | 8 +- src/STEPPlugin/STEPPlugin_ImportDriver.cxx | 8 +- src/STEPPlugin/STEPPlugin_ImportDriver.hxx | 8 +- src/STLPlugin/STLPlugin_ExportDriver.cxx | 18 +- src/STLPlugin/STLPlugin_ExportDriver.hxx | 8 +- src/STLPlugin/STLPlugin_ImportDriver.cxx | 8 +- src/STLPlugin/STLPlugin_ImportDriver.hxx | 8 +- .../ShHealOper_ChangeOrientation.hxx | 1 - src/ShHealOper/ShHealOper_CloseContour.hxx | 1 - src/ShHealOper/ShHealOper_FillHoles.cxx | 2 - src/ShHealOper/ShHealOper_FillHoles.hxx | 1 - src/ShHealOper/ShHealOper_RemoveFace.hxx | 1 - .../ShHealOper_RemoveInternalWires.hxx | 1 - src/ShHealOper/ShHealOper_Sewing.hxx | 1 - src/ShHealOper/ShHealOper_SpiltCurve2d.hxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.cxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.hxx | 4 +- src/ShHealOper/ShHealOper_SplitCurve3d.cxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve3d.hxx | 4 +- src/VTKPlugin/VTKPlugin_ExportDriver.cxx | 4 +- src/VTKPlugin/VTKPlugin_ExportDriver.hxx | 8 +- src/XAOPlugin/XAOPlugin_Driver.cxx | 8 +- src/XAOPlugin/XAOPlugin_Driver.hxx | 8 +- 261 files changed, 1352 insertions(+), 2358 deletions(-) diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx index 6b21bd238..0898da702 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx @@ -83,7 +83,7 @@ AdvancedEngine_DividedDiskDriver::AdvancedEngine_DividedDiskDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const +Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -138,11 +138,7 @@ Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -527,4 +523,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx index 2a9c7b60c..9334b5769 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx @@ -41,9 +41,9 @@ public: // Methods PUBLIC // AdvancedEngine_DividedDiskDriver(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_DividedDiskDriver() {}; @@ -56,7 +56,7 @@ private: TopoDS_Shell MakeDiskHexagon (double R, double Ratio) const; TopoDS_Shape MakeDiskSquare (double R, double Ratio) const; - OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver) }; #endif // _AdvancedEngine_DividedDiskDriver_HXX diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index 88bd4a37f..097a1b265 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -27,8 +27,6 @@ #include "AdvancedEngine_SmoothingSurfaceDriver.hxx" #include "AdvancedEngine_ISmoothingSurface.hxx" -#include - #include #include #include diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index 1b890ef36..004c45e50 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx @@ -400,7 +400,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakeQuarterPipeTShape (const doubl //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const +Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -623,11 +623,7 @@ Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -688,4 +684,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx index 236e23d67..b11c6d1cc 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx @@ -36,9 +36,9 @@ public: // Methods PUBLIC // AdvancedEngine_PipeTShapeDriver(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_PipeTShapeDriver() {}; @@ -47,7 +47,7 @@ public: std::vector& params); // Type management // - OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver) private: /*! diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx index 6d4bb52c2..e76ba756f 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx @@ -164,7 +164,7 @@ TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const +Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -222,11 +222,7 @@ Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) co aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -274,4 +270,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx index 4cd035915..707072875 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx @@ -33,9 +33,9 @@ public: // Methods PUBLIC // AdvancedEngine_SmoothingSurfaceDriver(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_SmoothingSurfaceDriver() {}; @@ -44,7 +44,7 @@ public: std::vector& params); // Type management // - OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver) private: TopoDS_Shape MakeSmoothingSurfaceUnClosed (const Handle(TColgp_HArray1OfPnt) &theListOfPoints, diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx index bb27ff186..0fe78abd1 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx @@ -54,7 +54,7 @@ BREPPlugin_ExportDriver::BREPPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer BREPPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -95,4 +95,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx index bcdb47f8f..84b469cc8 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~BREPPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _BREPPlugin_ExportDriver_HXX diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.cxx b/src/BREPPlugin/BREPPlugin_ImportDriver.cxx index 14338dc87..49dea4171 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.cxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.cxx @@ -55,7 +55,7 @@ BREPPlugin_ImportDriver::BREPPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer BREPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -76,11 +76,7 @@ Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -113,4 +109,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx index 08778cbe4..194046f1b 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx @@ -32,14 +32,14 @@ public: ~BREPPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _BREPPlugin_ImportDriver_HXX diff --git a/src/BlockFix/BlockFix_BlockFixAPI.cxx b/src/BlockFix/BlockFix_BlockFixAPI.cxx index 0f3cbe274..c6d6d3221 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.cxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.cxx @@ -30,13 +30,11 @@ #include #include -#include - #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient); //======================================================================= //function : BlockFix_BlockFixAPI diff --git a/src/BlockFix/BlockFix_BlockFixAPI.hxx b/src/BlockFix/BlockFix_BlockFixAPI.hxx index 9de5d7334..c86bacd01 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.hxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.hxx @@ -25,17 +25,15 @@ #include #include +#include #include #include #include -#include -#include +DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, Standard_Transient); -DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared); - -class BlockFix_BlockFixAPI : public MMgt_TShared +class BlockFix_BlockFixAPI : public Standard_Transient { public: Standard_EXPORT BlockFix_BlockFixAPI(); @@ -48,7 +46,7 @@ public: Standard_Integer& OptimumNbFaces(); Standard_EXPORT void Perform(); - OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient) private: Handle(ShapeBuild_ReShape) myContext; diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx index 77f0f11e4..f106d44cf 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx @@ -50,7 +50,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); //======================================================================= //function : BlockFix_PeriodicSurfaceModifier() diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx index 4adaf6f30..1da5e5296 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx @@ -35,8 +35,6 @@ #include #include -#include - class TopoDS_Vertex; class TopoDS_Edge; class TopoDS_Face; @@ -83,7 +81,7 @@ public: const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); - OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification) + DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification) private: Standard_Real myTolerance; diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx index bb9b6fa7a..ace1f9059 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx @@ -56,7 +56,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification); //======================================================================= //function : BlockFix_SphereSpaceModifier diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx index 378e24e0b..57e9727ac 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx @@ -33,8 +33,6 @@ #include #include -#include - class TopoDS_Vertex; class TopoDS_Edge; class TopoDS_Face; @@ -70,7 +68,7 @@ public: const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); Standard_EXPORT Standard_Boolean ForRotation (const TopoDS_Face& F); - OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification) + DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification) private: Standard_Real myTolerance; diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 02765bfb4..b3d92b18f 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -26,8 +26,6 @@ #include -#include - #include #include diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx index 53f68259f..77de8c2d8 100644 --- a/src/CurveCreator/CurveCreator_Utils.cxx +++ b/src/CurveCreator/CurveCreator_Utils.cxx @@ -23,8 +23,6 @@ #include "CurveCreator_Section.hxx" #include "CurveCreator_UtilsICurve.hxx" -#include - #include #include @@ -621,14 +619,10 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); for( aSelection->Init(); aSelection->More(); aSelection->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive(); -#endif Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity ); diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index fd7b86889..aec63c79e 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -28,8 +28,6 @@ #include "EntityGUI_3DSketcherDlg.h" #include "EntityGUI_Widgets.h" -#include - #include #include #include @@ -105,7 +103,7 @@ DEFINE_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject) class AIS_Text:public AIS_InteractiveObject { public: - OCCT_DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject) + DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject) AIS_Text(){}; @@ -147,7 +145,7 @@ protected: Graphic3d_VerticalTextAlignment aVJustification; }; -OCCT_IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject) +IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject) AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& position, Quantity_Color color = Quantity_NOC_YELLOW, diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index bd0a18fc3..7d8b1080e 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -64,7 +64,8 @@ #include #include -#include +#include + #include #include diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt index 4a73c259f..9a34d081b 100755 --- a/src/GEOM/CMakeLists.txt +++ b/src/GEOM/CMakeLists.txt @@ -40,15 +40,13 @@ SET(_link_LIBRARIES ${CAS_TKCDF} ${CAS_TKG3d} ${CAS_TKStdL} + ${CAS_TKStd} + ${CAS_TKBin} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} GEOMSketcher ) -IF(CAS_VERSION_STR VERSION_GREATER "7.0.0") - LIST(APPEND _link_LIBRARIES ${CAS_TKStd} ${CAS_TKBin}) -ENDIF() - # --- headers --- SET(GEOM_HEADERS diff --git a/src/GEOM/GEOM_Application.cxx b/src/GEOM/GEOM_Application.cxx index f9e1f941c..289e20776 100644 --- a/src/GEOM/GEOM_Application.cxx +++ b/src/GEOM/GEOM_Application.cxx @@ -22,7 +22,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application) //======================================================================= //function : GEOM_Application @@ -42,22 +42,6 @@ GEOM_Application::~GEOM_Application() { } -#if OCC_VERSION_LARGE <= 0x07000000 -//======================================================================= -//function : Formats -//purpose : -//======================================================================= - -void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats) -{ - Formats.Append(TCollection_ExtendedString ("SALOME_GEOM")); -#if OCC_VERSION_MAJOR > 6 - Formats.Append(TCollection_ExtendedString ("BinOcaf")); -#endif -} -#endif - - //======================================================================= //function : ResourcesName //purpose : diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx index 3cf3085e8..ab1592386 100644 --- a/src/GEOM/GEOM_Application.hxx +++ b/src/GEOM/GEOM_Application.hxx @@ -28,21 +28,16 @@ #include #include -#include - class GEOM_Application : public TDocStd_Application { public: Standard_EXPORT GEOM_Application(); Standard_EXPORT ~GEOM_Application(); -#if OCC_VERSION_LARGE <= 0x07000000 - Standard_EXPORT virtual void Formats(TColStd_SequenceOfExtendedString& Formats); -#endif Standard_EXPORT Standard_CString ResourcesName(); public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application) + DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application) }; DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application) diff --git a/src/GEOM/GEOM_BaseDriver.cxx b/src/GEOM/GEOM_BaseDriver.cxx index 314c65760..8a7c72679 100644 --- a/src/GEOM/GEOM_BaseDriver.cxx +++ b/src/GEOM/GEOM_BaseDriver.cxx @@ -33,7 +33,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); //================================================================================ /*! diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx index 61aa70f6a..72ecad69a 100644 --- a/src/GEOM/GEOM_BaseDriver.hxx +++ b/src/GEOM/GEOM_BaseDriver.hxx @@ -36,18 +36,10 @@ #include #include -#include - #include #include #include -#if OCC_VERSION_MAJOR < 7 - #define LOGBOOK TFunction_Logbook -#else - #define LOGBOOK Handle(TFunction_Logbook) -#endif - struct GEOM_Param { std::string name; @@ -107,7 +99,7 @@ public: return params.back(); } - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver) + DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver) }; DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver); diff --git a/src/GEOM/GEOM_BaseObject.cxx b/src/GEOM/GEOM_BaseObject.cxx index a0ced3b4d..ee2a92aeb 100644 --- a/src/GEOM/GEOM_BaseObject.cxx +++ b/src/GEOM/GEOM_BaseObject.cxx @@ -515,4 +515,4 @@ TDF_Label GEOM_BaseObject::GetFreeLabel() return _label.FindChild(FREE_LABEL); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); diff --git a/src/GEOM/GEOM_BaseObject.hxx b/src/GEOM/GEOM_BaseObject.hxx index 0c7a65dfc..464e0f6a0 100644 --- a/src/GEOM/GEOM_BaseObject.hxx +++ b/src/GEOM/GEOM_BaseObject.hxx @@ -166,7 +166,7 @@ public: int _docID; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient) + DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient) }; #endif diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index b8d540a74..a6c169018 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -34,8 +34,6 @@ #include "GEOM_SubShapeDriver.hxx" #include "Sketcher_Profile.hxx" -#include - #include "utilities.h" #include @@ -66,11 +64,9 @@ #include -#if OCC_VERSION_LARGE > 0x07000000 #include #include #include -#endif #include @@ -241,11 +237,9 @@ GEOM_Engine::GEOM_Engine() TFunction_DriverTable::Get()->AddDriver(GEOM_Object::GetSubShapeID(), new GEOM_SubShapeDriver()); _OCAFApp = new GEOM_Application(); -#if OCC_VERSION_LARGE > 0x07000000 _OCAFApp->DefineFormat("SALOME_GEOM", "GEOM Document Version 1.0", "sgd", new StdDrivers_DocumentRetrievalDriver, 0); BinDrivers::DefineFormat(_OCAFApp); -#endif _UndoLimit = 0; } @@ -285,11 +279,7 @@ Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID, bool force) aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID)); } else if (force) { -#if OCC_VERSION_MAJOR > 6 _OCAFApp->NewDocument("BinOcaf", aDoc); -#else - _OCAFApp->NewDocument("SALOME_GEOM", aDoc); -#endif aDoc->SetUndoLimit(_UndoLimit); _mapIDDocument.Bind(theDocID, aDoc); TDataStd_Integer::Set(aDoc->Main(), theDocID); @@ -588,12 +578,10 @@ bool GEOM_Engine::Load(int theDocID, const char* theFileName) return false; } -#if OCC_VERSION_MAJOR > 6 // Replace old document format by the new one. if (aDoc->StorageFormat().IsEqual("SALOME_GEOM")) { aDoc->ChangeStorageFormat("BinOcaf"); } -#endif aDoc->SetUndoLimit(_UndoLimit); diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx index 564774078..e1cfd7b7d 100644 --- a/src/GEOM/GEOM_Engine.hxx +++ b/src/GEOM/GEOM_Engine.hxx @@ -27,8 +27,6 @@ #include "GEOM_Object.hxx" #include "GEOM_DataMapOfAsciiStringTransient.hxx" -#include - #include #include diff --git a/src/GEOM/GEOM_Field.cxx b/src/GEOM/GEOM_Field.cxx index b975e5d08..1c577599a 100644 --- a/src/GEOM/GEOM_Field.cxx +++ b/src/GEOM/GEOM_Field.cxx @@ -756,5 +756,5 @@ const Standard_GUID& GEOM_FieldStep::GetDataID() return TDataStd_ExtStringArray::GetID(); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); diff --git a/src/GEOM/GEOM_Field.hxx b/src/GEOM/GEOM_Field.hxx index 5284fa021..439035d22 100644 --- a/src/GEOM/GEOM_Field.hxx +++ b/src/GEOM/GEOM_Field.hxx @@ -123,7 +123,7 @@ class GEOM_Field : public GEOM_BaseObject // Returns all steps Standard_EXPORT std::list< Handle(GEOM_FieldStep)> GetSteps(); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject) + DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject) private: @@ -185,7 +185,7 @@ public: // Returns GUID of CAF data array const Standard_GUID& GetDataID(); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject) + DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject) private: diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 952dbd3e9..0f64bd555 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -27,8 +27,6 @@ #include #include -#include - #include "utilities.h" #include @@ -980,4 +978,4 @@ void* GEOM_Function::GetCallBackData() return reinterpret_cast ( address ); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index 5c4b530c6..4e7f16f1e 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -36,8 +36,6 @@ #include #include -#include - class GEOM_Function; DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient); @@ -197,7 +195,7 @@ public: //Returns top label of this function's naming tree Standard_EXPORT TDF_Label GetNamingEntry (const Standard_Boolean create = Standard_True); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient) + DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient) private: diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index 1c3a07612..7b5ce77bd 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -296,5 +296,5 @@ GEOM_Object::GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObject return funs; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); diff --git a/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx index 716073151..5c3756125 100644 --- a/src/GEOM/GEOM_Object.hxx +++ b/src/GEOM/GEOM_Object.hxx @@ -115,7 +115,7 @@ class GEOM_Object : public GEOM_BaseObject GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects ); public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject) + DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject) }; #endif diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx index 633fd44d0..a189af2e1 100644 --- a/src/GEOM/GEOM_PythonDump.hxx +++ b/src/GEOM/GEOM_PythonDump.hxx @@ -48,10 +48,8 @@ namespace GEOM //operator TCollection_AsciiString () const; -#if OCC_VERSION_MAJOR >= 7 template Standard_EXPORT TPythonDump& operator<< (const Handle(T)& theObject) { return *this << theObject.get(); } -#endif Standard_EXPORT TPythonDump& operator<< (bool theArg); Standard_EXPORT TPythonDump& operator<< (long int theArg); Standard_EXPORT TPythonDump& operator<< (int theArg); diff --git a/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx index 2e6475362..d8e07e714 100644 --- a/src/GEOM/GEOM_Solver.cxx +++ b/src/GEOM/GEOM_Solver.cxx @@ -64,11 +64,7 @@ bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction) aDriver->Init(theFunction->GetEntry()); -#if OCC_VERSION_MAJOR < 7 - TFunction_Logbook aLog; -#else Handle(TFunction_Logbook) aLog = TFunction_Logbook::Set( aDriver->Label() ); -#endif if(aDriver->Execute(aLog) == 0) return false; return true; diff --git a/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx index 3715f3e6c..1f4e675fe 100644 --- a/src/GEOM/GEOM_SubShapeDriver.cxx +++ b/src/GEOM/GEOM_SubShapeDriver.cxx @@ -48,7 +48,7 @@ GEOM_SubShapeDriver::GEOM_SubShapeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOM_SubShapeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -101,11 +101,7 @@ Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -159,4 +155,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); diff --git a/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx index 2ac04f9d8..810d71eeb 100644 --- a/src/GEOM/GEOM_SubShapeDriver.hxx +++ b/src/GEOM/GEOM_SubShapeDriver.hxx @@ -35,9 +35,9 @@ class GEOM_SubShapeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOM_SubShapeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOM_SubShapeDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMAlgo/FILES b/src/GEOMAlgo/FILES index 91e59813f..cc8fd6328 100644 --- a/src/GEOMAlgo/FILES +++ b/src/GEOMAlgo/FILES @@ -106,6 +106,4 @@ GEOMAlgo_ShapeInfo.hxx GEOMAlgo_ShapeInfo.cxx GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx -Basics_OCCTVersion.hxx - GEOMAlgo_KindOfDef.hxx diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx index 27c3737b7..b9fb15a9e 100644 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx @@ -25,8 +25,6 @@ #include -#include - #include #include #include @@ -197,12 +195,7 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace (const TopoDS_Edge& aEold, const TopoDS_Edge& aEnew, const TopoDS_Face& aF, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Boolean bIsClosed, bUClosed, bHasOld; Standard_Integer iRet, aNbPoints; @@ -222,7 +215,6 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace return iRet; } // -#if OCC_VERSION_LARGE > 0x06080000 // Try to copy PCurve from old edge to the new one. iRet = BOPTools_AlgoTools2D::AttachExistingPCurve(aEold, aEnew, aF, aCtx); @@ -233,7 +225,6 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace // The PCurve is attached successfully. return iRet; } -#endif // BOPTools_AlgoTools2D::BuildPCurveForEdgeOnFace(aEnew, aF); aC2D=BRep_Tool::CurveOnSurface(aEnew, aF, aT1, aT2); @@ -446,12 +437,7 @@ void GEOMAlgo_AlgoTools::RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE, Standard_Boolean GEOMAlgo_AlgoTools::IsSplitToReverse (const TopoDS_Edge& aEF1, const TopoDS_Edge& aEF2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aContext -#else - const Handle(BOPInt_Context)& aContext -#endif - ) + const Handle(IntTools_Context)& aContext) { Standard_Boolean aFlag; Standard_Real aT1, aT2, aScPr, a, b; @@ -496,12 +482,7 @@ Standard_Boolean GEOMAlgo_AlgoTools::ProjectPointOnShape (const gp_Pnt& aP1, const TopoDS_Shape& aS, gp_Pnt& aP2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Boolean bIsDone = Standard_False; Standard_Real aT2; @@ -648,12 +629,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_ListOfShape& aLESD, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Boolean bIsDone; Standard_Real aTol2, aD2; @@ -692,12 +668,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes (const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_IndexedDataMapOfShapeListOfShape& aMEE, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Integer aNbE, aNbEProcessed, aNbESD, iErr; TopTools_ListOfShape aLESD; @@ -765,12 +736,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes (GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMPKLE, const Standard_Real aTol, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Integer i, aNbE, iErr, j, aNbEE, aNbToAdd; TopTools_IndexedDataMapOfShapeListOfShape aMEE, aMSDE, aMEToAdd; diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx index c670dd486..a737460dc 100755 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx @@ -26,16 +26,10 @@ #ifndef _GEOMAlgo_AlgoTools_HeaderFile #define _GEOMAlgo_AlgoTools_HeaderFile -#include - #include #include #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -92,34 +86,19 @@ class GEOMAlgo_AlgoTools { static Standard_Integer RefineSDShapes (GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD, const Standard_Real aTol, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_IndexedDataMapOfShapeListOfShape& aMEE, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1, const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_ListOfShape& aLESD, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void PointOnShape(const TopoDS_Shape& aS, @@ -146,12 +125,7 @@ class GEOMAlgo_AlgoTools { static Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1, const TopoDS_Shape& aS, gp_Pnt& aP2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void CorrectTolerances(const TopoDS_Shape& aShape, @@ -169,12 +143,7 @@ class GEOMAlgo_AlgoTools { Standard_EXPORT static Standard_Boolean IsSplitToReverse1 (const TopoDS_Edge& aEF1, const TopoDS_Edge& aEF2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE, const TopoDS_Face& aF, @@ -191,42 +160,22 @@ class GEOMAlgo_AlgoTools { Standard_EXPORT static Standard_Boolean IsSplitToReverse(const TopoDS_Edge& theSplit, const TopoDS_Edge& theEdge, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& theCtx -#else - const Handle(BOPInt_Context)& theCtx -#endif - ) ; + const Handle(IntTools_Context)& theCtx) ; Standard_EXPORT static Standard_Boolean IsSplitToReverse (const TopoDS_Face& theFSp, const TopoDS_Face& theFSr, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& theCtx -#else - const Handle(BOPInt_Context)& theCtx -#endif - ) ; + const Handle(IntTools_Context)& theCtx) ; Standard_EXPORT static Standard_Boolean IsSplitToReverse (const TopoDS_Shape& theSp, const TopoDS_Shape& theSr, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& theCtx -#else - const Handle(BOPInt_Context)& theCtx -#endif - ) ; + const Handle(IntTools_Context)& theCtx) ; Standard_EXPORT static Standard_Integer BuildPCurveForEdgeOnFace (const TopoDS_Edge& aEold, const TopoDS_Edge& aEnew, const TopoDS_Face& aF, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; // Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx index ca035f35a..5f6ef23b5 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx @@ -27,7 +27,7 @@ // #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx index 46564f2d8..ef2f5ac87 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx @@ -69,7 +69,7 @@ class GEOMAlgo_Clsf : public GEOMAlgo_HAlgo Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo) protected: Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx index 3da3f8bb9..7c6b9f5c6 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx @@ -47,7 +47,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx index 2af5f487f..e89b559c0 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx @@ -71,7 +71,7 @@ class GEOMAlgo_ClsfBox : public GEOMAlgo_Clsf Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf) protected: TopoDS_Shape myBox; diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx index c16ea5f5d..3c7cb4279 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx @@ -31,7 +31,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx index c940a9a25..95ec33d5a 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx @@ -78,7 +78,7 @@ public: Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf) protected: diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx index 9257dece7..4f0a0e0a0 100755 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx @@ -32,7 +32,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx index 6f945dcbb..5d13525a7 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx @@ -58,7 +58,7 @@ class GEOMAlgo_ClsfSolid : public GEOMAlgo_Clsf Standard_EXPORT virtual void CheckData() ; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf) protected: TopoDS_Shape myShape; diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx index 18ec5f05a..8748c71ed 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx @@ -32,7 +32,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx index 8aabf7344..ff7c88731 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx @@ -69,7 +69,7 @@ class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf) protected: Handle(Geom_Surface) myS; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx index 80e130f9e..f3834064a 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx @@ -26,8 +26,6 @@ #include -#include - #include #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index ce8bc9eb5..9bce9fe11 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -68,12 +68,7 @@ #include #include #include - -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index dffecb720..94801bb5a 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -554,11 +554,7 @@ Standard_Integer CheckAncesstors // iRet=0; // -#if OCC_VERSION_MAJOR < 7 - pLE=const_cast(&aMVE.FindFromKey(aVSD)); -#else pLE=const_cast(aMVE).ChangeSeek(aVSD); -#endif if (!pLE) { return iRet; } @@ -566,11 +562,7 @@ Standard_Integer CheckAncesstors for (; aItLE.More(); aItLE.Next()) { const TopoDS_Shape& aE=aItLE.Value(); // -#if OCC_VERSION_MAJOR < 7 - pLV=const_cast(&aMEV.FindFromKey(aE)); -#else pLV=const_cast(aMEV).ChangeSeek(aE); -#endif if (!pLV) { continue; // it should be not so } @@ -594,11 +586,7 @@ Standard_Integer CheckAncesstors // iRet=1; // -#if OCC_VERSION_MAJOR < 7 - pLVZ=const_cast(&aMEVZ.FindFromKey(aE)); -#else pLVZ=aMEVZ.ChangeSeek(aE); -#endif if (!pLVZ) { aMEVZ.Add(aE, aLVX); } diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index de5350af9..bb09bceb2 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -78,11 +76,7 @@ #include // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include #include diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx index 736c8f10f..48a7db3f4 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx @@ -25,12 +25,7 @@ // // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif - //======================================================================= //function : GEOMAlgo_GluerAlgo @@ -101,11 +96,7 @@ Standard_Boolean GEOMAlgo_GluerAlgo::CheckGeometry() const //function : SetContext //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 void GEOMAlgo_GluerAlgo::SetContext(const Handle(IntTools_Context)& theContext) -#else -void GEOMAlgo_GluerAlgo::SetContext(const Handle(BOPInt_Context)& theContext) -#endif { myContext=theContext; } @@ -113,11 +104,7 @@ void GEOMAlgo_GluerAlgo::SetContext(const Handle(BOPInt_Context)& theContext) //function : Context //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& GEOMAlgo_GluerAlgo::Context() -#else -const Handle(BOPInt_Context)& GEOMAlgo_GluerAlgo::Context() -#endif { return myContext; } @@ -153,10 +140,6 @@ void GEOMAlgo_GluerAlgo::Clear() void GEOMAlgo_GluerAlgo::Perform() { if (myContext.IsNull()) { -#if OCC_VERSION_LARGE > 0x06070100 myContext=new IntTools_Context; -#else - myContext=new BOPInt_Context; -#endif } } diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx index 7344af81e..3fa6fce40 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx @@ -27,18 +27,11 @@ #ifndef _GEOMAlgo_GluerAlgo_HeaderFile #define _GEOMAlgo_GluerAlgo_HeaderFile -#include - #include #include #include #include - -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -80,18 +73,10 @@ public: virtual void Clear() ; Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 void SetContext(const Handle(IntTools_Context)&) ; -#else - void SetContext(const Handle(BOPInt_Context)&) ; -#endif Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& Context() ; -#else - const Handle(BOPInt_Context)& Context() ; -#endif Standard_EXPORT const TopTools_DataMapOfShapeListOfShape& Images() const; @@ -103,11 +88,7 @@ protected: TopoDS_Shape myArgument; Standard_Real myTolerance; Standard_Boolean myCheckGeometry; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) myContext; -#else - Handle(BOPInt_Context) myContext; -#endif TopTools_DataMapOfShapeListOfShape myImages; TopTools_DataMapOfShapeShape myOrigins; diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx index 5ca2cedd0..4fc51d2f2 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx @@ -27,7 +27,7 @@ // #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient); //======================================================================= // function: diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx index e1d1f02a4..6f3f684fb 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx @@ -32,17 +32,15 @@ #include #include #include -#include +#include -#include - -DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared); +DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient); //======================================================================= //class : GEOMAlgo_HAlgo //purpose : //======================================================================= -class GEOMAlgo_HAlgo : public MMgt_TShared +class GEOMAlgo_HAlgo : public Standard_Transient { public: Standard_EXPORT @@ -60,7 +58,7 @@ class GEOMAlgo_HAlgo : public MMgt_TShared Standard_EXPORT Standard_Integer WarningStatus() const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient) protected: Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx index 05636647b..98981f651 100644 --- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx +++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx @@ -26,8 +26,6 @@ #include #include -#include - #include #include #include @@ -37,11 +35,7 @@ #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include @@ -108,11 +102,7 @@ void GEOMAlgo_RemoverWebs::Perform() if (!myContext.IsNull()) { myContext.Nullify(); } -#if OCC_VERSION_LARGE > 0x06070100 myContext=new IntTools_Context; -#else - myContext=new BOPInt_Context; -#endif // BuildSolid(); // @@ -225,11 +215,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() aSB.SetContext(myContext); aSB.SetShapes(aSFS); aSB.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 iErr=aSB.HasErrors(); -#else - iErr=aSB.ErrorStatus(); -#endif if (iErr) { myErrorStatus=20; // SolidBuilder failed return; @@ -261,11 +247,7 @@ void GEOMAlgo_RemoverWebs::AddInternalShapes(const BOPCol_ListOfShape& aLSR, TopoDS_Solid aSd; BRep_Builder aBB; BOPCol_ListIteratorOfListOfShape aItLS; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=new IntTools_Context; -#else - Handle(BOPInt_Context) aCtx=new BOPInt_Context; -#endif // aNbSI=aMSI.Extent(); for (i=1; i<=aNbSI; ++i) { diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx index 2fbac5c2f..dab662dd5 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx @@ -26,11 +26,7 @@ // // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif //======================================================================= //function : GEOMAlgo_ShapeAlgo @@ -54,11 +50,7 @@ GEOMAlgo_ShapeAlgo::~GEOMAlgo_ShapeAlgo() //function : SetContext //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 void GEOMAlgo_ShapeAlgo::SetContext(const Handle(IntTools_Context)& theContext) -#else -void GEOMAlgo_ShapeAlgo::SetContext(const Handle(BOPInt_Context)& theContext) -#endif { myContext=theContext; } @@ -66,11 +58,7 @@ void GEOMAlgo_ShapeAlgo::SetContext(const Handle(BOPInt_Context)& theContext) //function : Context //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& GEOMAlgo_ShapeAlgo::Context()const -#else -const Handle(BOPInt_Context)& GEOMAlgo_ShapeAlgo::Context()const -#endif { return myContext; } @@ -121,10 +109,6 @@ const TopoDS_Shape& GEOMAlgo_ShapeAlgo::Result()const void GEOMAlgo_ShapeAlgo::Perform() { if (myContext.IsNull()) { -#if OCC_VERSION_LARGE > 0x06070100 myContext=new IntTools_Context; -#else - myContext=new BOPInt_Context; -#endif } } diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx index 2bf1412e2..14cf3c642 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx @@ -20,25 +20,14 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_ShapeAlgo.hxx -// Created: Tue Dec 7 12:06:54 2004 -// Author: Peter KURNEV -// -// #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile #define _GEOMAlgo_ShapeAlgo_HeaderFile -#include - #include #include #include #include -#if OCC_VERSION_LARGE > 0x06070100 - #include -#else - #include -#endif +#include #include //======================================================================= @@ -47,23 +36,15 @@ //======================================================================= class GEOMAlgo_ShapeAlgo : public GEOMAlgo_Algo { - public: +public: //! Sets cashed geometrical tools
Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 void SetContext(const Handle(IntTools_Context)& theContext) ; -#else - void SetContext(const Handle(BOPInt_Context)& theContext) ; -#endif //! Returns cashed geometrical tools
Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& Context() const; -#else - const Handle(BOPInt_Context)& Context() const; -#endif Standard_EXPORT void SetShape(const TopoDS_Shape& aS) ; @@ -90,14 +71,10 @@ protected: Standard_EXPORT virtual ~GEOMAlgo_ShapeAlgo(); - TopoDS_Shape myShape; Standard_Real myTolerance; TopoDS_Shape myResult; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) myContext; -#else - Handle(BOPInt_Context) myContext; -#endif }; + #endif diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index cb7f85322..942538773 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -52,11 +50,7 @@ #include #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -101,9 +95,6 @@ GEOMAlgo_ShellSolidBuilder::~GEOMAlgo_ShellSolidBuilder() //======================================================================= void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFiller) { -#if OCC_VERSION_LARGE <= 0x07010000 - myErrorStatus=0; -#endif // myPaveFiller=(BOPAlgo_PaveFiller*)&theFiller; myDS=myPaveFiller->PDS(); @@ -111,97 +102,57 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi // // 1. CheckData CheckData(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // // 2. Prepare Prepare(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // // 3. Fill Images // 3.1 Vertice FillImagesVertices(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_VERTEX); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // 3.2 Edges FillImagesEdges(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_EDGE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // // 3.3 Wires FillImagesContainers(TopAbs_WIRE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_WIRE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // 3.4 Faces FillImagesFaces(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_FACE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } } @@ -228,9 +179,6 @@ GEOMAlgo_ShellSolid::~GEOMAlgo_ShellSolid() //======================================================================= void GEOMAlgo_ShellSolid::Perform() { -#if OCC_VERSION_LARGE <= 0x07010000 - myErrorStatus=0; -#endif // try { Standard_Integer aNbArgs, iRank, iErr, iBeg, iEnd, i, aNbSp; @@ -251,11 +199,7 @@ void GEOMAlgo_ShellSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } @@ -285,11 +229,7 @@ void GEOMAlgo_ShellSolid::Perform() return; } // -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=myDSFiller->Context(); -#else - Handle(BOPInt_Context) aCtx=myDSFiller->Context(); -#endif const BOPDS_IndexRange& aRange=pDS->Range(iRank); aRange.Indices(iBeg, iEnd); const TopoDS_Solid& aSolid=(!iRank) ? *((TopoDS_Solid*)&aTool) : *((TopoDS_Solid*)&aObj); @@ -299,11 +239,7 @@ void GEOMAlgo_ShellSolid::Perform() GEOMAlgo_ShellSolidBuilder aSSB; // aSSB.PerformWithFiller(*myDSFiller); -#if OCC_VERSION_LARGE > 0x07010001 iErr=aSSB.HasErrors(); -#else - iErr=aSSB.ErrorStatus(); -#endif if (iErr) { myErrorStatus=15; return; diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx index b7f49b6ab..069ca0a2d 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx @@ -37,8 +37,6 @@ #include #include -#include - #include //======================================================================= @@ -85,11 +83,7 @@ void GEOMAlgo_SolidSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx index fb5b8099b..db1a8ad58 100644 --- a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx @@ -41,8 +41,6 @@ #include -#include - static void TreatCompound(const TopoDS_Shape& aC, BOPCol_ListOfShape& aLSX); @@ -150,10 +148,6 @@ void GEOMAlgo_Splitter::Clear() //======================================================================= void GEOMAlgo_Splitter::BuildResult(const TopAbs_ShapeEnum theType) { -#if OCC_VERSION_LARGE <= 0x07010000 - myErrorStatus=0; -#endif - // TopAbs_ShapeEnum aType; BRep_Builder aBB; BOPCol_MapOfShape aM; diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index b669f5caf..8be6ab038 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -48,11 +46,7 @@ #include // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif // #include #include @@ -90,11 +84,7 @@ void GEOMAlgo_VertexSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } @@ -152,11 +142,7 @@ void GEOMAlgo_VertexSolid::BuildResult() const TopoDS_Shape& aTool=aLS.Last(); const TopoDS_Solid& aSolid=(myRank==0) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj); // -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=myDSFiller->Context(); -#else - Handle(BOPInt_Context) aCtx=myDSFiller->Context(); -#endif BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid); // aNbRanges=aDS.NbRanges(); diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx index 8c44271a7..663bc715d 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -40,17 +38,11 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include #include -#include - //======================================================================= //function : GEOMAlgo_WireSolid //purpose : @@ -80,11 +72,7 @@ void GEOMAlgo_WireSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } @@ -154,11 +142,7 @@ void GEOMAlgo_WireSolid::BuildResult() const TopoDS_Solid& aSolid=(iRank==0) ? *((TopoDS_Solid*)&aTool) : *((TopoDS_Solid*)&aObj); // -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=myDSFiller->Context(); -#else - Handle(BOPInt_Context) aCtx=myDSFiller->Context(); -#endif //BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid); // const BOPDS_IndexRange& aRange=pDS->Range(iRank); diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx index c8723dac3..b9f685676 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx @@ -30,7 +30,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter) //======================================================================= // function : GEOM_OCCFilter diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h index fd6a4ac0c..d52607340 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h @@ -27,8 +27,6 @@ #include -#include - class LightApp_SelectionMgr; class GEOM_OCCFilter : public SelectMgr_Filter @@ -44,7 +42,7 @@ private: public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter) + DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter) }; diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index 4ab85d38a..7ab8db1f9 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -26,8 +26,6 @@ #include "GEOMGUI_OCCSelector.h" #include "GEOM_Annotation.hxx" -#include - #include #include @@ -179,15 +177,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, Handle(SelectMgr_Selection) sel = theObj->Selection( m ); for ( sel->Init(); sel->More(); sel->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); -#endif if ( entity.IsNull() ) continue; diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 488b426f3..db86dc2e5 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -59,8 +59,6 @@ #include #include -#include - #include #include #include @@ -90,9 +88,6 @@ #include #include #include -#if OCC_VERSION_MAJOR < 7 - #include -#endif #include #include #include @@ -113,6 +108,7 @@ #include #include #include +#include #include @@ -242,8 +238,11 @@ namespace if ( aAISShape.IsNull() ) continue; -#ifdef USE_TEXTURED_SHAPE - const Handle(Image_PixMap)& aPixmap = aAISShape->TexturePixMap(); + const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap(); + if ( aTexture.IsNull() ) + continue; + + const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(); if ( aPixmap.IsNull() ) continue; @@ -258,7 +257,6 @@ namespace aPixmapUsersMap.UnBind( aPixmap ); aPixmapCacheMap.remove( aPixmapCacheMap.key( aPixmap ) ); } -#endif } } @@ -512,12 +510,10 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) myViewFrame = 0; -#if OCC_VERSION_MAJOR >= 7 myColorScale = new AIS_ColorScale; myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD); myColorScale->SetTransformPersistence ( Graphic3d_TransformPers::FromDeprecatedParams(Graphic3d_TMF_2d, gp_Pnt (-1,-1,0))); -#endif myFieldDataType = GEOM::FDT_Double; myFieldDimension = 0; @@ -866,11 +862,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap AISShape->SetLabelColor( qColorFromResources( "label_color", QColor( 255, 255, 255 ) ) ); // set display mode - AISShape->SetDisplayMode( HasDisplayMode() ? - // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function - GetDisplayMode() : - // display mode from properties - propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() ); + int displayMode = HasDisplayMode() ? + // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function + GetDisplayMode() : + // display mode from properties + propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt(); + AISShape->SetDisplayMode( displayMode ); // - face boundaries color and line width anAspect = AISShape->Attributes()->FaceBoundaryAspect(); @@ -960,7 +957,6 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap aImagePath = propMap.value( GEOM::propertyName( GEOM::Texture ) ).toString(); } -#ifdef USE_TEXTURED_SHAPE Handle(Image_PixMap) aPixmap; if ( !aImagePath.isEmpty() ) aPixmap = cacheTextureFor( aImagePath, AISShape ); @@ -969,14 +965,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // apply image to shape if ( !aPixmap.IsNull() ) { - AISShape->SetTexturePixMap( aPixmap ); - AISShape->SetTextureMapOn(); - AISShape->DisableTextureModulate(); - } - else { - AISShape->SetTextureMapOff(); + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMap( new Graphic3d_Texture2Dmanual( aPixmap ) ); } -#endif + if ( displayMode == GEOM_AISShape::TexturedShape ) + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOn(); + else + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOff(); // set line width AISShape->SetWidth( HasWidth() ? @@ -2965,11 +2959,7 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS { QColor aQColor; Quantity_Color aColor; -#if OCC_VERSION_MAJOR < 7 - if( FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) ) -#else if( AIS_ColorScale::FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) ) -#endif aQColor = QColor::fromRgbF( aColor.Red(), aColor.Green(), aColor.Blue() ); aResultList << aQColor; } @@ -2977,52 +2967,6 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS return aResultList; } -#if OCC_VERSION_MAJOR < 7 -// Note: the method is copied from Aspect_ColorScale class -Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue, - const Standard_Integer aMin, - const Standard_Integer aMax ) -{ - Standard_Integer minLimit( 0 ), maxLimit( 230 ); - - Standard_Integer aHue = maxLimit; - if ( aMin != aMax ) - aHue = (Standard_Integer)( maxLimit - ( maxLimit - minLimit ) * ( aValue - aMin ) / ( aMax - aMin ) ); - - aHue = Min( Max( minLimit, aHue ), maxLimit ); - - return aHue; -} - -// Note: the method is copied from Aspect_ColorScale class -Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue, - const Standard_Real aMin, - const Standard_Real aMax, - const Standard_Integer ColorsCount, - Quantity_Color& aColor ) -{ - if( aValueaMax || aMaxaMax ) - IntervNumber = ColorsCount-1; - else if( Abs( aMax-aMin ) > Precision::Approximation() ) - IntervNumber = Floor( Standard_Real( ColorsCount ) * ( aValue - aMin ) / ( aMax - aMin ) ); // 'Ceiling' replaced with 'Floor' - - Standard_Integer Interv = Standard_Integer( IntervNumber ); - - aColor = Quantity_Color( HueFromValue( Interv, 0, ColorsCount - 1 ), 1.0, 1.0, Quantity_TOC_HLS ); - - return Standard_True; - } -} -#endif - void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, const bool updateViewer ) { SalomeApp_Study* aStudy = dynamic_cast( myApp->activeStudy() ); @@ -3102,48 +3046,29 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 ); Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 ); Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 ); - -#if OCC_VERSION_MAJOR < 7 - Handle(Aspect_ColorScale) myColorScale = aView->ColorScale(); - if( !myColorScale.IsNull() ) - { - myColorScale->SetXPosition( anXPos ); - myColorScale->SetYPosition( anYPos ); - myColorScale->SetWidth( aWidth ); - myColorScale->SetHeight( aHeight ); -#else - Standard_Integer aWinWidth = 0, aWinHeight = 0; - aView->Window()->Size (aWinWidth, aWinHeight); - - myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos); - //myColorScale->SetBreadth (aWinWidth); // ??? - myColorScale->SetBreadth (aWinWidth*aWidth); // ??? - myColorScale->SetHeight (aWinHeight*aHeight); -#endif - - myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); - myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); - - myColorScale->SetTextHeight( aTextHeight ); - myColorScale->SetTitle( aColorScaleTitle ); - -#if OCC_VERSION_MAJOR < 7 - } - if( !aView->ColorScaleIsDisplayed() ) - aView->ColorScaleDisplay(); - } - else - if( aView->ColorScaleIsDisplayed() ) - aView->ColorScaleErase(); -#else + + Standard_Integer aWinWidth = 0, aWinHeight = 0; + aView->Window()->Size (aWinWidth, aWinHeight); + + myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos); + //myColorScale->SetBreadth (aWinWidth); // ??? + myColorScale->SetBreadth (aWinWidth*aWidth); // ??? + myColorScale->SetHeight (aWinHeight*aHeight); + + myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); + myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); + + myColorScale->SetTextHeight( aTextHeight ); + myColorScale->SetTitle( aColorScaleTitle ); + if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) aViewModel->getAISContext()->Display( myColorScale, Standard_True); } - else + else { if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) aViewModel->getAISContext()->Erase( myColorScale, Standard_True ); -#endif - + } + if( theIsRedisplayFieldSteps ) { _PTR(Study) aStudyDS = aStudy->studyDS(); diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index c7c6d879b..a776a1c1b 100755 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -45,12 +45,9 @@ class SALOME_OCCViewType; #include #include #include -#if OCC_VERSION_MAJOR >= 7 - #include -#endif +#include #include #include -#include #include #include @@ -277,20 +274,6 @@ protected: double& theFieldStepRangeMin, double& theFieldStepRangeMax ); -#if OCC_VERSION_MAJOR < 7 - // Note: the method is copied from Aspect_ColorScale class - static Standard_Integer HueFromValue( const Standard_Integer aValue, - const Standard_Integer aMin, - const Standard_Integer aMax ); - - // Note: the method is copied from Aspect_ColorScale class - static Standard_Boolean FindColor( const Standard_Real aValue, - const Standard_Real aMin, - const Standard_Real aMax, - const Standard_Integer ColorsCount, - Quantity_Color& aColor ); -#endif - protected: Handle(SALOME_InteractiveObject) myIO; TopoDS_Shape myShape; @@ -304,9 +287,7 @@ protected: std::string myTexture; int myType; SALOME_View* myViewFrame; -#if OCC_VERSION_MAJOR >= 7 Handle(AIS_ColorScale) myColorScale; -#endif int myUpdateColorScale; // IPAL54049 // Attributes diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index c15469dea..5470bbe2e 100755 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -88,7 +88,6 @@ #include -#include #include // External includes diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 78a067a67..2f9c592ae 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -29,8 +29,6 @@ #include "GEOM_GEOMGUI.hxx" -#include - #include #include diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx index cf8e5fe24..ac6a53b2a 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx @@ -65,7 +65,7 @@ GEOMImpl_3DSketcherDriver::GEOMImpl_3DSketcherDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_3DSketcherDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -319,11 +319,7 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -369,4 +365,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx index bc916a391..9d5f8307c 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_3DSketcherDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {}; @@ -42,7 +42,7 @@ public: Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index d648798ed..136fad4f2 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -74,7 +74,7 @@ GEOMImpl_ArcDriver::GEOMImpl_ArcDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ArcDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -157,11 +157,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -207,4 +203,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx index 2cda24cb0..6c6cdb23a 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx @@ -35,16 +35,16 @@ class GEOMImpl_ArcDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ArcDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ArcDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index 01b1631f8..3f42292a6 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx @@ -26,8 +26,6 @@ #include "Archimede_VolumeSection.hxx" -#include - #include #include @@ -69,7 +67,7 @@ GEOMImpl_ArchimedeDriver::GEOMImpl_ArchimedeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ArchimedeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -138,11 +136,7 @@ Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const aFunction->SetValue(tirant); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -174,4 +168,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx index 0ebf8bc8c..22c75f5d9 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx @@ -35,16 +35,16 @@ class GEOMImpl_ArchimedeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ArchimedeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx index aa50b635d..2c4f4ab6c 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx @@ -28,8 +28,6 @@ #include "utilities.h" -#include - #include #include #include @@ -1363,7 +1361,6 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeAnyFace (const TopoDS_Wire& if (!theResult.IsNull()) { // try to deal with result of BRepBuilderAPI_MakeFace + ShHealOper_ShapeProcess -#if OCC_VERSION_LARGE >= 0x06080000 #ifdef MAKE_FACE_PCURVES_FIX_TOLERANCE // check and fix pcurves, if necessary Standard_Real aT, aTolE, aD, aDMax; @@ -1395,7 +1392,6 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeAnyFace (const TopoDS_Wire& for (; aDMETolIt.More(); aDMETolIt.Next()) { sat.LimitTolerance(aDMETolIt.Key(), aDMETolIt.Value()); } -#endif #endif } else { diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index 2aef977a0..797495fac 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -123,7 +123,7 @@ GEOMImpl_BlockDriver::GEOMImpl_BlockDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_BlockDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -755,11 +755,7 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -1160,4 +1156,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx index 401c070d0..4ed6201c7 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx @@ -37,9 +37,9 @@ class GEOMImpl_BlockDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_BlockDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_BlockDriver() {}; @@ -63,7 +63,7 @@ private: const Standard_Integer theNbIterV, TopoDS_Shape& theResult) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 3d03eff3f..511708479 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -114,7 +114,7 @@ GEOMImpl_BooleanDriver::GEOMImpl_BooleanDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -150,19 +150,11 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList2.Append(aShape2); aCSI.SetArguments(aList1); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); aCSI.SetArguments(aList2); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } @@ -213,11 +205,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList1.Append(aShape); aCSI.SetArguments(aList1); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -241,11 +229,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList2.Append(aShape2); aCSI.SetArguments(aList2); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -286,11 +270,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList1.Append(aShape); aCSI.SetArguments(aList1); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -320,11 +300,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList2.Append(aTool); aCSI.SetArguments(aList2); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -347,11 +323,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -454,12 +426,10 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation // This allows to avoid adding empty compounds, // resulting from COMMON on two non-intersecting shapes. if (aStepResult.ShapeType() == TopAbs_COMPOUND) { -#if OCC_VERSION_MAJOR >= 7 if ((aValue1.ShapeType() == TopAbs_FACE || aValue1.ShapeType() == TopAbs_SHELL) && (aValue2.ShapeType() == TopAbs_FACE || aValue2.ShapeType() == TopAbs_SHELL)) { aStepResult = makeCompoundShellFromFaces(aStepResult); } -#endif TopoDS_Iterator aCompIter (aStepResult); for (; aCompIter.More(); aCompIter.Next()) { // add shape in a result @@ -517,12 +487,10 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation // This allows to avoid adding empty compounds, // resulting from CUT of parts if (aCut.ShapeType() == TopAbs_COMPOUND) { -#if OCC_VERSION_MAJOR >= 7 if (itSub1.Value().ShapeType() == TopAbs_FACE || itSub1.Value().ShapeType() == TopAbs_SHELL) { aCut = makeCompoundShellFromFaces(aCut); } -#endif TopoDS_Iterator aCompIter (aCut); for (; aCompIter.More(); aCompIter.Next()) { // add shape in a result @@ -550,7 +518,6 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation // perform FUSE operation else if (theType == BOOLEAN_FUSE) { -#if OCC_VERSION_MAJOR >= 7 Standard_Boolean isFaces = Standard_False; TopTools_ListOfShape listShape1, listShape2; GEOMUtils::AddSimpleShapes(theShape1, listShape1); @@ -568,7 +535,6 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation } } } -#endif // Perform BRepAlgoAPI_Fuse BO (theShape1, theShape2); @@ -576,10 +542,8 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes"); } aShape = BO.Shape(); -#if OCC_VERSION_MAJOR >= 7 if (isFaces) aShape = makeCompoundShellFromFaces(aShape); -#endif } // perform SECTION operation @@ -739,4 +703,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx index 033e21b14..6ffc39060 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx @@ -37,9 +37,9 @@ class GEOMImpl_BooleanDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_BooleanDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_BooleanDriver() {}; @@ -54,7 +54,7 @@ private: TopoDS_Shape makeCompoundShellFromFaces(const TopoDS_Shape theShape) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index 3e79b5e99..10343e06a 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_BoxDriver::GEOMImpl_BoxDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_BoxDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -116,11 +116,7 @@ Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -160,4 +156,4 @@ bool GEOMImpl_BoxDriver::GetCreationInformation(std::string& theOper return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx index a43961ae3..1ef5aba02 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_BoxDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_BoxDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_BoxDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationNameName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index 7685ffd63..6ac40c886 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -95,7 +95,7 @@ static Standard_Boolean isGoodForChamfer (const TopoDS_Shape& theShape) //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ChamferDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -267,11 +267,7 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -361,4 +357,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx index 7347b531b..88b6d50d0 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ChamferDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ChamferDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ChamferDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index 53dc21545..046d4e026 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx @@ -71,7 +71,7 @@ GEOMImpl_CircleDriver::GEOMImpl_CircleDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_CircleDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -187,11 +187,7 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -237,4 +233,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx index e75144b9d..109c8a3fd 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_CircleDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_CircleDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_CircleDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index e25b5537d..63fbaeff3 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx @@ -67,7 +67,7 @@ GEOMImpl_ConeDriver::GEOMImpl_ConeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ConeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -137,11 +137,7 @@ Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const } if (aShape.IsNull()) return 0; -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif aFunction->SetValue(aShape); return 1; @@ -185,4 +181,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx index 6ca640923..d08889523 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ConeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ConeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ConeDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index 21df551eb..c9bd7bc8d 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -66,7 +66,7 @@ GEOMImpl_CopyDriver::GEOMImpl_CopyDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_CopyDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -98,11 +98,7 @@ Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aCopy); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -150,7 +146,7 @@ GetCreationInformation(std::string& theOperationName, * \brief Performs Transfer Data operation. */ //================================================================================ -Standard_Integer GEOMImpl_CopyDriver::transferData(LOGBOOK& log) const +Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& log) const { Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); GEOMImpl_ITransferData aTD (aFunction); @@ -414,4 +410,4 @@ Standard_Boolean GEOMImpl_CopyDriver::getInPlaceByHistory return Standard_True; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx index e3f8bcf15..fcfe4f804 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx @@ -41,9 +41,9 @@ class GEOMImpl_CopyDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_CopyDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_CopyDriver() {}; @@ -51,11 +51,11 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver) private: - Standard_Integer transferData(LOGBOOK& log) const; + Standard_Integer transferData(Handle(TFunction_Logbook)& log) const; Standard_Boolean getInPlace (const TopoDS_Shape &theSourceShape, diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index 79ee42148..27689d7a9 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx @@ -65,7 +65,7 @@ GEOMImpl_CylinderDriver::GEOMImpl_CylinderDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_CylinderDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -142,11 +142,7 @@ Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -198,4 +194,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx index b85457edb..ff39f51eb 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_CylinderDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_CylinderDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_CylinderDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx index 05fa46439..9c2ba294c 100644 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx @@ -69,7 +69,7 @@ GEOMImpl_DiskDriver::GEOMImpl_DiskDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_DiskDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,11 +165,7 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -214,4 +210,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx index 7ede29b2b..c638b0072 100755 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_DiskDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_DiskDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_DiskDriver() {}; @@ -42,7 +42,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index 291894b69..7e6878745 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx @@ -62,7 +62,7 @@ GEOMImpl_EllipseDriver::GEOMImpl_EllipseDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_EllipseDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -154,11 +154,7 @@ Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -196,4 +192,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx index fc86df15b..818b846f3 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_EllipseDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_EllipseDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_EllipseDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 2ee22d9d9..8f574c85f 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -57,7 +57,7 @@ GEOMImpl_ExportDriver::GEOMImpl_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -88,11 +88,7 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( GetDocID(), obj, aFileName, aFormatName ) ); return 0; -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -110,4 +106,4 @@ GetCreationInformation(std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx index 35a0ac394..c3ba65857 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ExportDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ExportDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ExportDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx index 0562601de..1d632c839 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx @@ -63,7 +63,7 @@ GEOMImpl_FaceDriver::GEOMImpl_FaceDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FaceDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -118,11 +118,7 @@ Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -170,4 +166,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx index b477df995..751b42498 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_FaceDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FaceDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FaceDriver() {}; @@ -42,7 +42,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx index 2e12e8651..5da0b8141 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx @@ -44,7 +44,7 @@ GEOMImpl_FieldDriver::GEOMImpl_FieldDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FieldDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& log) const { return 0; } @@ -105,4 +105,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx index bd5bb4751..a4891dde3 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx @@ -34,9 +34,9 @@ class GEOMImpl_FieldDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FieldDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FieldDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx index 7b6cd60e1..49a509ba6 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx @@ -22,8 +22,6 @@ #include "GEOMImpl_Fillet1d.hxx" -#include - #include #include #include @@ -182,33 +180,7 @@ static Standard_Boolean isRadiusIntersected(const Handle(Geom2d_Curve)& theCurve for(a = anInter.NbSegments(); a > 0; a--) { // Porting to DEV version of OCCT 10.02.2017 BEGIN -#if OCC_VERSION_LARGE > 0x07010000 Standard_NotImplemented::Raise("The treatment of tangential intersection is not implemented"); -#else - // This piece of code seems never worked, because: - // 1. In case of two curves intersection - // method Segment with TWO output curves HAS TO be used. - // 2. Method Segment with ONE output curve (as below) just raises - // Standard_NotImplemented exception since 05.03.2012 (at least) - // and that is why has been eliminated 03.02.2017. - anInter.Segment(a, aCurve); - aPoint = aCurve->Value(aCurve->FirstParameter()); - if (aPoint.Distance(theStart) < aTol) - if (!theStartConnected) - return Standard_True; - if (aPoint.Distance(theEnd) < aTol) - return Standard_True; - if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol)) - return Standard_True; - aPoint = aCurve->Value(aCurve->LastParameter()); - if (aPoint.Distance(theStart) < aTol) - if (!theStartConnected) - return Standard_True; - if (aPoint.Distance(theEnd) < aTol) - return Standard_True; - if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol)) - return Standard_True; -#endif // Porting to DEV version of OCCT 10.02.2017 END } return Standard_False; diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx index bd2ece120..32dcbdc62 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx @@ -149,7 +149,7 @@ static void addEdgeRelation(TopTools_DataMapOfShapeShape& theMap, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_Fillet1dDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -258,11 +258,7 @@ Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const } aFunction->SetValue(aResult); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -449,4 +445,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx index c530e1171..a4600de07 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx @@ -39,9 +39,9 @@ public: Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, @@ -51,7 +51,7 @@ private: Standard_EXPORT bool MakeFillet(const TopoDS_Wire&, const TopTools_ListOfShape&, const Standard_Real, bool, TopoDS_Wire&) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx index 28b54364d..e1267a0f7 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx @@ -61,7 +61,7 @@ GEOMImpl_Fillet2dDriver::GEOMImpl_Fillet2dDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_Fillet2dDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,11 +165,7 @@ Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -209,4 +205,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx index ab30ca0bc..cde717bd6 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_Fillet2dDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_Fillet2dDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {}; @@ -43,7 +43,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index 6a903c635..40f27b7fa 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx @@ -67,7 +67,7 @@ GEOMImpl_FilletDriver::GEOMImpl_FilletDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FilletDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -147,11 +147,7 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -218,4 +214,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx index 6d5d58462..a69230b1b 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_FilletDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FilletDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FilletDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index 3175f6e65..bd1109aea 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -28,8 +28,6 @@ #include -#include - #include #include #include @@ -94,7 +92,7 @@ GEOMImpl_FillingDriver::GEOMImpl_FillingDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FillingDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -357,11 +355,7 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -413,4 +407,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx index 62a466d98..2167a3461 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_FillingDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FillingDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FillingDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index a9c72ec93..6d56d9355 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -34,8 +34,6 @@ #include "GEOMAlgo_CoupleOfShapes.hxx" #include "GEOMAlgo_ListOfCoupleOfShapes.hxx" -#include - #include "utilities.h" #include @@ -739,7 +737,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueByList (const TopoDS_Shape& theShape, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_GlueDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -824,11 +822,7 @@ Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif if (!aWrn.IsEmpty()) { Standard_Failure::Raise(aWrn.ToCString()); @@ -886,4 +880,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx index ab132e8d8..ffa5fb83a 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx @@ -40,9 +40,9 @@ class GEOMImpl_GlueDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_GlueDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_GlueDriver() {}; @@ -78,7 +78,7 @@ public: const TopTools_MapOfShape& theShapesList, const Standard_Boolean doGlueAllEdges); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index db43dcf43..c75a775b2 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx @@ -98,7 +98,7 @@ GEOMImpl_HealingDriver::GEOMImpl_HealingDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_HealingDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -163,11 +163,7 @@ Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -1161,4 +1157,4 @@ void GEOMImpl_HealingDriver::SaveStatistics( const ShHealOper_Tool& healer, bool *stats = healer.GetStatistics(); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx index eeaa2a35c..235fdf8e1 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx @@ -47,9 +47,9 @@ public: Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static Standard_Boolean AreEdgesC1 (const TopoDS_Edge& E1, const TopoDS_Edge& E2); Standard_EXPORT static void FuseCollinearEdges (const TopoDS_Shape&, @@ -59,7 +59,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver) private: Standard_Boolean ShapeProcess ( GEOMImpl_IHealing*, const TopoDS_Shape&, TopoDS_Shape& ) const; diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index ba87e9c4f..0a1a786b7 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -22,8 +22,6 @@ #include -#include - #include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index 1dc269f68..2817ef568 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -24,8 +24,6 @@ #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index db35fe4a4..111f7dc69 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -46,8 +46,6 @@ #include #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx index 19812c257..8e950aa14 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx @@ -35,8 +35,6 @@ #include #include -#include - #include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index 3d9bf31ad..89dc6cf0d 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -62,8 +62,6 @@ #include "GEOMImpl_IIsoline.hxx" #include "GEOMImpl_PolylineDumper.hxx" -#include - #include "utilities.h" #include @@ -1513,9 +1511,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2D // Compute the isoline curve try { -#if OCC_VERSION_LARGE > 0x06010000 OCC_CATCH_SIGNALS; -#endif if (!GetSolver()->ComputeFunction(aFunction)) { SetErrorCode("Polyline driver failed"); return NULL; @@ -1592,9 +1588,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2DOnPlane //Compute the isoline curve try { -#if OCC_VERSION_LARGE > 0x06010000 OCC_CATCH_SIGNALS; -#endif if (!GetSolver()->ComputeFunction(aFunction)) { SetErrorCode("Polyline driver failed"); return NULL; diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index baf47d45d..6a6d99829 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 8da09ad37..90acf17a6 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -40,8 +40,6 @@ #include #include "GEOM_ISubShape.hxx" -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx index c4e41b09b..def40028c 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx @@ -28,8 +28,6 @@ #include "GEOM_Object.hxx" #include "GEOM_Field.hxx" -#include - #include "Utils_SALOME_Exception.hxx" #include diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index fdd3c307b..309c2bcc7 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -45,8 +45,6 @@ #include #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index ad2f75f9f..8b87bd8cf 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -20,8 +20,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include - #include #include #include @@ -43,10 +41,8 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x07010000 #include #include -#endif #include #include #include @@ -55,10 +51,8 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x06090000 #include #include -#endif #include #include #include @@ -1576,39 +1570,22 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersections // 1. Launch the checker aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 Standard_Boolean iErr = aCSI.HasErrors(); -#else - Standard_Integer iErr = aCSI.ErrorStatus(); -#endif // Standard_Integer aNbS, n1, n2; -#if OCC_VERSION_LARGE > 0x07010000 BOPDS_MapIteratorOfMapOfPair aItMPK; -#else - BOPDS_MapIteratorMapOfPassKey aItMPK; -#endif // // 2. Take the shapes from DS const BOPDS_DS& aDS = aCSI.DS(); aNbS=aDS.NbShapes(); // // 3. Get the pairs of interfered shapes -#if OCC_VERSION_LARGE > 0x07010000 const BOPDS_MapOfPair& aMPK=aDS.Interferences(); -#else - const BOPDS_MapOfPassKey& aMPK=aDS.Interferences(); -#endif aItMPK.Initialize(aMPK); for (; aItMPK.More(); aItMPK.Next()) { -#if OCC_VERSION_LARGE > 0x07010000 const BOPDS_Pair& aPK=aItMPK.Value(); aPK.Indices(n1, n2); -#else - const BOPDS_PassKey& aPK=aItMPK.Value(); - aPK.Ids(n1, n2); -#endif // if (n1 > aNbS || n2 > aNbS){ return false; // Error @@ -1663,7 +1640,6 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersectionsFast TopTools_IndexedMapOfShape anIndices; TopExp::MapShapes(aScopy, anIndices); -#if OCC_VERSION_LARGE > 0x06090000 // Checker of fast interferences BRepExtrema_SelfIntersection aTool(aScopy, (theTolerance <= 0.) ? 0.0 : theTolerance); @@ -1691,7 +1667,6 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersectionsFast if (aTool.IsDone()) SetErrorCode(OK); -#endif return theIntersections->IsEmpty(); } @@ -1794,21 +1769,13 @@ bool GEOMImpl_IMeasureOperations::FastIntersect (Handle(GEOM_Object) theShape1, aBSP.Perform(); // 2. Get sets of IDs of overlapped faces -#if OCC_VERSION_LARGE > 0x06090000 for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next()) -#else - for (BRepExtrema_OverlappedSubShapes::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next()) -#endif { const TopoDS_Shape& aS1 = aBSP.GetSubShape1(anIt1.Key()); theIntersections1->Append(anIndices1.FindIndex(aS1)); } -#if OCC_VERSION_LARGE > 0x06090000 for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next()) -#else - for (BRepExtrema_OverlappedSubShapes::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next()) -#endif { const TopoDS_Shape& aS2 = aBSP.GetSubShape2(anIt2.Key()); theIntersections2->Append(anIndices2.FindIndex(aS2)); diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 34af46dff..0a3c2d831 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -46,8 +46,6 @@ #include #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index 867845185..3a7159a2f 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -55,7 +55,7 @@ GEOMImpl_ImportDriver::GEOMImpl_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -76,11 +76,7 @@ Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const Handle(GEOM_Object) anImported = Handle(GEOM_Object)::DownCast( aSeq->Value(1) ); TopoDS_Shape aShape = anImported->GetValue(); aFunction->SetValue( aShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -110,4 +106,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx index 9016284d6..31fb62b1b 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ImportDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ImportDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ImportDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index bddbe3ec2..a5c42940c 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx @@ -68,7 +68,7 @@ GEOMImpl_LineDriver::GEOMImpl_LineDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_LineDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -177,11 +177,7 @@ Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -224,4 +220,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx index a873a825b..567b38381 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_LineDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_LineDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_LineDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index 80d046394..36332dbea 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx @@ -74,7 +74,7 @@ GEOMImpl_MarkerDriver::GEOMImpl_MarkerDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_MarkerDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -157,11 +157,7 @@ Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -211,4 +207,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx index 4ee615bb8..5fd49222a 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_MarkerDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_MarkerDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_MarkerDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index 9be99da0a..ab3c01973 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -84,7 +84,7 @@ GEOMImpl_MeasureDriver::GEOMImpl_MeasureDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_MeasureDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -317,11 +317,7 @@ Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -369,4 +365,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx index 2524d54f9..fa03f349b 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_MeasureDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_MeasureDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_MeasureDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index b4364a39d..96efab24d 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx @@ -73,7 +73,7 @@ GEOMImpl_MirrorDriver::GEOMImpl_MirrorDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_MirrorDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -156,11 +156,7 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -206,4 +202,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx index ca2f3d766..555fec652 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_MirrorDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_MirrorDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_MirrorDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 6fd616265..413ccff7c 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -60,7 +60,7 @@ GEOMImpl_OffsetDriver::GEOMImpl_OffsetDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -180,11 +180,7 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -232,4 +228,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx index f0312c941..913e45538 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_OffsetDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_OffsetDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_OffsetDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 5a95d6ec4..0988e6ddc 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -44,9 +44,7 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x07010001 #include -#endif #include #include #include @@ -109,11 +107,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape) aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); aCSI.SetArguments(aList); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Partition operation will not be performed, because argument shape is self-intersected"); } } @@ -122,7 +116,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape) //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -417,11 +411,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const aShape = PS.Shape(); if (aShape.IsNull()) { // Mantis issue 22009 -#if OCC_VERSION_LARGE > 0x07010001 if (PS.HasError(STANDARD_TYPE(BOPAlgo_AlertTooFewArguments)) && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1) -#else - if (PS.ErrorStatus() == 100 && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1) -#endif aShape = PS.Arguments().First(); else return 0; @@ -507,11 +497,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const } } -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -569,4 +555,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx index 4e34d1ba6..c7d7848b5 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PartitionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PartitionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PartitionDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index ca48f41bf..655d7a796 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -3021,7 +3021,7 @@ static bool CreateGroups2(const TopoDS_Shape &theProfile, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PipeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -3375,11 +3375,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape); aFunction->SetValue(aRes); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -3458,4 +3454,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx index 43eeb1741..ac2df1640 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx @@ -39,9 +39,9 @@ class GEOMImpl_PipeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PipeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK& log) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK& log) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& log) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)& log) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipeDriver() {}; @@ -59,7 +59,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx index 521795203..06664db5b 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx @@ -53,7 +53,7 @@ GEOMImpl_PipePathDriver::GEOMImpl_PipePathDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PipePathDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -120,11 +120,7 @@ Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const if (aRes.IsNull()) return 0; aFunction->SetValue(aRes); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -165,4 +161,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx index e4efdaf83..b07de6be1 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PipePathDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PipePathDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipePathDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 3fc0821e0..f5603b35c 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -29,8 +29,6 @@ #include -#include - // OCCT Includes #include #include @@ -80,7 +78,7 @@ GEOMImpl_PlaneDriver::GEOMImpl_PlaneDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PlaneDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -238,11 +236,7 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -305,4 +299,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx index 6846ceaa9..1c76a3202 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PlaneDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PlaneDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PlaneDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index 0e73047d9..908076627 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx @@ -110,7 +110,7 @@ static Standard_Boolean getExtremaSolution //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -362,11 +362,7 @@ Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const //aShape.Infinite(Standard_True); // VSR: 05/04/2010: Fix 20668 (Fit All for points & lines) aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -442,4 +438,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx index 371d5ee8b..2d28eaf76 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PointDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PointDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PointDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index e1cfea99e..d9d32a486 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -69,7 +69,7 @@ GEOMImpl_PolylineDriver::GEOMImpl_PolylineDriver() //function : MakePolyline2D //purpose : //======================================================================= -Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const +Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) { return 0; @@ -178,11 +178,7 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const } aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -191,7 +187,7 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PolylineDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -276,11 +272,7 @@ Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -445,4 +437,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx index 5bee45c8b..39115d242 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PolylineDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PolylineDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PolylineDriver() {}; @@ -47,9 +47,9 @@ public: std::vector& params); private: - Standard_Integer MakePolyline2D(LOGBOOK& log) const; + Standard_Integer MakePolyline2D(Handle(TFunction_Logbook)& log) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index 7c3f9a7fd..e84ca1eb0 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx @@ -90,7 +90,7 @@ GEOMImpl_PositionDriver::GEOMImpl_PositionDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PositionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -214,11 +214,7 @@ Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -266,4 +262,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx index 6f6639384..cd0ea863b 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PositionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PositionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PositionDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index 89f466df0..c70ba4969 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -95,7 +95,7 @@ GEOMImpl_PrismDriver::GEOMImpl_PrismDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PrismDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -256,11 +256,7 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aRes); } -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -559,4 +555,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx index 8712ede83..c992ca367 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx @@ -41,9 +41,9 @@ public: Standard_EXPORT GEOMImpl_PrismDriver(); Standard_EXPORT ~GEOMImpl_PrismDriver() {}; - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate (LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute (const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate (Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute (const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); @@ -65,7 +65,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index c9cde5f0f..966ebc824 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -93,7 +93,7 @@ GEOMImpl_ProjectionDriver::GEOMImpl_ProjectionDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ProjectionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -247,11 +247,7 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif } else if (aType == PROJECTION_ON_WIRE) { // Perform projection of point on a wire or an edge. GEOMImpl_IProjection aProj (aFunction); @@ -713,11 +709,7 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder } // Transform the curve to cylinder's parametric space. -#if OCC_VERSION_MAJOR < 7 - GEOMUtils::Handle(HTrsfCurve2d) aTrsfCurve = -#else Handle(GEOMUtils::HTrsfCurve2d) aTrsfCurve = -#endif new GEOMUtils::HTrsfCurve2d(aCurve, aPar[0], aPar[1], aTrsf2d); Approx_Curve2d aConv (aTrsfCurve, aPar[0], aPar[1], aUResol, aVResol, GeomAbs_C1, @@ -807,4 +799,4 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder return aResult; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx index ec2050c63..7abaf8208 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx @@ -37,9 +37,9 @@ class GEOMImpl_ProjectionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ProjectionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ProjectionDriver() {}; @@ -48,7 +48,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver) private: diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index 19426f389..38788bdde 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx @@ -72,7 +72,7 @@ GEOMImpl_RevolutionDriver::GEOMImpl_RevolutionDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_RevolutionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -133,11 +133,7 @@ Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape); aFunction->SetValue(aRes); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -175,4 +171,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx index 72bf2c47d..9ed1655f3 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_RevolutionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_RevolutionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_RevolutionDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index 6da731792..8811fde53 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx @@ -79,7 +79,7 @@ GEOMImpl_RotateDriver::GEOMImpl_RotateDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_RotateDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -311,11 +311,7 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -381,4 +377,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx index 547881ae3..c0736535d 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_RotateDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_RotateDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_RotateDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index fbfc99845..f3bbc3e5d 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_ScaleDriver::GEOMImpl_ScaleDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ScaleDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -173,11 +173,7 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -222,4 +218,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx index 1d29154e6..77a768929 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ScaleDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ScaleDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ScaleDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 13544e81b..06b7fdc95 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -408,7 +408,7 @@ GEOMImpl_ShapeDriver::GEOMImpl_ShapeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -770,11 +770,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const aMV.SetArguments(aLS); aMV.SetIntersect(aCI.GetIsIntersect()); aMV.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aMV.HasErrors()) return 0; -#else - if (aMV.ErrorStatus()) return 0; -#endif aShape = aMV.Shape(); } @@ -1083,11 +1079,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif if (!aWarning.IsEmpty()) Standard_Failure::Raise(aWarning.ToCString()); @@ -2034,7 +2026,7 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver); //modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f #include diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 489d2f2fb..6af068f6e 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -44,9 +44,9 @@ public: Standard_EXPORT GEOMImpl_ShapeDriver(); Standard_EXPORT ~GEOMImpl_ShapeDriver() {}; - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); @@ -61,7 +61,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver) private: diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index dc4270c30..ed5f99565 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx @@ -63,7 +63,7 @@ GEOMImpl_SketcherDriver::GEOMImpl_SketcherDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_SketcherDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -127,11 +127,7 @@ Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const // set the function result aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -181,4 +177,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx index 7974f6f28..c95977a30 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_SketcherDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_SketcherDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_SketcherDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index 2c514ef65..82d256285 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx @@ -58,7 +58,7 @@ GEOMImpl_SphereDriver::GEOMImpl_SphereDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_SphereDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -97,11 +97,7 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -139,4 +135,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx index 300e8bb06..315852b4a 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_SphereDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_SphereDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_SphereDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index 317127015..ccc9a793f 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -128,7 +128,7 @@ GEOMImpl_SplineDriver::GEOMImpl_SplineDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_SplineDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -325,11 +325,7 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -401,4 +397,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx index 507d40848..95a490281 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_SplineDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_SplineDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_SplineDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx index 6a53822bf..c72b15eb6 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_ThruSectionsDriver::GEOMImpl_ThruSectionsDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -133,11 +133,7 @@ Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -175,4 +171,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx index 6aad13272..47d8072cf 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ThruSectionsDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ThruSectionsDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index 119712a49..be4ef43e1 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx @@ -65,7 +65,7 @@ GEOMImpl_TorusDriver::GEOMImpl_TorusDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_TorusDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -115,11 +115,7 @@ Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -160,4 +156,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx index 179868182..e0ab7f6ff 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_TorusDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_TorusDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_TorusDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index a3370f64c..b8354ba16 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_TranslateDriver::GEOMImpl_TranslateDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_TranslateDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -241,11 +241,7 @@ Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -318,4 +314,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx index 1f3469892..a61c215cd 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_TranslateDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_TranslateDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_TranslateDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index b825c206f..494622175 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -81,7 +81,7 @@ GEOMImpl_VectorDriver::GEOMImpl_VectorDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_VectorDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,11 +165,7 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -223,4 +219,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx index 3d5c86a97..396d2e203 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_VectorDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_VectorDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_VectorDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver) }; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 67ed48db0..05f27880a 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -55,8 +55,6 @@ #include #endif -#include - #include #include diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index 58a79a562..245715152 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx @@ -26,8 +26,6 @@ #include #include -#include - #include #include #include diff --git a/src/GEOMUtils/GEOMUtils.cxx b/src/GEOMUtils/GEOMUtils.cxx index 27d89edda..3c1761027 100644 --- a/src/GEOMUtils/GEOMUtils.cxx +++ b/src/GEOMUtils/GEOMUtils.cxx @@ -24,8 +24,6 @@ #include -#include - #include #include @@ -96,9 +94,7 @@ #include #include -#if OCC_VERSION_LARGE >= 0x07010000 #include -#endif #include #include diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx index c31cf3dae..7180c2950 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx @@ -21,7 +21,7 @@ #include namespace GEOMUtils { - OCCT_IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); + IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); } //======================================================================= diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx index ce7f0b4f8..8d1b69c87 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx @@ -73,7 +73,7 @@ namespace GEOMUtils public: - OCCT_DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d) + DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d) }; } diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx index 6c51082ef..185672eda 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx @@ -139,11 +139,7 @@ Handle(Adaptor2d_HCurve2d) GEOMUtils::TrsfCurve2d::Trim const Standard_Real /*Tol*/) const { Handle(Geom2d_Curve) aCurve = myCurve.Curve(); -#if OCC_VERSION_MAJOR < 7 - GEOMUtils::Handle(HTrsfCurve2d) aAHCurve = -#else Handle(GEOMUtils::HTrsfCurve2d) aAHCurve = -#endif new GEOMUtils::HTrsfCurve2d(aCurve, First, Last, myTrsf); return aAHCurve; diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx index 9d14fc760..59538094f 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx @@ -22,8 +22,6 @@ #include -#include - #include #include #include diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc index abf15301f..5dce2cc26 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.cc +++ b/src/GEOM_I/GEOM_BaseObject_i.cc @@ -51,7 +51,7 @@ GEOM_BaseObject_i::GEOM_BaseObject_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_BaseObject) theImpl) + Handle(::GEOM_BaseObject) theImpl) : SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl) { } @@ -181,7 +181,7 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetDependency() TCollection_AsciiString anEntry; for (int i = 1; i<=aLength; i++) { - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i)); + Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i)); if (anObj.IsNull()) continue; TDF_Tool::Entry(anObj->GetEntry(), anEntry); GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), (char*) anEntry.ToCString()); @@ -211,7 +211,7 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetLastDependency() TCollection_AsciiString anEntry; for (int i = 1; i<=aLength; i++) { - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i)); + Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i)); if (anObj.IsNull()) continue; GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), anObj->GetEntryString().ToCString()); @@ -277,8 +277,8 @@ GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation() int nbI = 0; for ( int i = 1; i <= nbFun; ++i ) { - HANDLE_NAMESPACE(GEOM_BaseDriver) driver = - HANDLE_NAMESPACE(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i )); + Handle(::GEOM_BaseDriver) driver = + Handle(::GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i )); if ( !driver.IsNull() ) { std::vector params; diff --git a/src/GEOM_I/GEOM_BaseObject_i.hh b/src/GEOM_I/GEOM_BaseObject_i.hh index a9966da60..f3875eb0c 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.hh +++ b/src/GEOM_I/GEOM_BaseObject_i.hh @@ -37,7 +37,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject, public virtual SALOME::GenericObj_i { public: - GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_BaseObject) theImpl); + GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_BaseObject) theImpl); ~GEOM_BaseObject_i(); virtual char* GetEntry(); @@ -68,7 +68,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject virtual GEOM::CreationInformationSeq* GetCreationInformation(); - HANDLE_NAMESPACE(GEOM_BaseObject) GetImpl() { return _impl; } + Handle(::GEOM_BaseObject) GetImpl() { return _impl; } protected: @@ -76,7 +76,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject private: - HANDLE_NAMESPACE(GEOM_BaseObject) _impl; + Handle(::GEOM_BaseObject) _impl; }; #endif diff --git a/src/GEOM_I/GEOM_Field_i.cc b/src/GEOM_I/GEOM_Field_i.cc index 6b0f6ca44..48a7858c3 100644 --- a/src/GEOM_I/GEOM_Field_i.cc +++ b/src/GEOM_I/GEOM_Field_i.cc @@ -39,7 +39,7 @@ GEOM_Field_i::GEOM_Field_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_Field) theImpl): + Handle(::GEOM_Field) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), _impl( theImpl ) @@ -66,7 +66,7 @@ GEOM_Field_i::~GEOM_Field_i() GEOM::GEOM_Object_ptr GEOM_Field_i::GetShape() { GEOM::GEOM_Object_var shapeVar; - HANDLE_NAMESPACE(GEOM_Object) shape = _impl->GetShape(); + Handle(::GEOM_Object) shape = _impl->GetShape(); if ( !shape.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( shape->GetDocID(), @@ -135,7 +135,7 @@ GEOM::string_array* GEOM_Field_i::GetComponents() GEOM::GEOM_FieldStep_ptr GEOM_Field_i::AddStep(::CORBA::Long stepID, ::CORBA::Long stamp) { GEOM::GEOM_FieldStep_var stepVar; - HANDLE_NAMESPACE(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp ); + Handle(::GEOM_FieldStep) step = _impl->AddStep( stepID, stamp ); if ( !step.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(), @@ -175,8 +175,8 @@ CORBA::Long GEOM_Field_i::CountSteps() GEOM::ListOfLong* GEOM_Field_i::GetSteps() { - std::list< HANDLE_NAMESPACE(GEOM_FieldStep)> stepList = _impl->GetSteps(); - std::list< HANDLE_NAMESPACE(GEOM_FieldStep)>::iterator stp = stepList.begin(); + std::list< Handle(::GEOM_FieldStep)> stepList = _impl->GetSteps(); + std::list< Handle(::GEOM_FieldStep)>::iterator stp = stepList.begin(); GEOM::ListOfLong_var stepIds = new GEOM::ListOfLong(); stepIds->length( stepList.size() ); @@ -198,7 +198,7 @@ GEOM::ListOfLong* GEOM_Field_i::GetSteps() GEOM::GEOM_FieldStep_ptr GEOM_Field_i::GetStep(CORBA::Long stepID) { GEOM::GEOM_FieldStep_var stepVar; - HANDLE_NAMESPACE(GEOM_FieldStep) step = _impl->GetStep(stepID); + Handle(::GEOM_FieldStep) step = _impl->GetStep(stepID); if ( !step.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(), @@ -229,7 +229,7 @@ CORBA::Long GEOM_Field_i::GetArraySize() GEOM_FieldStep_i::GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): + Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), _impl( theImpl ) @@ -288,7 +288,7 @@ void GEOM_FieldStep_i::SetStamp(::CORBA::Long stamp) GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField() { GEOM::GEOM_Field_var fieldVar; - HANDLE_NAMESPACE(GEOM_Field) field = _impl->GetField(); + Handle(::GEOM_Field) field = _impl->GetField(); if ( !field.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( field->GetDocID(), @@ -304,7 +304,7 @@ GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField() */ //================================================================================ -GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) @@ -355,7 +355,7 @@ GEOM::short_array* GEOM_BoolFieldStep_i::GetValues() */ //================================================================================ -GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) @@ -406,7 +406,7 @@ GEOM::ListOfLong* GEOM_IntFieldStep_i::GetValues() */ //================================================================================ -GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) @@ -457,7 +457,7 @@ GEOM::ListOfDouble* GEOM_DoubleFieldStep_i::GetValues() */ //================================================================================ -GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) diff --git a/src/GEOM_I/GEOM_Field_i.hh b/src/GEOM_I/GEOM_Field_i.hh index c60641174..c1f26d541 100644 --- a/src/GEOM_I/GEOM_Field_i.hh +++ b/src/GEOM_I/GEOM_Field_i.hh @@ -39,7 +39,7 @@ class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public virtual GEOM_BaseObject_i { public: - GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_Field) theImpl); + GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_Field) theImpl); ~GEOM_Field_i(); virtual GEOM::GEOM_Object_ptr GetShape(); @@ -56,7 +56,7 @@ class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public v private: - HANDLE_NAMESPACE(GEOM_Field) _impl; + Handle(::GEOM_Field) _impl; }; //================================================================================ @@ -66,7 +66,7 @@ class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public v class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, public virtual GEOM_BaseObject_i { public: - GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); ~GEOM_FieldStep_i(); virtual void SetStamp(::CORBA::Long stamp); @@ -77,7 +77,7 @@ class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, protected: - HANDLE_NAMESPACE(GEOM_FieldStep) _impl; + Handle(::GEOM_FieldStep) _impl; }; //================================================================================ @@ -87,7 +87,7 @@ class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, class GEOM_I_EXPORT GEOM_BoolFieldStep_i : public virtual POA_GEOM::GEOM_BoolFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::short_array& boolValues); virtual GEOM::short_array* GetValues(); @@ -100,7 +100,7 @@ class GEOM_I_EXPORT GEOM_BoolFieldStep_i : public virtual POA_GEOM::GEOM_BoolFie class GEOM_I_EXPORT GEOM_IntFieldStep_i : public virtual POA_GEOM::GEOM_IntFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::ListOfLong& intValues); virtual GEOM::ListOfLong* GetValues(); @@ -113,7 +113,7 @@ class GEOM_I_EXPORT GEOM_IntFieldStep_i : public virtual POA_GEOM::GEOM_IntField class GEOM_I_EXPORT GEOM_DoubleFieldStep_i : public virtual POA_GEOM::GEOM_DoubleFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::ListOfDouble& doubleValues); virtual GEOM::ListOfDouble* GetValues(); @@ -126,7 +126,7 @@ class GEOM_I_EXPORT GEOM_DoubleFieldStep_i : public virtual POA_GEOM::GEOM_Doubl class GEOM_I_EXPORT GEOM_StringFieldStep_i : public virtual POA_GEOM::GEOM_StringFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::string_array& strValues); virtual GEOM::string_array* GetValues(); diff --git a/src/GEOM_I/GEOM_GEOM_I.hxx b/src/GEOM_I/GEOM_GEOM_I.hxx index 6da092805..e37504900 100755 --- a/src/GEOM_I/GEOM_GEOM_I.hxx +++ b/src/GEOM_I/GEOM_GEOM_I.hxx @@ -20,12 +20,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : GEOM_GEOM_I.hxx -// Author : Alexander A. BORODIN -// Module : GEOM -// -#ifndef _GEOM_GEOM_I_HXX_ -#define _GEOM_GEOM_I_HXX_ +#ifndef GEOM_GEOM_I_HXX +#define GEOM_GEOM_I_HXX #ifdef WIN32 #if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS @@ -37,11 +33,4 @@ #define GEOM_I_EXPORT #endif -#include -#if OCC_VERSION_MAJOR < 7 - #define HANDLE_NAMESPACE(CLS) Handle(CLS) -#else - #define HANDLE_NAMESPACE(CLS) Handle(::CLS) -#endif - -#endif //_GEOM_GEOM_I_HXX_ +#endif // GEOM_GEOM_I_HXX diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 782124624..63064b051 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -178,7 +178,7 @@ char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObject = + Handle(::GEOM_BaseObject) anObject = _impl->GetObject(aStudy->StudyId(), aLocalPersistentID); if ( !anObject.IsNull() ) { @@ -264,7 +264,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, { // recieve current TopoDS shape CORBA::String_var entry = aShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aGShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( aShape->GetStudyID(), entry )); TopoDS_Shape TopoSh = aGShape->GetValue(); // find label of main shape @@ -273,7 +273,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, aMainSh = aMainSh->GetMainShape(); } entry = aMainSh->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry ); + Handle(::GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry ); TDF_Label aMainLbl = anObj->GetFunction(1)->GetNamingEntry(); // check all named shapes using iterator @@ -461,7 +461,7 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::ListOfGO_var aResList) { CORBA::String_var entry = theMainShape->GetEntry(); - //HANDLE_NAMESPACE(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry); + //Handle(::GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry); Handle(TColStd_HArray1OfInteger) anArray; if(SeqS.Length()>0) { // create a group @@ -469,9 +469,9 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_wrap GrObj = GOp->CreateGroup( theMainShape, SeqS(1).ShapeType() ); AddInStudy(theStudy, GrObj, GrName, theMainShape._retn()); //CORBA::String_var GrEntry = GrObj->GetEntry(); - //HANDLE_NAMESPACE(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry); + //Handle(::GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry); // add named objects - //HANDLE_NAMESPACE(GEOM_Object) anObj; + //Handle(::GEOM_Object) anObj; for(int i=1; i<=SeqS.Length(); i++) { TopoDS_Shape aValue = SeqS.Value(i); //anArray = new TColStd_HArray1OfInteger(1,1); @@ -480,7 +480,7 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GOp->AddObject(GrObj,anIndex); //anObj = GEOM_Engine::GetEngine()->AddObject(aMainShape->GetDocID(), GEOM_SUBSHAPE); //if (anObj.IsNull()) continue; - //HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); + //Handle(::GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); //if (aFunction.IsNull()) continue; //GEOM_ISubShape aSSI(aFunction); //aSSI.SetMainShape(aMainShape->GetLastFunction()); @@ -514,7 +514,7 @@ GEOM::ListOfGO* GEOM_Gen_i:: if(theMainShape->_is_nil()) return aResList._retn(); CORBA::String_var entry = theMainShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aMainShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( theMainShape->GetStudyID(), entry )); if (aMainShape.IsNull()) return aResList._retn(); TopoDS_Shape MainSh = aMainShape->GetValue(); @@ -600,11 +600,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, if (isMultiFile) aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath (theComponent->GetStudy()->URL())).c_str()); -#if OCC_VERSION_MAJOR > 6 aNameWithExt += TCollection_AsciiString("_GEOM.cbf"); -#else - aNameWithExt += TCollection_AsciiString("_GEOM.sgd"); -#endif aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString()); // Build a full file name of temporary file TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt; @@ -667,7 +663,6 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, TCollection_AsciiString aNameWithExt(""); SALOMEDS::Study_var study = theComponent->GetStudy(); -#if OCC_VERSION_MAJOR > 6 // Get the file name. int i; int aLength = aSeq->length(); @@ -683,14 +678,6 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, break; } } -#else - if (isMultiFile) { - CORBA::String_var url = study->URL(); - aNameWithExt = (char*)SALOMEDS_Tool::GetNameFromPath(url.in()).c_str(); - } - - aNameWithExt += "_GEOM.sgd"; -#endif TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt); @@ -826,8 +813,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, //Create a new GEOM_Object - HANDLE_NAMESPACE(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID); - HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); + Handle(::GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID); + Handle(::GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); aFunction->SetValue(aTopology); TCollection_AsciiString anEntry; @@ -1145,16 +1132,16 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } /* - HANDLE_NAMESPACE(GEOM_Function) anOFun = theObject->GetLastFunction(); + Handle(::GEOM_Function) anOFun = theObject->GetLastFunction(); if (!anOFun.IsNull()) { CORBA::String_var entryArg = anArgO->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg); + Handle(::GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg); if (!anArgOImpl.IsNull()) { TopoDS_Shape anArgOShape = anArgOImpl->GetValue(); TopoDS_Shape aMultiArgShape; @@ -1189,7 +1176,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, {} } GEOM::GEOM_Object_var anArgOMulti = (aMultiArgShape); // TODO - HANDLE_NAMESPACE(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); + Handle(::GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); anArgOMultiFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti); } @@ -1340,8 +1327,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, aResParts->length(nb); if (nb > 0) { - HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); - HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); + Handle(::GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1356,8 +1343,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); - HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); + Handle(::GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1374,7 +1361,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var anObj = anOutArgs[ i ]; if (CORBA::is_nil(anObj)) continue; - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -1466,8 +1453,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::Study_ptr th GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -1742,8 +1729,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } @@ -1886,8 +1873,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu aResParts->length(nb); if (nb > 0) { - HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); - HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); + Handle(::GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1902,8 +1889,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); - HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); + Handle(::GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1918,7 +1905,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu GEOM::GEOM_Object_var anObj = theArgs[ i ]; if (CORBA::is_nil(anObj)) continue; - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -2018,8 +2005,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::Study_ptr GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -2556,14 +2543,14 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh if (CORBA::is_nil(theMainShape) || theIndices.length() < 1) return GEOM::GEOM_Object::_nil(); CORBA::String_var entry = theMainShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aMainShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( theMainShape->GetStudyID(), entry )); if (aMainShape.IsNull()) return GEOM::GEOM_Object::_nil(); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1, theIndices.length()); for(Standard_Integer i = 0; iSetValue(i+1, theIndices[i]); - HANDLE_NAMESPACE(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); + Handle(::GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); if(anObject.IsNull()) return GEOM::GEOM_Object::_nil(); TCollection_AsciiString anEntry; @@ -2579,7 +2566,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh void GEOM_Gen_i::RemoveObject(GEOM::GEOM_BaseObject_ptr theObject) { CORBA::String_var anEntry = theObject->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false); + Handle(::GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false); if (!anObject.IsNull()) _impl->RemoveObject(anObject); } @@ -2614,7 +2601,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetIORFromString(const char* stringIOR) { GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char* theEntry) { GEOM::GEOM_BaseObject_var obj; - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry); if (handle_object.IsNull()) return obj._retn(); TCollection_AsciiString stringIOR = handle_object->GetIOR(); @@ -2629,12 +2616,12 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const c GEOM_BaseObject_i* servant = 0; switch( handle_object->GetType() ) { case GEOM_FIELD: { - servant = new GEOM_Field_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Field)::DownCast( handle_object )); + servant = new GEOM_Field_i (_poa, engine, Handle(::GEOM_Field)::DownCast( handle_object )); break; } case GEOM_FIELD_STEP: { - HANDLE_NAMESPACE(GEOM_FieldStep) step = HANDLE_NAMESPACE(GEOM_FieldStep)::DownCast( handle_object ); - HANDLE_NAMESPACE(GEOM_Field) field = step->GetField(); + Handle(::GEOM_FieldStep) step = Handle(::GEOM_FieldStep)::DownCast( handle_object ); + Handle(::GEOM_Field) field = step->GetField(); int type = ( !field.IsNull() ? field->GetDataType() : 0 ); switch( type ) { case GEOM::FDT_Bool: @@ -2652,7 +2639,7 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const c break; } default: - servant = new GEOM_Object_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Object)::DownCast( handle_object )); + servant = new GEOM_Object_i (_poa, engine, Handle(::GEOM_Object)::DownCast( handle_object )); } PortableServer::ObjectId_var id = _poa->activate_object(servant); @@ -3057,7 +3044,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, std::string aGboEntry = gbo->GetEntry(); Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(gbo->GetStudyID()); Handle(TDataStd_TreeNode) aNode, aRoot; - HANDLE_NAMESPACE(GEOM_Function) aFunction; + Handle(::GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDataStd_ChildNodeIterator Itr( aRoot ); @@ -3130,7 +3117,7 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy, Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(theStudy->StudyId()); Handle(TDataStd_TreeNode) aNode, aRoot; - HANDLE_NAMESPACE(GEOM_Function) aFunction; + Handle(::GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDF_Label aLabel; @@ -3176,7 +3163,7 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy, // because they could not be modified anyhow. std::set aToBeInSelected; for ( it = aSelected.begin(); it != aSelected.end(); ++it ) { - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false); if ( handle_object.IsNull() ) continue; @@ -3274,11 +3261,11 @@ void GEOM_Gen_i::includeSubObjects(SALOMEDS::Study_ptr theStudy, std::set& anOthers) { std::set::iterator foundIt; - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false); if ( handle_object.IsNull() ) return; - HANDLE_NAMESPACE(GEOM_Function) aShapeFun = handle_object->GetFunction(1); + Handle(::GEOM_Function) aShapeFun = handle_object->GetFunction(1); if ( aShapeFun.IsNull() || !aShapeFun->HasSubShapeReferences() ) return; diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index 253c45ff1..1d45ccbd3 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -70,7 +70,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeBoxDXDYDZ (CORBA::Double the GetOperations()->SetNotDone(); //Create the Box - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ); + Handle(::GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -90,13 +90,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeBoxTwoPnt //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn(); //Create the Box - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -121,7 +121,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFaceHW (CORBA::Double theH, return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation); + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -144,13 +144,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFaceObjHW GetOperations()->SetNotDone(); //Get the reference object - HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObj); + Handle(::GEOM_Object) anObj = GetObjectImpl(theObj); if (anObj.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW); + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -172,13 +172,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskPntVecR GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); // Make Disk - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskPntVecR(aPnt, aVec, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -201,14 +201,14 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskThreePnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Disk - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskThreePnt(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -233,7 +233,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskR (CORBA::Double theR, return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation); + Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -254,7 +254,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderRH (CORBA::Double th GetOperations()->SetNotDone(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -276,7 +276,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderRHA (CORBA::Double t GetOperations()->SetNotDone(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -298,13 +298,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderPntVecRH GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -326,13 +326,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderPntVecRHA GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -354,7 +354,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeConeR1R2H (CORBA::Double the GetOperations()->SetNotDone(); //Create the Cone - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH); + Handle(::GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -376,13 +376,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeConePntVecR1R2H GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cone - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeConePntVecR1R2H(aPnt, aVec, theR1, theR2, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -403,7 +403,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeSphereR (CORBA::Double theR) GetOperations()->SetNotDone(); //Create the Cone - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSphereR(theR); + Handle(::GEOM_Object) anObject = GetOperations()->MakeSphereR(theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -424,12 +424,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeSpherePntR GetOperations()->SetNotDone(); //Get the reference point - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); //Create the Sphere - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSpherePntR(aPnt, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -451,7 +451,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeTorusRR GetOperations()->SetNotDone(); // Make Torus - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTorusRR(theRMajor, theRMinor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -474,13 +474,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeTorusPntVecRR GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); // Make Torus - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTorusPntVecRR(aPnt, aVec, theRMajor, theRMinor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -503,13 +503,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismVecH GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismVecH(aBase, aVec, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -532,13 +532,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismVecH2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismVecH2Ways(aBase, aVec, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -561,13 +561,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismVecHWithScaling GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismVecH(aBase, aVec, theH, theScaleFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -591,15 +591,15 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPnt GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -623,15 +623,15 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPnt2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismTwoPnt2Ways(aBase, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -656,15 +656,15 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPntWithScaling GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2, theScaleFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -687,12 +687,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZ GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -715,12 +715,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZ2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismDXDYDZ2Ways(aBase, theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -744,12 +744,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZWithScaling GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ, theScaleFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -775,13 +775,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDraftPrism GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aInit = GetObjectImpl(theInitShape); - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aInit = GetObjectImpl(theInitShape); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull() || aInit.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert); + Handle(::GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -805,8 +805,8 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipe GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); if (aBase.IsNull() || aPath.IsNull()) return aSeq._retn(); @@ -819,7 +819,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipe Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -839,13 +839,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeRevolutionAxisAngle GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn(); //Create the Revolution - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeRevolutionAxisAngle(aBase, anAxis, theAngle); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -868,13 +868,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeRevolutionAxisAngle2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn(); //Create the Revolution - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeRevolutionAxisAngle2Ways(aBase, anAxis, theAngle); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -903,7 +903,7 @@ GEOM_I3DPrimOperations_i::MakeFilling(const GEOM::ListOfGO& theContours, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theContours, aShapes )) return aGEOMObject._retn(); @@ -932,7 +932,7 @@ GEOM_I3DPrimOperations_i::MakeFilling(const GEOM::ListOfGO& theContours, } //Create the Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFilling + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilling (aShapes, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter, aMethod, theApprox); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -960,7 +960,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThruSections(const GEOM::Lis //Get the shapes aLen = theSeqSections.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]); if (!aSh.IsNull()) aSeqSections->Append(aSh); } @@ -968,7 +968,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThruSections(const GEOM::Lis return aGEOMObject._retn(); // Make shell or solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeThruSections(aSeqSections,theModeSolid,thePreci,theRuled); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1005,17 +1005,17 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithDifferentSections if (aNbLocs && aNbBases != aNbLocs) return aSeq._retn(); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); if (aPath.IsNull()) return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); if (aLoc.IsNull()) continue; aSeqLocations->Append(aLoc); @@ -1037,7 +1037,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithDifferentSections Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1074,16 +1074,16 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithShellSections if (aNbLocs && aNbBases != aNbLocs) return aSeq._retn(); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); if (aPath.IsNull()) return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); if (aLoc.IsNull()) continue; aSeqLocations->Append(aLoc); @@ -1091,7 +1091,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithShellSections aSeqBases->Append(aBase); if (aNbSubBases >= aNbBases) { - HANDLE_NAMESPACE(GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]); + Handle(::GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]); if (aSubBase.IsNull()) { aSeqSubBases->Clear(); aNbSubBases = 0; @@ -1115,7 +1115,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithShellSections Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1147,11 +1147,11 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); if (aLoc.IsNull()) continue; aSeqLocations->Append(aLoc); @@ -1173,7 +1173,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1195,9 +1195,9 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aPath.IsNull() || aVec.IsNull()) return aSeq._retn(); @@ -1211,7 +1211,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1244,7 +1244,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThickening aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); // Get faces IDs. @@ -1263,7 +1263,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThickening //Create the thickened shape if (doCopy) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeThickening( + Handle(::GEOM_Object) anObject = GetOperations()->MakeThickening( aBasicObject, aFaceIDs, theOffset, doCopy, theInside); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1297,14 +1297,14 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePath GetOperations()->SetNotDone(); // Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aBase1 = GetObjectImpl(theBase1); - HANDLE_NAMESPACE(GEOM_Object) aBase2 = GetObjectImpl(theBase2); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aBase1 = GetObjectImpl(theBase1); + Handle(::GEOM_Object) aBase2 = GetObjectImpl(theBase2); if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn(); // Create the Path - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); + Handle(::GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1327,7 +1327,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges GetOperations()->SetNotDone(); // Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient; @@ -1338,12 +1338,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges int aNbBases2 = theBase2.length(); for (ind = 0; ind < aNbBases1; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); if (!aBase.IsNull()) aSeqBases1->Append(aBase); } for (ind = 0; ind < aNbBases2; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); if (!aBase.IsNull()) aSeqBases2->Append(aBase); } @@ -1352,7 +1352,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges return aGEOMObject._retn(); // Create the Path - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); + Handle(::GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc index 3e4f4f96a..f44df5b3c 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.cc +++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc @@ -69,7 +69,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointXYZ GetOperations()->SetNotDone(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ); + Handle(::GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -90,11 +90,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointWithReference GetOperations()->SetNotDone(); //Get the reference point - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theReference); + Handle(::GEOM_Object) aReference = GetObjectImpl(theReference); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointWithReference(aReference, theX, theY, theZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -116,12 +116,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnLinesIntersection GetOperations()->SetNotDone(); //Get the reference Lines - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLine1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theLine2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theLine1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theLine2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnLinesIntersection(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -145,11 +145,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnCurve + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurve (aReference, theParameter, takeOrientationIntoAccount); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -173,17 +173,17 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurveByLength GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Get the reference point (can be NULL) - HANDLE_NAMESPACE(GEOM_Object) aRefPoint; + Handle(::GEOM_Object) aRefPoint; if (!CORBA::is_nil(theStartPoint)) { aRefPoint = GetObjectImpl(theStartPoint); } //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurveByLength(aReference, theLength, aRefPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -208,11 +208,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurveByCoord GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurveByCoord(aReference, theXParameter, theYParameter, theZParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -237,11 +237,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurface GetOperations()->SetNotDone(); //Get the reference surface - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface); + Handle(::GEOM_Object) aReference = GetObjectImpl(theSurface); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnSurface(aReference, theUParameter, theVParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -266,11 +266,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurfaceByCoord GetOperations()->SetNotDone(); //Get the reference surface - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface); + Handle(::GEOM_Object) aReference = GetObjectImpl(theSurface); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnSurfaceByCoord(aReference, theXParameter, theYParameter, theZParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -292,11 +292,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnFace (GEOM::GEOM_Objec GetOperations()->SetNotDone(); //Get the reference face - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theFace); + Handle(::GEOM_Object) aReference = GetObjectImpl(theFace); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference); + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -317,11 +317,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentOnCurve GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the vector - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTangentOnCurve(aReference, theParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -344,7 +344,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeVectorDXDYDZ //Create the Vector - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ); + Handle(::GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -365,12 +365,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeVectorTwoPnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the vector - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -392,12 +392,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLine GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theDir); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theDir); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -418,12 +418,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLineTwoPnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -444,12 +444,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLineTwoFaces GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theFace1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theFace2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theFace1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theFace2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeLineTwoFaces(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -473,12 +473,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlanePntVec GetOperations()->SetNotDone(); //Get the references - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theVec); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlanePntVec(aRef1, aRef2, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -501,14 +501,14 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneThreePnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aRef3 = GetObjectImpl(thePnt3); if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlaneThreePnt(aRef1, aRef2, aRef3, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -530,11 +530,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneFace GetOperations()->SetNotDone(); //Get the reference face - HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace); + Handle(::GEOM_Object) aRef = GetObjectImpl(theFace); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlaneFace(aRef, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -557,12 +557,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlane2Vec GetOperations()->SetNotDone(); //Get the references - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theVec1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theVec1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theVec2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlane2Vec(aRef1, aRef2, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -585,10 +585,10 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneLCS GetOperations()->SetNotDone(); //Get the references - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLCS); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theLCS); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlaneLCS(aRef1, theTrimSize, theOrientation); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -612,7 +612,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarker GetOperations()->SetNotDone(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ, + Handle(::GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -635,11 +635,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarkerFromShape GetOperations()->SetNotDone(); //Get the referenced object - HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aRef = GetObjectImpl(theShape); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef); + Handle(::GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -662,13 +662,13 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarkerPntTwoVec GetOperations()->SetNotDone(); //Get the referenced objects - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theOrigin); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theXVec); - HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(theYVec); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theOrigin); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theXVec); + Handle(::GEOM_Object) aRef3 = GetObjectImpl(theYVec); if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1, + Handle(::GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1, aRef2, aRef3); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -695,11 +695,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentPlaneOnFace GetOperations()->SetNotDone(); //Get the reference face - HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace); + Handle(::GEOM_Object) aRef = GetObjectImpl(theFace); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index 838577adb..e24fe856b 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc @@ -73,16 +73,16 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad GetOperations()->SetNotDone(); //Get the reference edges - HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); - HANDLE_NAMESPACE(GEOM_Object) anEdge3 = GetObjectImpl(theEdge3); - HANDLE_NAMESPACE(GEOM_Object) anEdge4 = GetObjectImpl(theEdge4); + Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + Handle(::GEOM_Object) anEdge3 = GetObjectImpl(theEdge3); + Handle(::GEOM_Object) anEdge4 = GetObjectImpl(theEdge4); if (anEdge1.IsNull() || anEdge2.IsNull() || anEdge3.IsNull() || anEdge4.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeQuad(anEdge1, anEdge2, anEdge3, anEdge4); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -104,13 +104,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad2Edges GetOperations()->SetNotDone(); //Get the reference edges - HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); if (anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeQuad2Edges(anEdge1, anEdge2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -133,16 +133,16 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad4Vertices GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); - HANDLE_NAMESPACE(GEOM_Object) aPnt4 = GetObjectImpl(thePnt4); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt4 = GetObjectImpl(thePnt4); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull() || aPnt4.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeQuad4Vertices(aPnt1, aPnt2, aPnt3, aPnt4); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -166,19 +166,19 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeHexa GetOperations()->SetNotDone(); //Get the reference Faces - HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1); - HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2); - HANDLE_NAMESPACE(GEOM_Object) anFace3 = GetObjectImpl(theFace3); - HANDLE_NAMESPACE(GEOM_Object) anFace4 = GetObjectImpl(theFace4); - HANDLE_NAMESPACE(GEOM_Object) anFace5 = GetObjectImpl(theFace5); - HANDLE_NAMESPACE(GEOM_Object) anFace6 = GetObjectImpl(theFace6); + Handle(::GEOM_Object) anFace1 = GetObjectImpl(theFace1); + Handle(::GEOM_Object) anFace2 = GetObjectImpl(theFace2); + Handle(::GEOM_Object) anFace3 = GetObjectImpl(theFace3); + Handle(::GEOM_Object) anFace4 = GetObjectImpl(theFace4); + Handle(::GEOM_Object) anFace5 = GetObjectImpl(theFace5); + Handle(::GEOM_Object) anFace6 = GetObjectImpl(theFace6); if (anFace1.IsNull() || anFace2.IsNull() || anFace3.IsNull() || anFace4.IsNull() || anFace5.IsNull() || anFace6.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeHexa + Handle(::GEOM_Object) anObject = GetOperations()->MakeHexa (anFace1, anFace2, anFace3, anFace4, anFace5, anFace6); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -200,13 +200,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeHexa2Faces GetOperations()->SetNotDone(); //Get the reference Faces - HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1); - HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2); + Handle(::GEOM_Object) anFace1 = GetObjectImpl(theFace1); + Handle(::GEOM_Object) anFace2 = GetObjectImpl(theFace2); if (anFace1.IsNull() || anFace2.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeHexa2Faces(anFace1, anFace2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -228,11 +228,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeBlockCompound GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Create the Blocks Compound - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeBlockCompound(aCompound); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -257,11 +257,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetPoint (GEOM::GEOM_Object_ptr GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Create the Point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetPoint(aShape, theX, theY, theZ, theEpsilon); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -284,12 +284,12 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetVertexNearPoint GetOperations()->SetNotDone(); // Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); // Create the Point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetVertexNearPoint(aShape, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -312,15 +312,15 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetEdge (GEOM::GEOM_Object_ptr t GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aShape.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetEdge(aShape, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -342,13 +342,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetEdgeNearPoint (GEOM::GEOM_Obj GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Create the Edge - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetEdgeNearPoint(aShape, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -374,18 +374,18 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByPoints GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); - HANDLE_NAMESPACE(GEOM_Object) aPoint3 = GetObjectImpl(thePoint3); - HANDLE_NAMESPACE(GEOM_Object) aPoint4 = GetObjectImpl(thePoint4); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint3 = GetObjectImpl(thePoint3); + Handle(::GEOM_Object) aPoint4 = GetObjectImpl(thePoint4); if (aShape.IsNull() || aPoint1.IsNull() || aPoint2.IsNull() || aPoint3.IsNull() || aPoint4.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceByPoints(aShape, aPoint1, aPoint2, aPoint3, aPoint4); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -409,15 +409,15 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByEdges GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); if (aShape.IsNull() || anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceByEdges(aShape, anEdge1, anEdge2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -439,13 +439,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetOppositeFace (GEOM::GEOM_Obje GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aShape.IsNull() || aFace.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetOppositeFace(aShape, aFace); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -467,13 +467,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceNearPoint (GEOM::GEOM_Obj GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceNearPoint(aShape, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -495,13 +495,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByNormale (GEOM::GEOM_Obj GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aShape.IsNull() || aVector.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceByNormale(aShape, aVector); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -526,13 +526,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetShapesNearPoint GetOperations()->SetNotDone(); // Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); // Create the Shape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetShapesNearPoint(aShape, aPoint, theShapeType, theTolerance); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -556,7 +556,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::ExplodeCompoundOfBlocks GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aSeq._retn(); //Explode @@ -568,7 +568,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::ExplodeCompoundOfBlocks Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -591,7 +591,7 @@ CORBA::Boolean GEOM_IBlocksOperations_i::IsCompoundOfBlocks GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return isComp; //Check @@ -623,7 +623,7 @@ CORBA::Boolean GEOM_IBlocksOperations_i::CheckCompoundOfBlocks GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return isComp; //Check @@ -698,7 +698,7 @@ char* GEOM_IBlocksOperations_i::PrintBCErrors const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors) { //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return NULL; // Convert the errors sequence @@ -763,12 +763,12 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetNonBlocks GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) aFaces; - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) aFaces; + Handle(::GEOM_Object) anObject = GetOperations()->GetNonBlocks(aShape, theToleranceC1, aFaces); if (!GetOperations()->IsDone()) return aGEOMObject._retn(); @@ -797,11 +797,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::RemoveExtraEdges GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces); + Handle(::GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -822,11 +822,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::UnionFaces GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionFaces(aShape); + Handle(::GEOM_Object) anObject = GetOperations()->UnionFaces(aShape); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -846,11 +846,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::CheckAndImprove (GEOM::GEOM_Obje GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->CheckAndImprove(aCompound); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -872,13 +872,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockNearPoint (GEOM::GEOM_Ob GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aCompound.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Get the block - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetBlockNearPoint(aCompound, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -900,7 +900,7 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockByParts (GEOM::GEOM_Obje GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Get the parts @@ -909,13 +909,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockByParts (GEOM::GEOM_Obje aLen = theParts.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theParts[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aParts->Append(aSh); } //Get the Block - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetBlockByParts(aCompound, aParts); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -937,7 +937,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aSeq._retn(); //Get the parts @@ -946,7 +946,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_pt aLen = theParts.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theParts[ind]); if (aSh.IsNull()) return aSeq._retn(); aParts->Append(aSh); } @@ -960,7 +960,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_pt Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -982,11 +982,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeMultiTransformation1D GetOperations()->SetNotDone(); //Get the object itself and the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theBlock); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D + Handle(::GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D (aBasicObject, theDirFace1, theDirFace2, theNbTimes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1013,11 +1013,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeMultiTransformation2D GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theBlock); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D + Handle(::GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D (aBasicObject, theDirFace1U, theDirFace2U, theNbTimesU, theDirFace1V, theDirFace2V, theNbTimesV); @@ -1039,7 +1039,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::Propagate (GEOM::GEOM_Object_ptr theSh GetOperations()->SetNotDone(); //Get the reference Shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); //Get the Propagation chains @@ -1051,7 +1051,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::Propagate (GEOM::GEOM_Object_ptr theSh Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc index 2cfe521bc..0a38cd145 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc @@ -73,13 +73,13 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeBoolean GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aSh1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aSh2 = GetObjectImpl(theShape2); if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn(); // Make Boolean - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeBoolean(aSh1, aSh2, theOp, IsCheckSelfInte); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -104,13 +104,13 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeFuse GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aSh1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aSh2 = GetObjectImpl(theShape2); if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn(); // Make Boolean - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFuse + Handle(::GEOM_Object) anObject = GetOperations()->MakeFuse (aSh1, aSh2, IsCheckSelfInte, IsRmExtraEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -142,7 +142,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeFuseList } // Make fusion - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFuseList(aShapes, IsCheckSelfInte, IsRmExtraEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -173,7 +173,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeCommonList } // Make fusion - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCommonList(aShapes, IsCheckSelfInte); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -197,7 +197,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeCutList //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aMainShape = GetObjectImpl(theMainShape); if (aMainShape.IsNull()) { return aGEOMObject._retn(); @@ -211,7 +211,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeCutList } // Make fusion - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCutList(aMainShape, aShapes, IsCheckSelfInte); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -262,7 +262,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakePartition } // Make Partition - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns, theLimit, theRemoveWebs, aMaterials, theKeepNonlimitShapes, @@ -317,7 +317,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakePartitionNonSelfIntersected } // Make Partition - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns, theLimit, theRemoveWebs, aMaterials, theKeepNonlimitShapes, @@ -344,13 +344,13 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeHalfPartition GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPl = GetObjectImpl(thePlane); + Handle(::GEOM_Object) aSh = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPl = GetObjectImpl(thePlane); if (aSh.IsNull() || aPl.IsNull()) return aGEOMObject._retn(); // Make Half Partition - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeHalfPartition(aSh, aPl); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 003f1d8c8..9389fc7df 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -76,7 +76,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCirclePntVecR //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn(); //Get the arguments - HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec; + Handle(::GEOM_Object) aPnt, aVec; if (!CORBA::is_nil(thePnt)) { aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); @@ -87,7 +87,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCirclePntVecR } // Make Circle - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCirclePntVecR(aPnt, aVec, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -110,14 +110,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCircleThreePnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Circle - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCircleThreePnt(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -140,14 +140,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCircleCenter2Pnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Circle - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -173,7 +173,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipse //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn(); //Get the arguments - HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj; + Handle(::GEOM_Object) aPnt, aVec, aVecMaj; if (!CORBA::is_nil(thePnt)) { aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); @@ -184,7 +184,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipse } // Make Ellipse - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeEllipse(aPnt, aVec, theRMajor, theRMinor, aVecMaj); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -213,7 +213,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipseVec //if (thePnt == NULL || theVec == NULL || theVecMaj == NULL) return aGEOMObject._retn(); //Get the arguments - HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj; + Handle(::GEOM_Object) aPnt, aVec, aVecMaj; if (!CORBA::is_nil(thePnt)) { aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); @@ -228,7 +228,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipseVec } // Make Ellipse - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeEllipse(aPnt, aVec, theRMajor, theRMinor, aVecMaj); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -252,14 +252,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArc GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Arc - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeArc(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -285,14 +285,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcCenter GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make ArcCenter - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeArcCenter(aPnt1, aPnt2, aPnt3,theSense); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -316,14 +316,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcOfEllipse GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Arc - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeArcOfEllipse(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -348,15 +348,15 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakePolyline //Get the reference point int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePolyline(aPoints, theIsClosed); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -381,15 +381,15 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSplineBezier //Get the reference point int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Bezier curve - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSplineBezier(aPoints, theIsClosed); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -415,15 +415,15 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSplineInterpolation //Get the reference point int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSplineInterpolation(aPoints, theIsClosed, theDoReordering); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -449,21 +449,21 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSplineInterpolWithTangents //Get the reference points int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } //Get the reference vectors - HANDLE_NAMESPACE(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec); - HANDLE_NAMESPACE(GEOM_Object) aVec2 = GetObjectImpl(theLastVec); + Handle(::GEOM_Object) aVec1 = GetObjectImpl(theFirstVec); + Handle(::GEOM_Object) aVec2 = GetObjectImpl(theLastVec); if (aVec1.IsNull() || aVec2.IsNull()) return aGEOMObject._retn(); // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSplineInterpolWithTangents(aPoints, aVec1, aVec2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -501,7 +501,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametric } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr, theParamMin, theParamMax, theParamStep, aType); @@ -542,7 +542,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametricNew } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr, theParamMin, theParamMax, 0.0, aType, theParamNbStep, true); @@ -568,10 +568,10 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeIsoline //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); // Make isoline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeIsoline(aFace, IsUIsoline, theParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -597,7 +597,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcher aWorkingPlane.push_back(theWorkingPlane[ind]); // Make Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSketcher(theCommand, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -616,10 +616,10 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcherOnPlane //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); + Handle(::GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); // Make Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSketcherOnPlane(theCommand, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -638,7 +638,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::Make3DSketcherCommand (const cha GetOperations()->SetNotDone(); // Make 3D Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand); + Handle(::GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -663,7 +663,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::Make3DSketcher aCoords.push_back(theCoordinates[ind]); // Make Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->Make3DSketcher(aCoords); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -710,7 +710,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakePolyline2D } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2D + Handle(::GEOM_Object) anObject = GetOperations()->MakePolyline2D (aCoords, aNames, aTypes, aCloseds, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) { @@ -743,13 +743,13 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakePolyline2DOnPlane Handle(TColStd_HArray1OfByte) aCloseds = ConvertBoolArray(theClosedList); std::list > aCoords; - HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = + Handle(::GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); ConvertListListDouble(theCoordsList, aCoords); // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane + Handle(::GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane (aCoords, aNames, aTypes, aCloseds, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) { diff --git a/src/GEOM_I/GEOM_IFieldOperations_i.cc b/src/GEOM_I/GEOM_IFieldOperations_i.cc index 1626e25e7..3a6ceca24 100644 --- a/src/GEOM_I/GEOM_IFieldOperations_i.cc +++ b/src/GEOM_I/GEOM_IFieldOperations_i.cc @@ -76,8 +76,8 @@ GEOM_IFieldOperations_i::CreateField(GEOM::GEOM_Object_ptr theShape, for ( size_t i = 0; i < theComponentNames.length(); ++i ) compNames->SetValue( i+1, theComponentNames[ i ].in() ); } - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl( theShape ); - HANDLE_NAMESPACE(GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef, + Handle(::GEOM_Object) aShapeRef = GetObjectImpl( theShape ); + Handle(::GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef, theName, (int) theType, theDimension, @@ -96,7 +96,7 @@ GEOM_IFieldOperations_i::CreateField(GEOM::GEOM_Object_ptr theShape, CORBA::Long GEOM_IFieldOperations_i::CountFields( GEOM::GEOM_Object_ptr shape) { - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); return ( CORBA::Long) GetOperations()->CountFields( go ); } @@ -111,7 +111,7 @@ GEOM::ListOfFields* GEOM_IFieldOperations_i::GetFields( GEOM::GEOM_Object_ptr sh { GEOM::ListOfFields_var fields = new GEOM::ListOfFields; - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); Handle(TColStd_HSequenceOfTransient) seq = GetOperations()->GetFields( go ); if ( !seq.IsNull() ) @@ -120,7 +120,7 @@ GEOM::ListOfFields* GEOM_IFieldOperations_i::GetFields( GEOM::GEOM_Object_ptr sh int nbF = 0; for ( int i = 1; i <= seq->Length(); ++i ) { - HANDLE_NAMESPACE(GEOM_Field) f = HANDLE_NAMESPACE(GEOM_Field)::DownCast( seq->Value( i )); + Handle(::GEOM_Field) f = Handle(::GEOM_Field)::DownCast( seq->Value( i )); GEOM::GEOM_Field_var fvar = GEOM::GEOM_Field::_narrow( GetBaseObject( f )); if ( !fvar->_is_nil() ) fields[ nbF++ ] = fvar._retn(); @@ -141,9 +141,9 @@ GEOM::GEOM_Field_ptr GEOM_IFieldOperations_i::GetField( GEOM::GEOM_Object_ptr sh { GEOM::GEOM_Field_var field; - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); - HANDLE_NAMESPACE(GEOM_Field) f = GetOperations()->GetField( go, name ); + Handle(::GEOM_Field) f = GetOperations()->GetField( go, name ); field = GEOM::GEOM_Field::_narrow( GetBaseObject( f )); return field._retn(); @@ -158,6 +158,6 @@ GEOM::GEOM_Field_ptr GEOM_IFieldOperations_i::GetField( GEOM::GEOM_Object_ptr sh ::CORBA::Long GEOM_IFieldOperations_i::GetNbSubShapes(::GEOM::GEOM_Object_ptr shape, ::CORBA::Short fieldDim) { - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); return GEOM_Field::GetNbSubShapes( go, fieldDim ); } diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc index d55117e21..50728b440 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.cc +++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc @@ -74,11 +74,11 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CreateGroup(GEOM::GEOM_Object_ptr if (theShapeType < 0) return aGEOMObject._retn(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theMainShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType); + Handle(::GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -96,7 +96,7 @@ void GEOM_IGroupOperations_i::AddObject(GEOM::GEOM_Object_ptr theGroup, CORBA::L GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; GetOperations()->AddObject(aGroupRef, theSubShapeId); @@ -116,7 +116,7 @@ void GEOM_IGroupOperations_i::RemoveObject(GEOM::GEOM_Object_ptr theGroup, CORBA GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; GetOperations()->RemoveObject(aGroupRef, theSubShapeId); @@ -137,7 +137,7 @@ void GEOM_IGroupOperations_i::UnionList (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to add @@ -145,7 +145,7 @@ void GEOM_IGroupOperations_i::UnionList (GEOM::GEOM_Object_ptr theGroup, int ind, aLen = theSubShapes.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); if (aSh.IsNull()) return; aSubShapes->Append(aSh); } @@ -166,7 +166,7 @@ void GEOM_IGroupOperations_i::DifferenceList (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to remove @@ -174,7 +174,7 @@ void GEOM_IGroupOperations_i::DifferenceList (GEOM::GEOM_Object_ptr theGroup, int ind, aLen = theSubShapes.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); if (aSh.IsNull()) return; aSubShapes->Append(aSh); } @@ -195,7 +195,7 @@ void GEOM_IGroupOperations_i::UnionIDs (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to add @@ -222,7 +222,7 @@ void GEOM_IGroupOperations_i::DifferenceIDs (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to remove @@ -251,12 +251,12 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::UnionGroups (GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); //Get the reference groups - HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2); + Handle(::GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -276,12 +276,12 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::IntersectGroups (GEOM::GEOM_Objec GetOperations()->SetNotDone(); //Get the reference groups - HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2); + Handle(::GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -301,12 +301,12 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CutGroups (GEOM::GEOM_Object_ptr GetOperations()->SetNotDone(); //Get the reference groups - HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2); + Handle(::GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -329,13 +329,13 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::UnionListOfGroups (const GEOM::Li int ind, aLen = theGList.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups->Append(aGr); } //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups); + Handle(::GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -358,13 +358,13 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::IntersectListOfGroups (const GEOM int ind, aLen = theGList.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups->Append(aGr); } //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups); + Handle(::GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -389,19 +389,19 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CutListOfGroups (const GEOM::List int ind, aLen = theGList1.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList1[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList1[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups1->Append(aGr); } aLen = theGList2.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList2[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups2->Append(aGr); } //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2); + Handle(::GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -418,7 +418,7 @@ CORBA::Long GEOM_IGroupOperations_i::GetType(GEOM::GEOM_Object_ptr theGroup) GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return -1; return GetOperations()->GetType(aGroupRef); @@ -437,10 +437,10 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::GetMainShape(GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return aGEOMObject._retn(); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef); + Handle(::GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -459,7 +459,7 @@ GEOM::ListOfLong* GEOM_IGroupOperations_i::GetObjects(GEOM::GEOM_Object_ptr theG GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return aList._retn(); aList = new GEOM::ListOfLong; diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index 3f4f4f366..d83e0d161 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -101,12 +101,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ProcessShape (GEOM::GEOM_Object // return aGEOMObject._retn(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject, + Handle(::GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject, ConvertStringArray( theOperations ), ConvertStringArray( theParams ), ConvertStringArray( theValues ) ); if ( !GetOperations()->IsDone() || aNewObject.IsNull() ) @@ -211,14 +211,14 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::SuppressFaces (GEOM::GEOM_Objec GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // if theFaces is empty - it's OK, it means that ALL faces must be removed // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->SuppressFaces( anObject, Convert( theFaces ) ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -241,12 +241,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::CloseContour (GEOM::GEOM_Object GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->CloseContour( anObject, Convert( theWires ), isCommonVertex ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -268,14 +268,14 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::RemoveIntWires (GEOM::GEOM_Obje GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // if theWires is empty - it's OK, it means that ALL wires should be removed // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->RemoveIntWires( anObject, Convert( theWires ) ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -297,14 +297,14 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::FillHoles (GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // if theWires is empty - it's OK, it means that ALL wires should be removed // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->FillHoles( anObject, Convert( theWires ) ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -330,12 +330,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::Sew (const GEOM::ListOfGO& theO return aGEOMObject._retn(); //Get the shapes - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theObjects, aShapes )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false ); + Handle(::GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -361,12 +361,12 @@ GEOM_IHealingOperations_i::SewAllowNonManifold (const GEOM::ListOfGO& theObjects return aGEOMObject._retn(); //Get the shapes - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theObjects, aShapes )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true ); + Handle(::GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -387,12 +387,12 @@ GEOM_IHealingOperations_i::RemoveInternalFaces (const GEOM::ListOfGO& theSolids) GetOperations()->SetNotDone(); // Get the objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theSolids, aShapes )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes); + Handle(::GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -419,12 +419,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::DivideEdge (GEOM::GEOM_Object_p return aGEOMObject._retn(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->DivideEdge( anObject, theIndex, theValue, isByParameter ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -448,17 +448,17 @@ GEOM_IHealingOperations_i::DivideEdgeByPoint (GEOM::GEOM_Object_ptr theObject, GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Get the points - std::list< HANDLE_NAMESPACE(GEOM_Object) > aPoints; + std::list< Handle(::GEOM_Object) > aPoints; if (! GetListOfObjectsImpl( thePoints, aPoints )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->DivideEdgeByPoint( anObject, theIndex, aPoints ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -481,21 +481,21 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::FuseCollinearEdgesWithinWire GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); int ind, aLen; - std::list aVerts; + std::list aVerts; //Get the shapes aLen = theVertices.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theVertices[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aVerts.push_back(aSh); } //Perform operation - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->FuseCollinearEdgesWithinWire(aWire, aVerts); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -523,7 +523,7 @@ GEOM_IHealingOperations_i::GetFreeBoundary ( const GEOM::ListOfGO & theObjects, Handle(TColStd_HSequenceOfTransient) anObjects = new TColStd_HSequenceOfTransient(); for ( size_t i = 0; i < theObjects.length(); ++i ) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObjects[i]); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObjects[i]); if (anObject.IsNull()) return false; anObjects->Append( anObject ); @@ -539,12 +539,12 @@ GEOM_IHealingOperations_i::GetFreeBoundary ( const GEOM::ListOfGO & theObjects, int i, n = aClosed->Length(); theClosedWires->length( n ); for ( i = 1; i <= n; i++ ) - (*theClosedWires)[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aClosed->Value(i))); + (*theClosedWires)[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aClosed->Value(i))); n = anOpen->Length(); theOpenWires->length( n ); for ( i = 1, n = anOpen->Length(); i <= n; i++ ) - (*theOpenWires)[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(anOpen->Value(i))); + (*theOpenWires)[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(anOpen->Value(i))); return true; } @@ -569,12 +569,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ChangeOrientation (GEOM::GEOM_O aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform -// HANDLE_NAMESPACE(GEOM_Object) aNewObject = +// Handle(::GEOM_Object) aNewObject = GetOperations()->ChangeOrientation( anObject ); // if (!GetOperations()->IsDone() || aNewObject.IsNull()) // return aGEOMObject._retn(); @@ -597,12 +597,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ChangeOrientationCopy (GEOM::GE GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->ChangeOrientationCopy( anObject ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -624,12 +624,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::LimitTolerance (GEOM::GEOM_Obje GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->LimitTolerance(anObject, theTolerance); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc index 57d768f18..87a697c9b 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -36,10 +36,7 @@ #include "GEOM_BaseObject.hxx" #include "GEOMImpl_Types.hxx" -#include - #include - #include //============================================================================= @@ -79,11 +76,11 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::MakeCopy(GEOM::GEOM_Object_ptr t GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); + Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal); if (anOriginal.IsNull()) return aGEOMObject._retn(); //Create the copy - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -106,7 +103,7 @@ void GEOM_IInsertOperations_i::Export GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); + Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal); if (anOriginal.IsNull()) return; //Export the shape to the file @@ -139,7 +136,7 @@ GEOM::ListOfGBO* GEOM_IInsertOperations_i::ImportFile aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetBaseObject(Handle(::GEOM_BaseObject)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -180,7 +177,7 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::RestoreShape (const SALOMEDS::TM char* buf = (char*)theStream.NP_data(); std::istringstream aStream (buf); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream); + Handle(::GEOM_Object) anObject = GetOperations()->RestoreShape(aStream); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -280,8 +277,8 @@ CORBA::Boolean GEOM_IInsertOperations_i::TransferData } //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom); - HANDLE_NAMESPACE(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo); + Handle(::GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom); + Handle(::GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo); if (aShapeFrom.IsNull() || aShapeTo.IsNull()) { diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc index 0d89b61d3..236717cb7 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.cc +++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc @@ -66,11 +66,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletAll GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletAll(aShapeRef, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -90,7 +90,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdges GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -102,7 +102,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdges } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletEdges(aShapeRef, theR, anEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -122,7 +122,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdgesR1R2 GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -134,7 +134,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdgesR1R2 } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletEdgesR1R2(aShapeRef, theR1, theR2, anEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -154,7 +154,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFaces GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -166,7 +166,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFaces } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletFaces(aShapeRef, theR, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -186,7 +186,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFacesR1R2 GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -198,7 +198,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFacesR1R2 } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletFacesR1R2(aShapeRef, theR1, theR2, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -218,7 +218,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet2D GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference vertex @@ -230,7 +230,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet2D } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFillet2D(aShapeRef, theR, aVertexes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -251,7 +251,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet1D GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape (wire) - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference vertex @@ -263,7 +263,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet1D } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFillet1D(aShapeRef, theR, aVertexes, doIgnoreSecantVertices); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -282,11 +282,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferAll GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferAll(aShapeRef, theD); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -307,11 +307,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdge GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdge(aShapeRef, theD1, theD2, theFace1, theFace2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -331,11 +331,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgeAD GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdgeAD(aShapeRef, theD, theAngle, theFace1, theFace2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -356,7 +356,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFaces GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -368,7 +368,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFaces } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferFaces(aShapeRef, theD1, theD2, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -388,7 +388,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFacesAD GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -400,7 +400,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFacesAD } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferFacesAD(aShapeRef, theD, theAngle, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -421,7 +421,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdges GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -433,7 +433,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdges } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdges(aShapeRef, theD1, theD2, aEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -454,7 +454,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgesAD GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -466,7 +466,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgesAD } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdgesAD(aShapeRef, theD, theAngle, aEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -487,11 +487,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeArchimede (GEOM::GEOM_Object_ GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Archimede - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeArchimede + Handle(::GEOM_Object) anObject = GetOperations()->MakeArchimede (aShapeRef, theWeight, theWaterDensity, theMeshingDeflection); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -508,8 +508,8 @@ CORBA::Long GEOM_ILocalOperations_i::GetSubShapeIndex (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr theSubShape) { //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); if (aShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; //Get the unique ID of inside diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 97e8df969..591861013 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -355,7 +355,7 @@ GEOM::GEOM_IKindOfShape::shape_kind GEOM_IMeasureOperations_i::KindOfShape GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger; @@ -403,7 +403,7 @@ void GEOM_IMeasureOperations_i::GetPosition Zz = Xx = 1.; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -424,11 +424,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetCentreOfMass GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); // Make Point - centre of mass of theShape - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape); + Handle(::GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -449,11 +449,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetVertexByIndex GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if ( aShape.IsNull() ) return aGEOMObject._retn(); // Get vertex by index - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex); + Handle(::GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -475,14 +475,14 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetNormal GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) return aGEOMObject._retn(); // Get the OptionalPoint (can be not defined) - HANDLE_NAMESPACE(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint); + Handle(::GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint); // Make Vector - normal to theFace (in point theOptionalPoint if the face is not planar) - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint); + Handle(::GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -504,7 +504,7 @@ void GEOM_IMeasureOperations_i::GetBasicProperties (GEOM::GEOM_Object_ptr theSha GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -528,7 +528,7 @@ void GEOM_IMeasureOperations_i::GetInertia GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -554,7 +554,7 @@ void GEOM_IMeasureOperations_i::GetBoundingBox (GEOM::GEOM_Object_ptr theShape, GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -577,11 +577,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::MakeBoundingBox GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); // Make Box - bounding box of theShape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetBoundingBox(aShape, precise); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -604,7 +604,7 @@ void GEOM_IMeasureOperations_i::GetTolerance GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -632,7 +632,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape } //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { @@ -660,7 +660,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry } //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { @@ -685,7 +685,7 @@ char* GEOM_IMeasureOperations_i::PrintShapeErrors const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrors) { //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { return NULL; @@ -720,7 +720,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Obj GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { GEOMImpl_IMeasureOperations::SICheckLevel aCheckLevel; @@ -787,7 +787,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersectionsFast GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger; @@ -822,7 +822,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckBOPArguments GetOperations()->SetNotDone(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); bool isGood = false; if (!aShape.IsNull()) { @@ -855,8 +855,8 @@ CORBA::Boolean GEOM_IMeasureOperations_i::FastIntersect (GEOM::GEOM_Object_ptr t GEOM::ListOfLong_var anIntegersArray2 = new GEOM::ListOfLong(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (!aShape1.IsNull() && !aShape2.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers1 = new TColStd_HSequenceOfInteger; @@ -897,7 +897,7 @@ char* GEOM_IMeasureOperations_i::IsGoodForSolid (GEOM::GEOM_Object_ptr theShape) GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return CORBA::string_dup("WRN_NULL_OBJECT_OR_SHAPE"); // Get shape parameters @@ -916,7 +916,7 @@ char* GEOM_IMeasureOperations_i::WhatIs (GEOM::GEOM_Object_ptr theShape) GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return NULL; // Get shape parameters @@ -941,7 +941,7 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_ GEOM::ListOfBool_var aResults = new GEOM::ListOfBool; aResults->length(nb_points); - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); std::vector tmp(3*nb_points); for (int i = 0; i < 3*nb_points; i++) @@ -966,8 +966,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetMinDistance GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get shape parameters @@ -991,8 +991,8 @@ CORBA::Long GEOM_IMeasureOperations_i::ClosestPoints GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (!aShape1.IsNull() && !aShape2.IsNull()) { Handle(TColStd_HSequenceOfReal) aDoubles = new TColStd_HSequenceOfReal; @@ -1022,7 +1022,7 @@ void GEOM_IMeasureOperations_i::PointCoordinates (GEOM::GEOM_Object_ptr theShape GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; @@ -1042,8 +1042,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngle (GEOM::GEOM_Object_ptr theShap GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get the angle @@ -1062,8 +1062,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngleBtwVectors (GEOM::GEOM_Object_p GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get the angle @@ -1083,7 +1083,7 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve); if(aShape.IsNull()) return -1.0; return GetOperations()->CurveCurvatureByParam(aShape,theParam); @@ -1101,8 +1101,8 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if( aShape.IsNull() || aPoint.IsNull() ) return -1.0; return GetOperations()->CurveCurvatureByPoint(aShape,aPoint); @@ -1123,7 +1123,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); if(aShape.IsNull()) return -1.0; return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam); @@ -1141,8 +1141,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if( aShape.IsNull() || aPoint.IsNull() ) return -1.0; return GetOperations()->MaxSurfaceCurvatureByPoint(aShape,aPoint); @@ -1162,7 +1162,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); if (aShape.IsNull()) return -1.0; return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam); @@ -1180,8 +1180,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return -1.0; return GetOperations()->MinSurfaceCurvatureByPoint(aShape,aPoint); diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index b3d6c6125..47aadccca 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -135,7 +135,7 @@ void GEOM_IOperations_i::AbortOperation() */ //============================================================================= GEOM::GEOM_BaseObject_ptr -GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject) +GEOM_IOperations_i::GetBaseObject(Handle(::GEOM_BaseObject) theObject) { GEOM::GEOM_BaseObject_var GO; if (theObject.IsNull()) return GO._retn(); @@ -150,10 +150,10 @@ GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject) * GetObjectImpl */ //============================================================================= -HANDLE_NAMESPACE(GEOM_BaseObject) +Handle(::GEOM_BaseObject) GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject) { - HANDLE_NAMESPACE(GEOM_BaseObject) anImpl; + Handle(::GEOM_BaseObject) anImpl; if (!CORBA::is_nil(theObject)) { CORBA::String_var anEntry = theObject->GetEntry(); anImpl = GetImpl()->GetEngine()->GetObject( theObject->GetStudyID(), anEntry ); @@ -166,7 +166,7 @@ GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject) * GetObject */ //============================================================================= -GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject) +GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(::GEOM_Object) theObject) { return GEOM::GEOM_Object::_narrow( GetBaseObject( theObject )); } @@ -176,9 +176,9 @@ GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object * GetObjectImpl */ //============================================================================= -HANDLE_NAMESPACE(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject) +Handle(::GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject) { - return HANDLE_NAMESPACE(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject )); + return Handle(::GEOM_Object)::DownCast( GetBaseObjectImpl( theObject )); } //============================================================================= @@ -196,7 +196,7 @@ Handle(TColStd_HSequenceOfTransient) GEOM_IOperations_i::GetListOfObjectsImpl int aNbObj = theObjects.length(); for (i = 0; i < aNbObj; i++) { - HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]); + Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]); if (anObj.IsNull()) { aResult.Nullify(); @@ -215,13 +215,13 @@ Handle(TColStd_HSequenceOfTransient) GEOM_IOperations_i::GetListOfObjectsImpl //======================================================================= bool GEOM_IOperations_i::GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects, - std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList) + std::list< Handle(::GEOM_Object) >& theList) { int i; int aNbObj = theObjects.length(); for (i = 0; i < aNbObj; i++) { - HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]); + Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]); if (anObj.IsNull()) return false; diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh index aa271fbf1..61acf9656 100644 --- a/src/GEOM_I/GEOM_IOperations_i.hh +++ b/src/GEOM_I/GEOM_IOperations_i.hh @@ -47,10 +47,10 @@ class GEOM_I_EXPORT GEOM_IOperations_i : public virtual POA_GEOM::GEOM_IOperatio virtual CORBA::Long GetStudyID(); - virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject); - virtual HANDLE_NAMESPACE(GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject); - virtual GEOM::GEOM_Object_ptr GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject); - virtual HANDLE_NAMESPACE(GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject); + virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(Handle(::GEOM_BaseObject) theObject); + virtual Handle(::GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject); + virtual GEOM::GEOM_Object_ptr GetObject(Handle(::GEOM_Object) theObject); + virtual Handle(::GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject); virtual void StartOperation(); @@ -68,7 +68,7 @@ protected: Handle(TColStd_HSequenceOfTransient) GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects); bool GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects, - std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList); + std::list< Handle(::GEOM_Object) >& theList); Handle(TColStd_HArray1OfExtendedString) ConvertStringArray(const GEOM::string_array &theInArray); diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index 31e54ba2f..0f18c5bb0 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -102,13 +102,13 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeEdge GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn(); //Create the Edge - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -131,17 +131,17 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeEdgeOnCurveByLength GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aRefCurve = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aRefCurve = GetObjectImpl(theCurve); if (aRefCurve.IsNull()) return aGEOMObject._retn(); //Get the reference point (can be NULL) - HANDLE_NAMESPACE(GEOM_Object) aRefPoint; + Handle(::GEOM_Object) aRefPoint; if (!CORBA::is_nil(theStartPoint)) { aRefPoint = GetObjectImpl(theStartPoint); } //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeEdgeOnCurveByLength(aRefCurve, theLength, aRefPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -165,12 +165,12 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeEdgeWire GetOperations()->SetNotDone(); //Get the source wire - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); //Create the Edge - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance); + Handle(::GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -192,18 +192,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeWire GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theEdgesAndWires.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeWire(aShapes, theTolerance); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -226,11 +226,11 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFace GetOperations()->SetNotDone(); //Get the reference wire - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted); + Handle(::GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted); //if (!GetOperations()->IsDone() || anObject.IsNull()) // enable warning status if (anObject.IsNull()) @@ -254,18 +254,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWires GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theWires.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theWires[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theWires[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceWires(aShapes, isPlanarWanted); //if (!GetOperations()->IsDone() || anObject.IsNull()) // enable warning status @@ -290,15 +290,15 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceFromSurface GetOperations()->SetNotDone(); //Get the reference face and wire - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aFace.IsNull() || aWire.IsNull()) { return aGEOMObject._retn(); } //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceFromSurface(aFace, aWire); if (anObject.IsNull()) { @@ -322,14 +322,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWithConstraints GetOperations()->SetNotDone(); //Get the shapes - std::list aConstraints; + std::list aConstraints; for( int ind = 0; ind < theConstraints.length(); ind++ ) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); + Handle(::GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); aConstraints.push_back(anObject); } // Make Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceWithConstraints( aConstraints ); // enable warning status @@ -353,18 +353,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeShell GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theFacesAndShells.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeShell(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -386,14 +386,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSolidShell GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShell = GetObjectImpl(theShell); + Handle(::GEOM_Object) aShell = GetObjectImpl(theShell); if (aShell.IsNull()) return aGEOMObject._retn(); - std::list aShapes; + std::list aShapes; aShapes.push_back(aShell); //Create the Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); + Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -414,18 +414,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSolidShells GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theShells.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShells[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -447,18 +447,18 @@ GEOM_IShapesOperations_i::MakeCompound (const GEOM::ListOfGO& theShapes) GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theShapes.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theShapes[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCompound(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -481,18 +481,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSolidFromConnectedFaces GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theFacesOrShells.length(); for (ind = 0; ind < aLen; ind++) { - ::HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]); + ::Handle(::GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidFromConnectedFaces(aShapes, isIntersect); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -516,12 +516,12 @@ GEOM_IShapesOperations_i::MakeGlueFaces (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueFaces(aShapes, theTolerance, doKeepNonSolids); //if (!GetOperations()->IsDone() || anObject.IsNull()) // to allow warning @@ -546,7 +546,7 @@ GEOM_IShapesOperations_i::GetGlueFaces (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aSeq._retn(); @@ -561,7 +561,7 @@ GEOM_IShapesOperations_i::GetGlueFaces (const GEOM::ListOfGO& theShapes, Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -584,17 +584,17 @@ GEOM_IShapesOperations_i::MakeGlueFacesByList (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Get the shapes - std::list aFaces; + std::list aFaces; if (! GetListOfObjectsImpl( theFaces, aFaces )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueFacesByList(aShapes, theTolerance, aFaces, doKeepNonSolids, doGlueAllEdges); //if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -620,12 +620,12 @@ GEOM_IShapesOperations_i::MakeGlueEdges (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueEdges(aShapes, theTolerance); //if (!GetOperations()->IsDone() || anObject.IsNull()) // to allow warning @@ -650,7 +650,7 @@ GEOM_IShapesOperations_i::GetGlueEdges (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aSeq._retn(); @@ -665,7 +665,7 @@ GEOM_IShapesOperations_i::GetGlueEdges (const GEOM::ListOfGO& theShapes, Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -686,17 +686,17 @@ GEOM_IShapesOperations_i::MakeGlueEdgesByList (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Get the shapes - std::list anEdges; + std::list anEdges; if (! GetListOfObjectsImpl( theEdges, anEdges )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueEdgesByList(aShapes, theTolerance, anEdges); //if (!GetOperations()->IsDone() || anObject.IsNull()) // to allow warning @@ -717,7 +717,7 @@ GEOM_IShapesOperations_i::GetExistingSubObjects (GEOM::GEOM_Object_ptr theShape, { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -728,7 +728,7 @@ GEOM_IShapesOperations_i::GetExistingSubObjects (GEOM::GEOM_Object_ptr theShape, Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -744,7 +744,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeExplode (GEOM::GEOM_Object_ptr the { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -756,7 +756,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeExplode (GEOM::GEOM_Object_ptr the Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -772,7 +772,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeAllSubShapes (GEOM::GEOM_Object_pt { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -784,7 +784,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeAllSubShapes (GEOM::GEOM_Object_pt Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -800,7 +800,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::ExtractSubShapes (GEOM::GEOM_Object_pt { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -813,7 +813,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::ExtractSubShapes (GEOM::GEOM_Object_pt Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -829,7 +829,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::SubShapeAllIDs (GEOM::GEOM_Object_pt { GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfInteger) aHSeq = @@ -856,7 +856,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetAllSubShapesIDs (GEOM::GEOM_Objec { GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfInteger) aHSeq = @@ -887,10 +887,10 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSubShape GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theMainShape); if (aShape.IsNull()) return aGEOMObject._retn(); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID); + Handle(::GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -914,7 +914,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t if (theIndices.length() < 1) return aSeq._retn(); - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theMainShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger (1, theIndices.length()); @@ -928,7 +928,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (i = 0; i < aLength; i++) - aSeq[i] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i+1))); + aSeq[i] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i+1))); return aSeq._retn(); } @@ -942,8 +942,8 @@ CORBA::Long GEOM_IShapesOperations_i::GetSubShapeIndex (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape) { //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); - HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; @@ -966,14 +966,14 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSubShapesIndices GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; //Get the reference main shape - HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); if (aMainShapeRef.IsNull()) return aSeq._retn(); //Get the subshapes - std::list aShapes; + std::list aShapes; int aLen = theSubShapes.length(); for (int ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); if (aSh.IsNull()) { MESSAGE("NULL shape") @@ -1007,8 +1007,8 @@ CORBA::Long GEOM_IShapesOperations_i::GetTopologyIndex (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape) { //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); - HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; @@ -1028,7 +1028,7 @@ CORBA::Long GEOM_IShapesOperations_i::GetTopologyIndex char* GEOM_IShapesOperations_i::GetShapeTypeString (GEOM::GEOM_Object_ptr theShape) { //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return NULL; // Get shape parameters @@ -1046,8 +1046,8 @@ CORBA::Boolean GEOM_IShapesOperations_i::IsSubShapeBelongsTo( GEOM::GEOM_Object_ GEOM::GEOM_Object_ptr theObject, const CORBA::Long theObjectIndex) { - HANDLE_NAMESPACE(GEOM_Object) aSubObject = GetObjectImpl( theSubObject ); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theObject ); + Handle(::GEOM_Object) aSubObject = GetObjectImpl( theSubObject ); + Handle(::GEOM_Object) anObject = GetObjectImpl( theObject ); if( anObject.IsNull() || aSubObject.IsNull() ) return false; @@ -1083,7 +1083,7 @@ CORBA::Long GEOM_IShapesOperations_i::NumberOfEdges (GEOM::GEOM_Object_ptr theSh CORBA::Long GEOM_IShapesOperations_i::NumberOfSubShapes (GEOM::GEOM_Object_ptr theShape, const CORBA::Long theShapeType) { - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return -1; CORBA::Long aNb = GetOperations()->NumberOfSubShapes(aShape, theShapeType); @@ -1106,11 +1106,11 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::ChangeOrientation GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Create the Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ReverseShape(aShape); + Handle(::GEOM_Object) anObject = GetOperations()->ReverseShape(aShape); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1129,7 +1129,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetFreeFacesIDs (GEOM::GEOM_Object_p GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfInteger) aHSeq = @@ -1159,8 +1159,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapes GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return aSeq._retn(); @@ -1172,7 +1172,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapes Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1193,7 +1193,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapesMulti GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; //Get the shapes - std::list aShapes; + std::list aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aSeq._retn(); @@ -1205,7 +1205,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapesMulti Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1254,8 +1254,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlane GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn(); @@ -1268,7 +1268,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlane Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1291,9 +1291,9 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocation GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); - HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) anPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn(); @@ -1306,7 +1306,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocation Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1329,8 +1329,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinder GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn(); @@ -1343,7 +1343,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinder Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1367,9 +1367,9 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinderWithLocation GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn(); @@ -1382,7 +1382,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinderWithLocation Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1405,8 +1405,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnSphere GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCenter = GetObjectImpl(theCenter); if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn(); @@ -1419,7 +1419,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnSphere Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1444,11 +1444,11 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnQuadrangle GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); + Handle(::GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); + Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); + Handle(::GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); if (aShape.IsNull() || aTopLeftPoint.IsNull() || @@ -1468,7 +1468,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnQuadrangle Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1490,8 +1490,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnPlaneIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn(); @@ -1527,9 +1527,9 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocationIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); - HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) anPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn(); @@ -1566,8 +1566,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnCylinderIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn(); @@ -1604,9 +1604,9 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnCylinderWithLocationIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn(); @@ -1642,8 +1642,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnSphereIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCenter = GetObjectImpl(theCenter); if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn(); @@ -1681,11 +1681,11 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnQuadrangleIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); + Handle(::GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); + Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); + Handle(::GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); if (aShape.IsNull() || aTopLeftPoint.IsNull() || @@ -1727,8 +1727,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnBox GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aBox = GetObjectImpl(theBox); if (aShape.IsNull() || aBox.IsNull() ) return aSeq._retn(); @@ -1742,7 +1742,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnBox Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1764,8 +1764,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnBoxIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aBox = GetObjectImpl(theBox); if (aShape.IsNull() || aBox.IsNull() ) return aSeq._retn(); @@ -1802,8 +1802,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnShape GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aSeq._retn(); @@ -1818,7 +1818,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnShape Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1841,14 +1841,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetShapesOnShapeAsCompound GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aGEOMObject._retn(); //Get Shapes On Shape - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound + Handle(::GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound (aCheckShape,aShape, theShapeType,ShapeState(theState)); if (anObject.IsNull()) @@ -1875,8 +1875,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnShapeIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aSeq._retn(); @@ -1911,14 +1911,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlace GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetInPlace(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1941,14 +1941,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlaceOld GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetInPlaceOld(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1971,14 +1971,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlaceByHistory GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetInPlaceByHistory(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -2001,14 +2001,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSame GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetSame(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -2027,8 +2027,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSameIDs GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aSeq._retn(); @@ -2063,14 +2063,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::ExtendEdge GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) anEdge = GetObjectImpl(theEdge); + Handle(::GEOM_Object) anEdge = GetObjectImpl(theEdge); if (anEdge.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) aNewEdge = + Handle(::GEOM_Object) aNewEdge = GetOperations()->ExtendEdge(anEdge, theMin, theMax); if (!GetOperations()->IsDone() || aNewEdge.IsNull()) { @@ -2098,14 +2098,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::ExtendFace GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) aNewFace = + Handle(::GEOM_Object) aNewFace = GetOperations()->ExtendFace(aFace, theUMin, theUMax, theVMin, theVMax); if (!GetOperations()->IsDone() || aNewFace.IsNull()) { @@ -2129,14 +2129,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSurfaceFromFace GetOperations()->SetNotDone(); //Get the reference object - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace); + Handle(::GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace); if (!GetOperations()->IsDone() || aNewFace.IsNull()) { return aGEOMObject._retn(); @@ -2160,8 +2160,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapeEdgeSorted GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint); if (aShape.IsNull() || aStartPoint.IsNull()) { return aSeq._retn(); @@ -2180,7 +2180,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapeEdgeSorted aSeq->length(aLength); for (i = 1; i <= aLength; i++) { - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); } return aSeq._retn(); @@ -2203,7 +2203,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapesWithTolerance GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { return aSeq._retn(); @@ -2225,7 +2225,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapesWithTolerance aSeq->length(aLength); for (i = 1; i <= aLength; i++) { - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); } return aSeq._retn(); diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc index e8e2fcd2d..55aa0eb3f 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -87,15 +87,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPoints aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the first point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -123,19 +123,19 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPointsCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the first point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Create the translated shape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->TranslateTwoPointsCopy(aBasicObject, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -167,7 +167,7 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -194,11 +194,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the translated shape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->TranslateDXDYDZCopy(aBasicObject, theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -230,11 +230,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVector aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -261,15 +261,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector); + Handle(::GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -302,16 +302,16 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorDistance aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation if (theCopy) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()-> + Handle(::GEOM_Object) anObject = GetOperations()-> TranslateVectorDistance(aBasicObject, aVector, theDistance, theCopy); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -351,11 +351,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::Rotate (GEOM::GEOM_Object_ptr aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the axis of revolution - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (anAxis.IsNull()) return aGEOMObject._retn(); //Perform the rotation @@ -382,15 +382,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateCopy (GEOM::GEOM_Object GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the axis of rotation - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (anAxis.IsNull()) return aGEOMObject._retn(); //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle); + Handle(::GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -420,11 +420,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlane } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the plane - HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane); + Handle(::GEOM_Object) aPlane = GetObjectImpl(thePlane); if (aPlane.IsNull()) return aGEOMObject._retn(); //Perform the mirror @@ -451,15 +451,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlaneCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane); + Handle(::GEOM_Object) aPlane = GetObjectImpl(thePlane); if (aPlane.IsNull()) return aGEOMObject._retn(); //Perform the mirror - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane); + Handle(::GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -489,11 +489,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxis } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the axis - HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aAxis = GetObjectImpl(theAxis); if (aAxis.IsNull()) return aGEOMObject._retn(); //Perform the mirror @@ -520,15 +520,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxisCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aAxis = GetObjectImpl(theAxis); if (aAxis.IsNull()) return aGEOMObject._retn(); //Perform the mirror - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis); + Handle(::GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -558,11 +558,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPoint } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); //Perform the mirror @@ -589,15 +589,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPointCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); //Perform the mirror - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint); + Handle(::GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -627,7 +627,7 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape } //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape @@ -654,11 +654,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset); + Handle(::GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -680,12 +680,12 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ProjectShapeCopy GetOperations()->SetNotDone(); //Get the input objects - HANDLE_NAMESPACE(GEOM_Object) aSource = GetObjectImpl(theSource); - HANDLE_NAMESPACE(GEOM_Object) aTarget = GetObjectImpl(theTarget); + Handle(::GEOM_Object) aSource = GetObjectImpl(theSource); + Handle(::GEOM_Object) aTarget = GetObjectImpl(theTarget); if (aSource.IsNull() || aTarget.IsNull()) return aGEOMObject._retn(); //Create the projection - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget); + Handle(::GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -707,14 +707,14 @@ CORBA::Double GEOM_ITransformOperations_i::ProjectPointOnWire GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aPoint.IsNull() || aWire.IsNull()) { return -1.0; } - HANDLE_NAMESPACE(GEOM_Object) aPointOnEdge; + Handle(::GEOM_Object) aPointOnEdge; Standard_Integer anEdgeIndex; CORBA::Double aResult = GetOperations()->ProjectPointOnWire (aPoint, aWire, aPointOnEdge, anEdgeIndex); @@ -751,11 +751,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShape } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); @@ -786,18 +786,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); } //Perform the scale - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->ScaleShapeCopy(aBasicObject, aPoint, theFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -831,11 +831,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxes } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); @@ -869,18 +869,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxesCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); } //Perform the scale - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes + Handle(::GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes (aBasicObject, aPoint, theFactorX, theFactorY, theFactorZ, /*doCopy*/true); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -913,18 +913,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShape } //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the Start LCS (may be NULL for positioning from global LCS) - HANDLE_NAMESPACE(GEOM_Object) aStartLCS; + Handle(::GEOM_Object) aStartLCS; if (!CORBA::is_nil(theStartLCS)) { aStartLCS = GetObjectImpl(theStartLCS); if (aStartLCS.IsNull()) return aGEOMObject._retn(); } //Get the End LCS - HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); + Handle(::GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); if (aEndLCS.IsNull()) return aGEOMObject._retn(); //Perform the Position @@ -952,22 +952,22 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShapeCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the Start LCS (may be NULL for positioning from global LCS) - HANDLE_NAMESPACE(GEOM_Object) aStartLCS; + Handle(::GEOM_Object) aStartLCS; if (!CORBA::is_nil(theStartLCS)) { aStartLCS = GetObjectImpl(theStartLCS); if (aStartLCS.IsNull()) return aGEOMObject._retn(); } //Get the End LCS - HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); + Handle(::GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); if (aEndLCS.IsNull()) return aGEOMObject._retn(); //Perform the position - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->PositionShapeCopy(aBasicObject, aStartLCS, aEndLCS); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -993,15 +993,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionAlongPath GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the path object - HANDLE_NAMESPACE(GEOM_Object) aPathObject = GetObjectImpl(thePath); + Handle(::GEOM_Object) aPathObject = GetObjectImpl(thePath); if (aPathObject.IsNull()) return aGEOMObject._retn(); //Perform the position - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->PositionAlongPath(aBasicObject, aPathObject, theDistance, theCopy, theReverse); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1030,15 +1030,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate1D GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DX by default //Perform the translation - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->Translate1D(aBasicObject, aVector, theStep, theNbTimes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1064,19 +1064,19 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate2D (GEOM::GEOM_ GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector1 of translation - HANDLE_NAMESPACE(GEOM_Object) aVector1 = GetObjectImpl(theVector1); + Handle(::GEOM_Object) aVector1 = GetObjectImpl(theVector1); //if (aVector1.IsNull()) return aGEOMObject._retn(); // DX by default //Get the vector2 of translation - HANDLE_NAMESPACE(GEOM_Object) aVector2 = GetObjectImpl(theVector2); + Handle(::GEOM_Object) aVector2 = GetObjectImpl(theVector2); //if (aVector2.IsNull()) return aGEOMObject._retn(); // DY by default //Perform the translation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Translate2D + Handle(::GEOM_Object) anObject = GetOperations()->Translate2D (aBasicObject, aVector1, theStep1, theNbTimes1, aVector2, theStep2, theNbTimes2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1098,15 +1098,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate1D (GEOM::GEOM_Obj GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes); + Handle(::GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -1128,15 +1128,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate1DByStep (GEOM::GE GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps); + Handle(::GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -1159,15 +1159,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2DNbTimes (GEOM::G GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D + Handle(::GEOM_Object) anObject = GetOperations()->Rotate2D (aBasicObject, aVector, theNbObjects, theRadialStep, theNbSteps); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1192,15 +1192,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2DByStep (GEOM::GE GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D + Handle(::GEOM_Object) anObject = GetOperations()->Rotate2D (aBasicObject, aVector, theAngle, theNbTimes1, theStep, theNbTimes2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1225,17 +1225,17 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2D (GEOM::GEOM_Obj GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default double anAngle = M_PI * theAngle / 180.; //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D + Handle(::GEOM_Object) anObject = GetOperations()->Rotate2D (aBasicObject, aVector, anAngle, theNbTimes1, theStep, theNbTimes2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1269,19 +1269,19 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePoints aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the central point of rotation - HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); + Handle(::GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); if (aCentPoint.IsNull()) return aGEOMObject._retn(); //Get the first point - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -1310,23 +1310,23 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePointsCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the central point of rotation - HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); + Handle(::GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); if (aCentPoint.IsNull()) return aGEOMObject._retn(); //Get the first point - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->RotateThreePointsCopy(aBasicObject, aCentPoint, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1349,15 +1349,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TransformLikeOtherCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the sample object - HANDLE_NAMESPACE(GEOM_Object) aSample = GetObjectImpl(theSample); + Handle(::GEOM_Object) aSample = GetObjectImpl(theSample); if (aSample.IsNull()) return aGEOMObject._retn(); //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) aResObject = + Handle(::GEOM_Object) aResObject = GetOperations()->TransformLikeOtherCopy(anObject, aSample); if (!GetOperations()->IsDone() || aResObject.IsNull()) return aGEOMObject._retn(); @@ -1382,11 +1382,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RecomputeObject aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Perform the recomputation - HANDLE_NAMESPACE(GEOM_Function) aLastFunction = anObject->GetLastFunction(); + Handle(::GEOM_Function) aLastFunction = anObject->GetLastFunction(); if (aLastFunction.IsNull()) return aGEOMObject._retn(); GetOperations()->GetSolver()->ComputeFunction(aLastFunction); @@ -1411,14 +1411,14 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MakeProjectionOnCylinder GetOperations()->SetNotDone(); //Get the object - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) { return aGEOMObject._retn(); } //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder + Handle(::GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder (anObject, theRadius, theStartAngle, theAngleLength, theAngleRotation); if (!GetOperations()->IsDone() || aResObject.IsNull()) { diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 3894aff78..165613dc6 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -61,7 +61,7 @@ //============================================================================= GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_Object) theImpl) : + Handle(::GEOM_Object) theImpl) : SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), _impl( theImpl ) @@ -169,7 +169,7 @@ char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID) { CORBA::String_var name(""); - HANDLE_NAMESPACE(GEOM_Function) aMainFun = _impl->GetLastFunction(); + Handle(::GEOM_Function) aMainFun = _impl->GetLastFunction(); if ( aMainFun.IsNull() ) return name._retn(); const TDataStd_ListOfExtendedString& aListEntries = aMainFun->GetSubShapeReferences(); @@ -177,14 +177,14 @@ char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID) for (; anIt.More(); anIt.Next()) { TCollection_AsciiString anEntry = anIt.Value(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = + Handle(::GEOM_BaseObject) anObj = GEOM_Engine::GetEngine()->GetObject( _impl->GetDocID(), anEntry.ToCString(), false ); if ( anObj.IsNull() ) continue; TCollection_AsciiString aSubName = anObj->GetName(); if ( aSubName.IsEmpty() ) continue; - HANDLE_NAMESPACE(GEOM_Function) aFun = anObj->GetLastFunction(); + Handle(::GEOM_Function) aFun = anObj->GetLastFunction(); if ( aFun.IsNull() ) continue; GEOM_ISubShape ISS( aFun ); @@ -359,7 +359,7 @@ GEOM::ListOfLong* GEOM_Object_i::GetSubShapeIndices() GEOM::ListOfLong_var anIndices = new GEOM::ListOfLong; if(!_impl->IsMainShape()) { - HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one) + Handle(::GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one) if(aFunction.IsNull()) return anIndices._retn(); GEOM_ISubShape ISS(aFunction); Handle(TColStd_HArray1OfInteger) anArray = ISS.GetIndices(); @@ -384,7 +384,7 @@ GEOM::GEOM_Object_ptr GEOM_Object_i::GetMainShape() { GEOM::GEOM_Object_var obj; if(!_impl->IsMainShape()) { - HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one) + Handle(::GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one) if(aFunction.IsNull()) return obj._retn(); GEOM_ISubShape ISS(aFunction); @@ -413,7 +413,7 @@ bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other) GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other ); if ( !CORBA::is_nil( shapePtr ) ) { CORBA::String_var entry = shapePtr->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) otherObject = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) otherObject = Handle(::GEOM_Object)::DownCast ( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), entry, false )); if ( !otherObject.IsNull() ) { TopoDS_Shape thisShape = _impl->GetValue(); diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index c825acd59..9a1d5adc6 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -36,7 +36,7 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM_BaseObject_i { public: - GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_Object) theImpl); + GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_Object) theImpl); ~GEOM_Object_i(); virtual GEOM::shape_type GetShapeType(); @@ -81,11 +81,11 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual bool IsShape(); - HANDLE_NAMESPACE(GEOM_Object) GetImpl() { return _impl; } + Handle(::GEOM_Object) GetImpl() { return _impl; } private: - HANDLE_NAMESPACE(GEOM_Object) _impl; + Handle(::GEOM_Object) _impl; TopoDS_Shape _geom; }; diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx index d8cea0968..1b311aa3e 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx @@ -115,7 +115,7 @@ IGESPlugin_ExportDriver::IGESPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer IGESPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -185,4 +185,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx index 35a799ab3..81c5f254b 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~IGESPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _IGESPlugin_ExportDriver_HXX diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx index 3cc0c7cb5..f82173160 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx @@ -80,7 +80,7 @@ IGESPlugin_ImportDriver::IGESPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer IGESPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -195,11 +195,7 @@ Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aResShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -282,4 +278,4 @@ IGESPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return TCollection_AsciiString(); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx index 35c5ab87f..7d3f11eaf 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx @@ -32,9 +32,9 @@ public: ~IGESPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); @@ -44,7 +44,7 @@ public: const TCollection_AsciiString&, TCollection_AsciiString& ); - OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _IGESPlugin_ImportDriver_HXX diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx index ae7a8326b..b964bcdab 100644 --- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx @@ -28,8 +28,6 @@ #include #include -#include - #include #include #include diff --git a/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx b/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx index 65c158550..6b0cbb9fe 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx @@ -32,7 +32,7 @@ // SALOME includes #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter) +IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter) //======================================================================= // function : Constructor diff --git a/src/MeasureGUI/MeasureGUI_DimensionFilter.h b/src/MeasureGUI/MeasureGUI_DimensionFilter.h index 60e83db1d..273653efb 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionFilter.h +++ b/src/MeasureGUI/MeasureGUI_DimensionFilter.h @@ -27,9 +27,6 @@ #ifndef MEASUREGUI_DIMENSIONFILTER_H #define MEASUREGUI_DIMENSIONFILTER_H -// KERNEL includes -#include - // GEOM includes #include @@ -49,7 +46,7 @@ class MeasureGUI_DimensionFilter : public SelectMgr_Filter { public: - OCCT_DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter) + DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter) public: Standard_EXPORT MeasureGUI_DimensionFilter( const Handle(AIS_InteractiveObject)& theIO ); diff --git a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx index fa63bceb9..296fc8594 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx @@ -55,10 +55,7 @@ #include #include #include - -#if OCC_VERSION_LARGE >= 0x07010000 #include -#endif //================================================================================= // function : Constructor diff --git a/src/OBJECT/GEOM_AISDimension.cxx b/src/OBJECT/GEOM_AISDimension.cxx index e4bccc9ec..748bef3a5 100755 --- a/src/OBJECT/GEOM_AISDimension.cxx +++ b/src/OBJECT/GEOM_AISDimension.cxx @@ -26,9 +26,9 @@ #include "GEOM_AISDimension.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension) -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension) -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension) /* ****************************************************************************** * * * diff --git a/src/OBJECT/GEOM_AISDimension.hxx b/src/OBJECT/GEOM_AISDimension.hxx index 17ffd27e5..26f07380b 100755 --- a/src/OBJECT/GEOM_AISDimension.hxx +++ b/src/OBJECT/GEOM_AISDimension.hxx @@ -31,8 +31,6 @@ #include #include -#include - DEFINE_STANDARD_HANDLE(GEOM_AISLength, AIS_LengthDimension) DEFINE_STANDARD_HANDLE(GEOM_AISDiameter, AIS_DiameterDimension) DEFINE_STANDARD_HANDLE(GEOM_AISAngle, AIS_AngleDimension) @@ -45,7 +43,7 @@ class GEOM_AISLength : public AIS_LengthDimension { public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension) + DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension) public: Standard_EXPORT GEOM_AISLength( const Standard_Integer theId ); @@ -64,7 +62,7 @@ class GEOM_AISDiameter : public AIS_DiameterDimension { public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension) + DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension) public: Standard_EXPORT GEOM_AISDiameter( const Standard_Integer theId ); @@ -83,7 +81,7 @@ class GEOM_AISAngle : public AIS_AngleDimension { public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension) + DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension) public: Standard_EXPORT GEOM_AISAngle( const Standard_Integer theId ); diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 71212889b..d2cbff7b4 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -30,8 +30,6 @@ #include -#include - // Open CASCADE Includes #include #include @@ -67,22 +65,14 @@ #include #include #include - -#if OCC_VERSION_LARGE > 0x06070200 #include -#endif - -#if OCC_VERSION_MAJOR < 7 - #include -#else - #include -#endif +#include #include #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) GEOM_AISShape::TopLevelDispMode GEOM_AISShape::myTopLevelDm = GEOM_AISShape::TopKeepCurrent; Quantity_Color GEOM_AISShape::myTopLevelColor; @@ -107,15 +97,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, Handle(SelectMgr_Selection) sel = theObj->Selection( m ); for ( sel->Init(); sel->More(); sel->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); -#endif if ( entity.IsNull() ) continue; Handle(SelectMgr_EntityOwner) owner = @@ -221,7 +207,7 @@ Standard_CString GEOM_AISShape::getName() void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPrs, const Standard_Integer aMode) -{ +{ if (IsInfinite()) aPrs->SetInfiniteState(Standard_True); //pas de prise en compte lors du FITALL Handle(AIS_InteractiveContext) anIC = GetContext(); @@ -234,10 +220,8 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent bool anIsColorField = anIsField && myFieldDataType != GEOM::FDT_String; bool anIsTextField = anIsField && myFieldDataType == GEOM::FDT_String; -#if OCC_VERSION_LARGE > 0x06070200 if (isShowVertices()) myDrawer->SetVertexDrawMode(Prs3d_VDM_All); -#endif // StdSelect_DisplayMode d = (StdSelect_DisplayMode) aMode; bool isTopLev = isTopLevel() && switchTopLevel(); @@ -254,11 +238,7 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent if( !isTopLev && anIsColorField && myFieldDimension == 1 ) drawField( aPrs, false, aMode == CustomHighlight ); else -#if OCC_VERSION_MAJOR < 7 - StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); -#else StdPrs_WFShape::Add(aPrs,myshape,myDrawer); -#endif break; } case Shading: @@ -278,11 +258,8 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent } case TexturedShape: { -#ifdef USE_TEXTURED_SHAPE - AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode); -#else - AIS_Shape::Compute(aPresentationManager, aPrs, aMode); -#endif + shadingMode(aPresentationManager, aPrs, Shading); + break; } } if (isShowVectors()) @@ -437,11 +414,7 @@ void GEOM_AISShape::shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPre { // PAL12113: AIS_Shape::Compute() works correctly with shapes containing no faces //StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer); -#ifdef USE_TEXTURED_SHAPE - AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode); -#else - AIS_Shape::Compute(aPresentationManager, aPrs, aMode); -#endif + SALOME_AISShape::Compute(aPresentationManager, aPrs, aMode); } } @@ -604,6 +577,7 @@ void GEOM_AISShape::drawField( const Handle(Prs3d_Presentation)& thePrs, else { Quantity_Color aColor( aQColor.redF(), aQColor.greenF(), aQColor.blueF(), Quantity_TOC_RGB ); + SetCustomColor( aSubShape, aColor ); if( myFieldDimension == 0 ) { TopoDS_Vertex aVertexShape = TopoDS::Vertex( aSubShape ); @@ -630,22 +604,25 @@ void GEOM_AISShape::drawField( const Handle(Prs3d_Presentation)& thePrs, myDrawer->WireAspect()->SetWidth( myOwnWidth ); else myDrawer->WireAspect()->SetWidth( myOwnWidth + 4 ); -#if OCC_VERSION_MAJOR < 7 - StdPrs_WFDeflectionShape::Add( thePrs, aSubShape, myDrawer ); -#else + /* StdPrs_WFShape::Add( thePrs, aSubShape, myDrawer ); -#endif + */ } else if( myFieldDimension == 2 || myFieldDimension == 3 || myFieldDimension == -1 ) { - myDrawer->ShadingAspect()->SetColor( aColor ); - StdPrs_ShadedShape::Add( thePrs, aSubShape, myDrawer ); + //Handle(Prs3d_ShadingAspect) anAspect = new Prs3d_ShadingAspect(); + //anAspect->SetColor( aColor ); + //myDrawer->SetShadingAspect( anAspect ); + //StdPrs_ShadedShape::Add( thePrs, aSubShape, myDrawer ); } } } } + + SALOME_AISShape::Compute( Handle(PrsMgr_PresentationManager3d)(), + thePrs, AIS_Shaded ); } void GEOM_AISShape::drawName( const Handle(Prs3d_Presentation)& thePrs ) diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index 46d862f9f..62bf81233 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -157,7 +157,7 @@ private: static Quantity_Color myTopLevelColor; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISShape,SALOME_AISShape) + DEFINE_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_AISShape, SALOME_AISShape) diff --git a/src/OBJECT/GEOM_AISTrihedron.cxx b/src/OBJECT/GEOM_AISTrihedron.cxx index 8468b8b05..90ab13f71 100755 --- a/src/OBJECT/GEOM_AISTrihedron.cxx +++ b/src/OBJECT/GEOM_AISTrihedron.cxx @@ -28,7 +28,7 @@ #include "GEOM_AISTrihedron.hxx" #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) /* Class : GEOM_AISTrihedron diff --git a/src/OBJECT/GEOM_AISTrihedron.hxx b/src/OBJECT/GEOM_AISTrihedron.hxx index ad9a5e5f7..0bbda269f 100755 --- a/src/OBJECT/GEOM_AISTrihedron.hxx +++ b/src/OBJECT/GEOM_AISTrihedron.hxx @@ -61,7 +61,7 @@ private: Handle(SALOME_InteractiveObject) myObject; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron) + DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron) }; #endif diff --git a/src/OBJECT/GEOM_AISVector.cxx b/src/OBJECT/GEOM_AISVector.cxx index 75d909852..3f985758c 100644 --- a/src/OBJECT/GEOM_AISVector.cxx +++ b/src/OBJECT/GEOM_AISVector.cxx @@ -30,7 +30,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape) //======================================================================= //function : GEOM_AISVector diff --git a/src/OBJECT/GEOM_AISVector.hxx b/src/OBJECT/GEOM_AISVector.hxx index 05350bf32..6b5279531 100644 --- a/src/OBJECT/GEOM_AISVector.hxx +++ b/src/OBJECT/GEOM_AISVector.hxx @@ -57,7 +57,7 @@ protected: virtual bool isShowVectors() {return true;} public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape) + DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape) diff --git a/src/OBJECT/GEOM_Annotation.cxx b/src/OBJECT/GEOM_Annotation.cxx index 2ab8f8e12..808893ac8 100755 --- a/src/OBJECT/GEOM_Annotation.cxx +++ b/src/OBJECT/GEOM_Annotation.cxx @@ -66,9 +66,6 @@ GEOM_Annotation::GEOM_Annotation() : AIS_InteractiveObject() SetDisplayMode( 0 ); SetZLayer( Graphic3d_ZLayerId_Default ); SetAutoHide( Standard_True ); -#if OCC_VERSION_LARGE <= 0x07010001 - SetHilightMode( HighlightAll ); -#endif SetMutable( Standard_True ); SetDepthCulling( Standard_True ); @@ -749,7 +746,6 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& return; } } -#if OCC_VERSION_LARGE > 0x07010001 const Handle(Graphic3d_PresentationAttributes) aHighlightStyle = theWorkspace->HighlightStyle(); if (!aHighlightStyle.IsNull() && myAISObject->myHilightMode == HighlightLabel) { @@ -757,15 +753,6 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& theWorkspace->SetHighlightStyle(empty); theWorkspace->ApplyAspectLine(); } -#else - const bool toHighlight = theWorkspace->ToHighlight(); - - if (toHighlight && myAISObject->myHilightMode == HighlightLabel) - { - theWorkspace->SetHighlight( false ); - theWorkspace->ApplyAspectLine(); - } -#endif GLint myOldDepthMode = 0; @@ -879,14 +866,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& aContext->ApplyModelViewMatrix(); -#if OCC_VERSION_LARGE > 0x07010001 theWorkspace->SetHighlightStyle(aHighlightStyle); -#else - if ( toHighlight != theWorkspace->ToHighlight() ) - { - theWorkspace->SetHighlight( toHighlight ); - } -#endif } // ======================================================================= @@ -895,21 +875,13 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& // purpose : Perform highlighting of the presentation. // ======================================================================= void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, -#if OCC_VERSION_LARGE > 0x07010001 const Handle(Prs3d_Drawer)& theStyle, -#else - const Handle(Graphic3d_HighlightStyle)& theStyle, -#endif const Standard_Integer theMode ) { if ( myPrsSh.IsNull() ) { Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer; -#if OCC_VERSION_LARGE > 0x07010001 aDrawer->Link( theStyle ); -#else - aDrawer->Link( Selectable()->HilightAttributes() ); -#endif Handle(Prs3d_IsoAspect) aUIsoAspect = new Prs3d_IsoAspect( aDrawer->UIsoAspect()->Aspect()->Color(), aDrawer->UIsoAspect()->Aspect()->Type(), @@ -942,12 +914,7 @@ void GEOM_Annotation::GEOM_AnnotationOwner::Unhilight ( const Handle(PrsMgr_Pres const Standard_Integer theMode ) { SelectMgr_EntityOwner::Unhilight( thePM, theMode ); - -#if OCC_VERSION_LARGE > 0x07010001 thePM->Unhighlight( myPrsSh ); -#else - thePM->Unhighlight( myPrsSh, theMode ); -#endif } // ======================================================================= diff --git a/src/OBJECT/GEOM_Annotation.hxx b/src/OBJECT/GEOM_Annotation.hxx index 00fc80986..360a4911e 100755 --- a/src/OBJECT/GEOM_Annotation.hxx +++ b/src/OBJECT/GEOM_Annotation.hxx @@ -27,8 +27,6 @@ #ifndef GEOM_Annotation_HeaderFile #define GEOM_Annotation_HeaderFile -#include - #include #include #include @@ -363,11 +361,7 @@ public: //! \param theMode [in] the display mode. virtual void HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, -#if OCC_VERSION_LARGE > 0x07010001 const Handle(Prs3d_Drawer)& theStyle, -#else - const Handle(Graphic3d_HighlightStyle)& theStyle, -#endif const Standard_Integer theMode = 0 ) Standard_OVERRIDE; //! Removes highlighting from the type of shape. diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx index a0f5c4f24..1010f91ad 100644 --- a/src/OBJECT/GEOM_InteractiveObject.cxx +++ b/src/OBJECT/GEOM_InteractiveObject.cxx @@ -27,7 +27,7 @@ #include "GEOM_InteractiveObject.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject) GEOM_InteractiveObject::GEOM_InteractiveObject() : SALOME_InteractiveObject() diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx index 1e7fe5947..544a981f2 100644 --- a/src/OBJECT/GEOM_InteractiveObject.hxx +++ b/src/OBJECT/GEOM_InteractiveObject.hxx @@ -51,7 +51,7 @@ private: std::string myFatherIOR; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject) + DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject) }; DEFINE_STANDARD_HANDLE(GEOM_InteractiveObject, SALOME_InteractiveObject) diff --git a/src/OBJECT/GEOM_TopWireframeShape.cxx b/src/OBJECT/GEOM_TopWireframeShape.cxx index 79c0cf934..7090b5906 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.cxx +++ b/src/OBJECT/GEOM_TopWireframeShape.cxx @@ -42,7 +42,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape) GEOM_TopWireframeShape::GEOM_TopWireframeShape( const TopoDS_Shape& shape ) :SALOME_AISShape(shape) diff --git a/src/OBJECT/GEOM_TopWireframeShape.hxx b/src/OBJECT/GEOM_TopWireframeShape.hxx index 099af8807..28c78a40a 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.hxx +++ b/src/OBJECT/GEOM_TopWireframeShape.hxx @@ -50,7 +50,7 @@ public: Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ); public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape) + DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape) diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx index c6bfe8580..4ef399263 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx @@ -58,7 +58,7 @@ STEPPlugin_ExportDriver::STEPPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STEPPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -154,4 +154,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx index a95799a8e..7a5564afb 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~STEPPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _STEPPlugin_ExportDriver_HXX diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx index c7fc450ac..8d2bed979 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx @@ -597,7 +597,7 @@ STEPPlugin_ImportDriver::STEPPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer STEPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -800,11 +800,7 @@ Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aResShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -883,4 +879,4 @@ STEPPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return aValue; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx index 626ff02bd..7c5978562 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx @@ -32,9 +32,9 @@ public: ~STEPPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); @@ -43,7 +43,7 @@ public: const TCollection_AsciiString&, TCollection_AsciiString& ); - OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _STEPPlugin_ImportDriver_HXX diff --git a/src/STLPlugin/STLPlugin_ExportDriver.cxx b/src/STLPlugin/STLPlugin_ExportDriver.cxx index 3f269f304..80a8da539 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.cxx @@ -24,7 +24,6 @@ // KERNEL includes #include #include -#include // GEOM includes #include "GEOM_Function.hxx" @@ -63,7 +62,7 @@ STLPlugin_ExportDriver::STLPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer STLPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -97,7 +96,6 @@ Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const TopoDS_Shape aCopyShape = aCopy.Shape(); // ASCII mode aWriter.ASCIIMode() = anIsASCII; -#if OCC_VERSION_LARGE > 0x06080000 if ( anIsRelative ) { Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; Bnd_Box bndBox; @@ -108,20 +106,8 @@ Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const //Compute triangulation BRepTools::Clean( aCopyShape ); BRepMesh_IncrementalMesh aMesh( aCopyShape, aDeflection ); -#else - // set relative mode on false for using custom deflection coefficient - aWriter.RelativeMode( ) = anIsRelative; - if( anIsRelative ) - aWriter.SetCoefficient( aDeflection ); - else - aWriter.SetDeflection( aDeflection ); -#endif aWriter.Write( aCopyShape, aFileName.ToCString() ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } catch( Standard_Failure ) @@ -143,4 +129,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/STLPlugin/STLPlugin_ExportDriver.hxx b/src/STLPlugin/STLPlugin_ExportDriver.hxx index d3a0569db..450ff28a2 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~STLPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _STLPlugin_ExportDriver_HXX diff --git a/src/STLPlugin/STLPlugin_ImportDriver.cxx b/src/STLPlugin/STLPlugin_ImportDriver.cxx index a586767b9..368429795 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.cxx @@ -61,7 +61,7 @@ STLPlugin_ImportDriver::STLPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer STLPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -109,11 +109,7 @@ Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -146,4 +142,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/STLPlugin/STLPlugin_ImportDriver.hxx b/src/STLPlugin/STLPlugin_ImportDriver.hxx index 2d0adf6af..1f457745d 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.hxx @@ -32,14 +32,14 @@ public: ~STLPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _STLPlugin_ImportDriver_HXX diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx index 71b27c08c..3aab7d976 100644 --- a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx +++ b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_ChangeOrientation_HeaderFile #define ShHealOper_ChangeOrientation_HeaderFile -#include #include #include diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx index d8d9d3389..2afe07bb2 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.hxx +++ b/src/ShHealOper/ShHealOper_CloseContour.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_CloseContour_HeaderFile #define ShHealOper_CloseContour_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx index 799aa8f6e..70a65d688 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.cxx +++ b/src/ShHealOper/ShHealOper_FillHoles.cxx @@ -24,8 +24,6 @@ // Created: 26.04.04 17:35:30 // Author: Galina KULIKOVA -#include - #include #include #include diff --git a/src/ShHealOper/ShHealOper_FillHoles.hxx b/src/ShHealOper/ShHealOper_FillHoles.hxx index 7b19d27b0..8202ed935 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.hxx +++ b/src/ShHealOper/ShHealOper_FillHoles.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_FillHoles_HeaderFile #define ShHealOper_FillHoles_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_RemoveFace.hxx b/src/ShHealOper/ShHealOper_RemoveFace.hxx index b5a4390af..7c3da9738 100644 --- a/src/ShHealOper/ShHealOper_RemoveFace.hxx +++ b/src/ShHealOper/ShHealOper_RemoveFace.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_RemoveFace_HeaderFile #define ShHealOper_RemoveFace_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx index fe5a7eda0..76b2ea935 100644 --- a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx +++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_RemoveInternalWires_HeaderFile #define ShHealOper_RemoveInternalWires_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx index 6f07c461b..8044f8bb0 100644 --- a/src/ShHealOper/ShHealOper_Sewing.hxx +++ b/src/ShHealOper/ShHealOper_Sewing.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_Sewing_HeaderFile #define ShHealOper_Sewing_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx index 9f5ea9157..3f4d928e5 100644 --- a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx @@ -59,7 +59,7 @@ class ShHealOper_SplitCurve2d : public ShapeUpgrade_SplitCurve2d public: // Declaration of CASCADE RTTI - OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) + DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) }; // Definition of HANDLE object using Standard_DefineHandle.hxx diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx index b49ee85b7..90e139a0e 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx @@ -28,7 +28,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) +IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) //======================================================================= //function : Compute diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx index f50b7744f..d0aa883e4 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx @@ -27,8 +27,6 @@ #ifndef ShHealOper_SplitCurve2d_HeaderFile #define ShHealOper_SplitCurve2d_HeaderFile -#include - #include #include #include @@ -61,7 +59,7 @@ class ShHealOper_SplitCurve2d : public ShapeUpgrade_SplitCurve2d public: // Declaration of CASCADE RTTI - OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) + DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) }; // Definition of HANDLE object using Standard_DefineHandle.hxx diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx index cb942b932..de8a4438c 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx @@ -28,7 +28,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) +IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) //======================================================================= //function : Compute diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx index f0b436a69..874e3b285 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx @@ -27,8 +27,6 @@ #ifndef ShHealOper_SplitCurve3d_HeaderFile #define ShHealOper_SplitCurve3d_HeaderFile -#include - #include #include #include @@ -61,7 +59,7 @@ class ShHealOper_SplitCurve3d : public ShapeUpgrade_SplitCurve3d public: // Declaration of CASCADE RTTI - OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) + DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) }; // Definition of HANDLE object using Standard_DefineHandle.hxx diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx index ae67871a2..9595d6852 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx @@ -69,7 +69,7 @@ VTKPlugin_ExportDriver::VTKPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer VTKPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -123,4 +123,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx index f32345b04..3e4398428 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~VTKPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _VTKPlugin_ExportDriver_HXX diff --git a/src/XAOPlugin/XAOPlugin_Driver.cxx b/src/XAOPlugin/XAOPlugin_Driver.cxx index 3f463efd7..7d72d59ec 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.cxx +++ b/src/XAOPlugin/XAOPlugin_Driver.cxx @@ -63,7 +63,7 @@ XAOPlugin_Driver::~XAOPlugin_Driver() //function : Execute //purpose : //======================================================================= -Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const +Standard_Integer XAOPlugin_Driver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label()); @@ -88,11 +88,7 @@ Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const if (shape.IsNull()) return 0; function->SetValue(shape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -114,5 +110,5 @@ bool XAOPlugin_Driver::GetCreationInformation(std::string& theOperat return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); diff --git a/src/XAOPlugin/XAOPlugin_Driver.hxx b/src/XAOPlugin/XAOPlugin_Driver.hxx index f2ed811eb..11318cbe3 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.hxx +++ b/src/XAOPlugin/XAOPlugin_Driver.hxx @@ -34,16 +34,16 @@ public: ~XAOPlugin_Driver(); static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } - virtual void Validate(LOGBOOK&) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } + virtual void Validate(Handle(TFunction_Logbook)&) const {} virtual bool GetCreationInformation(std::string& theOperationName, std::vector& theParams); static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function - OCCT_DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver) }; #endif // _XAOPlugin_Driver_HXX -- 2.39.2