From 31b91717e01915431d5658a7054af18a7b7044d5 Mon Sep 17 00:00:00 2001 From: mpa Date: Wed, 24 Feb 2016 16:45:13 +0300 Subject: [PATCH] Migration to OCCT 7.0 --- resources/GEOMDS_Resources | 14 +- resources/Plugin.in | 5 + src/ARCHIMEDE/Archimede_VolumeSection.hxx | 12 +- .../AdvancedEngine_DividedDiskDriver.cxx | 10 +- .../AdvancedEngine_DividedDiskDriver.hxx | 11 +- .../AdvancedEngine_IOperations.cxx | 43 ++- .../AdvancedEngine_IOperations.hxx | 7 +- .../AdvancedEngine_PipeTShapeDriver.cxx | 10 +- .../AdvancedEngine_PipeTShapeDriver.hxx | 13 +- .../AdvancedEngine_SmoothingSurfaceDriver.cxx | 12 +- .../AdvancedEngine_SmoothingSurfaceDriver.hxx | 16 +- src/BREPPlugin/BREPPlugin_ExportDriver.cxx | 14 +- src/BREPPlugin/BREPPlugin_ExportDriver.hxx | 11 +- src/BREPPlugin/BREPPlugin_ImportDriver.cxx | 20 +- src/BREPPlugin/BREPPlugin_ImportDriver.hxx | 13 +- src/BlockFix/BlockFix_BlockFixAPI.cxx | 3 +- src/BlockFix/BlockFix_BlockFixAPI.hxx | 10 +- src/BlockFix/BlockFix_CheckTool.cxx | 2 - src/BlockFix/BlockFix_CheckTool.hxx | 4 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 3 +- .../BlockFix_PeriodicSurfaceModifier.hxx | 15 +- src/BlockFix/BlockFix_SphereSpaceModifier.cxx | 3 +- src/BlockFix/BlockFix_SphereSpaceModifier.hxx | 15 +- src/BlockFix/BlockFix_UnionEdges.hxx | 2 +- src/CurveCreator/CurveCreator_Curve.cxx | 1 - src/CurveCreator/CurveCreator_Curve.hxx | 4 +- src/CurveCreator/CurveCreator_Displayer.cxx | 2 +- src/CurveCreator/CurveCreator_Displayer.hxx | 6 +- src/CurveCreator/CurveCreator_ICurve.hxx | 5 +- src/CurveCreator/CurveCreator_Utils.cxx | 12 +- src/CurveCreator/CurveCreator_Utils.hxx | 4 +- src/CurveCreator/CurveCreator_Widget.cxx | 2 - src/CurveCreator/CurveCreator_Widget.h | 21 +- src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 12 +- src/GEOM/GEOM_Application.cxx | 8 +- src/GEOM/GEOM_Application.hxx | 5 +- src/GEOM/GEOM_BaseDriver.cxx | 4 +- src/GEOM/GEOM_BaseDriver.hxx | 17 +- src/GEOM/GEOM_BaseObject.cxx | 4 +- src/GEOM/GEOM_BaseObject.hxx | 4 +- src/GEOM/GEOM_Engine.cxx | 14 +- src/GEOM/GEOM_Engine.hxx | 3 +- src/GEOM/GEOM_Field.cxx | 10 +- src/GEOM/GEOM_Field.hxx | 8 +- src/GEOM/GEOM_Function.cxx | 7 +- src/GEOM/GEOM_Function.hxx | 12 +- src/GEOM/GEOM_Object.cxx | 3 +- src/GEOM/GEOM_Object.hxx | 4 +- src/GEOM/GEOM_PythonDump.hxx | 4 + src/GEOM/GEOM_Solver.cxx | 8 +- src/GEOM/GEOM_SubShapeDriver.cxx | 10 +- src/GEOM/GEOM_SubShapeDriver.hxx | 30 +- src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx | 2 - src/GEOMAlgo/GEOMAlgo_Clsf.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_Clsf.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx | 4 +- src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx | 8 +- src/GEOMAlgo/GEOMAlgo_Extractor.hxx | 3 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx | 5 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx | 5 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx | 3 - src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx | 9 +- src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx | 30 +- src/GEOMAlgo/GEOMAlgo_HAlgo.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_HAlgo.hxx | 4 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 12 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx | 1 - src/GEOMBase/GEOMBase_Helper.cxx | 1 - src/GEOMBase/GEOMBase_Helper.h | 3 +- src/GEOMFiltersSelection/GEOM_OCCFilter.cxx | 3 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 4 +- src/GEOMGUI/GEOM_Displayer.cxx | 75 ++-- src/GEOMGUI/GEOM_Displayer.h | 11 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx | 55 +-- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 16 +- src/GEOMImpl/GEOMImpl_ArcDriver.hxx | 56 +-- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx | 58 +--- src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_BlockDriver.hxx | 87 ++--- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_BooleanDriver.hxx | 66 +--- src/GEOMImpl/GEOMImpl_BoxDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_BoxDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_ChamferDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_CircleDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_CircleDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_ConeDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_ConeDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_CopyDriver.cxx | 18 +- src/GEOMImpl/GEOMImpl_CopyDriver.hxx | 30 +- src/GEOMImpl/GEOMImpl_CylinderDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_CylinderDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_DiskDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_DiskDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_EllipseDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_EllipseDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_ExportDriver.hxx | 35 +- src/GEOMImpl/GEOMImpl_FaceDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_FaceDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_FieldDriver.cxx | 5 +- src/GEOMImpl/GEOMImpl_FieldDriver.hxx | 11 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_FilletDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_FillingDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_GlueDriver.hxx | 108 ++---- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_HealingDriver.hxx | 49 +-- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 1 - src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 1 - src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 4 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx | 4 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFieldOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IFieldOperations.hxx | 7 +- src/GEOMImpl/GEOMImpl_IGroupOperations.cxx | 1 - src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IInsertOperations.hxx | 3 +- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 1 - src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPolyline2D.hxx | 20 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 3 +- src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 4 +- .../GEOMImpl_ITransformOperations.cxx | 1 - src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_ImportDriver.hxx | 38 +- src/GEOMImpl/GEOMImpl_LineDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_LineDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_MarkerDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_MarkerDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_MeasureDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_MirrorDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_MirrorDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_OffsetDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_PartitionDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_PipeDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_PipePathDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_PipePathDriver.hxx | 55 +-- src/GEOMImpl/GEOMImpl_PlaneDriver.cxx | 12 +- src/GEOMImpl/GEOMImpl_PlaneDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_PointDriver.hxx | 52 +-- src/GEOMImpl/GEOMImpl_PolylineDriver.cxx | 20 +- src/GEOMImpl/GEOMImpl_PolylineDriver.hxx | 55 +-- src/GEOMImpl/GEOMImpl_PolylineDumper.hxx | 28 +- src/GEOMImpl/GEOMImpl_PositionDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_PositionDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_PrismDriver.hxx | 51 +-- src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx | 15 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx | 56 +-- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_RotateDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_RotateDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_ScaleDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_ScaleDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 51 +-- src/GEOMImpl/GEOMImpl_SketcherDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_SketcherDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_SphereDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_SphereDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_SplineDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx | 56 +-- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 11 +- src/GEOMImpl/GEOMImpl_TorusDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_TranslateDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_TranslateDriver.hxx | 53 +-- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 9 +- src/GEOMImpl/GEOMImpl_VectorDriver.hxx | 54 +-- src/GEOMToolsGUI/GEOMToolsGUI.h | 4 +- src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx | 3 +- src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx | 3 +- src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx | 4 + src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx | 3 +- 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 | 7 + src/GEOM_I/GEOM_Gen_i.cc | 114 +++--- src/GEOM_I/GEOM_Gen_i.hh | 3 +- 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 | 14 +- src/GEOM_I/GEOM_ILocalOperations_i.cc | 64 ++-- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 86 ++--- 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 | 14 +- src/IGESPlugin/IGESPlugin_ExportDriver.hxx | 15 +- src/IGESPlugin/IGESPlugin_ImportDriver.cxx | 21 +- src/IGESPlugin/IGESPlugin_ImportDriver.hxx | 17 +- .../MeasureGUI_DimensionCreateTool.h | 1 + src/MeasureGUI/MeasureGUI_DimensionFilter.cxx | 3 +- src/MeasureGUI/MeasureGUI_DimensionFilter.h | 5 +- .../MeasureGUI_DimensionInteractor.h | 2 +- .../MeasureGUI_ManageDimensionsDlg.cxx | 8 +- src/OBJECT/GEOM_AISDimension.cxx | 9 +- src/OBJECT/GEOM_AISDimension.hxx | 11 +- src/OBJECT/GEOM_AISShape.cxx | 18 +- src/OBJECT/GEOM_AISShape.hxx | 3 +- src/OBJECT/GEOM_AISTrihedron.cxx | 10 +- src/OBJECT/GEOM_AISTrihedron.hxx | 18 +- src/OBJECT/GEOM_AISVector.cxx | 4 +- src/OBJECT/GEOM_AISVector.hxx | 2 +- src/OBJECT/GEOM_InteractiveObject.cxx | 3 +- src/OBJECT/GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.cxx | 3 +- src/OBJECT/GEOM_TopWireframeShape.hxx | 2 +- src/RepairGUI/RepairGUI_InspectObjectDlg.h | 5 +- src/STEPPlugin/STEPPlugin_ExportDriver.cxx | 14 +- src/STEPPlugin/STEPPlugin_ExportDriver.hxx | 15 +- src/STEPPlugin/STEPPlugin_ImportDriver.cxx | 21 +- src/STEPPlugin/STEPPlugin_ImportDriver.hxx | 22 +- src/STLPlugin/STLPlugin_ExportDriver.cxx | 20 +- src/STLPlugin/STLPlugin_ExportDriver.hxx | 15 +- src/STLPlugin/STLPlugin_ImportDriver.cxx | 20 +- src/STLPlugin/STLPlugin_ImportDriver.hxx | 15 +- src/ShHealOper/ShHealOper_SpiltCurve2d.hxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.cxx | 3 +- src/ShHealOper/ShHealOper_SplitCurve2d.hxx | 4 +- src/ShHealOper/ShHealOper_SplitCurve3d.cxx | 3 +- src/ShHealOper/ShHealOper_SplitCurve3d.hxx | 4 +- src/VTKPlugin/VTKPlugin_ExportDriver.cxx | 14 +- src/VTKPlugin/VTKPlugin_ExportDriver.hxx | 15 +- src/XAOPlugin/XAOPlugin_Driver.cxx | 16 +- src/XAOPlugin/XAOPlugin_Driver.hxx | 14 +- src/XAOPlugin/XAOPlugin_IOperations.cxx | 14 +- 264 files changed, 2190 insertions(+), 3778 deletions(-) mode change 100755 => 100644 src/GEOM_I/GEOM_Gen_i.cc diff --git a/resources/GEOMDS_Resources b/resources/GEOMDS_Resources index 06f018f22..deb6655f9 100644 --- a/resources/GEOMDS_Resources +++ b/resources/GEOMDS_Resources @@ -1,5 +1,7 @@ -formatlist:SALOME_GEOM - +formatlist:SALOME_GEOM|BinOcaf +! +! SALOME_GEOM format +! SALOME_GEOM.Description: GEOM Document Version 1.0 SALOME_GEOM.FileExtension: sgd SALOME_GEOM.StoragePlugin: ad696000-5b34-11d1-b5ba-00a0c9064368 @@ -7,4 +9,10 @@ SALOME_GEOM.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368 SALOME_GEOMSchema: ad696002-5b34-11d1-b5ba-00a0c9064368 SALOME_GEOM.AttributeStoragePlugin: 47b0b826-d931-11d1-b5da-00a0c9064368 SALOME_GEOM.AttributeRetrievalPlugin: 47b0b827-d931-11d1-b5da-00a0c9064368 - +! +! BinOcaf format +! +BinOcaf.Description: Bin Ocaf Document Version 1.0 +BinOcaf.FileExtension: cbf +BinOcaf.StoragePlugin: 03a56835-8269-11d5-aab2-0050044b1af1 +BinOcaf.RetrievalPlugin: 03a56836-8269-11d5-aab2-0050044b1af1 diff --git a/resources/Plugin.in b/resources/Plugin.in index 3d4fad5e5..2d5485bf9 100644 --- a/resources/Plugin.in +++ b/resources/Plugin.in @@ -8,3 +8,8 @@ a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@ +! +! BinOcaf Document Plugin +! +03a56835-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@ +03a56836-8269-11d5-aab2-0050044b1af1.Location: @CAS_BINPLUGIN@ diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.hxx b/src/ARCHIMEDE/Archimede_VolumeSection.hxx index c919d7e0a..ba54d60a3 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.hxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.hxx @@ -33,7 +33,7 @@ #include #include -class Handle(Geom_RectangularTrimmedSurface); +#include class VolumeSection{ @@ -41,7 +41,7 @@ public: // Constructeur effectuant le maillage de peau de la shape Standard_EXPORT VolumeSection(TopoDS_Shape , Standard_Real); - //Methode qui affecte € un point,les coordonn‰es de centre de la boite englobante de la shape + //Methode qui affecte � un point,les coordonn�es de centre de la boite englobante de la shape Standard_EXPORT void CenterOfGravity(); // Methode qui calcule le volume sous un plan Z = h @@ -50,10 +50,10 @@ public: // Methode qui resout l'equation V(h)=constante Standard_EXPORT Standard_Real Archimede(Standard_Real , Standard_Real); - // Methode permettant de "setter" un plan afin de l'utiliser € l'interieur de la classe + // Methode permettant de "setter" un plan afin de l'utiliser � l'interieur de la classe Standard_EXPORT void SetPlane(Handle (Geom_Plane)); - // Methode permettant de r‰cup‰rer la shape modifi‰e € l'ext‰rieur de la classe + // Methode permettant de r�cup�rer la shape modifi�e � l'ext�rieur de la classe Standard_EXPORT TopoDS_Shape GetShape(); // Methode effectuant la rotation du plan et de la shape @@ -62,10 +62,10 @@ public: // Methode effectuant la rotation inverse du plan et de la shape Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) InvMakeRotation(gp_Dir,Handle(Geom_RectangularTrimmedSurface)); - // Methode permettant de d‰couper le plan selon une projection de la Shape + // Methode permettant de d�couper le plan selon une projection de la Shape Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) TrimSurf(); - // Methode permmettant de deplacer le plan jusqu'a la position donn‰e par Archimˆde + // Methode permmettant de deplacer le plan jusqu'a la position donn�e par Archim�de Standard_EXPORT Handle (Geom_RectangularTrimmedSurface) AjustePlan(Handle(Geom_RectangularTrimmedSurface),Standard_Real,gp_Pnt); Standard_EXPORT void getZ( double& min, double& max); diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx index 87983b066..6b21bd238 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx @@ -49,7 +49,6 @@ #include #include -#include #include #include @@ -84,7 +83,7 @@ AdvancedEngine_DividedDiskDriver::AdvancedEngine_DividedDiskDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(TFunction_Logbook& log) const +Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -139,7 +138,11 @@ Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(TFunction_Logbook& lo aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -524,5 +527,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx index 51ae667a8..2a9c7b60c 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx @@ -41,12 +41,9 @@ public: // Methods PUBLIC // AdvancedEngine_DividedDiskDriver(); - virtual Standard_Integer Execute(TFunction_Logbook& log) const; - virtual void Validate(TFunction_Logbook&) const {} - Standard_Boolean MustExecute(const TFunction_Logbook&) const - { - return Standard_True; - } + virtual Standard_Integer Execute(LOGBOOK& log) const; + virtual void Validate(LOGBOOK&) const {} + Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_DividedDiskDriver() {}; @@ -59,7 +56,7 @@ private: TopoDS_Shell MakeDiskHexagon (double R, double Ratio) const; TopoDS_Shape MakeDiskSquare (double R, double Ratio) const; - DEFINE_STANDARD_RTTI( AdvancedEngine_DividedDiskDriver ) + OCCT_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 54c02a0fd..88bd4a37f 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -33,31 +33,30 @@ #include #include -#include "GEOM_Function.hxx" -#include "GEOM_PythonDump.hxx" -#include "GEOMUtils.hxx" -#include "GEOMAlgo_ClsfSurf.hxx" -#include "GEOMAlgo_FinderShapeOn2.hxx" -#include "GEOMAlgo_Splitter.hxx" - -#include "GEOMImpl_Gen.hxx" -#include "GEOMImpl_Types.hxx" - -#include "GEOMImpl_IBasicOperations.hxx" -#include "GEOMImpl_IBooleanOperations.hxx" -#include "GEOMImpl_IShapesOperations.hxx" -#include "GEOMImpl_ITransformOperations.hxx" -#include "GEOMImpl_IBlocksOperations.hxx" -#include "GEOMImpl_I3DPrimOperations.hxx" -#include "GEOMImpl_ILocalOperations.hxx" -#include "GEOMImpl_IHealingOperations.hxx" -#include "GEOMImpl_IGroupOperations.hxx" -#include "GEOMImpl_GlueDriver.hxx" +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include #include #include @@ -812,7 +811,7 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh //============================================================================= bool AdvancedEngine_IOperations::GetFacesOnSurf (const TopoDS_Shape &theShape, - const Handle_Geom_Surface& theSurface, + const Handle(Geom_Surface)& theSurface, const Standard_Real theTolerance, TopTools_ListOfShape &theFaces) { diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.hxx b/src/AdvancedEngine/AdvancedEngine_IOperations.hxx index 98bfaeabc..8a28dded3 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.hxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.hxx @@ -28,6 +28,9 @@ #include "GEOM_Engine.hxx" #include "GEOM_Object.hxx" +#include +#include + #include #include @@ -40,8 +43,6 @@ class GEOMImpl_I3DPrimOperations; class GEOMImpl_ILocalOperations; class GEOMImpl_IHealingOperations; class GEOMImpl_IGroupOperations; -class Handle_Geom_Surface; -class TopTools_ListOfShape; class ADVANCEDENGINE_EXPORT AdvancedEngine_IOperations: public GEOM_IOperations { @@ -71,7 +72,7 @@ private: gp_Trsf aTrsf); bool GetFacesOnSurf(const TopoDS_Shape &theShape, - const Handle_Geom_Surface& theSurface, + const Handle(Geom_Surface)& theSurface, const Standard_Real theTolerance, TopTools_ListOfShape &theFaces); diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index e2d7d501a..1b890ef36 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -401,7 +400,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakeQuarterPipeTShape (const doubl //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& log) const +Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -624,7 +623,11 @@ Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute (TFunction_Logbook& lo aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -685,5 +688,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx index eb821952e..236e23d67 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx @@ -36,12 +36,10 @@ public: // Methods PUBLIC // AdvancedEngine_PipeTShapeDriver(); - virtual Standard_Integer Execute(TFunction_Logbook& log) const; - virtual void Validate(TFunction_Logbook&) const {} - Standard_Boolean MustExecute(const TFunction_Logbook&) const - { - return Standard_True; - } + virtual Standard_Integer Execute(LOGBOOK& log) const; + virtual void Validate(LOGBOOK&) const {} + Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + static const Standard_GUID& GetID(); ~AdvancedEngine_PipeTShapeDriver() {}; @@ -49,8 +47,7 @@ public: std::vector& params); // Type management // -DEFINE_STANDARD_RTTI( AdvancedEngine_PipeTShapeDriver ) - + OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver) private: /*! diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx index 02b291b3a..6d4bb52c2 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx @@ -25,7 +25,6 @@ #include "GEOM_Function.hxx" -#include #include #include @@ -98,7 +97,7 @@ AdvancedEngine_SmoothingSurfaceDriver::AdvancedEngine_SmoothingSurfaceDriver() //purpose : //======================================================================= TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed - (const Handle_TColgp_HArray1OfPnt &theListOfPoints, + (const Handle(TColgp_HArray1OfPnt) &theListOfPoints, const Standard_Integer theNbMax, const Standard_Integer theDegMax, const Standard_Real theDMax) const @@ -165,7 +164,7 @@ TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logbook& log) const +Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -223,7 +222,11 @@ Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(TFunction_Logboo aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -271,5 +274,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx index 8fb7ddf4a..4cd035915 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx @@ -22,7 +22,6 @@ #include "GEOM_BaseDriver.hxx" -#include #include #include @@ -34,12 +33,10 @@ public: // Methods PUBLIC // AdvancedEngine_SmoothingSurfaceDriver(); - virtual Standard_Integer Execute(TFunction_Logbook& log) const; - virtual void Validate(TFunction_Logbook&) const {} - Standard_Boolean MustExecute(const TFunction_Logbook&) const - { - return Standard_True; - } + virtual Standard_Integer Execute(LOGBOOK& log) const; + virtual void Validate(LOGBOOK&) const {} + Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + static const Standard_GUID& GetID(); ~AdvancedEngine_SmoothingSurfaceDriver() {}; @@ -47,11 +44,10 @@ public: std::vector& params); // Type management // -DEFINE_STANDARD_RTTI( AdvancedEngine_SmoothingSurfaceDriver ) - + OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver) private: TopoDS_Shape MakeSmoothingSurfaceUnClosed - (const Handle_TColgp_HArray1OfPnt &theListOfPoints, + (const Handle(TColgp_HArray1OfPnt) &theListOfPoints, const Standard_Integer theNbMax, const Standard_Integer theDegMax, const Standard_Real theDMax) const; diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx index 56f556fd3..bb27ff186 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( TFunction_Logbook& log ) const +Standard_Integer BREPPlugin_ExportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -83,15 +83,6 @@ Standard_Integer BREPPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons return 1; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean BREPPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -104,5 +95,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE( BREPPlugin_ExportDriver,GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx index aa321a633..bcdb47f8f 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( BREPPlugin_ExportDriver, GEOM_BaseDriver ); class BREPPlugin_ExportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~BREPPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + virtual void Validate(LOGBOOK&) const {} + Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); -DEFINE_STANDARD_RTTI( BREPPlugin_ExportDriver ) + OCCT_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 a5d2f4d49..14338dc87 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( TFunction_Logbook& log ) const +Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -76,20 +76,15 @@ Standard_Integer BREPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons aFunction->SetValue( aShape ); - log.SetTouched( Label() ); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean BREPPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -118,5 +113,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx index be6115d76..08778cbe4 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( BREPPlugin_ImportDriver, GEOM_BaseDriver ); class BREPPlugin_ImportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~BREPPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + std::vector& params ); -DEFINE_STANDARD_RTTI( BREPPlugin_ImportDriver ) + OCCT_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 7ccc18aca..0f3cbe274 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.cxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.cxx @@ -36,8 +36,7 @@ #include -IMPLEMENT_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared); -IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared); //======================================================================= //function : BlockFix_BlockFixAPI diff --git a/src/BlockFix/BlockFix_BlockFixAPI.hxx b/src/BlockFix/BlockFix_BlockFixAPI.hxx index 23c47ea53..9de5d7334 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.hxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.hxx @@ -26,11 +26,13 @@ #include #include -#include +#include #include #include #include +#include + DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared); class BlockFix_BlockFixAPI : public MMgt_TShared @@ -41,15 +43,15 @@ public: void SetShape(const TopoDS_Shape& Shape); TopoDS_Shape Shape() const; - Handle_ShapeBuild_ReShape& Context(); + Handle(ShapeBuild_ReShape)& Context(); Standard_Real& Tolerance(); Standard_Integer& OptimumNbFaces(); Standard_EXPORT void Perform(); - DEFINE_STANDARD_RTTI(BlockFix_BlockFixAPI); + OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI,MMgt_TShared) private: - Handle_ShapeBuild_ReShape myContext; + Handle(ShapeBuild_ReShape) myContext; TopoDS_Shape myShape; Standard_Real myTolerance; Standard_Integer myOptimumNbFaces; diff --git a/src/BlockFix/BlockFix_CheckTool.cxx b/src/BlockFix/BlockFix_CheckTool.cxx index 7ae163037..a248c8e1e 100644 --- a/src/BlockFix/BlockFix_CheckTool.cxx +++ b/src/BlockFix/BlockFix_CheckTool.cxx @@ -40,13 +40,11 @@ #include #include #include -#include #include #include #include #include -#include #include //======================================================================= diff --git a/src/BlockFix/BlockFix_CheckTool.hxx b/src/BlockFix/BlockFix_CheckTool.hxx index 6b4a5fccf..c65be92b7 100644 --- a/src/BlockFix/BlockFix_CheckTool.hxx +++ b/src/BlockFix/BlockFix_CheckTool.hxx @@ -27,11 +27,9 @@ #include #include #include +#include #include -class TopoDS_Shape; -class TopTools_ListOfShape; - #include #include diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx index 467bbd89e..77f0f11e4 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx @@ -50,8 +50,7 @@ #include -IMPLEMENT_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); -IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); +OCCT_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 18c244716..4adaf6f30 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx @@ -33,19 +33,18 @@ #include #include #include -#include -#include -#include #include +#include + +class TopoDS_Vertex; +class TopoDS_Edge; class TopoDS_Face; -class Geom_Surface; class TopLoc_Location; -class TopoDS_Edge; +class Geom_Surface; class Geom_Curve; -class TopoDS_Vertex; -class gp_Pnt; class Geom2d_Curve; +class gp_Pnt; DEFINE_STANDARD_HANDLE(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); @@ -84,7 +83,7 @@ public: const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); - DEFINE_STANDARD_RTTI(BlockFix_PeriodicSurfaceModifier); + OCCT_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 9951a7379..bb9b6fa7a 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx @@ -56,8 +56,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification); -IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification); +OCCT_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 632c0d246..378e24e0b 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx @@ -31,19 +31,18 @@ #include #include #include -#include -#include -#include #include +#include + +class TopoDS_Vertex; +class TopoDS_Edge; class TopoDS_Face; -class Geom_Surface; class TopLoc_Location; -class TopoDS_Edge; +class Geom_Surface; class Geom_Curve; -class TopoDS_Vertex; -class gp_Pnt; class Geom2d_Curve; +class gp_Pnt; DEFINE_STANDARD_HANDLE(BlockFix_SphereSpaceModifier, BRepTools_Modification); @@ -71,7 +70,7 @@ public: const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); Standard_EXPORT Standard_Boolean ForRotation (const TopoDS_Face& F); - DEFINE_STANDARD_RTTI(BlockFix_SphereSpaceModifier); + OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification) private: Standard_Real myTolerance; diff --git a/src/BlockFix/BlockFix_UnionEdges.hxx b/src/BlockFix/BlockFix_UnionEdges.hxx index e1d472c42..7f9548bdf 100644 --- a/src/BlockFix/BlockFix_UnionEdges.hxx +++ b/src/BlockFix/BlockFix_UnionEdges.hxx @@ -41,7 +41,7 @@ public: private: Standard_Real myTolerance; - Handle_ShapeBuild_ReShape myContext; + Handle(ShapeBuild_ReShape) myContext; }; diff --git a/src/CurveCreator/CurveCreator_Curve.cxx b/src/CurveCreator/CurveCreator_Curve.cxx index 331c16734..e307e8160 100644 --- a/src/CurveCreator/CurveCreator_Curve.cxx +++ b/src/CurveCreator/CurveCreator_Curve.cxx @@ -38,7 +38,6 @@ #include #include -#include #include #define DEBTRACE(msg) {std::cerr< AISObjectsList; public: - CurveCreator_Displayer( Handle_AIS_InteractiveContext theContext, + CurveCreator_Displayer( Handle(AIS_InteractiveContext) theContext, const int theZLayer = -1 ); ~CurveCreator_Displayer(void); - void display( const Handle_AIS_InteractiveObject& theObject, bool isUpdate ); + void display( const Handle(AIS_InteractiveObject)& theObject, bool isUpdate ); void eraseAll( bool isUpdate ); //void highlight( const AISObjectsList& theObjects, bool isHL ); @@ -44,7 +44,7 @@ protected: Quantity_Color getActiveColor( bool isHL ); private: - Handle_AIS_InteractiveContext myContext; + Handle(AIS_InteractiveContext) myContext; AISObjectsList myObjects; int myZLayer; }; diff --git a/src/CurveCreator/CurveCreator_ICurve.hxx b/src/CurveCreator/CurveCreator_ICurve.hxx index 2e5f68da5..150e37d2e 100644 --- a/src/CurveCreator/CurveCreator_ICurve.hxx +++ b/src/CurveCreator/CurveCreator_ICurve.hxx @@ -27,14 +27,13 @@ #include "CurveCreator_Macro.hxx" #include +#include #include #include #include #include -class Handle_AIS_InteractiveObject; - namespace CurveCreator { //! Type of the section @@ -221,7 +220,7 @@ public: /*** Presentation methods ***/ /***********************************************/ - virtual Handle_AIS_InteractiveObject getAISObject( const bool theNeedToBuild = false ) const = 0; + virtual Handle(AIS_InteractiveObject) getAISObject( const bool theNeedToBuild = false ) const = 0; protected: virtual void constructAISObject() = 0; diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx index 8e0df1686..0170fb5ff 100644 --- a/src/CurveCreator/CurveCreator_Utils.cxx +++ b/src/CurveCreator/CurveCreator_Utils.cxx @@ -618,22 +618,22 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo //ASL: we switch off automatic highlight to improve performance of selection theContext->SetAutomaticHilight( Standard_False ); - Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); + 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(); + Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive(); #else - Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive(); + Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive(); #endif - Handle_Select3D_SensitivePoint aSenPnt = Handle_Select3D_SensitivePoint::DownCast( aSenEntity ); + Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity ); gp_Pnt anOwnerPnt = aSenPnt->Point(); - Handle_SelectMgr_EntityOwner anOwner = Handle_SelectMgr_EntityOwner::DownCast( aSenPnt->OwnerId() ); + Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() ); CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(), @@ -992,7 +992,7 @@ Handle(TColgp_HArray1OfPnt) CurveCreator_Utils::getPoints // purpose : //======================================================================= void CurveCreator_Utils::FindPlane - (const Handle_TColgp_HArray1OfPnt &thePoints, + (const Handle(TColgp_HArray1OfPnt) &thePoints, gp_Pln &thePlane, Standard_Integer &thePlnStatus) { diff --git a/src/CurveCreator/CurveCreator_Utils.hxx b/src/CurveCreator/CurveCreator_Utils.hxx index cc42b846f..5fb3629c3 100644 --- a/src/CurveCreator/CurveCreator_Utils.hxx +++ b/src/CurveCreator/CurveCreator_Utils.hxx @@ -205,7 +205,7 @@ protected: * \param IsBSpline BSpline flag. Output parameter. * \return the array of points. Null handle in case of failure. */ - static Handle_TColgp_HArray1OfPnt getPoints + static Handle(TColgp_HArray1OfPnt) getPoints (const TopoDS_Shape &theShape, bool &IsClosed, bool &IsBSpline); @@ -226,7 +226,7 @@ protected: * \param thePlnStatus the current status on input. It can be modified on * output. */ - static void FindPlane(const Handle_TColgp_HArray1OfPnt &thePoints, + static void FindPlane(const Handle(TColgp_HArray1OfPnt) &thePoints, gp_Pln &thePlane, Standard_Integer &thePlnStatus); diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx index 540ebd46b..7f860efbd 100644 --- a/src/CurveCreator/CurveCreator_Widget.cxx +++ b/src/CurveCreator/CurveCreator_Widget.cxx @@ -19,8 +19,6 @@ #include "CurveCreator_Widget.h" #include "CurveCreator_TreeView.h" -#include "CurveCreator_ICurve.hxx" -#include "CurveCreator.hxx" #include "CurveCreator_NewSectionDlg.h" #include "CurveCreator_Utils.hxx" #include "CurveCreator_UtilsICurve.hxx" diff --git a/src/CurveCreator/CurveCreator_Widget.h b/src/CurveCreator/CurveCreator_Widget.h index 7ef2152ed..c070694f0 100644 --- a/src/CurveCreator/CurveCreator_Widget.h +++ b/src/CurveCreator/CurveCreator_Widget.h @@ -24,29 +24,28 @@ #include "CurveCreator.hxx" #include "CurveCreator_ICurve.hxx" -#include -#include - -#include #include +#include + #include #include - +#include #include #include #include -#include // TODO - remove + +#include +#include + +class CurveCreator_TableView; +class CurveCreator_TreeView; +class CurveCreator_NewSectionDlg; class OCCViewer_Viewer; class OCCViewer_ViewPort3d; -class AIS_ListOfInteractive; - class QAction; class QPixmap; -class CurveCreator_TableView; -class CurveCreator_TreeView; -class CurveCreator_NewSectionDlg; class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget { diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index cb8938bfd..47d1fd5d4 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -105,8 +105,7 @@ DEFINE_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject) class AIS_Text:public AIS_InteractiveObject { public: - // CASCADE RTTI - DEFINE_STANDARD_RTTI(AIS_Text ); + OCCT_DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject) AIS_Text(){}; @@ -148,8 +147,7 @@ protected: Graphic3d_VerticalTextAlignment aVJustification; }; -IMPLEMENT_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject) -IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject) +OCCT_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, @@ -180,7 +178,7 @@ void AIS_Text::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentation aPresentation->Clear(); - Handle_Prs3d_TextAspect asp = myDrawer->TextAspect(); + Handle(Prs3d_TextAspect) asp = myDrawer->TextAspect(); asp->SetFont(aFont); asp->SetColor(aColor); @@ -1394,7 +1392,7 @@ void EntityGUI_3DSketcherDlg::displayTrihedron (int selMode) gp_Pnt P(getLastPoint().x,getLastPoint().y,getLastPoint().z); Handle(Geom_Axis2Placement) anAxis = new Geom_Axis2Placement(P,gp::DZ(),gp::DX()); Handle(AIS_Trihedron) anIO = new AIS_Trihedron(anAxis); - anIO->SetSelectionMode(selMode); + anIO->GetContext()->Activate(anIO, selMode); SOCC_Prs* aSPrs = dynamic_cast (((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0)); @@ -1536,7 +1534,7 @@ void EntityGUI_3DSketcherDlg::displayAngle (double theAngle, P0, P1, P2); - if (anAngleIO == NULL) + if (anAngleIO.IsNull()) return; if (store) diff --git a/src/GEOM/GEOM_Application.cxx b/src/GEOM/GEOM_Application.cxx index 09c7e410a..cdda8af45 100644 --- a/src/GEOM/GEOM_Application.cxx +++ b/src/GEOM/GEOM_Application.cxx @@ -22,10 +22,7 @@ #include -#include - -IMPLEMENT_STANDARD_HANDLE (GEOM_Application, TDocStd_Application) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application) //======================================================================= //function : GEOM_Application @@ -53,6 +50,9 @@ GEOM_Application::~GEOM_Application() void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats) { Formats.Append(TCollection_ExtendedString ("SALOME_GEOM")); +#if OCC_VERSION_MAJOR > 6 + Formats.Append(TCollection_ExtendedString ("BinOcaf")); +#endif } diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx index 382651616..639765548 100644 --- a/src/GEOM/GEOM_Application.hxx +++ b/src/GEOM/GEOM_Application.hxx @@ -26,8 +26,9 @@ #include #include #include +#include -class TColStd_SequenceOfExtendedString; +#include class GEOM_Application : public TDocStd_Application { @@ -39,7 +40,7 @@ public: Standard_EXPORT Standard_CString ResourcesName(); public: - DEFINE_STANDARD_RTTI(GEOM_Application); + OCCT_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 1343f8262..314c65760 100644 --- a/src/GEOM/GEOM_BaseDriver.cxx +++ b/src/GEOM/GEOM_BaseDriver.cxx @@ -30,12 +30,10 @@ #include "GEOM_Object.hxx" #include "GEOM_Engine.hxx" -#include #include #include -IMPLEMENT_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); //================================================================================ /*! diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx index 11de7d135..61aa70f6a 100644 --- a/src/GEOM/GEOM_BaseDriver.hxx +++ b/src/GEOM/GEOM_BaseDriver.hxx @@ -27,17 +27,26 @@ #ifndef __GEOM_BaseDriver_HXX__ #define __GEOM_BaseDriver_HXX__ +#include "GEOM_Function.hxx" + #include +#include #include #include +#include +#include + +#include #include #include #include -class Handle(GEOM_Function); -class Handle(TColStd_HSequenceOfTransient); -class Handle(TColStd_HArray1OfInteger); +#if OCC_VERSION_MAJOR < 7 + #define LOGBOOK TFunction_Logbook +#else + #define LOGBOOK Handle(TFunction_Logbook) +#endif struct GEOM_Param { @@ -98,7 +107,7 @@ public: return params.back(); } - DEFINE_STANDARD_RTTI (GEOM_BaseDriver) + OCCT_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 e7abfa48d..28e98d7ab 100644 --- a/src/GEOM/GEOM_BaseObject.cxx +++ b/src/GEOM/GEOM_BaseObject.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include "utilities.h" @@ -516,5 +515,4 @@ TDF_Label GEOM_BaseObject::GetFreeLabel() return _label.FindChild(FREE_LABEL); } -IMPLEMENT_STANDARD_HANDLE (GEOM_BaseObject, Standard_Transient ); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); diff --git a/src/GEOM/GEOM_BaseObject.hxx b/src/GEOM/GEOM_BaseObject.hxx index 2d0b536c7..0c7a65dfc 100644 --- a/src/GEOM/GEOM_BaseObject.hxx +++ b/src/GEOM/GEOM_BaseObject.hxx @@ -30,11 +30,11 @@ #include #include #include +#include #include class GEOM_BaseObject; -class Handle(TFunction_Driver); class GEOM_Engine; DEFINE_STANDARD_HANDLE( GEOM_BaseObject, Standard_Transient ); @@ -166,7 +166,7 @@ public: int _docID; public: - DEFINE_STANDARD_RTTI( GEOM_BaseObject ); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient) }; #endif diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 7550ef30a..ac1216f5a 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -62,7 +62,6 @@ #include #include -#include #include #include @@ -265,7 +264,11 @@ 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); @@ -564,6 +567,13 @@ 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); if(_mapIDDocument.IsBound(theDocID)) _mapIDDocument.UnBind(theDocID); @@ -1878,7 +1888,7 @@ TCollection_AsciiString GetPublishCommands if (aRefIt != theMapRefs.end()) { // Recursively publish all references. std::list< int >::const_iterator aRefTagIt = aRefIt->second.begin(); - + for(; aRefTagIt != aRefIt->second.end(); ++aRefTagIt) { const TCollection_AsciiString aRefCmd = GetPublishCommands (*aRefTagIt, theEntryToCmdMap, theMapRefs, thePublished); diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx index 9b2fea81a..564774078 100644 --- a/src/GEOM/GEOM_Engine.hxx +++ b/src/GEOM/GEOM_Engine.hxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -54,8 +55,6 @@ struct TObjectData TCollection_AsciiString _pyName; bool _unpublished; }; - -class Handle_TColStd_HArray1OfByte; struct TVariable{ TCollection_AsciiString myVariable; diff --git a/src/GEOM/GEOM_Field.cxx b/src/GEOM/GEOM_Field.cxx index 124e16c58..b975e5d08 100644 --- a/src/GEOM/GEOM_Field.cxx +++ b/src/GEOM/GEOM_Field.cxx @@ -318,8 +318,8 @@ Handle(TColStd_HArray1OfExtendedString) GEOM_Field::GetComponents() //function : getFunctionToSetValues //purpose : dump any HArray into a string //======================================================================= -template< class Handle_HARRAY1 > -TCollection_AsciiString arrayToSting( const Handle_HARRAY1& ar, +template< class HandleArray1 > +TCollection_AsciiString arrayToSting( const HandleArray1& ar, const char* quote="") { TCollection_AsciiString s; @@ -756,7 +756,5 @@ const Standard_GUID& GEOM_FieldStep::GetDataID() return TDataStd_ExtStringArray::GetID(); } -IMPLEMENT_STANDARD_HANDLE (GEOM_Field, GEOM_BaseObject ); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); -IMPLEMENT_STANDARD_HANDLE (GEOM_FieldStep, GEOM_BaseObject ); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); diff --git a/src/GEOM/GEOM_Field.hxx b/src/GEOM/GEOM_Field.hxx index 46a3ba988..5284fa021 100644 --- a/src/GEOM/GEOM_Field.hxx +++ b/src/GEOM/GEOM_Field.hxx @@ -36,8 +36,6 @@ class GEOM_FieldStep; DEFINE_STANDARD_HANDLE( GEOM_Field, GEOM_BaseObject ); DEFINE_STANDARD_HANDLE( GEOM_FieldStep, GEOM_BaseObject ); - - class GEOM_Field : public GEOM_BaseObject { GEOM_Field(const TDF_Label& theLabel); @@ -125,7 +123,7 @@ class GEOM_Field : public GEOM_BaseObject // Returns all steps Standard_EXPORT std::list< Handle(GEOM_FieldStep)> GetSteps(); - DEFINE_STANDARD_RTTI( GEOM_Field ); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject) private: @@ -187,9 +185,7 @@ public: // Returns GUID of CAF data array const Standard_GUID& GetDataID(); - - - DEFINE_STANDARD_RTTI( GEOM_FieldStep ); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject) private: diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 1dee1d765..e21a6df18 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -56,10 +56,6 @@ #include #include -#include -#include -#include -#include #include #include @@ -993,5 +989,4 @@ void* GEOM_Function::GetCallBackData() return reinterpret_cast ( address ); } -IMPLEMENT_STANDARD_HANDLE (GEOM_Function, Standard_Transient); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index 3cce33ac3..5c4b530c6 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -26,16 +26,18 @@ #include #include #include +#include +#include +#include +#include #include #include #include #include #include -class Handle_TColStd_HArray1OfByte; -class Handle_TColStd_HArray1OfReal; -class Handle_TColStd_HArray1OfInteger; -class Handle_TColStd_HSequenceOfTransient; +#include + class GEOM_Function; DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient); @@ -195,7 +197,7 @@ public: //Returns top label of this function's naming tree Standard_EXPORT TDF_Label GetNamingEntry (const Standard_Boolean create = Standard_True); - DEFINE_STANDARD_RTTI (GEOM_Function); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient) private: diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index c42014fd8..c1bde9ac5 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -296,6 +296,5 @@ GEOM_Object::GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObject return funs; } -IMPLEMENT_STANDARD_HANDLE (GEOM_Object, GEOM_BaseObject ); -IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); diff --git a/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx index 818813fd7..716073151 100644 --- a/src/GEOM/GEOM_Object.hxx +++ b/src/GEOM/GEOM_Object.hxx @@ -34,7 +34,7 @@ #include class GEOM_Object; -class Handle(TFunction_Driver); +class TFunction_Driver; class GEOM_Engine; DEFINE_STANDARD_HANDLE( GEOM_Object, GEOM_BaseObject ); @@ -115,7 +115,7 @@ class GEOM_Object : public GEOM_BaseObject GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects ); public: - DEFINE_STANDARD_RTTI( GEOM_Object ); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject) }; #endif diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx index a92b988e3..7736c343d 100644 --- a/src/GEOM/GEOM_PythonDump.hxx +++ b/src/GEOM/GEOM_PythonDump.hxx @@ -48,6 +48,10 @@ 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 e3e3c0f6d..2e6475362 100644 --- a/src/GEOM/GEOM_Solver.cxx +++ b/src/GEOM/GEOM_Solver.cxx @@ -56,15 +56,19 @@ bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) theObject, TDF_LabelSequence& //============================================================================= bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction) { - if(theFunction == NULL) return false; + if(theFunction.IsNull()) return false; Standard_GUID aGUID = theFunction->GetDriverGUID(); Handle(TFunction_Driver) aDriver; if(!TFunction_DriverTable::Get()->FindDriver(aGUID, aDriver)) return false; 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 c62f4dfae..3715f3e6c 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(TFunction_Logbook& log) const +Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -101,8 +101,11 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_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; } @@ -155,6 +158,5 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOM_SubShapeDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); diff --git a/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx index 57d795abd..2ac04f9d8 100644 --- a/src/GEOM/GEOM_SubShapeDriver.hxx +++ b/src/GEOM/GEOM_SubShapeDriver.hxx @@ -26,18 +26,7 @@ #ifndef _GEOM_SubShapeDriver_HeaderFile #define _GEOM_SubShapeDriver_HeaderFile -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOM_SubShapeDriver, GEOM_BaseDriver ); @@ -45,22 +34,19 @@ class GEOM_SubShapeDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOM_SubShapeDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOM_SubShapeDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOM_SubShapeDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOM_SubShapeDriver ) - + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx index d547036c4..c670dd486 100755 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx @@ -32,10 +32,8 @@ #include #include #if OCC_VERSION_LARGE > 0x06070100 -#include #include #else -#include #include #endif #include diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx index 69b9bb46c..ca035f35a 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx @@ -27,8 +27,7 @@ // #include -IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx index 2b706da25..46564f2d8 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx @@ -36,8 +36,6 @@ #include #include #include -#include -#include #include #include @@ -71,7 +69,7 @@ class GEOMAlgo_Clsf : public GEOMAlgo_HAlgo Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - DEFINE_STANDARD_RTTI(GEOMAlgo_Clsf); + OCCT_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 63b87a63e..3da3f8bb9 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx @@ -47,8 +47,7 @@ #include -IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx index 267c12b01..2af5f487f 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx @@ -35,8 +35,6 @@ #include #include #include -#include -#include #include #include @@ -73,7 +71,7 @@ class GEOMAlgo_ClsfBox : public GEOMAlgo_Clsf Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfBox) + OCCT_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 c86358135..c16ea5f5d 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx @@ -31,9 +31,7 @@ #include - -IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx index 8f80b9219..c940a9a25 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; - DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfQuad); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf) protected: diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx index 6d9cae508..9257dece7 100755 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx @@ -32,8 +32,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx index ee060b315..6f945dcbb 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() ; - DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSolid) + OCCT_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 56a743c99..18ec5f05a 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx @@ -32,8 +32,7 @@ #include -IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx index 44064d786..8aabf7344 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx @@ -30,11 +30,9 @@ #include #include -#include #include #include #include -#include #include #include @@ -57,7 +55,7 @@ class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf void SetSurface(const Handle(Geom_Surface)& aS) ; Standard_EXPORT - const Handle_Geom_Surface& Surface() const; + const Handle(Geom_Surface)& Surface() const; Standard_EXPORT virtual void Perform() ; @@ -71,10 +69,10 @@ class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - DEFINE_STANDARD_RTTI(GEOMAlgo_ClsfSurf); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf) protected: - Handle_Geom_Surface myS; + Handle(Geom_Surface) myS; GeomAdaptor_Surface myGAS; }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_Extractor.hxx b/src/GEOMAlgo/GEOMAlgo_Extractor.hxx index 1386696aa..c93b64d74 100644 --- a/src/GEOMAlgo/GEOMAlgo_Extractor.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Extractor.hxx @@ -34,8 +34,7 @@ #include #include #include - -class TopTools_IndexedMapOfShape; +#include /** diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx index c31f69e03..4267cc262 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx @@ -32,7 +32,6 @@ #include #include -#include #include #include @@ -73,7 +72,7 @@ class GEOMAlgo_FinderShapeOn : public GEOMAlgo_ShapeAlgo void SetState(const GEOMAlgo_State aSF) ; Standard_EXPORT - const Handle_Geom_Surface& Surface() const; + const Handle(Geom_Surface)& Surface() const; Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; @@ -113,7 +112,7 @@ protected: void FindVertices() ; - Handle_Geom_Surface mySurface; + Handle(Geom_Surface) mySurface; TopAbs_ShapeEnum myShapeType; GEOMAlgo_State myState; TopoDS_Shape myArg1; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx index 82e803b53..f334e1836 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx @@ -39,7 +39,6 @@ #include #include -#include #include #include @@ -83,7 +82,7 @@ class GEOMAlgo_FinderShapeOn1 : public GEOMAlgo_ShapeAlgo Standard_Integer NbPntsMax() const; Standard_EXPORT - const Handle_Geom_Surface& Surface() const; + const Handle(Geom_Surface)& Surface() const; Standard_EXPORT TopAbs_ShapeEnum ShapeType() const; @@ -133,7 +132,7 @@ class GEOMAlgo_FinderShapeOn1 : public GEOMAlgo_ShapeAlgo virtual TopAbs_State GetPointState(const gp_Pnt& aP) ; - Handle_Geom_Surface mySurface; + Handle(Geom_Surface) mySurface; TopAbs_ShapeEnum myShapeType; GEOMAlgo_State myState; Standard_Integer myNbPntsMin; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx index 4c2b13e7a..88dffc5e6 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx @@ -62,7 +62,7 @@ class GEOMAlgo_FinderShapeOn2 : public GEOMAlgo_ShapeAlgo void SetClsf(const Handle(GEOMAlgo_Clsf)& aClsf) ; Standard_EXPORT - const Handle_GEOMAlgo_Clsf& Clsf() const; + const Handle(GEOMAlgo_Clsf)& Clsf() const; Standard_EXPORT void SetShapeType(const TopAbs_ShapeEnum aST) ; @@ -134,7 +134,7 @@ protected: GEOMAlgo_State myState; Standard_Integer myNbPntsMin; Standard_Integer myNbPntsMax; - Handle_GEOMAlgo_Clsf myClsf; + Handle(GEOMAlgo_Clsf) myClsf; TopTools_ListOfShape myLS; GEOMAlgo_IndexedDataMapOfShapeState myMSS; }; diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx index 3dab4d491..7140cc77f 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -46,8 +45,6 @@ #include #include #include -#include - //======================================================================= //function : GetInPlace diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx index f452387fd..037ef847c 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx @@ -26,17 +26,16 @@ #ifndef _GEOMAlgo_GetInPlaceAPI_HeaderFile #define _GEOMAlgo_GetInPlaceAPI_HeaderFile +#include +#include +#include #include class GEOMAlgo_GetInPlace; -class Handle_GEOM_Function; class BRepExtrema_DistShapeShape; class TopoDS_Face; class TopoDS_Shape; -class TopTools_IndexedMapOfShape; -class TopTools_ListOfShape; - /** * This is an API class for all GetInPlace algorithm. @@ -83,7 +82,7 @@ public: * list is not cleared at first. */ Standard_EXPORT static Standard_Boolean GetInPlaceByHistory - (const Handle_GEOM_Function &theWhereFunction, + (const Handle(GEOM_Function) &theWhereFunction, const TopTools_IndexedMapOfShape &theWhereIndices, const TopoDS_Shape &theWhat, TopTools_ListOfShape &theShapesInPlace); diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index 9aff0eda5..dffecb720 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -546,7 +546,7 @@ Standard_Integer CheckAncesstors const TopTools_IndexedDataMapOfShapeListOfShape& aMEV, TopTools_IndexedDataMapOfShapeListOfShape& aMEVZ) { - Standard_Address pLE, pLV, pLVZ; + TopTools_ListOfShape *pLE, *pLV, *pLVZ; Standard_Integer iRet, aNbVX; TopTools_ListIteratorOfListOfShape aItLE, aItLV; TopTools_MapOfShape aMFence; @@ -554,24 +554,28 @@ Standard_Integer CheckAncesstors // iRet=0; // - pLE=aMVE.FindFromKey1(aVSD); +#if OCC_VERSION_MAJOR < 7 + pLE=const_cast(&aMVE.FindFromKey(aVSD)); +#else + pLE=const_cast(aMVE).ChangeSeek(aVSD); +#endif if (!pLE) { return iRet; } - // - const TopTools_ListOfShape& aLE=*((TopTools_ListOfShape*)pLE); - aItLE.Initialize(aLE); + aItLE.Initialize(*pLE); for (; aItLE.More(); aItLE.Next()) { const TopoDS_Shape& aE=aItLE.Value(); // - pLV=aMEV.FindFromKey1(aE); +#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 } - // aLVX.Clear(); - const TopTools_ListOfShape& aLV=*((TopTools_ListOfShape*)pLV); - aItLV.Initialize(aLV); + aItLV.Initialize(*pLV); for (; aItLV.More(); aItLV.Next()) { const TopoDS_Shape& aV=aItLV.Value(); if (!aV.IsSame(aVSD)) { @@ -590,12 +594,16 @@ Standard_Integer CheckAncesstors // iRet=1; // - pLVZ=aMEVZ.FindFromKey1(aE); +#if OCC_VERSION_MAJOR < 7 + pLVZ=const_cast(&aMEVZ.FindFromKey(aE)); +#else + pLVZ=aMEVZ.ChangeSeek(aE); +#endif if (!pLVZ) { aMEVZ.Add(aE, aLVX); } else { - TopTools_ListOfShape& aLVZ=*((TopTools_ListOfShape*)pLVZ); + TopTools_ListOfShape& aLVZ=*pLVZ; aLVZ.Append(aLVX); } } diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx index d22928aed..5ca2cedd0 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx @@ -27,8 +27,7 @@ // #include -IMPLEMENT_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared); -IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared); //======================================================================= // function: diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx index d5a62bccd..e1d1f02a4 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx @@ -34,6 +34,8 @@ #include #include +#include + DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared); //======================================================================= @@ -58,7 +60,7 @@ class GEOMAlgo_HAlgo : public MMgt_TShared Standard_EXPORT Standard_Integer WarningStatus() const; - DEFINE_STANDARD_RTTI(GEOMAlgo_HAlgo); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo,MMgt_TShared) protected: Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx index 58f99950d..2bf1412e2 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx @@ -35,9 +35,9 @@ #include #include #if OCC_VERSION_LARGE > 0x06070100 -#include + #include #else -#include + #include #endif #include @@ -60,9 +60,9 @@ class GEOMAlgo_ShapeAlgo : public GEOMAlgo_Algo //! Returns cashed geometrical tools
Standard_EXPORT #if OCC_VERSION_LARGE > 0x06070100 - const Handle_IntTools_Context& Context() const; + const Handle(IntTools_Context)& Context() const; #else - const Handle_BOPInt_Context& Context() const; + const Handle(BOPInt_Context)& Context() const; #endif Standard_EXPORT @@ -95,9 +95,9 @@ protected: Standard_Real myTolerance; TopoDS_Shape myResult; #if OCC_VERSION_LARGE > 0x06070100 - Handle_IntTools_Context myContext; + Handle(IntTools_Context) myContext; #else - Handle_BOPInt_Context myContext; + Handle(BOPInt_Context) myContext; #endif }; #endif diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx index d7610e7f2..9c83cc557 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index 0f1050bdc..4c2614e10 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -54,7 +54,6 @@ #include #include -#include #include #include diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index 8199fdfc6..64d46f202 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -35,6 +35,8 @@ #include #include CORBA_CLIENT_HEADER(GEOM_Gen) +#include + #include #include @@ -47,7 +49,6 @@ class SUIT_Desktop; class SUIT_ViewWindow; class SALOME_Prs; class GEOM_Operation; -class TColStd_MapOfInteger; //================================================================ // Class : GEOMBase_Helper diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx index 3cf575115..c8723dac3 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx @@ -30,8 +30,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(GEOM_OCCFilter, SelectMgr_Filter) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter) +OCCT_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 a36e0bef1..fd6a4ac0c 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h @@ -27,6 +27,8 @@ #include +#include + class LightApp_SelectionMgr; class GEOM_OCCFilter : public SelectMgr_Filter @@ -42,7 +44,7 @@ private: public: - DEFINE_STANDARD_RTTI(GEOM_OCCFilter); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter) }; diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 59d48a37f..3ed44e128 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -38,7 +38,6 @@ #include #include -#include #include #include #include @@ -87,7 +86,9 @@ #include #include #include -#include +#if OCC_VERSION_MAJOR < 7 + #include +#endif #include #include #include @@ -99,7 +100,6 @@ #include #include #include -#include #include #include #include @@ -507,6 +507,12 @@ 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_TMF_2d, gp_Pnt (-1,-1,0)); +#endif + myFieldDataType = GEOM::FDT_Double; myFieldDimension = 0; myFieldStepRangeMin = 0; @@ -2922,7 +2928,7 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS return aResultList; } -// Note: the method is copied from Aspect_ColorScale class +// Note: the method is copied from AIS_ColorScale class Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue, const Standard_Integer aMin, const Standard_Integer aMax ) @@ -2938,7 +2944,7 @@ Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue, return aHue; } -// Note: the method is copied from Aspect_ColorScale class +// Note: the method is copied from AIS_ColorScale class Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue, const Standard_Real aMin, const Standard_Real aMax, @@ -2976,6 +2982,7 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons if( !aViewModel ) return; +#if OCC_VERSION_MAJOR < 7 Handle(V3d_Viewer) aViewer = aViewModel->getViewer3d(); if( aViewer.IsNull() ) return; @@ -2987,6 +2994,7 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons Handle(V3d_View) aView = aViewer->ActiveView(); if( aView.IsNull() ) return; +#endif Standard_Boolean anIsDisplayColorScale = Standard_False; TCollection_AsciiString aColorScaleTitle; @@ -3038,38 +3046,49 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons if( anIsDisplayColorScale ) { - Handle(Aspect_ColorScale) aColorScale = aView->ColorScale(); - if( !aColorScale.IsNull() ) + SUIT_Session* session = SUIT_Session::session(); + SUIT_ResourceMgr* resMgr = session->resourceMgr(); + + Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 ); + Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 ); + Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 ); + 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() ) { - SUIT_Session* session = SUIT_Session::session(); - SUIT_ResourceMgr* resMgr = session->resourceMgr(); - - Standard_Real anXPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 ); - Standard_Real anYPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 ); - Standard_Real aWidth = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 ); - 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 ); - - aColorScale->SetXPosition( anXPos ); - aColorScale->SetYPosition( anYPos ); - aColorScale->SetWidth( aWidth ); - aColorScale->SetHeight( aHeight ); - - aColorScale->SetTextHeight( aTextHeight ); - aColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); - - aColorScale->SetTitle( aColorScaleTitle ); - aColorScale->SetRange( aColorScaleMin, aColorScaleMax ); +#endif + + myColorScale->SetXPosition( anXPos ); + myColorScale->SetYPosition( anYPos ); + myColorScale->SetWidth( aWidth ); + myColorScale->SetHeight( aHeight ); + + myColorScale->SetTextHeight( aTextHeight ); + myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); + + myColorScale->SetTitle( aColorScaleTitle ); + myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); + +#if OCC_VERSION_MAJOR < 7 } if( !aView->ColorScaleIsDisplayed() ) aView->ColorScaleDisplay(); } else - { if( aView->ColorScaleIsDisplayed() ) aView->ColorScaleErase(); +#else + if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) + aViewModel->getAISContext()->Display( myColorScale ); } + else + if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) + aViewModel->getAISContext()->Erase( myColorScale ); +#endif if( theIsRedisplayFieldSteps ) { diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index 36d2d4aee..cf5a9df55 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -28,6 +28,7 @@ #define GEOM_DISPLAYER_H #include "GEOM_GEOMGUI.hxx" +#include #include @@ -44,7 +45,11 @@ class SALOME_OCCViewType; #include #include #include +#if OCC_VERSION_MAJOR >= 7 + #include +#endif #include +#include #include #include @@ -60,14 +65,11 @@ class SALOME_OCCViewType; typedef std::list ObjectList; -class TColStd_MapOfInteger; class LightApp_SelectionMgr; class SalomeApp_Study; class SalomeApp_Application; class SUIT_SelectionFilter; -class Handle_GEOM_AISShape; class gp_Ax3; -//class SALOME_Selection; class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer { @@ -298,6 +300,9 @@ protected: std::string myTexture; int myType; SALOME_View* myViewFrame; +#if OCC_VERSION_MAJOR >= 7 + Handle(AIS_ColorScale) myColorScale; +#endif // Attributes Quantity_Color myShadingColor; diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx index c82c0b353..cf8e5fe24 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -319,7 +319,11 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(TFunction_Logbook& log) cons if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -365,5 +369,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx index 877255051..bc916a391 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx @@ -23,61 +23,26 @@ #ifndef _GEOMImpl_3DSketcherDriver_HeaderFile #define _GEOMImpl_3DSketcherDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - #include DEFINE_STANDARD_HANDLE( GEOMImpl_3DSketcherDriver, GEOM_BaseDriver ); -#ifndef _GEOM_BaseDriver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - - class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_3DSketcherDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {}; -Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, - std::vector& params); + Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, + std::vector& params); - // Type management - // - DEFINE_STANDARD_RTTI( GEOMImpl_3DSketcherDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index 3bdd738ef..d648798ed 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -112,7 +112,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const if (aType == CIRC_ARC_THREE_PNT) { GC_MakeArcOfCircle arc (aP1, aP2, aP3); - aShape = BRepBuilderAPI_MakeEdge(arc).Edge(); + aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge(); } else if ( aType == CIRC_ARC_CENTER ) { // CIRC_ARC_CENTER Standard_Boolean sense = aCI.GetSense(); @@ -128,7 +128,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const Handle(Geom_Circle) aGeomCirc = circ.Value(); GC_MakeArcOfCircle arc (aGeomCirc->Circ(), aP2, aP3, Standard_True); - aShape = BRepBuilderAPI_MakeEdge(arc).Edge(); + aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge(); } else if ( aType == ELLIPSE_ARC_CENTER_TWO_PNT ) { // ELLIPSE_ARC_CENTER_TWO_PNT if ( aP1.Distance(aP2) <= aP1.Distance(aP3) ) { // Standard_ConstructionError::Raise("Arc creation aborted: the distance from Center Point to Point 1 needs to be bigger than the distance from Center Point to Point 2"); @@ -146,7 +146,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const // double alpha = fabs(aV1.Angle(aV2)); GC_MakeArcOfEllipse arc (aGeomEllipse->Elips(), aP2, aP3, Standard_True); - aShape = BRepBuilderAPI_MakeEdge(arc).Edge(); + aShape = BRepBuilderAPI_MakeEdge(arc.Value()).Edge(); } } } @@ -157,7 +157,11 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -203,6 +207,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ArcDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx index 9bdfabcf0..2cda24cb0 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_ArcDriver_HeaderFile #define _GEOMImpl_ArcDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ArcDriver, GEOM_BaseDriver ); @@ -68,19 +34,17 @@ class GEOMImpl_ArcDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ArcDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ArcDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ArcDriver() {}; -Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, - std::vector& params); + Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, + std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ArcDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index 7fc65ae4f..01b1631f8 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx @@ -69,7 +69,7 @@ GEOMImpl_ArchimedeDriver::GEOMImpl_ArchimedeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ArchimedeDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -138,7 +138,11 @@ Standard_Integer GEOMImpl_ArchimedeDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(tirant); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -170,6 +174,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx index 0b728fece..0ebf8bc8c 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx @@ -22,45 +22,11 @@ // File : GEOMImpl_ArchimedeDriver.hxx // Module : GEOMImpl -// + #ifndef _GEOMImpl_ArchimedeDriver_HeaderFile #define _GEOMImpl_ArchimedeDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ArchimedeDriver, GEOM_BaseDriver ); @@ -68,19 +34,17 @@ class GEOMImpl_ArchimedeDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ArchimedeDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {}; -Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, - std::vector& params); + Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, + std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ArchimedeDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index dec260615..2aef977a0 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -755,7 +755,11 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -1156,6 +1160,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BlockDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx index 693cba8d1..401c070d0 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx @@ -26,42 +26,9 @@ #ifndef _GEOMImpl_BlockDriver_HeaderFile #define _GEOMImpl_BlockDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif #include -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_BlockDriver, GEOM_BaseDriver ); @@ -69,36 +36,34 @@ class GEOMImpl_BlockDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_BlockDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_BlockDriver() {}; + 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 bool GetCreationInformation(std::string& theOperationName, - std::vector& params); + Standard_EXPORT static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_BlockDriver() {}; -private: - void MultiTransformate1D (const TopoDS_Shape& theBlock, - const TopoDS_Shape& theFace1, - const TopoDS_Shape& theFace2, - const Standard_Integer theNbIter, - TopoDS_Shape& theResult) const; - - void MultiTransformate2D (const TopoDS_Shape& theBlock, - const TopoDS_Shape& theFace1U, - const TopoDS_Shape& theFace2U, - const Standard_Integer theNbIterU, - const TopoDS_Shape& theFace1V, - const TopoDS_Shape& theFace2V, - const Standard_Integer theNbIterV, - TopoDS_Shape& theResult) const; - -DEFINE_STANDARD_RTTI( GEOMImpl_BlockDriver ) + Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, + std::vector& params); +private: + void MultiTransformate1D (const TopoDS_Shape& theBlock, + const TopoDS_Shape& theFace1, + const TopoDS_Shape& theFace2, + const Standard_Integer theNbIter, + TopoDS_Shape& theResult) const; + + void MultiTransformate2D (const TopoDS_Shape& theBlock, + const TopoDS_Shape& theFace1U, + const TopoDS_Shape& theFace2U, + const Standard_Integer theNbIterU, + const TopoDS_Shape& theFace1V, + const TopoDS_Shape& theFace2V, + const Standard_Integer theNbIterV, + TopoDS_Shape& theResult) const; + + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 367fc62bd..6b7ce296f 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -113,7 +113,7 @@ GEOMImpl_BooleanDriver::GEOMImpl_BooleanDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const +Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -322,7 +322,11 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute (TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -618,6 +622,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BooleanDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx index 0ee96d77c..97a2e2dab 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx @@ -26,53 +26,9 @@ #ifndef _GEOMImpl_BooleanDriver_HeaderFile #define _GEOMImpl_BooleanDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TopoDS_Shape_HeaderFile #include -#endif - - -class Standard_Transient; -class Handle_Standard_Type; -class Handle(TFunction_Driver); -class GEOMImpl_BooleanDriver; - - - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_BooleanDriver, GEOM_BaseDriver ); @@ -80,17 +36,15 @@ class GEOMImpl_BooleanDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_BooleanDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_BooleanDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_BooleanDriver() {}; -Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, - std::vector& params); + Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, + std::vector& params); private: @@ -98,7 +52,7 @@ private: const TopoDS_Shape theShape2, const Standard_Integer theType) const; -DEFINE_STANDARD_RTTI( GEOMImpl_BooleanDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index bf20cc699..3e79b5e99 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -116,7 +116,11 @@ Standard_Integer GEOMImpl_BoxDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -156,7 +160,4 @@ bool GEOMImpl_BoxDriver::GetCreationInformation(std::string& theOper return true; } - -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_BoxDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx index 27859c885..a43961ae3 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_BoxDriver_HeaderFile #define _GEOMImpl_BoxDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_BoxDriver, GEOM_BaseDriver ); @@ -68,21 +34,18 @@ class GEOMImpl_BoxDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_BoxDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_BoxDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_BoxDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationNameName, std::vector& params); - -DEFINE_STANDARD_RTTI( GEOMImpl_BoxDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index c63f16861..7685ffd63 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -267,7 +267,11 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -357,6 +361,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ChamferDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx index 8932b9c41..7347b531b 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_ChamferDriver_HeaderFile #define _GEOMImpl_ChamferDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ChamferDriver, GEOM_BaseDriver ); @@ -68,20 +34,18 @@ class GEOMImpl_ChamferDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ChamferDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ChamferDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ChamferDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ChamferDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index e4e2857f0..53dc21545 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -187,7 +187,11 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -233,6 +237,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CircleDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx index 864426d90..e75144b9d 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_CircleDriver_HeaderFile #define _GEOMImpl_CircleDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_CircleDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_CircleDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_CircleDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_CircleDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_CircleDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_CircleDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index dc27b2168..e25b5537d 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -137,7 +137,11 @@ Standard_Integer GEOMImpl_ConeDriver::Execute(TFunction_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; @@ -181,6 +185,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ConeDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx index 1f5fda175..6ca640923 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_ConeDriver_HeaderFile #define _GEOMImpl_ConeDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ConeDriver, GEOM_BaseDriver ); @@ -68,20 +34,18 @@ class GEOMImpl_ConeDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ConeDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ConeDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ConeDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ConeDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index 4bff92260..21df551eb 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -33,9 +33,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -69,7 +66,7 @@ GEOMImpl_CopyDriver::GEOMImpl_CopyDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CopyDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -101,7 +98,11 @@ Standard_Integer GEOMImpl_CopyDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aCopy); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -149,8 +150,7 @@ GetCreationInformation(std::string& theOperationName, * \brief Performs Transfer Data operation. */ //================================================================================ - -Standard_Integer GEOMImpl_CopyDriver::transferData(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_CopyDriver::transferData(LOGBOOK& log) const { Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); GEOMImpl_ITransferData aTD (aFunction); @@ -414,6 +414,4 @@ Standard_Boolean GEOMImpl_CopyDriver::getInPlaceByHistory return Standard_True; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CopyDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx index 4503e61ac..e3f8bcf15 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx @@ -26,14 +26,13 @@ #ifndef _GEOMImpl_CopyDriver_HeaderFile #define _GEOMImpl_CopyDriver_HeaderFile -class TopoDS_Shape; -class TopTools_IndexedDataMapOfShapeListOfShape; -class TopTools_IndexedMapOfShape; -class Standard_GUID; - +#include +#include -#include "GEOM_BaseDriver.hxx" +#include +class TopoDS_Shape; +class Standard_GUID; DEFINE_STANDARD_HANDLE( GEOMImpl_CopyDriver, GEOM_BaseDriver ); @@ -41,24 +40,22 @@ class GEOMImpl_CopyDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_CopyDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_CopyDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_CopyDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_CopyDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver) private: - Standard_Integer transferData(TFunction_Logbook& log) const; + Standard_Integer transferData(LOGBOOK& log) const; Standard_Boolean getInPlace (const TopoDS_Shape &theSourceShape, @@ -78,7 +75,6 @@ private: const TopoDS_Shape &theDestinationShape, const Handle(GEOM_Function) &theDestinationRef, TopTools_IndexedDataMapOfShapeListOfShape &theMapSourceDest) const; - }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index 04d7f9656..79ee42148 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -142,7 +142,11 @@ Standard_Integer GEOMImpl_CylinderDriver::Execute(TFunction_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; } @@ -194,6 +198,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_CylinderDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx index 2836bf79e..b85457edb 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_CylinderDriver_HeaderFile #define _GEOMImpl_CylinderDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_CylinderDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_CylinderDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_CylinderDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_CylinderDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_CylinderDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_CylinderDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx index a64b3192f..05fa46439 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,7 +165,11 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -209,6 +213,5 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_DiskDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx index fb4c2666e..7ede29b2b 100755 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx @@ -23,41 +23,7 @@ #ifndef _GEOMImpl_DiskDriver_HeaderFile #define _GEOMImpl_DiskDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_DiskDriver, GEOM_BaseDriver ); @@ -65,20 +31,18 @@ class GEOMImpl_DiskDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_DiskDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_DiskDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_DiskDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_DiskDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index b72bf7439..291894b69 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -154,7 +154,11 @@ Standard_Integer GEOMImpl_EllipseDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -192,5 +196,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_EllipseDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx index f074b2e55..fc86df15b 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_EllipseDriver_HeaderFile #define _GEOMImpl_EllipseDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_EllipseDriver, GEOM_BaseDriver ); @@ -68,20 +34,18 @@ class GEOMImpl_EllipseDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_EllipseDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_EllipseDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_EllipseDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_EllipseDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 7d3bbf7f3..2ee22d9d9 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -88,7 +88,11 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(TFunction_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; } @@ -106,5 +110,4 @@ GetCreationInformation(std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ExportDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx index 2b5cf949b..35a0ac394 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx @@ -26,24 +26,7 @@ #ifndef _GEOMImpl_ExportDriver_HeaderFile #define _GEOMImpl_ExportDriver_HeaderFile -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ExportDriver, GEOM_BaseDriver ); @@ -51,20 +34,18 @@ class GEOMImpl_ExportDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ExportDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ExportDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ExportDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ExportDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx index 8cdd2fe9c..0562601de 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -118,7 +118,11 @@ Standard_Integer GEOMImpl_FaceDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -166,5 +170,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FaceDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx index 897f8938f..b477df995 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx @@ -23,41 +23,7 @@ #ifndef _GEOMImpl_FaceDriver_HeaderFile #define _GEOMImpl_FaceDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_FaceDriver, GEOM_BaseDriver ); @@ -65,20 +31,18 @@ class GEOMImpl_FaceDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_FaceDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_FaceDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_FaceDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_FaceDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx index 1b2cbc612..2e12e8651 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_FieldDriver::Execute(LOGBOOK& log) const { return 0; } @@ -105,5 +105,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FieldDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx index 5b7b5baac..bd5bb4751 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx @@ -23,7 +23,7 @@ #ifndef _GEOMImpl_FieldDriver_HeaderFile #define _GEOMImpl_FieldDriver_HeaderFile -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_FieldDriver, GEOM_BaseDriver ); @@ -34,9 +34,10 @@ class GEOMImpl_FieldDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FieldDriver(); - Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } + 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 static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FieldDriver() {}; @@ -44,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - DEFINE_STANDARD_RTTI( GEOMImpl_FieldDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx index cce147164..34efa40cd 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx @@ -148,7 +148,7 @@ static void addEdgeRelation(TopTools_DataMapOfShapeShape& theMap, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_Fillet1dDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -257,7 +257,11 @@ Standard_Integer GEOMImpl_Fillet1dDriver::Execute(TFunction_Logbook& log) const } aFunction->SetValue(aResult); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -408,5 +412,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx index ec2749f4c..c530e1171 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx @@ -23,51 +23,10 @@ #ifndef _GEOMImpl_Fillet1dDriver_HeaderFile #define _GEOMImpl_Fillet1dDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - #include #include -class Standard_Transient; -class Handle_Standard_Type; -class Handle(TFunction_Driver); -class GEOMImpl_Fillet1dDriver; - - - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet1dDriver, GEOM_BaseDriver ); @@ -75,16 +34,14 @@ class GEOMImpl_Fillet1dDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // Standard_EXPORT GEOMImpl_Fillet1dDriver(); Standard_EXPORT ~GEOMImpl_Fillet1dDriver() {}; Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } + 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 bool GetCreationInformation(std::string& theOperationName, @@ -94,7 +51,7 @@ private: Standard_EXPORT bool MakeFillet(const TopoDS_Wire&, const TopTools_ListOfShape&, const Standard_Real, bool, TopoDS_Wire&) const; -DEFINE_STANDARD_RTTI( GEOMImpl_Fillet1dDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx index d5201fba1..28b54364d 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,7 +165,11 @@ Standard_Integer GEOMImpl_Fillet2dDriver::Execute(TFunction_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; } @@ -205,5 +209,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx index d3c4c66ff..ab30ca0bc 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx @@ -23,41 +23,7 @@ #ifndef _GEOMImpl_Fillet2dDriver_HeaderFile #define _GEOMImpl_Fillet2dDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_Fillet2dDriver, GEOM_BaseDriver ); @@ -65,20 +31,19 @@ class GEOMImpl_Fillet2dDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_Fillet2dDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_Fillet2dDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index 4843ad2ad..6a903c635 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -147,7 +147,11 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -214,5 +218,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FilletDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx index 929101cb6..6d5d58462 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_FilletDriver_HeaderFile #define _GEOMImpl_FilletDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_FilletDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_FilletDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_FilletDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_FilletDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_FilletDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_FilletDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index a079774f7..d65669c07 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -94,7 +94,7 @@ GEOMImpl_FillingDriver::GEOMImpl_FillingDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FillingDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -352,7 +352,11 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -404,5 +408,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_FillingDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx index 7acbe807c..62a466d98 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_FillingDriver_HeaderFile #define _GEOMImpl_FillingDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_FillingDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_FillingDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_FillingDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_FillingDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_FillingDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_FillingDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index 9bfaa3155..a9c72ec93 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -739,7 +739,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueByList (const TopoDS_Shape& theShape, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_GlueDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -824,7 +824,11 @@ Standard_Integer GEOMImpl_GlueDriver::Execute(TFunction_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()); @@ -882,5 +886,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_GlueDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx index 827a865e9..ab132e8d8 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx @@ -26,47 +26,12 @@ #ifndef _GEOMImpl_GlueDriver_HeaderFile #define _GEOMImpl_GlueDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - #include - - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif +#include #include #include -class TColStd_SequenceOfExtendedString; -class TopTools_DataMapOfShapeListOfShape; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_GlueDriver, GEOM_BaseDriver ); @@ -74,49 +39,46 @@ class GEOMImpl_GlueDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_GlueDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_GlueDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_GlueDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -Standard_EXPORT static TopoDS_Shape GlueFaces - (const TopoDS_Shape &theShape, - const Standard_Real theTolerance, - const Standard_Boolean doKeepNonSolids = Standard_True, - TopTools_DataMapOfShapeListOfShape *pMapModif = NULL); + Standard_EXPORT static TopoDS_Shape GlueFaces (const TopoDS_Shape& theShape, + const Standard_Real theTolerance, + const Standard_Boolean doKeepNonSolids = Standard_True, + TopTools_DataMapOfShapeListOfShape* pMapModif = NULL); /* -Standard_EXPORT TopoDS_Shape GlueFacesWithWarnings (const TopoDS_Shape& theShape, - const Standard_Real theTolerance, - const Standard_Boolean doKeepNonSolids, - TCollection_AsciiString& theWarning) const; - -Standard_EXPORT static TopoDS_Shape GlueFacesByList (const TopoDS_Shape& theShape, - const Standard_Real theTolerance, - const Standard_Boolean doKeepNonSolids, - const TopTools_MapOfShape& aFaces); + Standard_EXPORT TopoDS_Shape GlueFacesWithWarnings (const TopoDS_Shape& theShape, + const Standard_Real theTolerance, + const Standard_Boolean doKeepNonSolids, + TCollection_AsciiString& theWarning) const; + + Standard_EXPORT static TopoDS_Shape GlueFacesByList (const TopoDS_Shape& theShape, + const Standard_Real theTolerance, + const Standard_Boolean doKeepNonSolids, + const TopTools_MapOfShape& aFaces); */ -Standard_EXPORT TopoDS_Shape GlueWithWarnings (const TopoDS_Shape& theShape, - const Standard_Real theTolerance, - const TopAbs_ShapeEnum theShapeType, - const Standard_Boolean doKeepNonSolids, - TCollection_AsciiString& theWarning) const; - -Standard_EXPORT static TopoDS_Shape GlueByList (const TopoDS_Shape& theShape, - const Standard_Real theTolerance, - const Standard_Boolean doKeepNonSolids, - const TopTools_MapOfShape& theShapesList, - const Standard_Boolean doGlueAllEdges); - - -DEFINE_STANDARD_RTTI( GEOMImpl_GlueDriver ) + Standard_EXPORT TopoDS_Shape GlueWithWarnings (const TopoDS_Shape& theShape, + const Standard_Real theTolerance, + const TopAbs_ShapeEnum theShapeType, + const Standard_Boolean doKeepNonSolids, + TCollection_AsciiString& theWarning) const; + + Standard_EXPORT static TopoDS_Shape GlueByList (const TopoDS_Shape& theShape, + const Standard_Real theTolerance, + const Standard_Boolean doKeepNonSolids, + const TopTools_MapOfShape& theShapesList, + const Standard_Boolean doGlueAllEdges); + + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index 1f0d1fc1f..db43dcf43 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -163,7 +163,11 @@ Standard_Integer GEOMImpl_HealingDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -1157,6 +1161,4 @@ void GEOMImpl_HealingDriver::SaveStatistics( const ShHealOper_Tool& healer, bool *stats = healer.GetStatistics(); } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_HealingDriver,GEOM_BaseDriver); - -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx index 110858b0b..eeaa2a35c 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx @@ -25,47 +25,15 @@ #ifndef _GEOMImpl_HealingDriver_HeaderFile #define _GEOMImpl_HealingDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - #include #include +#include #include - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -#include "GEOM_BaseDriver.hxx" +#include class GEOMImpl_IHealing; class ShHealOper_Tool; -class TopTools_SequenceOfShape; DEFINE_STANDARD_HANDLE( GEOMImpl_HealingDriver, GEOM_BaseDriver ); @@ -74,16 +42,14 @@ class GEOMImpl_HealingDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // Standard_EXPORT GEOMImpl_HealingDriver(); Standard_EXPORT ~GEOMImpl_HealingDriver() {}; Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } + 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 static Standard_Boolean AreEdgesC1 (const TopoDS_Edge& E1, const TopoDS_Edge& E2); Standard_EXPORT static void FuseCollinearEdges (const TopoDS_Shape&, @@ -93,10 +59,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - // Type management - // -DEFINE_STANDARD_RTTI( GEOMImpl_HealingDriver ) - + OCCT_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 9d7bfa787..ba87e9c4f 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -32,7 +32,6 @@ #include #include -#include #include #include @@ -77,7 +76,6 @@ #include #include -#include #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx index 40a3fbcdb..a65ac384a 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx @@ -29,11 +29,10 @@ #include "GEOM_Object.hxx" #include #include +#include class GEOMImpl_IGroupOperations; class GEOMImpl_IPipe; -class TopTools_IndexedMapOfShape; - class GEOMImpl_I3DPrimOperations : public GEOM_IOperations { public: diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index 18e4d22a9..1dc269f68 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 6a3575ea7..db35fe4a4 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -54,7 +54,6 @@ #include #include -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx index 15967eb5c..37d69f74e 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx @@ -27,12 +27,12 @@ #include #include +#include #include class GEOM_Engine; -class Handle(GEOM_Object); -class Handle(TColStd_HArray1OfInteger); +class GEOM_Object; class GEOMImpl_IBlocksOperations : public GEOM_IOperations { public: diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx index 5b0c51434..af3e46d3b 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx @@ -25,11 +25,11 @@ #include "GEOM_IOperations.hxx" +#include #include "list" class GEOM_Engine; -class Handle(GEOM_Object); -class Handle(TColStd_HArray1OfInteger); +class GEOM_Object; class GEOMImpl_IBooleanOperations : public GEOM_IOperations { public: diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index 6df07c547..2eb9459aa 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -30,7 +30,7 @@ #include class GEOM_Engine; -class Handle(GEOM_Object); +class GEOM_Object; class GEOMImpl_ICurvesOperations : public GEOM_IOperations { diff --git a/src/GEOMImpl/GEOMImpl_IFieldOperations.cxx b/src/GEOMImpl/GEOMImpl_IFieldOperations.cxx index cc87470f7..c0b219e29 100644 --- a/src/GEOMImpl/GEOMImpl_IFieldOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IFieldOperations.cxx @@ -24,13 +24,11 @@ #include "GEOMImpl_Types.hxx" -#include "GEOM_Field.hxx" #include "GEOM_Function.hxx" #include "GEOM_IField.hxx" #include "GEOM_Object.hxx" #include "GEOM_PythonDump.hxx" -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IFieldOperations.hxx b/src/GEOMImpl/GEOMImpl_IFieldOperations.hxx index a46e34b24..4a4cd3ae2 100644 --- a/src/GEOMImpl/GEOMImpl_IFieldOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IFieldOperations.hxx @@ -25,11 +25,12 @@ #include "GEOM_IOperations.hxx" +#include + #include +#include -class Handle(GEOM_Field); -class Handle(GEOM_Object); -class Handle(TColStd_HArray1OfExtendedString); +class GEOM_Object; class GEOMImpl_IFieldOperations : public GEOM_IOperations { public: diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index 3ebd25bed..4e6965c4f 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -36,7 +36,6 @@ #include #include -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 501e9da76..6b12c9bf2 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -48,7 +48,6 @@ #include #include -#include #include #include #include @@ -64,7 +63,6 @@ #include #include -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx index 31d3bf34b..c4e41b09b 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -45,8 +46,6 @@ class GEOMImpl_IShapesOperations; class GEOMImpl_IGroupOperations; class GEOMImpl_IFieldOperations; -class Handle_TColStd_HArray1OfByte; - class GEOMImpl_IInsertOperations : public GEOM_IOperations { public: diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index 46e889157..fdd3c307b 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -53,7 +53,6 @@ #include #include -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index 7b49fc9e2..3ee231128 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -37,7 +37,7 @@ #include class GEOM_Engine; -class Handle(GEOM_Object); +class GEOM_Object; class GEOMImpl_IMeasureOperations : public GEOM_IOperations { public: diff --git a/src/GEOMImpl/GEOMImpl_IPolyline2D.hxx b/src/GEOMImpl/GEOMImpl_IPolyline2D.hxx index 595a1b453..ee3d347b2 100644 --- a/src/GEOMImpl/GEOMImpl_IPolyline2D.hxx +++ b/src/GEOMImpl/GEOMImpl_IPolyline2D.hxx @@ -52,34 +52,34 @@ class GEOMIMPL_EXPORT GEOMImpl_IPolyline2D GEOMImpl_IPolyline2D(Handle(GEOM_Function) theFunction): _func(theFunction) {} - void SetNames(const Handle_TColStd_HArray1OfExtendedString &theValue) + void SetNames(const Handle(TColStd_HArray1OfExtendedString) &theValue) { _func->SetStringArray(POLY_ARG_NAMES, theValue); } - Handle_TColStd_HArray1OfExtendedString GetNames() + Handle(TColStd_HArray1OfExtendedString) GetNames() { return _func->GetStringArray(POLY_ARG_NAMES); } - void SetTypes(const Handle_TColStd_HArray1OfByte &theValue) + void SetTypes(const Handle(TColStd_HArray1OfByte) &theValue) { _func->SetByteArray(POLY_ARG_TYPES, theValue); } - Handle_TColStd_HArray1OfByte GetTypes() + Handle(TColStd_HArray1OfByte) GetTypes() { return _func->GetByteArray(POLY_ARG_TYPES); } - void SetClosedFlags(const Handle_TColStd_HArray1OfByte &theValue) + void SetClosedFlags(const Handle(TColStd_HArray1OfByte) &theValue) { _func->SetBooleanArray(POLY_ARG_CLOSEDS, theValue); } - Handle_TColStd_HArray1OfByte GetClosedFlags() + Handle(TColStd_HArray1OfByte) GetClosedFlags() { return _func->GetBooleanArray(POLY_ARG_CLOSEDS); } - void SetWorkingPlaneDbls(const Handle_TColStd_HArray1OfReal &thePlane) + void SetWorkingPlaneDbls(const Handle(TColStd_HArray1OfReal) &thePlane) { _func->SetRealArray(POLY_ARG_WPLANE_DBLS, thePlane); } - Handle_TColStd_HArray1OfReal GetWorkingPlaneDbls() + Handle(TColStd_HArray1OfReal) GetWorkingPlaneDbls() { return _func->GetRealArray(POLY_ARG_WPLANE_DBLS); } - void SetWorkingPlane(const Handle_GEOM_Function &thePlane) + void SetWorkingPlane(const Handle(GEOM_Function) &thePlane) { _func->SetReference(POLY_ARG_WPLANE_OBJ, thePlane); } - Handle_GEOM_Function GetWorkingPlane() + Handle(GEOM_Function) GetWorkingPlane() { return _func->GetReference(POLY_ARG_WPLANE_OBJ); } void SetCoords(const std::list > &theValue); diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 523d62c3c..fd5f459f9 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -77,7 +77,6 @@ #include #include #include -#include #include #include #include @@ -90,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -4754,7 +4754,6 @@ static bool isSameEdge(const TopoDS_Edge& theEdge1, const TopoDS_Edge& theEdge2) return true; } -#include //======================================================================= //function : isSameFace //purpose : Returns True if two faces coincide diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx index 03882dda5..2b2631cd6 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx @@ -37,14 +37,14 @@ #include #include +#include #include #include class GEOM_Engine; -class Handle(GEOM_Object); -class Handle(TColStd_HArray1OfInteger); +class GEOM_Object; class TopoDS_Shape; class GEOMImpl_IShapesOperations : public GEOM_IOperations diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 72c4a65ad..34af46dff 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -54,7 +54,6 @@ #include #include -#include #include #include diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index 1401621e4..867845185 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -76,7 +76,11 @@ Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_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; } @@ -106,5 +110,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ImportDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx index 64252425c..9016284d6 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx @@ -26,26 +26,6 @@ #ifndef _GEOMImpl_ImportDriver_HeaderFile #define _GEOMImpl_ImportDriver_HeaderFile - -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -#include - -class TColStd_SequenceOfExtendedString; - - #include "GEOM_BaseDriver.hxx" DEFINE_STANDARD_HANDLE( GEOMImpl_ImportDriver, GEOM_BaseDriver ); @@ -54,19 +34,19 @@ class GEOMImpl_ImportDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ImportDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ImportDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ImportDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ImportDriver ) + + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index c40b97754..bddbe3ec2 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -177,7 +177,11 @@ Standard_Integer GEOMImpl_LineDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -220,5 +224,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_LineDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx index e03159ce6..a873a825b 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_LineDriver_HeaderFile #define _GEOMImpl_LineDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_LineDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_LineDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_LineDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_LineDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_LineDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_LineDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index 6300afa62..80d046394 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -157,7 +157,11 @@ Standard_Integer GEOMImpl_MarkerDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -207,5 +211,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_MarkerDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx index b1632a9d6..4ee615bb8 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_MarkerDriver_HeaderFile #define _GEOMImpl_MarkerDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_MarkerDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_MarkerDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_MarkerDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_MarkerDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_MarkerDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_MarkerDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index ae8407118..9be99da0a 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -317,7 +317,11 @@ Standard_Integer GEOMImpl_MeasureDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -364,6 +368,5 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_MeasureDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx index 405574db5..2524d54f9 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_MeasureDriver_HeaderFile #define _GEOMImpl_MeasureDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_MeasureDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_MeasureDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_MeasureDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_MeasureDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_MeasureDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_MeasureDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index 47542efdc..b4364a39d 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -156,7 +156,11 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -202,5 +206,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_MirrorDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx index 563c93be8..ca2f3d766 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_MirrorDriver_HeaderFile #define _GEOMImpl_MirrorDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_MirrorDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_MirrorDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_MirrorDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_MirrorDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_MirrorDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_MirrorDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 10b7ba87f..d5bf48b4f 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -180,7 +180,11 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -228,5 +232,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_OffsetDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx index 46e7a781b..f0312c941 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_OffsetDriver_HeaderFile #define _GEOMImpl_OffsetDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_OffsetDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_OffsetDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_OffsetDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_OffsetDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_OffsetDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_OffsetDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index e888b2708..63e7e5284 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -116,7 +116,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape) //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -497,7 +497,11 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(TFunction_Logbook& log) const } } +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -555,5 +559,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PartitionDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx index a133aa728..4e34d1ba6 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_PartitionDriver_HeaderFile #define _GEOMImpl_PartitionDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PartitionDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_PartitionDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_PartitionDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_PartitionDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_PartitionDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_PartitionDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index c03946441..f3bd9189a 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -2400,7 +2400,7 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI) GeomAPI_Interpolate anInt(HAP,Standard_False,1.e-7); anInt.Load(aDir1,aDir2); anInt.Perform(); - Handle(Geom_Curve) iso = anInt.Curve(); + const Handle(Geom_BSplineCurve) iso = anInt.Curve(); fp = iso->FirstParameter(); lp = iso->LastParameter(); step = (lp-fp)/(NbP-1); @@ -2998,7 +2998,7 @@ static bool CreateGroups(const TopoDS_Shape &theProfile, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -3352,7 +3352,11 @@ Standard_Integer GEOMImpl_PipeDriver::Execute (TFunction_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; } @@ -3431,5 +3435,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PipeDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx index 7a70eaa4b..43eeb1741 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx @@ -26,45 +26,11 @@ #ifndef _GEOMImpl_PipeDriver_HeaderFile #define _GEOMImpl_PipeDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - #include #include #include -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PipeDriver, GEOM_BaseDriver ); @@ -72,13 +38,11 @@ class GEOMImpl_PipeDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // Standard_EXPORT GEOMImpl_PipeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const - { return Standard_True; } + 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 static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipeDriver() {}; @@ -95,11 +59,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - // Type management - // -DEFINE_STANDARD_RTTI( GEOMImpl_PipeDriver ) - - + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx index 885016647..521795203 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 (TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -120,7 +120,11 @@ Standard_Integer GEOMImpl_PipePathDriver::Execute (TFunction_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; } @@ -161,5 +165,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PipePathDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx index 554dd04e9..e4efdaf83 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -26,45 +26,7 @@ #ifndef _GEOMImpl_PipePathDriver_HeaderFile #define _GEOMImpl_PipePathDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -#include -#include -#include - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PipePathDriver, GEOM_BaseDriver ); @@ -72,24 +34,19 @@ class GEOMImpl_PipePathDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // Standard_EXPORT GEOMImpl_PipePathDriver(); - Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const - { return Standard_True; } + 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 static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipePathDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - // Type management - // -DEFINE_STANDARD_RTTI( GEOMImpl_PipePathDriver ) - + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 13208aa23..3fc0821e0 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -80,7 +80,7 @@ GEOMImpl_PlaneDriver::GEOMImpl_PlaneDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PlaneDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -127,7 +127,8 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(TFunction_Logbook& log) const if (gp_Vec(aP1, aP2).IsParallel(gp_Vec(aP1, aP3), Precision::Angular())) Standard_ConstructionError::Raise("Plane creation aborted: points lay on one line"); GC_MakePlane aMakePlane (aP1, aP2, aP3); - aShape = BRepBuilderAPI_MakeFace(aMakePlane, -aSize, +aSize, -aSize, +aSize, + aShape = BRepBuilderAPI_MakeFace(aMakePlane.Value(), + -aSize, +aSize, -aSize, +aSize, Precision::Confusion()).Shape(); } else if (aType == PLANE_FACE) { Handle(GEOM_Function) aRef = aPI.GetFace(); @@ -237,7 +238,11 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -300,5 +305,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PlaneDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx index cfb15a1e2..6846ceaa9 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_PlaneDriver_HeaderFile #define _GEOMImpl_PlaneDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PlaneDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_PlaneDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_PlaneDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_PlaneDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_PlaneDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_PlaneDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index b125ff051..0e73047d9 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -362,7 +362,11 @@ Standard_Integer GEOMImpl_PointDriver::Execute(TFunction_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; } @@ -438,5 +442,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PointDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx index 51f19c802..371d5ee8b 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_PointDriver_HeaderFile #define _GEOMImpl_PointDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PointDriver, GEOM_BaseDriver ); @@ -68,20 +34,18 @@ class GEOMImpl_PointDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_PointDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_PointDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_PointDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_PointDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index 92e50f7de..e1cfea99e 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -69,8 +69,7 @@ GEOMImpl_PolylineDriver::GEOMImpl_PolylineDriver() //function : MakePolyline2D //purpose : //======================================================================= -Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D - (TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const { if (Label().IsNull()) { return 0; @@ -179,7 +178,11 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D } aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -188,7 +191,7 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PolylineDriver::Execute(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -273,7 +276,11 @@ Standard_Integer GEOMImpl_PolylineDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -438,5 +445,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PolylineDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx index 51aae28c5..5bee45c8b 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_PolylineDriver_HeaderFile #define _GEOMImpl_PolylineDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PolylineDriver, GEOM_BaseDriver ); @@ -68,23 +34,22 @@ class GEOMImpl_PolylineDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_PolylineDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_PolylineDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_PolylineDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); private: - Standard_Integer MakePolyline2D(TFunction_Logbook& log) const; + Standard_Integer MakePolyline2D(LOGBOOK& log) const; -DEFINE_STANDARD_RTTI( GEOMImpl_PolylineDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PolylineDumper.hxx b/src/GEOMImpl/GEOMImpl_PolylineDumper.hxx index a531c1e95..0793d736a 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDumper.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDumper.hxx @@ -65,10 +65,10 @@ public: */ GEOMImpl_PolylineDumper (const std::list > &theCoords, - const Handle_TColStd_HArray1OfExtendedString &theNames, - const Handle_TColStd_HArray1OfByte &theTypes, - const Handle_TColStd_HArray1OfByte &theCloseds, - const Handle_TColStd_HArray1OfReal &thePlnCoords); + const Handle(TColStd_HArray1OfExtendedString) &theNames, + const Handle(TColStd_HArray1OfByte) &theTypes, + const Handle(TColStd_HArray1OfByte) &theCloseds, + const Handle(TColStd_HArray1OfReal) &thePlnCoords); /** * This construcor initializes the object with 2D polyline creation @@ -86,10 +86,10 @@ public: */ GEOMImpl_PolylineDumper (const std::list > &theCoords, - const Handle_TColStd_HArray1OfExtendedString &theNames, - const Handle_TColStd_HArray1OfByte &theTypes, - const Handle_TColStd_HArray1OfByte &theCloseds, - const Handle_GEOM_Object &theWorkingPlane); + const Handle(TColStd_HArray1OfExtendedString) &theNames, + const Handle(TColStd_HArray1OfByte) &theTypes, + const Handle(TColStd_HArray1OfByte) &theCloseds, + const Handle(GEOM_Object) &theWorkingPlane); /** * This method returns Standard_True if the dump description is created @@ -106,7 +106,7 @@ public: * \param theObject the newly created object. * \return Standard_True in case of success; Standard_False otherwise. */ - Standard_Boolean Dump(const Handle_GEOM_Object &theObject); + Standard_Boolean Dump(const Handle(GEOM_Object) &theObject); protected: @@ -119,11 +119,11 @@ protected: private: const std::list > &myCoords; - Handle_TColStd_HArray1OfExtendedString myNames; - Handle_TColStd_HArray1OfByte myTypes; - Handle_TColStd_HArray1OfByte myCloseds; - Handle_TColStd_HArray1OfReal myPlnCoords; - Handle_GEOM_Object myWorkingPlane; + Handle(TColStd_HArray1OfExtendedString) myNames; + Handle(TColStd_HArray1OfByte) myTypes; + Handle(TColStd_HArray1OfByte) myCloseds; + Handle(TColStd_HArray1OfReal) myPlnCoords; + Handle(GEOM_Object) myWorkingPlane; Standard_Boolean myIsDone; TCollection_ExtendedString myDescr; diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index dba25907d..7c3f9a7fd 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -214,7 +214,11 @@ Standard_Integer GEOMImpl_PositionDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -262,5 +266,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PositionDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx index bd56dcb1f..6f6639384 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_PositionDriver_HeaderFile #define _GEOMImpl_PositionDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PositionDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_PositionDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_PositionDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_PositionDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_PositionDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_PositionDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index 2846158f4..89f466df0 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -256,8 +256,11 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aRes); } - +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -556,5 +559,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_PrismDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx index a4eef442f..8712ede83 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx @@ -26,45 +26,11 @@ #ifndef _GEOMImpl_PrismDriver_HeaderFile #define _GEOMImpl_PrismDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - #include #include #include -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_PrismDriver, GEOM_BaseDriver ); @@ -72,14 +38,13 @@ class GEOMImpl_PrismDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - Standard_EXPORT GEOMImpl_PrismDriver(); Standard_EXPORT ~GEOMImpl_PrismDriver() {}; - Standard_EXPORT virtual Standard_Integer Execute (TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate (TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute (const TFunction_Logbook&) const { return Standard_True; } + 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 static const Standard_GUID& GetID(); Standard_EXPORT static TopoDS_Shape MakeScaledPrism (const TopoDS_Shape& theShapeBase, @@ -100,11 +65,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - // Type management - -DEFINE_STANDARD_RTTI( GEOMImpl_PrismDriver ) - - + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index 59e2939bc..57d842242 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -247,7 +247,11 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(TFunction_Logbook& log) cons if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); - log.SetTouched(Label()); +#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); @@ -709,7 +713,11 @@ 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, @@ -799,5 +807,4 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder return aResult; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx index 4244757b0..ec2050c63 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx @@ -26,42 +26,9 @@ #ifndef _GEOMImpl_ProjectionDriver_HeaderFile #define _GEOMImpl_ProjectionDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; class TopoDS_Shape; - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ProjectionDriver, GEOM_BaseDriver ); @@ -69,19 +36,20 @@ class GEOMImpl_ProjectionDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ProjectionDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ProjectionDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ProjectionDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver) + private: TopoDS_Shape projectOnCylinder(const TopoDS_Shape &theShape, @@ -89,10 +57,6 @@ private: const Standard_Real theStartAngle, const Standard_Real theAngleLength, const Standard_Real theAngleRotation) const; - -public: - -DEFINE_STANDARD_RTTI( GEOMImpl_ProjectionDriver ) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index f1152ffae..19426f389 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -133,7 +133,11 @@ Standard_Integer GEOMImpl_RevolutionDriver::Execute(TFunction_Logbook& log) cons TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape); aFunction->SetValue(aRes); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -171,5 +175,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx index 7c1d90c4e..72bf2c47d 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_RevolutionDriver_HeaderFile #define _GEOMImpl_RevolutionDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_RevolutionDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_RevolutionDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_RevolutionDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_RevolutionDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_RevolutionDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_RevolutionDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index aaabab0ee..6da731792 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -311,7 +311,11 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -377,5 +381,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_RotateDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx index ed6ea9d80..547881ae3 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_RotateDriver_HeaderFile #define _GEOMImpl_RotateDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_RotateDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_RotateDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_RotateDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_RotateDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_RotateDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_RotateDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index b7e11d546..fbfc99845 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -173,7 +173,11 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -218,5 +222,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ScaleDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx index 6c7be39e7..1d29154e6 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_ScaleDriver_HeaderFile #define _GEOMImpl_ScaleDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ScaleDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_ScaleDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ScaleDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ScaleDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ScaleDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ScaleDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 0e55b5a0d..436e2a927 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -1075,7 +1075,11 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(TFunction_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()); @@ -1545,7 +1549,7 @@ TopoDS_Edge GEOMImpl_ShapeDriver::MakeEdgeFromWire(const TopoDS_Shape& aWire, if (closed_flag) { // Check if closed curve is reordered. - Handle(Geom_Curve) aCurve = concatcurve->Value(concatcurve->Lower()); + Handle(Geom_BSplineCurve) aCurve = concatcurve->Value(concatcurve->Lower()); Standard_Real aFPar = aCurve->FirstParameter(); gp_Pnt aPFirst; gp_Pnt aPntVtx = BRep_Tool::Pnt(FirstVertex); @@ -2022,8 +2026,7 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ShapeDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver); +OCCT_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 67e6d83e2..489d2f2fb 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -26,47 +26,14 @@ #ifndef _GEOMImpl_ShapeDriver_HeaderFile #define _GEOMImpl_ShapeDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - #include #include #include #include -class TColStd_SequenceOfExtendedString; -class TopoDS_Face; - +#include -#include "GEOM_BaseDriver.hxx" +class TopoDS_Face; DEFINE_STANDARD_HANDLE( GEOMImpl_ShapeDriver, GEOM_BaseDriver ); @@ -74,14 +41,13 @@ class GEOMImpl_ShapeDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // Standard_EXPORT GEOMImpl_ShapeDriver(); Standard_EXPORT ~GEOMImpl_ShapeDriver() {}; - Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; - Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } + 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 static const Standard_GUID& GetID(); Standard_EXPORT static TopoDS_Edge MakeEdgeFromWire (const TopoDS_Shape& aWire, @@ -95,9 +61,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - // Type management - // -DEFINE_STANDARD_RTTI( GEOMImpl_ShapeDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver) private: @@ -114,7 +78,6 @@ private: const Standard_Real theUMax, const Standard_Real theVMin, const Standard_Real theVMax) const; - }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index b4a738cc8..dc4270c30 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -127,7 +127,11 @@ Standard_Integer GEOMImpl_SketcherDriver::Execute(TFunction_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; } @@ -177,5 +181,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_SketcherDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx index bffc7ebd6..7974f6f28 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_SketcherDriver_HeaderFile #define _GEOMImpl_SketcherDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_SketcherDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_SketcherDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_SketcherDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_SketcherDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_SketcherDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_SketcherDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index ea04b444f..2c514ef65 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -97,7 +97,11 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -135,5 +139,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_SphereDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx index 5af1c5eca..300e8bb06 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_SphereDriver_HeaderFile #define _GEOMImpl_SphereDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_SphereDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_SphereDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_SphereDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_SphereDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_SphereDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_SphereDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index 73f4b1387..317127015 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -325,7 +325,11 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -397,5 +401,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_SplineDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx index 271cc38af..507d40848 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_SplineDriver_HeaderFile #define _GEOMImpl_SplineDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_SplineDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_SplineDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_SplineDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_SplineDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_SplineDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_SplineDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx index cbf79a7dc..6a53822bf 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -133,7 +133,11 @@ Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(TFunction_Logbook& log) co aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -171,5 +175,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx index dac44a2ad..6aad13272 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx @@ -26,44 +26,7 @@ #ifndef _GEOMImpl_ThruSectionsDriver_HeaderFile #define _GEOMImpl_ThruSectionsDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif - -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_ThruSectionsDriver, GEOM_BaseDriver ); @@ -71,20 +34,19 @@ class GEOMImpl_ThruSectionsDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_ThruSectionsDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_ThruSectionsDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index edee9695a..119712a49 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -115,7 +115,11 @@ Standard_Integer GEOMImpl_TorusDriver::Execute(TFunction_Logbook& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); - log.SetTouched(Label()); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -156,5 +160,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_TorusDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx index ecdd1293d..179868182 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_TorusDriver_HeaderFile #define _GEOMImpl_TorusDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_TorusDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_TorusDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_TorusDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_TorusDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_TorusDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_TorusDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index 9ff6072a1..a3370f64c 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -241,7 +241,11 @@ Standard_Integer GEOMImpl_TranslateDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -314,5 +318,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_TranslateDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx index 4da7f3963..1f3469892 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_TranslateDriver_HeaderFile #define _GEOMImpl_TranslateDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_TranslateDriver, GEOM_BaseDriver ); @@ -68,20 +34,19 @@ class GEOMImpl_TranslateDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_TranslateDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_TranslateDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_TranslateDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_TranslateDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index 445e34517..b825c206f 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(TFunction_Logbook& log) const +Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,7 +165,11 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); +#if OCC_VERSION_MAJOR < 7 log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } @@ -219,5 +223,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE (GEOMImpl_VectorDriver,GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx index 26c180834..3d5c86a97 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx @@ -26,41 +26,7 @@ #ifndef _GEOMImpl_VectorDriver_HeaderFile #define _GEOMImpl_VectorDriver_HeaderFile -#ifndef _TColStd_SequenceOfExtendedString_HeaderFile -#include -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _TFunction_Driver_HeaderFile -#include -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#endif - -class TColStd_SequenceOfExtendedString; - - -#include "GEOM_BaseDriver.hxx" +#include DEFINE_STANDARD_HANDLE( GEOMImpl_VectorDriver, GEOM_BaseDriver ); @@ -68,20 +34,20 @@ class GEOMImpl_VectorDriver : public GEOM_BaseDriver { public: - // Methods PUBLIC - // -Standard_EXPORT GEOMImpl_VectorDriver(); -Standard_EXPORT virtual Standard_Integer Execute(TFunction_Logbook& log) const; -Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {} -Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; } -Standard_EXPORT static const Standard_GUID& GetID(); -Standard_EXPORT ~GEOMImpl_VectorDriver() {}; + 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 static const Standard_GUID& GetID(); + Standard_EXPORT ~GEOMImpl_VectorDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); -DEFINE_STANDARD_RTTI( GEOMImpl_VectorDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver) + }; #endif diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index 18a5f4669..c01c580d6 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -38,8 +38,8 @@ class SALOME_ListIO; class SalomeApp_Study; class SVTK_View; class QColor; -class Handle_SALOME_InteractiveObject; -class Handle_AIS_InteractiveContext; +class SALOME_InteractiveObject; +class AIS_InteractiveContext; #include diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx index 532b07c35..c31cf3dae 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx @@ -21,8 +21,7 @@ #include namespace GEOMUtils { - IMPLEMENT_STANDARD_HANDLE (HTrsfCurve2d, Adaptor2d_HCurve2d); - IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); + OCCT_IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); } //======================================================================= diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx index 555f9bd3f..ce7f0b4f8 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx @@ -73,8 +73,7 @@ namespace GEOMUtils public: - DEFINE_STANDARD_RTTI(HTrsfCurve2d); - + OCCT_DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d) }; } diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx index feb20bf80..6c51082ef 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx @@ -139,7 +139,11 @@ 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 c5f1466e9..9d14fc760 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx @@ -20,9 +20,10 @@ #ifndef _GEOMUtils_TrsfCurve2d_HXX_ #define _GEOMUtils_TrsfCurve2d_HXX_ - #include +#include + #include #include #include diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc index d99cd796a..20629cce1 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(GEOM_BaseObject) theImpl) + HANDLE_NAMESPACE(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(GEOM_BaseObject) anObj = Handle(GEOM_BaseObject)::DownCast(aSeq->Value(i)); + HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(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(GEOM_BaseObject) anObj = Handle(GEOM_BaseObject)::DownCast(aSeq->Value(i)); + HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(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(GEOM_BaseDriver) driver = - Handle(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i )); + HANDLE_NAMESPACE(GEOM_BaseDriver) driver = + HANDLE_NAMESPACE(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 556635d92..a9966da60 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(GEOM_BaseObject) theImpl); + GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_BaseObject) GetImpl() { return _impl; } + HANDLE_NAMESPACE(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(GEOM_BaseObject) _impl; + HANDLE_NAMESPACE(GEOM_BaseObject) _impl; }; #endif diff --git a/src/GEOM_I/GEOM_Field_i.cc b/src/GEOM_I/GEOM_Field_i.cc index ca669acda..6b0f6ca44 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(GEOM_Field) theImpl): + HANDLE_NAMESPACE(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(GEOM_Object) shape = _impl->GetShape(); + HANDLE_NAMESPACE(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(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp ); + HANDLE_NAMESPACE(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(GEOM_FieldStep)> stepList = _impl->GetSteps(); - std::list< Handle(GEOM_FieldStep)>::iterator stp = stepList.begin(); + std::list< HANDLE_NAMESPACE(GEOM_FieldStep)> stepList = _impl->GetSteps(); + std::list< HANDLE_NAMESPACE(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(GEOM_FieldStep) step = _impl->GetStep(stepID); + HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl): + HANDLE_NAMESPACE(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(GEOM_Field) field = _impl->GetField(); + HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl): +GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl): +GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl): +GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl): +GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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 f3e85b9ab..c60641174 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(GEOM_Field) theImpl); + GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_Field) _impl; + HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl); + GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) _impl; + HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl); + GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl); + GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl); + GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_FieldStep) theImpl); + GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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 3750bee52..6da092805 100755 --- a/src/GEOM_I/GEOM_GEOM_I.hxx +++ b/src/GEOM_I/GEOM_GEOM_I.hxx @@ -37,4 +37,11 @@ #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_ diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc old mode 100755 new mode 100644 index fd0c9d722..bb69e6fd1 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include @@ -179,7 +178,7 @@ char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); - Handle(GEOM_BaseObject) anObject = + HANDLE_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(aStudy->StudyId(), aLocalPersistentID); if ( !anObject.IsNull() ) { @@ -265,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(GEOM_Object) aGShape = Handle(GEOM_Object)::DownCast + HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast ( _impl->GetObject( aShape->GetStudyID(), entry )); TopoDS_Shape TopoSh = aGShape->GetValue(); // find label of main shape @@ -274,7 +273,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, aMainSh = aMainSh->GetMainShape(); } entry = aMainSh->GetEntry(); - Handle(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry ); + HANDLE_NAMESPACE(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry ); TDF_Label aMainLbl = anObj->GetFunction(1)->GetNamingEntry(); // check all named shapes using iterator @@ -462,7 +461,7 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::ListOfGO_var aResList) { CORBA::String_var entry = theMainShape->GetEntry(); - //Handle(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry); + //HANDLE_NAMESPACE(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry); Handle(TColStd_HArray1OfInteger) anArray; if(SeqS.Length()>0) { // create a group @@ -470,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(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry); + //HANDLE_NAMESPACE(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry); // add named objects - //Handle(GEOM_Object) anObj; + //HANDLE_NAMESPACE(GEOM_Object) anObj; for(int i=1; i<=SeqS.Length(); i++) { TopoDS_Shape aValue = SeqS.Value(i); //anArray = new TColStd_HArray1OfInteger(1,1); @@ -481,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(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); + //HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); //if (aFunction.IsNull()) continue; //GEOM_ISubShape aSSI(aFunction); //aSSI.SetMainShape(aMainShape->GetLastFunction()); @@ -515,7 +514,7 @@ GEOM::ListOfGO* GEOM_Gen_i:: if(theMainShape->_is_nil()) return aResList._retn(); CORBA::String_var entry = theMainShape->GetEntry(); - Handle(GEOM_Object) aMainShape = Handle(GEOM_Object)::DownCast + HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast ( _impl->GetObject( theMainShape->GetStudyID(), entry )); if (aMainShape.IsNull()) return aResList._retn(); TopoDS_Shape MainSh = aMainShape->GetValue(); @@ -601,7 +600,11 @@ 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; @@ -663,11 +666,32 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, // Prepare a file name to open TCollection_AsciiString aNameWithExt(""); SALOMEDS::Study_var study = theComponent->GetStudy(); + +#if OCC_VERSION_MAJOR > 6 + // Get the file name. + int i; + int aLength = aSeq->length(); + const char *aGeomSgd = "_GEOM.sgd"; + const char *aGeomcbf = "_GEOM.cbf"; + + for(i = 0; i < aLength; i++) { + std::string aName(aSeq[i]); + + if (aName.rfind(aGeomSgd) != std::string::npos || + aName.rfind(aGeomcbf) != std::string::npos) { + aNameWithExt = aName.c_str(); + 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); // Open document @@ -802,8 +826,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, //Create a new GEOM_Object - Handle(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID); - Handle(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); + HANDLE_NAMESPACE(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID); + HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); aFunction->SetValue(aTopology); TCollection_AsciiString anEntry; @@ -1121,16 +1145,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(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } /* - Handle(GEOM_Function) anOFun = theObject->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_Function) anOFun = theObject->GetLastFunction(); if (!anOFun.IsNull()) { CORBA::String_var entryArg = anArgO->GetEntry(); - Handle(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg); + HANDLE_NAMESPACE(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg); if (!anArgOImpl.IsNull()) { TopoDS_Shape anArgOShape = anArgOImpl->GetValue(); TopoDS_Shape aMultiArgShape; @@ -1165,7 +1189,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, {} } GEOM::GEOM_Object_var anArgOMulti = (aMultiArgShape); // TODO - Handle(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); anArgOMultiFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti); } @@ -1316,8 +1340,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, aResParts->length(nb); if (nb > 0) { - Handle(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); - Handle(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); + HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1332,8 +1356,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - Handle(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); - Handle(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); + HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1350,7 +1374,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(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); + HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -1442,8 +1466,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(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -1718,8 +1742,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(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } @@ -1862,8 +1886,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu aResParts->length(nb); if (nb > 0) { - Handle(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); - Handle(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); + HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1878,8 +1902,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - Handle(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); - Handle(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); + HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1894,7 +1918,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(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); + HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -1994,8 +2018,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(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - Handle(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -2529,14 +2553,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(GEOM_Object) aMainShape = Handle(GEOM_Object)::DownCast + HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(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(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); + HANDLE_NAMESPACE(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); if(anObject.IsNull()) return GEOM::GEOM_Object::_nil(); TCollection_AsciiString anEntry; @@ -2552,7 +2576,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(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false); + HANDLE_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false); if (!anObject.IsNull()) _impl->RemoveObject(anObject); } @@ -2587,7 +2611,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(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry); + HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry); if (handle_object.IsNull()) return obj._retn(); TCollection_AsciiString stringIOR = handle_object->GetIOR(); @@ -2602,12 +2626,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(GEOM_Field)::DownCast( handle_object )); + servant = new GEOM_Field_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Field)::DownCast( handle_object )); break; } case GEOM_FIELD_STEP: { - Handle(GEOM_FieldStep) step = Handle(GEOM_FieldStep)::DownCast( handle_object ); - Handle(GEOM_Field) field = step->GetField(); + HANDLE_NAMESPACE(GEOM_FieldStep) step = HANDLE_NAMESPACE(GEOM_FieldStep)::DownCast( handle_object ); + HANDLE_NAMESPACE(GEOM_Field) field = step->GetField(); int type = ( !field.IsNull() ? field->GetDataType() : 0 ); switch( type ) { case GEOM::FDT_Bool: @@ -2625,7 +2649,7 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const c break; } default: - servant = new GEOM_Object_i (_poa, engine, Handle(GEOM_Object)::DownCast( handle_object )); + servant = new GEOM_Object_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Object)::DownCast( handle_object )); } PortableServer::ObjectId_var id = _poa->activate_object(servant); @@ -3029,7 +3053,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(GEOM_Function) aFunction; + HANDLE_NAMESPACE(GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDataStd_ChildNodeIterator Itr( aRoot ); @@ -3102,7 +3126,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(GEOM_Function) aFunction; + HANDLE_NAMESPACE(GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDF_Label aLabel; @@ -3148,7 +3172,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(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false); + HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false); if ( handle_object.IsNull() ) continue; @@ -3246,11 +3270,11 @@ void GEOM_Gen_i::includeSubObjects(SALOMEDS::Study_ptr theStudy, std::set& anOthers) { std::set::iterator foundIt; - Handle(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false); + HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false); if ( handle_object.IsNull() ) return; - Handle(GEOM_Function) aShapeFun = handle_object->GetFunction(1); + HANDLE_NAMESPACE(GEOM_Function) aShapeFun = handle_object->GetFunction(1); if ( aShapeFun.IsNull() || !aShapeFun->HasSubShapeReferences() ) return; diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index 1ca901a40..34641ec7e 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -54,6 +54,7 @@ #include "GEOMUtils.hxx" #include +#include #include #include @@ -62,8 +63,6 @@ //#include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC -class TopTools_SequenceOfShape; - //===================================================================== // Generic operations creator (for plugins mechanism) //===================================================================== diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index 408b444cc..253c45ff1 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(GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn(); //Create the Box - Handle(GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation); + HANDLE_NAMESPACE(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(GEOM_Object) anObj = GetObjectImpl(theObj); + HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObj); if (anObj.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePnt); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); // Make Disk - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Disk - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePnt); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cylinder - Handle(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePnt); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cylinder - Handle(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePnt); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cone - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeSphereR(theR); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); //Create the Sphere - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePnt); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); // Make Torus - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aInit = GetObjectImpl(theInitShape); - Handle(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aInit = GetObjectImpl(theInitShape); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull() || aInit.IsNull()) return aGEOMObject._retn(); //Create the Prism - Handle(GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert); + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aPath = GetObjectImpl(thePath); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn(); //Create the Revolution - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn(); //Create the Revolution - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeFilling + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPath = GetObjectImpl(thePath); + HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); if (aPath.IsNull()) return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - Handle(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - Handle(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aPath = GetObjectImpl(thePath); + HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); if (aPath.IsNull()) return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - Handle(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - Handle(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - Handle(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase); - Handle(GEOM_Object) aPath = GetObjectImpl(thePath); - Handle(GEOM_Object) aVec = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeThickening( + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aBase1 = GetObjectImpl(theBase1); - Handle(GEOM_Object) aBase2 = GetObjectImpl(theBase2); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aBase1 = GetObjectImpl(theBase1); + HANDLE_NAMESPACE(GEOM_Object) aBase2 = GetObjectImpl(theBase2); if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn(); // Create the Path - Handle(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); + HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); if (!aBase.IsNull()) aSeqBases1->Append(aBase); } for (ind = 0; ind < aNbBases2; ind++) { - Handle(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); + HANDLE_NAMESPACE(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 438fc8909..3e4f4f96a 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(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ); + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theReference); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theReference); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(theLine1); - Handle(GEOM_Object) aRef2 = GetObjectImpl(theLine2); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLine1); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theLine2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = GetOperations()->MakePointOnCurve + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Get the reference point (can be NULL) - Handle(GEOM_Object) aRefPoint; + HANDLE_NAMESPACE(GEOM_Object) aRefPoint; if (!CORBA::is_nil(theStartPoint)) { aRefPoint = GetObjectImpl(theStartPoint); } //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theSurface); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theSurface); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theFace); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference); + HANDLE_NAMESPACE(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(GEOM_Object) aReference = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the vector - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ); + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the vector - Handle(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2); + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(thePnt); - Handle(GEOM_Object) aRef2 = GetObjectImpl(theDir); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theDir); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - Handle(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2); + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - Handle(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2); + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(theFace1); - Handle(GEOM_Object) aRef2 = GetObjectImpl(theFace2); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theFace1); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theFace2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(thePnt); - Handle(GEOM_Object) aRef2 = GetObjectImpl(theVec); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the plane - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aRef3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(thePnt3); if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn(); //Create the plane - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aRef = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the plane - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(theVec1); - Handle(GEOM_Object) aRef2 = GetObjectImpl(theVec2); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theVec1); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the plane - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(theLCS); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLCS); //Create the plane - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ, + HANDLE_NAMESPACE(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(GEOM_Object) aRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theShape); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef); + HANDLE_NAMESPACE(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(GEOM_Object) aRef1 = GetObjectImpl(theOrigin); - Handle(GEOM_Object) aRef2 = GetObjectImpl(theXVec); - Handle(GEOM_Object) aRef3 = GetObjectImpl(theYVec); + HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theOrigin); + HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theXVec); + HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(theYVec); if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn(); //Create the point - Handle(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1, + HANDLE_NAMESPACE(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(GEOM_Object) aRef = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the plane - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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 b6c3a62cd..838577adb 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(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); - Handle(GEOM_Object) anEdge3 = GetObjectImpl(theEdge3); - Handle(GEOM_Object) anEdge4 = GetObjectImpl(theEdge4); + 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); if (anEdge1.IsNull() || anEdge2.IsNull() || anEdge3.IsNull() || anEdge4.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); if (anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); - Handle(GEOM_Object) aPnt4 = GetObjectImpl(thePnt4); + 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); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull() || aPnt4.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(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); + 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); if (anFace1.IsNull() || anFace2.IsNull() || anFace3.IsNull() || anFace4.IsNull() || anFace5.IsNull() || anFace6.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = GetOperations()->MakeHexa + HANDLE_NAMESPACE(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(GEOM_Object) anFace1 = GetObjectImpl(theFace1); - Handle(GEOM_Object) anFace2 = GetObjectImpl(theFace2); + HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1); + HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2); if (anFace1.IsNull() || anFace2.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Create the Blocks Compound - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Create the Point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); // Create the Point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aShape.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Create the Edge - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(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); + 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); if (aShape.IsNull() || aPoint1.IsNull() || aPoint2.IsNull() || aPoint3.IsNull() || aPoint4.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - Handle(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); if (aShape.IsNull() || anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aFace = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); if (aShape.IsNull() || aFace.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); if (aShape.IsNull() || aVector.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); // Create the Shape - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - Handle(GEOM_Object) aFaces; - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(GEOM_Object) aFaces; + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - Handle(GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - Handle(GEOM_Object) anObject = GetOperations()->UnionFaces(aShape); + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Get the result - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aCompound.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Get the block - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aParts->Append(aSh); } //Get the Block - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aCompound = GetObjectImpl(theCompound); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Perform the transformation - Handle(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Perform the transformation - Handle(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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 b2aef8a8f..2cfe521bc 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(GEOM_Object) aSh1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aSh2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2); if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn(); // Make Boolean - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aSh1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aSh2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2); if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn(); // Make Boolean - Handle(GEOM_Object) anObject = GetOperations()->MakeFuse + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aMainShape = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theShape); - Handle(GEOM_Object) aPl = GetObjectImpl(thePlane); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aPl = GetObjectImpl(thePlane); if (aSh.IsNull() || aPl.IsNull()) return aGEOMObject._retn(); // Make Half Partition - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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 4e9235734..003f1d8c8 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(GEOM_Object) aPnt, aVec; + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Circle - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Circle - Handle(GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3); + HANDLE_NAMESPACE(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(GEOM_Object) aPnt, aVec, aVecMaj; + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt, aVec, aVecMaj; + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Arc - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make ArcCenter - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - Handle(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Arc - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Polyline - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Bezier curve - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Polyline - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } //Get the reference vectors - Handle(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec); - Handle(GEOM_Object) aVec2 = GetObjectImpl(theLastVec); + HANDLE_NAMESPACE(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec); + HANDLE_NAMESPACE(GEOM_Object) aVec2 = GetObjectImpl(theLastVec); if (aVec1.IsNull() || aVec2.IsNull()) return aGEOMObject._retn(); // Make Polyline - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aFace = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); // Make isoline - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); + HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); // Make Sketcher - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakePolyline2D + HANDLE_NAMESPACE(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(GEOM_Object) aWorkingPlane = + HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); ConvertListListDouble(theCoordsList, aCoords); // Make Polyline - Handle(GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane + HANDLE_NAMESPACE(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 8d0d95a10..1626e25e7 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(GEOM_Object) aShapeRef = GetObjectImpl( theShape ); - Handle(GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef, + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl( theShape ); + HANDLE_NAMESPACE(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(GEOM_Object) go = GetObjectImpl( shape ); + HANDLE_NAMESPACE(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(GEOM_Object) go = GetObjectImpl( shape ); + HANDLE_NAMESPACE(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(GEOM_Field) f = Handle(GEOM_Field)::DownCast( seq->Value( i )); + HANDLE_NAMESPACE(GEOM_Field) f = HANDLE_NAMESPACE(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(GEOM_Object) go = GetObjectImpl( shape ); + HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); - Handle(GEOM_Field) f = GetOperations()->GetField( go, name ); + HANDLE_NAMESPACE(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(GEOM_Object) go = GetObjectImpl( shape ); + HANDLE_NAMESPACE(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 d1dc65d33..d55117e21 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(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Fillet - Handle(GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - Handle(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - Handle(GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - Handle(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - Handle(GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - Handle(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - Handle(GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2); + HANDLE_NAMESPACE(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(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); + HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups->Append(aGr); } //Perform the operation - Handle(GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups); + HANDLE_NAMESPACE(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(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); + HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups->Append(aGr); } //Perform the operation - Handle(GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups); + HANDLE_NAMESPACE(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(GEOM_Object) aGr = GetObjectImpl(theGList1[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]); + HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups2->Append(aGr); } //Perform the operation - Handle(GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return aGEOMObject._retn(); - Handle(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef); + HANDLE_NAMESPACE(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(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + HANDLE_NAMESPACE(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 2f5b18fc5..3f4f4f366 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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject, + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(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(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(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(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(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(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theObjects, aShapes )) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false ); + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theObjects, aShapes )) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true ); + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theSolids, aShapes )) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Get the points - std::list< Handle(GEOM_Object) > aPoints; + std::list< HANDLE_NAMESPACE(GEOM_Object) > aPoints; if (! GetListOfObjectsImpl( thePoints, aPoints )) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) aWire = GetObjectImpl(theWire); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aVerts.push_back(aSh); } //Perform operation - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObjects[i]); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aClosed->Value(i))); + (*theClosedWires)[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(anOpen->Value(i))); + (*theOpenWires)[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform -// Handle(GEOM_Object) aNewObject = +// HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - Handle(GEOM_Object) aNewObject = + HANDLE_NAMESPACE(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 97c73470a..57d768f18 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -79,11 +79,11 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::MakeCopy(GEOM::GEOM_Object_ptr t GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); + HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); if (anOriginal.IsNull()) return aGEOMObject._retn(); //Create the copy - Handle(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -106,7 +106,7 @@ void GEOM_IInsertOperations_i::Export GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); + HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); if (anOriginal.IsNull()) return; //Export the shape to the file @@ -139,7 +139,7 @@ GEOM::ListOfGBO* GEOM_IInsertOperations_i::ImportFile aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetBaseObject(Handle(GEOM_BaseObject)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -180,7 +180,7 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::RestoreShape (const SALOMEDS::TM char* buf = (char*)theStream.NP_data(); std::istringstream aStream (buf); - Handle(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -280,8 +280,8 @@ CORBA::Boolean GEOM_IInsertOperations_i::TransferData } //Get the reference shape - Handle(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom); - Handle(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo); + HANDLE_NAMESPACE(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom); + HANDLE_NAMESPACE(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 7a6e9074c..0d89b61d3 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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Fillet - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Archimede - Handle(GEOM_Object) anObject = GetOperations()->MakeArchimede + HANDLE_NAMESPACE(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(GEOM_Object) aShapeRef = GetObjectImpl(theShape); - Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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 5093451fe..63cb07d15 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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); // Make Point - centre of mass of theShape - Handle(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if ( aShape.IsNull() ) return aGEOMObject._retn(); // Get vertex by index - Handle(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex); + HANDLE_NAMESPACE(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(GEOM_Object) aFace = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) return aGEOMObject._retn(); // Get the OptionalPoint (can be not defined) - Handle(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint); + HANDLE_NAMESPACE(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint); // Make Vector - normal to theFace (in point theOptionalPoint if the face is not planar) - Handle(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -503,7 +503,7 @@ void GEOM_IMeasureOperations_i::GetBasicProperties (GEOM::GEOM_Object_ptr theSha GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -526,7 +526,7 @@ void GEOM_IMeasureOperations_i::GetInertia GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -552,7 +552,7 @@ void GEOM_IMeasureOperations_i::GetBoundingBox (GEOM::GEOM_Object_ptr theShape, GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -575,11 +575,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::MakeBoundingBox GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); // Make Box - bounding box of theShape - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetBoundingBox(aShape, precise); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -602,7 +602,7 @@ void GEOM_IMeasureOperations_i::GetTolerance GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -630,7 +630,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape } //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { @@ -658,7 +658,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry } //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { @@ -683,7 +683,7 @@ char* GEOM_IMeasureOperations_i::PrintShapeErrors const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrors) { //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { return NULL; @@ -718,7 +718,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Obj GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); // Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { GEOMImpl_IMeasureOperations::SICheckLevel aCheckLevel; @@ -785,7 +785,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersectionsFast GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); // Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger; @@ -830,8 +830,8 @@ CORBA::Boolean GEOM_IMeasureOperations_i::FastIntersect (GEOM::GEOM_Object_ptr t GEOM::ListOfLong_var anIntegersArray2 = new GEOM::ListOfLong(); // Get the reference shape - Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (!aShape1.IsNull() && !aShape2.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers1 = new TColStd_HSequenceOfInteger; @@ -872,7 +872,7 @@ char* GEOM_IMeasureOperations_i::IsGoodForSolid (GEOM::GEOM_Object_ptr theShape) GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return CORBA::string_dup("WRN_NULL_OBJECT_OR_SHAPE"); // Get shape parameters @@ -891,7 +891,7 @@ char* GEOM_IMeasureOperations_i::WhatIs (GEOM::GEOM_Object_ptr theShape) GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return NULL; // Get shape parameters @@ -916,7 +916,7 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_ GEOM::ListOfBool_var aResults = new GEOM::ListOfBool; aResults->length(nb_points); - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); std::vector tmp(3*nb_points); for (int i = 0; i < 3*nb_points; i++) @@ -941,8 +941,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetMinDistance GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get shape parameters @@ -966,8 +966,8 @@ CORBA::Long GEOM_IMeasureOperations_i::ClosestPoints GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble(); //Get the reference shape - Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (!aShape1.IsNull() && !aShape2.IsNull()) { Handle(TColStd_HSequenceOfReal) aDoubles = new TColStd_HSequenceOfReal; @@ -997,7 +997,7 @@ void GEOM_IMeasureOperations_i::PointCoordinates (GEOM::GEOM_Object_ptr theShape GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; @@ -1017,8 +1017,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngle (GEOM::GEOM_Object_ptr theShap GetOperations()->SetNotDone(); //Get the reference shapes - Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get the angle @@ -1037,8 +1037,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngleBtwVectors (GEOM::GEOM_Object_p GetOperations()->SetNotDone(); //Get the reference shapes - Handle(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get the angle @@ -1058,7 +1058,7 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve); if(aShape.IsNull()) return -1.0; return GetOperations()->CurveCurvatureByParam(aShape,theParam); @@ -1076,8 +1076,8 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theCurve); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if( aShape.IsNull() || aPoint.IsNull() ) return -1.0; return GetOperations()->CurveCurvatureByPoint(aShape,aPoint); @@ -1098,7 +1098,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theSurf); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); if(aShape.IsNull()) return -1.0; return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam); @@ -1116,8 +1116,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theSurf); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if( aShape.IsNull() || aPoint.IsNull() ) return -1.0; return GetOperations()->MaxSurfaceCurvatureByPoint(aShape,aPoint); @@ -1137,7 +1137,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theSurf); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); if (aShape.IsNull()) return -1.0; return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam); @@ -1155,8 +1155,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - Handle(GEOM_Object) aShape = GetObjectImpl(theSurf); - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); + HANDLE_NAMESPACE(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 472bdf7ae..b3d6c6125 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(GEOM_BaseObject) theObject) +GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject) { GEOM::GEOM_BaseObject_var GO; if (theObject.IsNull()) return GO._retn(); @@ -150,10 +150,10 @@ GEOM_IOperations_i::GetBaseObject(Handle(GEOM_BaseObject) theObject) * GetObjectImpl */ //============================================================================= -Handle(GEOM_BaseObject) +HANDLE_NAMESPACE(GEOM_BaseObject) GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject) { - Handle(GEOM_BaseObject) anImpl; + HANDLE_NAMESPACE(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(GEOM_Object) theObject) +GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject) { return GEOM::GEOM_Object::_narrow( GetBaseObject( theObject )); } @@ -176,9 +176,9 @@ GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObjec * GetObjectImpl */ //============================================================================= -Handle(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject) +HANDLE_NAMESPACE(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject) { - return Handle(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject )); + return HANDLE_NAMESPACE(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(GEOM_Object) anObj = GetObjectImpl(theObjects[i]); + HANDLE_NAMESPACE(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(GEOM_Object) >& theList) + std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList) { int i; int aNbObj = theObjects.length(); for (i = 0; i < aNbObj; i++) { - Handle(GEOM_Object) anObj = GetObjectImpl(theObjects[i]); + HANDLE_NAMESPACE(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 f2262d0ae..aa271fbf1 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(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 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 void StartOperation(); @@ -68,7 +68,7 @@ protected: Handle(TColStd_HSequenceOfTransient) GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects); bool GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects, - std::list< Handle(GEOM_Object) >& theList); + std::list< HANDLE_NAMESPACE(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 325612adb..31e54ba2f 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(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - Handle(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn(); //Create the Edge - Handle(GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2); + HANDLE_NAMESPACE(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(GEOM_Object) aRefCurve = GetObjectImpl(theCurve); + HANDLE_NAMESPACE(GEOM_Object) aRefCurve = GetObjectImpl(theCurve); if (aRefCurve.IsNull()) return aGEOMObject._retn(); //Get the reference point (can be NULL) - Handle(GEOM_Object) aRefPoint; + HANDLE_NAMESPACE(GEOM_Object) aRefPoint; if (!CORBA::is_nil(theStartPoint)) { aRefPoint = GetObjectImpl(theStartPoint); } //Create the point - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aWire = GetObjectImpl(theWire); + HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); //Create the Edge - Handle(GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aWire = GetObjectImpl(theWire); + HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); //Create the Face - Handle(GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theWires[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theWires[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aFace = GetObjectImpl(theFace); - Handle(GEOM_Object) aWire = GetObjectImpl(theWire); + HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); if (aFace.IsNull() || aWire.IsNull()) { return aGEOMObject._retn(); } //Create the Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); aConstraints.push_back(anObject); } // Make Face - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShell = GetObjectImpl(theShell); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theShells[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]); + HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]); + ::HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Perform the gluing - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Perform the gluing - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) > aShapes; + std::list< HANDLE_NAMESPACE(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(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape); if (aShape.IsNull()) return aGEOMObject._retn(); - Handle(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i+1))); + aSeq[i] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); - Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(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(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(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(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + HANDLE_NAMESPACE(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(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); - Handle(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aSubObject = GetObjectImpl( theSubObject ); - Handle(GEOM_Object) anObject = GetObjectImpl( theObject ); + HANDLE_NAMESPACE(GEOM_Object) aSubObject = GetObjectImpl( theSubObject ); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Create the Solid - Handle(GEOM_Object) anObject = GetOperations()->ReverseShape(aShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - Handle(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1); - Handle(GEOM_Object) anPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); - Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aCenter = GetObjectImpl(theCenter); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(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); + 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); 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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAx1 = GetObjectImpl(theAx1); - Handle(GEOM_Object) anPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); - Handle(GEOM_Object) aPnt = GetObjectImpl(thePnt); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aCenter = GetObjectImpl(theCenter); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(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); + 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); if (aShape.IsNull() || aTopLeftPoint.IsNull() || @@ -1727,8 +1727,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnBox GetOperations()->SetNotDone(); //Get the reference objects - Handle(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aBox = GetObjectImpl(theBox); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aBox = GetObjectImpl(theBox); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aGEOMObject._retn(); //Get Shapes On Shape - Handle(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - Handle(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + HANDLE_NAMESPACE(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(GEOM_Object) anEdge = GetObjectImpl(theEdge); + HANDLE_NAMESPACE(GEOM_Object) anEdge = GetObjectImpl(theEdge); if (anEdge.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) aNewEdge = + HANDLE_NAMESPACE(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(GEOM_Object) aFace = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) aNewFace = + HANDLE_NAMESPACE(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(GEOM_Object) aFace = GetObjectImpl(theFace); + HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - Handle(GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace); + HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); - Handle(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint); + HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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(GEOM_Object) aShape = GetObjectImpl(theShape); + HANDLE_NAMESPACE(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(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(HANDLE_NAMESPACE(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 4ba4660ec..e8e2fcd2d 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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the first point of translation - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point of translation - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the first point of translation - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point of translation - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Create the translated shape - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the translated shape - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation - Handle(GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation if (theCopy) { - Handle(GEOM_Object) anObject = GetOperations()-> + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the axis of revolution - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the axis of rotation - Handle(GEOM_Object) anAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); if (anAxis.IsNull()) return aGEOMObject._retn(); //Perform the rotation - Handle(GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the plane - Handle(GEOM_Object) aPlane = GetObjectImpl(thePlane); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aPlane = GetObjectImpl(thePlane); + HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane); if (aPlane.IsNull()) return aGEOMObject._retn(); //Perform the mirror - Handle(GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the axis - Handle(GEOM_Object) aAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aAxis = GetObjectImpl(theAxis); + HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis); if (aAxis.IsNull()) return aGEOMObject._retn(); //Perform the mirror - Handle(GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); //Perform the mirror - Handle(GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape - Handle(GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset); + HANDLE_NAMESPACE(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(GEOM_Object) aSource = GetObjectImpl(theSource); - Handle(GEOM_Object) aTarget = GetObjectImpl(theTarget); + HANDLE_NAMESPACE(GEOM_Object) aSource = GetObjectImpl(theSource); + HANDLE_NAMESPACE(GEOM_Object) aTarget = GetObjectImpl(theTarget); if (aSource.IsNull() || aTarget.IsNull()) return aGEOMObject._retn(); //Create the projection - Handle(GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget); + HANDLE_NAMESPACE(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(GEOM_Object) aPoint = GetObjectImpl(thePoint); - Handle(GEOM_Object) aWire = GetObjectImpl(theWire); + HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); if (aPoint.IsNull() || aWire.IsNull()) { return -1.0; } - Handle(GEOM_Object) aPointOnEdge; + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - Handle(GEOM_Object) aPoint; + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the point - Handle(GEOM_Object) aPoint; + HANDLE_NAMESPACE(GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); } //Perform the scale - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - Handle(GEOM_Object) aPoint; + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the point - Handle(GEOM_Object) aPoint; + HANDLE_NAMESPACE(GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); } //Perform the scale - Handle(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the Start LCS (may be NULL for positioning from global LCS) - Handle(GEOM_Object) aStartLCS; + HANDLE_NAMESPACE(GEOM_Object) aStartLCS; if (!CORBA::is_nil(theStartLCS)) { aStartLCS = GetObjectImpl(theStartLCS); if (aStartLCS.IsNull()) return aGEOMObject._retn(); } //Get the End LCS - Handle(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the Start LCS (may be NULL for positioning from global LCS) - Handle(GEOM_Object) aStartLCS; + HANDLE_NAMESPACE(GEOM_Object) aStartLCS; if (!CORBA::is_nil(theStartLCS)) { aStartLCS = GetObjectImpl(theStartLCS); if (aStartLCS.IsNull()) return aGEOMObject._retn(); } //Get the End LCS - Handle(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); + HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); if (aEndLCS.IsNull()) return aGEOMObject._retn(); //Perform the position - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the path object - Handle(GEOM_Object) aPathObject = GetObjectImpl(thePath); + HANDLE_NAMESPACE(GEOM_Object) aPathObject = GetObjectImpl(thePath); if (aPathObject.IsNull()) return aGEOMObject._retn(); //Perform the position - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DX by default //Perform the translation - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector1 of translation - Handle(GEOM_Object) aVector1 = GetObjectImpl(theVector1); + HANDLE_NAMESPACE(GEOM_Object) aVector1 = GetObjectImpl(theVector1); //if (aVector1.IsNull()) return aGEOMObject._retn(); // DX by default //Get the vector2 of translation - Handle(GEOM_Object) aVector2 = GetObjectImpl(theVector2); + HANDLE_NAMESPACE(GEOM_Object) aVector2 = GetObjectImpl(theVector2); //if (aVector2.IsNull()) return aGEOMObject._retn(); // DY by default //Perform the translation - Handle(GEOM_Object) anObject = GetOperations()->Translate2D + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - Handle(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - Handle(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - Handle(GEOM_Object) anObject = GetOperations()->Rotate2D + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - Handle(GEOM_Object) anObject = GetOperations()->Rotate2D + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - Handle(GEOM_Object) aVector = GetObjectImpl(theVector); + HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default double anAngle = M_PI * theAngle / 180.; //Perform the rotation - Handle(GEOM_Object) anObject = GetOperations()->Rotate2D + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the central point of rotation - Handle(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); + HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); if (aCentPoint.IsNull()) return aGEOMObject._retn(); //Get the first point - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(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(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the central point of rotation - Handle(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); + HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); if (aCentPoint.IsNull()) return aGEOMObject._retn(); //Get the first point - Handle(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point - Handle(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the rotation - Handle(GEOM_Object) anObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the sample object - Handle(GEOM_Object) aSample = GetObjectImpl(theSample); + HANDLE_NAMESPACE(GEOM_Object) aSample = GetObjectImpl(theSample); if (aSample.IsNull()) return aGEOMObject._retn(); //Perform the transformation - Handle(GEOM_Object) aResObject = + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Perform the recomputation - Handle(GEOM_Function) aLastFunction = anObject->GetLastFunction(); + HANDLE_NAMESPACE(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(GEOM_Object) anObject = GetObjectImpl(theObject); + HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) { return aGEOMObject._retn(); } //Perform the transformation - Handle(GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder + HANDLE_NAMESPACE(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 cb48888d6..be1be90bc 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(GEOM_Object) theImpl) : + HANDLE_NAMESPACE(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(GEOM_Function) aMainFun = _impl->GetLastFunction(); + HANDLE_NAMESPACE(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(GEOM_BaseObject) anObj = + HANDLE_NAMESPACE(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(GEOM_Function) aFun = anObj->GetLastFunction(); + HANDLE_NAMESPACE(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(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one) + HANDLE_NAMESPACE(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(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one) + HANDLE_NAMESPACE(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(GEOM_Object) otherObject = Handle(GEOM_Object)::DownCast + HANDLE_NAMESPACE(GEOM_Object) otherObject = HANDLE_NAMESPACE(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 ccccc63d5..c825acd59 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(GEOM_Object) theImpl); + GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(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(GEOM_Object) GetImpl() { return _impl; } + HANDLE_NAMESPACE(GEOM_Object) GetImpl() { return _impl; } private: - Handle(GEOM_Object) _impl; + HANDLE_NAMESPACE(GEOM_Object) _impl; TopoDS_Shape _geom; }; diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx index 4e679fcf6..d8cea0968 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( TFunction_Logbook& log ) const +Standard_Integer IGESPlugin_ExportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -173,15 +173,6 @@ Standard_Integer IGESPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons return 0; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean IGESPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -194,5 +185,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE( IGESPlugin_ExportDriver,GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx index 8919e3065..35a799ab3 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( IGESPlugin_ExportDriver, GEOM_BaseDriver ); class IGESPlugin_ExportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~IGESPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); -DEFINE_STANDARD_RTTI( IGESPlugin_ExportDriver ) + OCCT_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 e99da857c..3cc0c7cb5 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( TFunction_Logbook& log ) const +Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -195,20 +195,15 @@ Standard_Integer IGESPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons aFunction->SetValue( aResShape ); - log.SetTouched( Label() ); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean IGESPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -287,6 +282,4 @@ IGESPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return TCollection_AsciiString(); } - -IMPLEMENT_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx index 8ce3b7fc7..35c5ab87f 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( IGESPlugin_ImportDriver, GEOM_BaseDriver ); class IGESPlugin_ImportDriver : public GEOM_BaseDriver @@ -35,19 +32,19 @@ public: ~IGESPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} - - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} + + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); static TCollection_AsciiString GetValue( const TCollection_AsciiString&, const TCollection_AsciiString&, TCollection_AsciiString& ); -DEFINE_STANDARD_RTTI( IGESPlugin_ImportDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _IGESPlugin_ImportDriver_HXX diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h index 083852243..faff258d2 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h +++ b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.h @@ -40,6 +40,7 @@ #include #include #include +#include //================================================================================= // class : MeasureGUI_DimensionCreateTool diff --git a/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx b/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx index 7e6359de1..65c158550 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx @@ -32,8 +32,7 @@ // SALOME includes #include -IMPLEMENT_STANDARD_HANDLE (MeasureGUI_DimensionFilter, SelectMgr_Filter) -IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter) //======================================================================= // function : Constructor diff --git a/src/MeasureGUI/MeasureGUI_DimensionFilter.h b/src/MeasureGUI/MeasureGUI_DimensionFilter.h index 5bd777f47..60e83db1d 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionFilter.h +++ b/src/MeasureGUI/MeasureGUI_DimensionFilter.h @@ -27,6 +27,9 @@ #ifndef MEASUREGUI_DIMENSIONFILTER_H #define MEASUREGUI_DIMENSIONFILTER_H +// KERNEL includes +#include + // GEOM includes #include @@ -46,7 +49,7 @@ class MeasureGUI_DimensionFilter : public SelectMgr_Filter { public: - DEFINE_STANDARD_RTTI(MeasureGUI_DimensionFilter); + OCCT_DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter) public: Standard_EXPORT MeasureGUI_DimensionFilter( const Handle(AIS_InteractiveObject)& theIO ); diff --git a/src/MeasureGUI/MeasureGUI_DimensionInteractor.h b/src/MeasureGUI/MeasureGUI_DimensionInteractor.h index bc01793b3..bbc43c286 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionInteractor.h +++ b/src/MeasureGUI/MeasureGUI_DimensionInteractor.h @@ -35,12 +35,12 @@ #include #include #include +#include #include class OCCViewer_ViewManager; class OCCViewer_Viewer; class SUIT_ViewWindow; -class Handle(V3d_View); //================================================================================= // class : MeasureGUI_DimensionInteractor diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx index 6d314288a..b0e199d3d 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx @@ -228,9 +228,9 @@ void MeasureGUI_ManageDimensionsDlg::StartSelection( const Selection theSelectio myDimensionInteractor->Enable(); connect( myDimensionInteractor, - SIGNAL( InteractionFinished( Handle_AIS_InteractiveObject ) ), + SIGNAL( InteractionFinished( Handle(AIS_InteractiveObject) ) ), this, - SLOT( OnInteractionFinished( Handle_AIS_InteractiveObject ) ) ); + SLOT( OnInteractionFinished( Handle(AIS_InteractiveObject) ) ) ); anAISContext->UpdateCurrentViewer(); } @@ -290,9 +290,9 @@ void MeasureGUI_ManageDimensionsDlg::StopSelection() myDimensionInteractor->Disable(); disconnect( myDimensionInteractor, - SIGNAL( InteractionFinished( Handle_AIS_InteractiveObject ) ), + SIGNAL( InteractionFinished( Handle(AIS_InteractiveObject) ) ), this, - SLOT( OnInteractionFinished( Handle_AIS_InteractiveObject ) ) ); + SLOT( OnInteractionFinished( Handle(AIS_InteractiveObject) ) ) ); } myCurrentSelection = Selection_None; diff --git a/src/OBJECT/GEOM_AISDimension.cxx b/src/OBJECT/GEOM_AISDimension.cxx index 1734db35e..e4bccc9ec 100755 --- a/src/OBJECT/GEOM_AISDimension.cxx +++ b/src/OBJECT/GEOM_AISDimension.cxx @@ -26,12 +26,9 @@ #include "GEOM_AISDimension.hxx" -IMPLEMENT_STANDARD_HANDLE (GEOM_AISLength, AIS_LengthDimension) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension) -IMPLEMENT_STANDARD_HANDLE (GEOM_AISDiameter, AIS_DiameterDimension) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension) -IMPLEMENT_STANDARD_HANDLE (GEOM_AISAngle, AIS_AngleDimension) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension) /* ****************************************************************************** * * * diff --git a/src/OBJECT/GEOM_AISDimension.hxx b/src/OBJECT/GEOM_AISDimension.hxx index 606702514..17ffd27e5 100755 --- a/src/OBJECT/GEOM_AISDimension.hxx +++ b/src/OBJECT/GEOM_AISDimension.hxx @@ -31,6 +31,8 @@ #include #include +#include + DEFINE_STANDARD_HANDLE(GEOM_AISLength, AIS_LengthDimension) DEFINE_STANDARD_HANDLE(GEOM_AISDiameter, AIS_DiameterDimension) DEFINE_STANDARD_HANDLE(GEOM_AISAngle, AIS_AngleDimension) @@ -42,7 +44,8 @@ DEFINE_STANDARD_HANDLE(GEOM_AISAngle, AIS_AngleDimension) class GEOM_AISLength : public AIS_LengthDimension { public: - DEFINE_STANDARD_RTTI(GEOM_AISLength) + + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension) public: Standard_EXPORT GEOM_AISLength( const Standard_Integer theId ); @@ -60,7 +63,8 @@ private: class GEOM_AISDiameter : public AIS_DiameterDimension { public: - DEFINE_STANDARD_RTTI(GEOM_AISDiameter) + + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension) public: Standard_EXPORT GEOM_AISDiameter( const Standard_Integer theId ); @@ -78,7 +82,8 @@ private: class GEOM_AISAngle : public AIS_AngleDimension { public: - DEFINE_STANDARD_RTTI(GEOM_AISAngle) + + OCCT_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 b8531ad40..7d4842187 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,11 @@ #include #include #include -#include +#if OCC_VERSION_MAJOR < 7 + #include +#else + #include +#endif #include #include @@ -82,8 +87,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (GEOM_AISShape, SALOME_AISShape) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) GEOM_AISShape::TopLevelDispMode GEOM_AISShape::myTopLevelDm = GEOM_AISShape::TopKeepCurrent; Quantity_Color GEOM_AISShape::myTopLevelColor; @@ -251,7 +255,11 @@ 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: @@ -612,7 +620,11 @@ 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 || diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index 0e6deec98..46d862f9f 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include @@ -158,7 +157,7 @@ private: static Quantity_Color myTopLevelColor; public: - DEFINE_STANDARD_RTTI(GEOM_AISShape); + OCCT_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 8ed94f9b9..8468b8b05 100755 --- a/src/OBJECT/GEOM_AISTrihedron.cxx +++ b/src/OBJECT/GEOM_AISTrihedron.cxx @@ -28,8 +28,7 @@ #include "GEOM_AISTrihedron.hxx" #include -IMPLEMENT_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) /* Class : GEOM_AISTrihedron @@ -63,10 +62,3 @@ void GEOM_AISTrihedron::setIO( const Handle(SALOME_InteractiveObject)& theIO ) { myObject = theIO; } - - - - - - - diff --git a/src/OBJECT/GEOM_AISTrihedron.hxx b/src/OBJECT/GEOM_AISTrihedron.hxx index 812d1bdb2..ad9a5e5f7 100755 --- a/src/OBJECT/GEOM_AISTrihedron.hxx +++ b/src/OBJECT/GEOM_AISTrihedron.hxx @@ -34,7 +34,7 @@ #include #include -class Handle(Geom_Axis2Placement); +class Geom_Axis2Placement; DEFINE_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron) @@ -61,21 +61,7 @@ private: Handle(SALOME_InteractiveObject) myObject; public: - DEFINE_STANDARD_RTTI(GEOM_AISTrihedron) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron) }; #endif - - - - - - - - - - - - - - diff --git a/src/OBJECT/GEOM_AISVector.cxx b/src/OBJECT/GEOM_AISVector.cxx index b57b89780..75d909852 100644 --- a/src/OBJECT/GEOM_AISVector.cxx +++ b/src/OBJECT/GEOM_AISVector.cxx @@ -30,9 +30,7 @@ #include #include - -IMPLEMENT_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape) +OCCT_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 bbb20f6e5..05350bf32 100644 --- a/src/OBJECT/GEOM_AISVector.hxx +++ b/src/OBJECT/GEOM_AISVector.hxx @@ -57,7 +57,7 @@ protected: virtual bool isShowVectors() {return true;} public: - DEFINE_STANDARD_RTTI (GEOM_AISVector) + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape) diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx index 63f8654b9..a0f5c4f24 100644 --- a/src/OBJECT/GEOM_InteractiveObject.cxx +++ b/src/OBJECT/GEOM_InteractiveObject.cxx @@ -27,8 +27,7 @@ #include "GEOM_InteractiveObject.hxx" -IMPLEMENT_STANDARD_HANDLE (GEOM_InteractiveObject, SALOME_InteractiveObject) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject) +OCCT_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 b95f810ad..1e7fe5947 100644 --- a/src/OBJECT/GEOM_InteractiveObject.hxx +++ b/src/OBJECT/GEOM_InteractiveObject.hxx @@ -51,7 +51,7 @@ private: std::string myFatherIOR; public: - DEFINE_STANDARD_RTTI(GEOM_InteractiveObject); + OCCT_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 13d61669a..79c0cf934 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.cxx +++ b/src/OBJECT/GEOM_TopWireframeShape.cxx @@ -42,8 +42,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape) +OCCT_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 f41c32302..099af8807 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: - DEFINE_STANDARD_RTTI(GEOM_TopWireframeShape); + OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape) diff --git a/src/RepairGUI/RepairGUI_InspectObjectDlg.h b/src/RepairGUI/RepairGUI_InspectObjectDlg.h index 2eda9969d..0154c16e3 100644 --- a/src/RepairGUI/RepairGUI_InspectObjectDlg.h +++ b/src/RepairGUI/RepairGUI_InspectObjectDlg.h @@ -28,6 +28,9 @@ #include #include +// OCCT includes +#include + class GeometryGUI; class SalomeApp_DoubleSpinBox; @@ -41,8 +44,6 @@ class QStackedLayout; class QTreeWidget; class QTreeWidgetItem; -class TopTools_IndexedMapOfShape; - class RepairGUI_InspectObjectDlg : public QDialog, public GEOMBase_Helper { Q_OBJECT diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx index 82815615d..c6bfe8580 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( TFunction_Logbook& log ) const +Standard_Integer STEPPlugin_ExportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -142,15 +142,6 @@ Standard_Integer STEPPlugin_ExportDriver::Execute( TFunction_Logbook& log ) cons return 0; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean STEPPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -163,5 +154,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE( STEPPlugin_ExportDriver,GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx index 0a86dc3d0..a95799a8e 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( STEPPlugin_ExportDriver, GEOM_BaseDriver ); class STEPPlugin_ExportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~STEPPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); -DEFINE_STANDARD_RTTI( STEPPlugin_ExportDriver ) + OCCT_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 b15b56a62..c7fc450ac 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( TFunction_Logbook& log ) const +Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -800,20 +800,15 @@ Standard_Integer STEPPlugin_ImportDriver::Execute( TFunction_Logbook& log ) cons aFunction->SetValue( aResShape ); - log.SetTouched( Label() ); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean STEPPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -888,6 +883,4 @@ STEPPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return aValue; } - -IMPLEMENT_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx index 5c2e60180..626ff02bd 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( STEPPlugin_ImportDriver, GEOM_BaseDriver ); class STEPPlugin_ImportDriver : public GEOM_BaseDriver @@ -35,19 +32,18 @@ public: ~STEPPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} - - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); - + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} + + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); static TCollection_AsciiString GetValue( const TCollection_AsciiString&, - const TCollection_AsciiString&, - TCollection_AsciiString& ); + const TCollection_AsciiString&, + TCollection_AsciiString& ); -DEFINE_STANDARD_RTTI( STEPPlugin_ImportDriver ) + OCCT_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 625d77436..3f269f304 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.cxx @@ -63,7 +63,7 @@ STLPlugin_ExportDriver::STLPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STLPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const +Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -117,7 +117,11 @@ Standard_Integer STLPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const aWriter.SetDeflection( aDeflection ); #endif aWriter.Write( aCopyShape, aFileName.ToCString() ); - log.SetTouched( Label() ); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } catch( Standard_Failure ) @@ -127,15 +131,6 @@ Standard_Integer STLPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const return 0; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean STLPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -148,5 +143,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE( STLPlugin_ExportDriver,GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/STLPlugin/STLPlugin_ExportDriver.hxx b/src/STLPlugin/STLPlugin_ExportDriver.hxx index 2fddcd155..d3a0569db 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( STLPlugin_ExportDriver, GEOM_BaseDriver ); class STLPlugin_ExportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~STLPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); -DEFINE_STANDARD_RTTI( STLPlugin_ExportDriver ) + OCCT_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 1fd36a3b6..a586767b9 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( TFunction_Logbook& log ) const +Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -109,20 +109,15 @@ Standard_Integer STLPlugin_ImportDriver::Execute( TFunction_Logbook& log ) const aFunction->SetValue( aShape ); - log.SetTouched( Label() ); +#if OCC_VERSION_MAJOR < 7 + log.SetTouched(Label()); +#else + log->SetTouched(Label()); +#endif return 1; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean STLPlugin_ImportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -151,5 +146,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -IMPLEMENT_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/STLPlugin/STLPlugin_ImportDriver.hxx b/src/STLPlugin/STLPlugin_ImportDriver.hxx index e6bebdf36..2d0adf6af 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( STLPlugin_ImportDriver, GEOM_BaseDriver ); class STLPlugin_ImportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~STLPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); -DEFINE_STANDARD_RTTI( STLPlugin_ImportDriver ) + OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _STLPlugin_ImportDriver_HXX diff --git a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx index 1b3f5cd00..9f5ea9157 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 -DEFINE_STANDARD_RTTI (ShHealOper_SplitCurve2d) + OCCT_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 4af096864..b49ee85b7 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx @@ -28,8 +28,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) -IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) //======================================================================= //function : Compute diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx index 738b46c7a..f50b7744f 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx @@ -27,6 +27,8 @@ #ifndef ShHealOper_SplitCurve2d_HeaderFile #define ShHealOper_SplitCurve2d_HeaderFile +#include + #include #include #include @@ -59,7 +61,7 @@ class ShHealOper_SplitCurve2d : public ShapeUpgrade_SplitCurve2d public: // Declaration of CASCADE RTTI -DEFINE_STANDARD_RTTI (ShHealOper_SplitCurve2d) + OCCT_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 c279ba95d..cb942b932 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx @@ -28,8 +28,7 @@ #include #include -IMPLEMENT_STANDARD_HANDLE (ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) -IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) +OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) //======================================================================= //function : Compute diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx index f69d54482..f0b436a69 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx @@ -27,6 +27,8 @@ #ifndef ShHealOper_SplitCurve3d_HeaderFile #define ShHealOper_SplitCurve3d_HeaderFile +#include + #include #include #include @@ -59,7 +61,7 @@ class ShHealOper_SplitCurve3d : public ShapeUpgrade_SplitCurve3d public: // Declaration of CASCADE RTTI -DEFINE_STANDARD_RTTI (ShHealOper_SplitCurve3d) + OCCT_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 98717f16d..ae67871a2 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( TFunction_Logbook& log ) const +Standard_Integer VTKPlugin_ExportDriver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -111,15 +111,6 @@ Standard_Integer VTKPlugin_ExportDriver::Execute( TFunction_Logbook& log ) const return 0; } -//======================================================================= -//function : MustExecute -//purpose : -//======================================================================= -Standard_Boolean VTKPlugin_ExportDriver::MustExecute( const TFunction_Logbook& ) const -{ - return Standard_True; -} - //================================================================================ /*! * \brief Returns a name of creation operation and names and values of creation parameters @@ -132,5 +123,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -IMPLEMENT_STANDARD_HANDLE( VTKPlugin_ExportDriver,GEOM_BaseDriver ); -IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); +OCCT_IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx index 0ed15f106..f32345b04 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx @@ -23,9 +23,6 @@ // GEOM includes #include "GEOM_BaseDriver.hxx" -// OCCT includes -#include - DEFINE_STANDARD_HANDLE( VTKPlugin_ExportDriver, GEOM_BaseDriver ); class VTKPlugin_ExportDriver : public GEOM_BaseDriver @@ -35,14 +32,14 @@ public: ~VTKPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute( TFunction_Logbook& log ) const; - Standard_Boolean MustExecute( const TFunction_Logbook& ) const; - virtual void Validate( TFunction_Logbook& ) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } + virtual void Validate( LOGBOOK& ) const {} - virtual bool GetCreationInformation( std::string& theOperationName, - std::vector& params ); + virtual bool GetCreationInformation( std::string& theOperationName, + std::vector& params ); -DEFINE_STANDARD_RTTI( VTKPlugin_ExportDriver ) + OCCT_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 26db324e1..3f463efd7 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.cxx +++ b/src/XAOPlugin/XAOPlugin_Driver.cxx @@ -32,7 +32,6 @@ // OCC includes #include -#include #include //======================================================================= @@ -61,16 +60,10 @@ XAOPlugin_Driver::~XAOPlugin_Driver() { } -Standard_Boolean XAOPlugin_Driver::MustExecute(const TFunction_Logbook&) const -{ - return Standard_True; -} - -//======================================================================= //function : Execute //purpose : //======================================================================= -Standard_Integer XAOPlugin_Driver::Execute(TFunction_Logbook& log) const +Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label()); @@ -95,7 +88,11 @@ Standard_Integer XAOPlugin_Driver::Execute(TFunction_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; } @@ -117,6 +114,5 @@ bool XAOPlugin_Driver::GetCreationInformation(std::string& theOperat return true; } -IMPLEMENT_STANDARD_HANDLE (XAOPlugin_Driver, GEOM_BaseDriver); -IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); +OCCT_IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); diff --git a/src/XAOPlugin/XAOPlugin_Driver.hxx b/src/XAOPlugin/XAOPlugin_Driver.hxx index 45a73658c..f2ed811eb 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(TFunction_Logbook& log) const; - Standard_Boolean MustExecute(const TFunction_Logbook&) const; - virtual void Validate(TFunction_Logbook&) const {} + virtual Standard_Integer Execute(LOGBOOK& log) const; + Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual void Validate(LOGBOOK&) const {} - virtual bool GetCreationInformation(std::string& theOperationName, - std::vector& theParams); + virtual bool GetCreationInformation(std::string& theOperationName, + std::vector& theParams); - static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function + static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function - DEFINE_STANDARD_RTTI(XAOPlugin_Driver) + OCCT_DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver) }; #endif // _XAOPlugin_Driver_HXX diff --git a/src/XAOPlugin/XAOPlugin_IOperations.cxx b/src/XAOPlugin/XAOPlugin_IOperations.cxx index a95da6534..d33a5deaf 100644 --- a/src/XAOPlugin/XAOPlugin_IOperations.cxx +++ b/src/XAOPlugin/XAOPlugin_IOperations.cxx @@ -27,12 +27,14 @@ #include // GEOM includes -#include "GEOM_PythonDump.hxx" -#include "GEOMImpl_Types.hxx" -#include "GEOMImpl_IGroupOperations.hxx" -#include "GEOMImpl_IShapesOperations.hxx" -#include "GEOMImpl_IFieldOperations.hxx" -#include "GEOM_ISubShape.hxx" +#include +#include +#include +#include +#include +#include +#include +#include #include #include -- 2.39.2