From 4d8c0024728a305fb2858aa407bb87418d1ec47c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 21 Aug 2017 15:11:28 +0300 Subject: [PATCH 01/26] 0023445: EDF 14284 - Problem with Dump Python --- src/GEOM/GEOM_Engine.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index bfd101415..f7ae8fc8e 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -1853,7 +1853,7 @@ void PublishObject (TObjectData& theObjectData, // store aCreationCommand before publishing commands int tag = GetTag(theObjectData._entry); - theEntryToCmdMap.insert( std::make_pair( tag + 2*theEntry2ObjData.size(), aCreationCommand )); + theEntryToCmdMap.insert( std::make_pair( tag + -2*theEntry2ObjData.size(), aCreationCommand )); } // make a command From b59b99da3ee1f2ee07e18f8ffca78e6a9e9a3665 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 29 Aug 2017 17:12:24 +0300 Subject: [PATCH 02/26] Issues 0023327, 023428 - 23327: EDF - Additional lines in dump study - 23428: [CEA 2072] A dump with "Create Group" creates a lot of lines with "SubShapeAllIDs" and "GetSameIDs" --- src/GEOM/GEOM_Engine.cxx | 52 +++++++++++++++++++++ src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 45 +++++++++++++++++- 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index f7ae8fc8e..b8d540a74 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -90,6 +90,14 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +// VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +// Next macro, when defined, causes appearing of SubShapeAllIDs(), SubShapeAllSortedIDs(), GetSameIDs() +// and other such commands in Python dump. +// See also GEOMImpl_IShapesOperations.cxx. +// --------------------------------------- +// #define DUMP_SUBSHAPE_IDS +// --------------------------------------- + typedef std::map< TCollection_AsciiString, TCollection_AsciiString > TSting2StringMap; typedef std::map< TCollection_AsciiString, TObjectData > TSting2ObjDataMap; typedef std::map< TCollection_AsciiString, TObjectData* > TSting2ObjDataPtrMap; @@ -165,6 +173,8 @@ static TCollection_AsciiString GetPublishCommands const TIntToListIntMap &theMapRefs, std::set< int > &thePublished); +void Prettify(TCollection_AsciiString& theScript); + //================================================================================ /*! * \brief Fix up the name of python variable @@ -869,6 +879,11 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, aScript.Insert( posToInsertGlobalVars, globalVars ); } + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifndef DUMP_SUBSHAPE_IDS + Prettify(aScript); +#endif + return aScript; } @@ -1918,6 +1933,43 @@ TCollection_AsciiString GetPublishCommands return aResult; } +void Prettify(TCollection_AsciiString& theScript) +{ + TCollection_AsciiString output; + static std::list ToRemove; + if (ToRemove.empty()) { + ToRemove.push_back("geompy.SubShapeAllIDs"); + ToRemove.push_back("geompy.SubShapeAllSortedCentresIDs"); + ToRemove.push_back("geompy.SubShapeAllSortedIDs"); + ToRemove.push_back("geompy.GetFreeFacesIDs"); + ToRemove.push_back("geompy.GetShapesOnBoxIDs"); + ToRemove.push_back("geompy.GetShapesOnShapeIDs"); + ToRemove.push_back("geompy.GetShapesOnPlaneIDs"); + ToRemove.push_back("geompy.GetShapesOnPlaneWithLocationIDs"); + ToRemove.push_back("geompy.GetShapesOnCylinderIDs"); + ToRemove.push_back("geompy.GetShapesOnCylinderWithLocationIDs"); + ToRemove.push_back("geompy.GetShapesOnSphereIDs"); + ToRemove.push_back("geompy.GetShapesOnQuadrangleIDs"); + ToRemove.push_back("geompy.GetSameIDs"); + } + + int start = 1; + while (start <= theScript.Length()) { + int end = theScript.Location("\n", start, theScript.Length()); + if (end == -1) end = theScript.Length(); + TCollection_AsciiString line = theScript.SubString(start, end); + bool found = false; + for (std::list::const_iterator it = ToRemove.begin(); it != ToRemove.end() && !found; ++it) + found = line.Search( *it ) != -1; + if (!found) + output += line; + start = end + 1; + } + theScript = output; + + //OK @@@@@@@@@@@@@@@@@@@@@@@@@@@ +} + //================================================================================ /*! * \brief Constructor diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index fd5f459f9..53f3c9269 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -105,6 +105,14 @@ #include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC +// VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +// Next macro, when defined, causes appearing of SubShapeAllIDs(), SubShapeAllSortedIDs(), GetSameIDs() +// and other such commands in Python dump. +// See also GEOM_Engine.cxx. +// --------------------------------------- +// #define DUMP_SUBSHAPE_IDS +// --------------------------------------- + namespace { void AddFlatSubShapes(const TopoDS_Shape& S, TopTools_ListOfShape& L, TopTools_MapOfShape& M) @@ -1675,6 +1683,8 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs Handle(GEOM_Function) aFunction = theShape->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS //Make a Python command GEOM::TPythonDump pd (aFunction, /*append=*/true); pd << "listSubShapeIDs = geompy.SubShapeAll"; @@ -1691,6 +1701,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs break; default: ; } +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -2250,9 +2261,12 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetFreeFacesIDs //The explode doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = theShape->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS //Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listFreeFacesIDs = geompy.GetFreeFacesIDs(" << theShape << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -2712,6 +2726,8 @@ Handle(TColStd_HSequenceOfInteger) // The GetShapesOnBox() doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theBox)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnBoxIDs = geompy.GetShapesOnBoxIDs(" @@ -2719,6 +2735,7 @@ Handle(TColStd_HSequenceOfInteger) << theShape << ", " << TopAbs_ShapeEnum(theShapeType) << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeqOfIDs; @@ -2907,13 +2924,16 @@ Handle(TColStd_HSequenceOfInteger) Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theCheckShape)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) - << "listShapesOnBoxIDs = geompy.GetShapesOnShapeIDs(" + << "listShapesOnShapeIDs = geompy.GetShapesOnShapeIDs(" << theCheckShape << ", " << theShape << ", " << TopAbs_ShapeEnum(theShapeType) << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeqOfIDs; @@ -3915,10 +3935,13 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnPlaneI // The GetShapesOnPlaneIDs() doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theAx1)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnPlane = geompy.GetShapesOnPlaneIDs" << "(" << theShape << "," << aShapeType << "," << theAx1 << "," << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -3982,10 +4005,13 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnPlaneW // The GetShapesOnPlaneIDs() doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theAx1)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnPlane = geompy.GetShapesOnPlaneWithLocationIDs" << "(" << theShape << ", " << aShapeType << ", " << theAx1 << ", "<< thePnt << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -4028,11 +4054,14 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnCylind // The GetShapesOnCylinder() doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theAxis)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnCylinder = geompy.GetShapesOnCylinderIDs" << "(" << theShape << ", " << aShapeType << ", " << theAxis << ", " << theRadius << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -4096,11 +4125,14 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnCylind Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape, GEOM::GetCreatedLast(thePnt,theAxis))->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnCylinder = geompy.GetShapesOnCylinderWithLocationIDs" << "(" << theShape << ", " << aShapeType << ", " << theAxis << ", " << thePnt << ", " << theRadius << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -4146,11 +4178,14 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnSphere // The GetShapesOnSphere() doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theCenter)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) - << "listShapesOnCylinder = geompy.GetShapesOnSphereIDs" + << "listShapesOnSphere = geompy.GetShapesOnSphereIDs" << "(" << theShape << ", " << aShapeType << ", " << theCenter << ", " << theRadius << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeq; @@ -4390,6 +4425,8 @@ Handle(TColStd_HSequenceOfInteger) lastObj = GEOM::GetCreatedLast(lastObj,theBottomLeftPoint); Handle(GEOM_Function) aFunction = lastObj->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnQuadrangle = geompy.GetShapesOnQuadrangleIDs(" << theShape << ", " @@ -4399,6 +4436,7 @@ Handle(TColStd_HSequenceOfInteger) << theBottomLeftPoint << ", " << theBottomRigthPoint << ", " << theState << ")"; +#endif // DUMP_SUBSHAPE_IDS SetErrorCode(OK); return aSeqOfIDs; @@ -5112,11 +5150,14 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSameIDs // The GetSameIDs() doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShapeWhere,theShapeWhat)->GetLastFunction(); + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifdef DUMP_SUBSHAPE_IDS // Make a Python command GEOM::TPythonDump(aFunction, /*append=*/true) << "listSameIDs = geompy.GetSameIDs(" << theShapeWhere << ", " << theShapeWhat << ")"; +#endif // DUMP_SUBSHAPE_IDS return aSeq; } else { SetErrorCode(NOT_FOUND_ANY); From 7a3c2d25cc85b5c75acf2c8df92e4373af480d42 Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Fri, 22 Sep 2017 15:46:58 +0200 Subject: [PATCH 03/26] XAO test fixed to work in salome test --- src/XAO/tests/CMakeLists.txt | 6 ++--- src/XAO/tests/CTestTestfileInstall.cmake | 4 +++- src/XAO/tests/TestUtils.hxx | 16 ++++++++++--- src/XAO/tests/data/CMakeLists.txt | 29 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 src/XAO/tests/data/CMakeLists.txt diff --git a/src/XAO/tests/CMakeLists.txt b/src/XAO/tests/CMakeLists.txt index 30ee76775..15c9a5f3b 100644 --- a/src/XAO/tests/CMakeLists.txt +++ b/src/XAO/tests/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# --- options --- +ADD_SUBDIRECTORY(data) # additional include directories INCLUDE_DIRECTORIES( @@ -57,15 +57,15 @@ ADD_EXECUTABLE(TestXAO ${TestXAO_SOURCES}) TARGET_LINK_LIBRARIES(TestXAO ${_link_LIBRARIES}) SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) +SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/xao) ADD_TEST(TestXAO TestXAO) -SET_TESTS_PROPERTIES(TestXAO PROPERTIES ENVIRONMENT "GEOM_SRC_DIR=${PROJECT_SOURCE_DIR};${tests_env}") +SET_TESTS_PROPERTIES(TestXAO PROPERTIES ENVIRONMENT "XAO_DATA_DIR=${TEST_INSTALL_DIRECTORY}/data;${tests_env}") INSTALL(TARGETS TestXAO DESTINATION ${SALOME_INSTALL_BINS}) # Application tests -SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/xao) INSTALL(TARGETS TestXAO RUNTIME DESTINATION ${TEST_INSTALL_DIRECTORY}) INSTALL(FILES CTestTestfileInstall.cmake diff --git a/src/XAO/tests/CTestTestfileInstall.cmake b/src/XAO/tests/CTestTestfileInstall.cmake index 1014dbc95..443de4580 100644 --- a/src/XAO/tests/CTestTestfileInstall.cmake +++ b/src/XAO/tests/CTestTestfileInstall.cmake @@ -18,4 +18,6 @@ # ADD_TEST(GEOM_TestXAO python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestXAO) -SET_TESTS_PROPERTIES(GEOM_TestXAO PROPERTIES LABELS "${COMPONENT_NAME}") +SET_TESTS_PROPERTIES(GEOM_TestXAO PROPERTIES + LABELS "${COMPONENT_NAME}" + ENVIRONMENT "XAO_DATA_DIR=$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/test/GEOM/xao/data") diff --git a/src/XAO/tests/TestUtils.hxx b/src/XAO/tests/TestUtils.hxx index 593916c22..a1cd41318 100644 --- a/src/XAO/tests/TestUtils.hxx +++ b/src/XAO/tests/TestUtils.hxx @@ -30,9 +30,19 @@ namespace XAO public: static std::string getTestFilePath(const std::string& fileName) { - std::string dataDir = getenv("GEOM_SRC_DIR"); - dataDir += "/src/XAO/tests/data/"; - dataDir += fileName; + std::string dataDir = ""; + char* geomSrcDir = getenv("XAO_DATA_DIR"); + if (geomSrcDir != NULL) + { + dataDir = geomSrcDir; +#if defined _WIN32 || defined __CYGWIN__ + dataDir += "\\"; +#else + dataDir += "/"; +#endif + dataDir += fileName; + } + return dataDir; } diff --git a/src/XAO/tests/data/CMakeLists.txt b/src/XAO/tests/data/CMakeLists.txt new file mode 100644 index 000000000..335e6d86a --- /dev/null +++ b/src/XAO/tests/data/CMakeLists.txt @@ -0,0 +1,29 @@ +# Copyright (C) 2012-2017 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(XAO_DATA_FILES + Box_1.brep + Box_2.brep + Cut_2.brep + test.xao + ) + +# --- rules --- +SET(XAO_DATA_DIR ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/xao/data) +INSTALL(FILES ${XAO_DATA_FILES} DESTINATION ${XAO_DATA_DIR}) From 47e260a9746423b69d6f29e941c845d851da64c7 Mon Sep 17 00:00:00 2001 From: asl Date: Mon, 26 Jun 2017 11:49:43 +0300 Subject: [PATCH 04/26] 0023450: Fields are not displayed in GEOM + IPAL54211: SALOME-8.3.0: Geometry fields are displayed incorrectly + Clean-up deprecated OCCT-related code --- .../AdvancedEngine_DividedDiskDriver.cxx | 8 +- .../AdvancedEngine_DividedDiskDriver.hxx | 8 +- .../AdvancedEngine_IOperations.cxx | 2 - .../AdvancedEngine_PipeTShapeDriver.cxx | 8 +- .../AdvancedEngine_PipeTShapeDriver.hxx | 8 +- .../AdvancedEngine_SmoothingSurfaceDriver.cxx | 8 +- .../AdvancedEngine_SmoothingSurfaceDriver.hxx | 8 +- src/BREPPlugin/BREPPlugin_ExportDriver.cxx | 4 +- src/BREPPlugin/BREPPlugin_ExportDriver.hxx | 8 +- src/BREPPlugin/BREPPlugin_ImportDriver.cxx | 8 +- src/BREPPlugin/BREPPlugin_ImportDriver.hxx | 8 +- src/BlockFix/BlockFix_BlockFixAPI.cxx | 4 +- src/BlockFix/BlockFix_BlockFixAPI.hxx | 10 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 2 +- .../BlockFix_PeriodicSurfaceModifier.hxx | 4 +- src/BlockFix/BlockFix_SphereSpaceModifier.cxx | 2 +- src/BlockFix/BlockFix_SphereSpaceModifier.hxx | 4 +- src/BlockFix/BlockFix_UnionFaces.cxx | 2 - src/CurveCreator/CurveCreator_Utils.cxx | 6 - src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 6 +- .../EntityGUI_FeatureDetectorDlg.cxx | 3 +- src/GEOM/CMakeLists.txt | 6 +- src/GEOM/GEOM_Application.cxx | 18 +- src/GEOM/GEOM_Application.hxx | 7 +- src/GEOM/GEOM_BaseDriver.cxx | 2 +- src/GEOM/GEOM_BaseDriver.hxx | 10 +- src/GEOM/GEOM_BaseObject.cxx | 2 +- src/GEOM/GEOM_BaseObject.hxx | 2 +- src/GEOM/GEOM_Engine.cxx | 12 - src/GEOM/GEOM_Engine.hxx | 2 - src/GEOM/GEOM_Field.cxx | 4 +- src/GEOM/GEOM_Field.hxx | 4 +- src/GEOM/GEOM_Function.cxx | 4 +- src/GEOM/GEOM_Function.hxx | 4 +- src/GEOM/GEOM_Object.cxx | 2 +- src/GEOM/GEOM_Object.hxx | 2 +- src/GEOM/GEOM_PythonDump.hxx | 2 - src/GEOM/GEOM_Solver.cxx | 4 - src/GEOM/GEOM_SubShapeDriver.cxx | 8 +- src/GEOM/GEOM_SubShapeDriver.hxx | 8 +- src/GEOMAlgo/FILES | 2 - src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx | 46 +-- src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx | 69 +--- src/GEOMAlgo/GEOMAlgo_Clsf.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Clsf.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx | 2 - src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 5 - src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx | 12 - src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 6 - src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx | 17 - src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx | 19 - src/GEOMAlgo/GEOMAlgo_HAlgo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_HAlgo.hxx | 10 +- src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx | 18 - src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx | 16 - src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 29 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 64 ---- src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx | 6 - src/GEOMAlgo/GEOMAlgo_Splitter.cxx | 6 - src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 14 - src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 16 - src/GEOMFiltersSelection/GEOM_OCCFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 4 +- src/GEOMGUI/GEOMGUI_OCCSelector.cxx | 6 - src/GEOMGUI/GEOM_Displayer.cxx | 145 ++------ src/GEOMGUI/GEOM_Displayer.h | 21 +- src/GEOMGUI/GeometryGUI.cxx | 1 - src/GEOMGUI/GeometryGUI.h | 2 - src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ArcDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 4 - src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_BlockDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 40 +-- src/GEOMImpl/GEOMImpl_BooleanDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_BoxDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_BoxDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ChamferDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_CircleDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_CircleDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ConeDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ConeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_CopyDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_CopyDriver.hxx | 10 +- src/GEOMImpl/GEOMImpl_CylinderDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_CylinderDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_DiskDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_DiskDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_EllipseDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_EllipseDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ExportDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FaceDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_FaceDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FieldDriver.cxx | 4 +- src/GEOMImpl/GEOMImpl_FieldDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet1d.cxx | 28 -- src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_FilletDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_FillingDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_GlueDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_HealingDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 6 - src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IInsertOperations.hxx | 2 - src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 33 -- .../GEOMImpl_ITransformOperations.cxx | 2 - src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ImportDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_LineDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_LineDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_MarkerDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_MarkerDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_MeasureDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_MirrorDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_MirrorDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_OffsetDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 18 +- src/GEOMImpl/GEOMImpl_PartitionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PipeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PipePathDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PipePathDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PlaneDriver.cxx | 10 +- src/GEOMImpl/GEOMImpl_PlaneDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PointDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PolylineDriver.cxx | 14 +- src/GEOMImpl/GEOMImpl_PolylineDriver.hxx | 10 +- src/GEOMImpl/GEOMImpl_PositionDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PositionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_PrismDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx | 12 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_RotateDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_RotateDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ScaleDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ScaleDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 12 +- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_SketcherDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_SketcherDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_SphereDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_SphereDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_SplineDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_TorusDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_TranslateDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_TranslateDriver.hxx | 8 +- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 8 +- src/GEOMImpl/GEOMImpl_VectorDriver.hxx | 8 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 2 - src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 2 - src/GEOMUtils/GEOMUtils.cxx | 4 - src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx | 2 +- src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx | 2 +- src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx | 4 - src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx | 2 - src/GEOM_I/GEOM_BaseObject_i.cc | 10 +- src/GEOM_I/GEOM_BaseObject_i.hh | 6 +- src/GEOM_I/GEOM_Field_i.cc | 24 +- src/GEOM_I/GEOM_Field_i.hh | 16 +- src/GEOM_I/GEOM_GEOM_I.hxx | 17 +- src/GEOM_I/GEOM_Gen_i.cc | 101 +++--- src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 206 +++++------ src/GEOM_I/GEOM_IBasicOperations_i.cc | 114 +++--- src/GEOM_I/GEOM_IBlocksOperations_i.cc | 176 +++++----- src/GEOM_I/GEOM_IBooleanOperations_i.cc | 30 +- src/GEOM_I/GEOM_ICurvesOperations_i.cc | 104 +++--- src/GEOM_I/GEOM_IFieldOperations_i.cc | 16 +- src/GEOM_I/GEOM_IGroupOperations_i.cc | 60 ++-- src/GEOM_I/GEOM_IHealingOperations_i.cc | 68 ++-- src/GEOM_I/GEOM_IInsertOperations_i.cc | 17 +- src/GEOM_I/GEOM_ILocalOperations_i.cc | 64 ++-- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 88 ++--- src/GEOM_I/GEOM_IOperations_i.cc | 18 +- src/GEOM_I/GEOM_IOperations_i.hh | 10 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 324 +++++++++--------- src/GEOM_I/GEOM_ITransformOperations_i.cc | 210 ++++++------ src/GEOM_I/GEOM_Object_i.cc | 14 +- src/GEOM_I/GEOM_Object_i.hh | 6 +- src/IGESPlugin/IGESPlugin_ExportDriver.cxx | 4 +- src/IGESPlugin/IGESPlugin_ExportDriver.hxx | 8 +- src/IGESPlugin/IGESPlugin_ImportDriver.cxx | 8 +- src/IGESPlugin/IGESPlugin_ImportDriver.hxx | 8 +- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 2 - src/MeasureGUI/MeasureGUI_DimensionFilter.cxx | 2 +- src/MeasureGUI/MeasureGUI_DimensionFilter.h | 5 +- .../MeasureGUI_DimensionInteractor.cxx | 3 - src/OBJECT/GEOM_AISDimension.cxx | 6 +- src/OBJECT/GEOM_AISDimension.hxx | 8 +- src/OBJECT/GEOM_AISShape.cxx | 55 +-- src/OBJECT/GEOM_AISShape.hxx | 2 +- src/OBJECT/GEOM_AISTrihedron.cxx | 2 +- src/OBJECT/GEOM_AISTrihedron.hxx | 2 +- src/OBJECT/GEOM_AISVector.cxx | 2 +- src/OBJECT/GEOM_AISVector.hxx | 2 +- src/OBJECT/GEOM_Annotation.cxx | 33 -- src/OBJECT/GEOM_Annotation.hxx | 6 - src/OBJECT/GEOM_InteractiveObject.cxx | 2 +- src/OBJECT/GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.cxx | 2 +- src/OBJECT/GEOM_TopWireframeShape.hxx | 2 +- src/STEPPlugin/STEPPlugin_ExportDriver.cxx | 4 +- src/STEPPlugin/STEPPlugin_ExportDriver.hxx | 8 +- src/STEPPlugin/STEPPlugin_ImportDriver.cxx | 8 +- src/STEPPlugin/STEPPlugin_ImportDriver.hxx | 8 +- src/STLPlugin/STLPlugin_ExportDriver.cxx | 18 +- src/STLPlugin/STLPlugin_ExportDriver.hxx | 8 +- src/STLPlugin/STLPlugin_ImportDriver.cxx | 8 +- src/STLPlugin/STLPlugin_ImportDriver.hxx | 8 +- .../ShHealOper_ChangeOrientation.hxx | 1 - src/ShHealOper/ShHealOper_CloseContour.hxx | 1 - src/ShHealOper/ShHealOper_FillHoles.cxx | 2 - src/ShHealOper/ShHealOper_FillHoles.hxx | 1 - src/ShHealOper/ShHealOper_RemoveFace.hxx | 1 - .../ShHealOper_RemoveInternalWires.hxx | 1 - src/ShHealOper/ShHealOper_Sewing.hxx | 1 - src/ShHealOper/ShHealOper_SpiltCurve2d.hxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.cxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve2d.hxx | 4 +- src/ShHealOper/ShHealOper_SplitCurve3d.cxx | 2 +- src/ShHealOper/ShHealOper_SplitCurve3d.hxx | 4 +- src/VTKPlugin/VTKPlugin_ExportDriver.cxx | 4 +- src/VTKPlugin/VTKPlugin_ExportDriver.hxx | 8 +- src/XAOPlugin/XAOPlugin_Driver.cxx | 8 +- src/XAOPlugin/XAOPlugin_Driver.hxx | 8 +- 261 files changed, 1352 insertions(+), 2358 deletions(-) diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx index 6b21bd238..0898da702 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.cxx @@ -83,7 +83,7 @@ AdvancedEngine_DividedDiskDriver::AdvancedEngine_DividedDiskDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const +Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -138,11 +138,7 @@ Standard_Integer AdvancedEngine_DividedDiskDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -527,4 +523,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx index 2a9c7b60c..9334b5769 100644 --- a/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_DividedDiskDriver.hxx @@ -41,9 +41,9 @@ public: // Methods PUBLIC // AdvancedEngine_DividedDiskDriver(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_DividedDiskDriver() {}; @@ -56,7 +56,7 @@ private: TopoDS_Shell MakeDiskHexagon (double R, double Ratio) const; TopoDS_Shape MakeDiskSquare (double R, double Ratio) const; - OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(AdvancedEngine_DividedDiskDriver,GEOM_BaseDriver) }; #endif // _AdvancedEngine_DividedDiskDriver_HXX diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index 88bd4a37f..097a1b265 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -27,8 +27,6 @@ #include "AdvancedEngine_SmoothingSurfaceDriver.hxx" #include "AdvancedEngine_ISmoothingSurface.hxx" -#include - #include #include #include diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index 1b890ef36..004c45e50 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx @@ -400,7 +400,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakeQuarterPipeTShape (const doubl //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const +Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -623,11 +623,7 @@ Standard_Integer AdvancedEngine_PipeTShapeDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -688,4 +684,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx index 236e23d67..b11c6d1cc 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.hxx @@ -36,9 +36,9 @@ public: // Methods PUBLIC // AdvancedEngine_PipeTShapeDriver(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_PipeTShapeDriver() {}; @@ -47,7 +47,7 @@ public: std::vector& params); // Type management // - OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(AdvancedEngine_PipeTShapeDriver,GEOM_BaseDriver) private: /*! diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx index 6d4bb52c2..e76ba756f 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx @@ -164,7 +164,7 @@ TopoDS_Shape AdvancedEngine_SmoothingSurfaceDriver::MakeSmoothingSurfaceUnClosed //function : Execute //purpose : //======================================================================= -Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) const +Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -222,11 +222,7 @@ Standard_Integer AdvancedEngine_SmoothingSurfaceDriver::Execute(LOGBOOK& log) co aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -274,4 +270,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver); diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx index 4cd035915..707072875 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.hxx @@ -33,9 +33,9 @@ public: // Methods PUBLIC // AdvancedEngine_SmoothingSurfaceDriver(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } static const Standard_GUID& GetID(); ~AdvancedEngine_SmoothingSurfaceDriver() {}; @@ -44,7 +44,7 @@ public: std::vector& params); // Type management // - OCCT_DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(AdvancedEngine_SmoothingSurfaceDriver,GEOM_BaseDriver) private: TopoDS_Shape MakeSmoothingSurfaceUnClosed (const Handle(TColgp_HArray1OfPnt) &theListOfPoints, diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx index bb27ff186..0fe78abd1 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.cxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.cxx @@ -54,7 +54,7 @@ BREPPlugin_ExportDriver::BREPPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer BREPPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer BREPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -95,4 +95,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx index bcdb47f8f..84b469cc8 100644 --- a/src/BREPPlugin/BREPPlugin_ExportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~BREPPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - virtual void Validate(LOGBOOK&) const {} - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(BREPPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _BREPPlugin_ExportDriver_HXX diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.cxx b/src/BREPPlugin/BREPPlugin_ImportDriver.cxx index 14338dc87..49dea4171 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.cxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.cxx @@ -55,7 +55,7 @@ BREPPlugin_ImportDriver::BREPPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer BREPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -76,11 +76,7 @@ Standard_Integer BREPPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -113,4 +109,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( BREPPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx index 08778cbe4..194046f1b 100644 --- a/src/BREPPlugin/BREPPlugin_ImportDriver.hxx +++ b/src/BREPPlugin/BREPPlugin_ImportDriver.hxx @@ -32,14 +32,14 @@ public: ~BREPPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(BREPPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _BREPPlugin_ImportDriver_HXX diff --git a/src/BlockFix/BlockFix_BlockFixAPI.cxx b/src/BlockFix/BlockFix_BlockFixAPI.cxx index 0f3cbe274..c6d6d3221 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.cxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.cxx @@ -30,13 +30,11 @@ #include #include -#include - #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, MMgt_TShared); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient); //======================================================================= //function : BlockFix_BlockFixAPI diff --git a/src/BlockFix/BlockFix_BlockFixAPI.hxx b/src/BlockFix/BlockFix_BlockFixAPI.hxx index 9de5d7334..c86bacd01 100644 --- a/src/BlockFix/BlockFix_BlockFixAPI.hxx +++ b/src/BlockFix/BlockFix_BlockFixAPI.hxx @@ -25,17 +25,15 @@ #include #include +#include #include #include #include -#include -#include +DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, Standard_Transient); -DEFINE_STANDARD_HANDLE(BlockFix_BlockFixAPI, MMgt_TShared); - -class BlockFix_BlockFixAPI : public MMgt_TShared +class BlockFix_BlockFixAPI : public Standard_Transient { public: Standard_EXPORT BlockFix_BlockFixAPI(); @@ -48,7 +46,7 @@ public: Standard_Integer& OptimumNbFaces(); Standard_EXPORT void Perform(); - OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(BlockFix_BlockFixAPI, Standard_Transient) private: Handle(ShapeBuild_ReShape) myContext; diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx index 77f0f11e4..f106d44cf 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx @@ -50,7 +50,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier, BRepTools_Modification); //======================================================================= //function : BlockFix_PeriodicSurfaceModifier() diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx index 4adaf6f30..1da5e5296 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.hxx @@ -35,8 +35,6 @@ #include #include -#include - class TopoDS_Vertex; class TopoDS_Edge; class TopoDS_Face; @@ -83,7 +81,7 @@ public: const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); - OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification) + DEFINE_STANDARD_RTTIEXT(BlockFix_PeriodicSurfaceModifier,BRepTools_Modification) private: Standard_Real myTolerance; diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx index bb9b6fa7a..ace1f9059 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.cxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.cxx @@ -56,7 +56,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification); +IMPLEMENT_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier, BRepTools_Modification); //======================================================================= //function : BlockFix_SphereSpaceModifier diff --git a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx index 378e24e0b..57e9727ac 100644 --- a/src/BlockFix/BlockFix_SphereSpaceModifier.hxx +++ b/src/BlockFix/BlockFix_SphereSpaceModifier.hxx @@ -33,8 +33,6 @@ #include #include -#include - class TopoDS_Vertex; class TopoDS_Edge; class TopoDS_Face; @@ -70,7 +68,7 @@ public: const TopoDS_Face& NewF1, const TopoDS_Face& NewF2); Standard_EXPORT Standard_Boolean ForRotation (const TopoDS_Face& F); - OCCT_DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification) + DEFINE_STANDARD_RTTIEXT(BlockFix_SphereSpaceModifier,BRepTools_Modification) private: Standard_Real myTolerance; diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 02765bfb4..b3d92b18f 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -26,8 +26,6 @@ #include -#include - #include #include diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx index 53f68259f..77de8c2d8 100644 --- a/src/CurveCreator/CurveCreator_Utils.cxx +++ b/src/CurveCreator/CurveCreator_Utils.cxx @@ -23,8 +23,6 @@ #include "CurveCreator_Section.hxx" #include "CurveCreator_UtilsICurve.hxx" -#include - #include #include @@ -621,14 +619,10 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) ); for( aSelection->Init(); aSelection->More(); aSelection->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive(); -#endif Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity ); diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index fd7b86889..aec63c79e 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -28,8 +28,6 @@ #include "EntityGUI_3DSketcherDlg.h" #include "EntityGUI_Widgets.h" -#include - #include #include #include @@ -105,7 +103,7 @@ DEFINE_STANDARD_HANDLE(AIS_Text, AIS_InteractiveObject) class AIS_Text:public AIS_InteractiveObject { public: - OCCT_DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject) + DEFINE_STANDARD_RTTIEXT(AIS_Text,AIS_InteractiveObject) AIS_Text(){}; @@ -147,7 +145,7 @@ protected: Graphic3d_VerticalTextAlignment aVJustification; }; -OCCT_IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject) +IMPLEMENT_STANDARD_RTTIEXT(AIS_Text, AIS_InteractiveObject) AIS_Text::AIS_Text( const TCollection_ExtendedString& text, const gp_Pnt& position, Quantity_Color color = Quantity_NOC_YELLOW, diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index bd0a18fc3..7d8b1080e 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -64,7 +64,8 @@ #include #include -#include +#include + #include #include diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt index 4a73c259f..9a34d081b 100755 --- a/src/GEOM/CMakeLists.txt +++ b/src/GEOM/CMakeLists.txt @@ -40,15 +40,13 @@ SET(_link_LIBRARIES ${CAS_TKCDF} ${CAS_TKG3d} ${CAS_TKStdL} + ${CAS_TKStd} + ${CAS_TKBin} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} GEOMSketcher ) -IF(CAS_VERSION_STR VERSION_GREATER "7.0.0") - LIST(APPEND _link_LIBRARIES ${CAS_TKStd} ${CAS_TKBin}) -ENDIF() - # --- headers --- SET(GEOM_HEADERS diff --git a/src/GEOM/GEOM_Application.cxx b/src/GEOM/GEOM_Application.cxx index f9e1f941c..289e20776 100644 --- a/src/GEOM/GEOM_Application.cxx +++ b/src/GEOM/GEOM_Application.cxx @@ -22,7 +22,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Application, TDocStd_Application) //======================================================================= //function : GEOM_Application @@ -42,22 +42,6 @@ GEOM_Application::~GEOM_Application() { } -#if OCC_VERSION_LARGE <= 0x07000000 -//======================================================================= -//function : Formats -//purpose : -//======================================================================= - -void GEOM_Application::Formats(TColStd_SequenceOfExtendedString& Formats) -{ - Formats.Append(TCollection_ExtendedString ("SALOME_GEOM")); -#if OCC_VERSION_MAJOR > 6 - Formats.Append(TCollection_ExtendedString ("BinOcaf")); -#endif -} -#endif - - //======================================================================= //function : ResourcesName //purpose : diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx index 3cf3085e8..ab1592386 100644 --- a/src/GEOM/GEOM_Application.hxx +++ b/src/GEOM/GEOM_Application.hxx @@ -28,21 +28,16 @@ #include #include -#include - class GEOM_Application : public TDocStd_Application { public: Standard_EXPORT GEOM_Application(); Standard_EXPORT ~GEOM_Application(); -#if OCC_VERSION_LARGE <= 0x07000000 - Standard_EXPORT virtual void Formats(TColStd_SequenceOfExtendedString& Formats); -#endif Standard_EXPORT Standard_CString ResourcesName(); public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application) + DEFINE_STANDARD_RTTIEXT(GEOM_Application,TDocStd_Application) }; DEFINE_STANDARD_HANDLE(GEOM_Application, TDocStd_Application) diff --git a/src/GEOM/GEOM_BaseDriver.cxx b/src/GEOM/GEOM_BaseDriver.cxx index 314c65760..8a7c72679 100644 --- a/src/GEOM/GEOM_BaseDriver.cxx +++ b/src/GEOM/GEOM_BaseDriver.cxx @@ -33,7 +33,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver); //================================================================================ /*! diff --git a/src/GEOM/GEOM_BaseDriver.hxx b/src/GEOM/GEOM_BaseDriver.hxx index 61aa70f6a..72ecad69a 100644 --- a/src/GEOM/GEOM_BaseDriver.hxx +++ b/src/GEOM/GEOM_BaseDriver.hxx @@ -36,18 +36,10 @@ #include #include -#include - #include #include #include -#if OCC_VERSION_MAJOR < 7 - #define LOGBOOK TFunction_Logbook -#else - #define LOGBOOK Handle(TFunction_Logbook) -#endif - struct GEOM_Param { std::string name; @@ -107,7 +99,7 @@ public: return params.back(); } - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver) + DEFINE_STANDARD_RTTIEXT(GEOM_BaseDriver,TFunction_Driver) }; DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver); diff --git a/src/GEOM/GEOM_BaseObject.cxx b/src/GEOM/GEOM_BaseObject.cxx index a0ced3b4d..ee2a92aeb 100644 --- a/src/GEOM/GEOM_BaseObject.cxx +++ b/src/GEOM/GEOM_BaseObject.cxx @@ -515,4 +515,4 @@ TDF_Label GEOM_BaseObject::GetFreeLabel() return _label.FindChild(FREE_LABEL); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_BaseObject, Standard_Transient ); diff --git a/src/GEOM/GEOM_BaseObject.hxx b/src/GEOM/GEOM_BaseObject.hxx index 0c7a65dfc..464e0f6a0 100644 --- a/src/GEOM/GEOM_BaseObject.hxx +++ b/src/GEOM/GEOM_BaseObject.hxx @@ -166,7 +166,7 @@ public: int _docID; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient) + DEFINE_STANDARD_RTTIEXT(GEOM_BaseObject,Standard_Transient) }; #endif diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index b8d540a74..a6c169018 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -34,8 +34,6 @@ #include "GEOM_SubShapeDriver.hxx" #include "Sketcher_Profile.hxx" -#include - #include "utilities.h" #include @@ -66,11 +64,9 @@ #include -#if OCC_VERSION_LARGE > 0x07000000 #include #include #include -#endif #include @@ -241,11 +237,9 @@ GEOM_Engine::GEOM_Engine() TFunction_DriverTable::Get()->AddDriver(GEOM_Object::GetSubShapeID(), new GEOM_SubShapeDriver()); _OCAFApp = new GEOM_Application(); -#if OCC_VERSION_LARGE > 0x07000000 _OCAFApp->DefineFormat("SALOME_GEOM", "GEOM Document Version 1.0", "sgd", new StdDrivers_DocumentRetrievalDriver, 0); BinDrivers::DefineFormat(_OCAFApp); -#endif _UndoLimit = 0; } @@ -285,11 +279,7 @@ Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID, bool force) aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID)); } else if (force) { -#if OCC_VERSION_MAJOR > 6 _OCAFApp->NewDocument("BinOcaf", aDoc); -#else - _OCAFApp->NewDocument("SALOME_GEOM", aDoc); -#endif aDoc->SetUndoLimit(_UndoLimit); _mapIDDocument.Bind(theDocID, aDoc); TDataStd_Integer::Set(aDoc->Main(), theDocID); @@ -588,12 +578,10 @@ bool GEOM_Engine::Load(int theDocID, const char* theFileName) return false; } -#if OCC_VERSION_MAJOR > 6 // Replace old document format by the new one. if (aDoc->StorageFormat().IsEqual("SALOME_GEOM")) { aDoc->ChangeStorageFormat("BinOcaf"); } -#endif aDoc->SetUndoLimit(_UndoLimit); diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx index 564774078..e1cfd7b7d 100644 --- a/src/GEOM/GEOM_Engine.hxx +++ b/src/GEOM/GEOM_Engine.hxx @@ -27,8 +27,6 @@ #include "GEOM_Object.hxx" #include "GEOM_DataMapOfAsciiStringTransient.hxx" -#include - #include #include diff --git a/src/GEOM/GEOM_Field.cxx b/src/GEOM/GEOM_Field.cxx index b975e5d08..1c577599a 100644 --- a/src/GEOM/GEOM_Field.cxx +++ b/src/GEOM/GEOM_Field.cxx @@ -756,5 +756,5 @@ const Standard_GUID& GEOM_FieldStep::GetDataID() return TDataStd_ExtStringArray::GetID(); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject ); diff --git a/src/GEOM/GEOM_Field.hxx b/src/GEOM/GEOM_Field.hxx index 5284fa021..439035d22 100644 --- a/src/GEOM/GEOM_Field.hxx +++ b/src/GEOM/GEOM_Field.hxx @@ -123,7 +123,7 @@ class GEOM_Field : public GEOM_BaseObject // Returns all steps Standard_EXPORT std::list< Handle(GEOM_FieldStep)> GetSteps(); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject) + DEFINE_STANDARD_RTTIEXT(GEOM_Field,GEOM_BaseObject) private: @@ -185,7 +185,7 @@ public: // Returns GUID of CAF data array const Standard_GUID& GetDataID(); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject) + DEFINE_STANDARD_RTTIEXT(GEOM_FieldStep,GEOM_BaseObject) private: diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 952dbd3e9..0f64bd555 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -27,8 +27,6 @@ #include #include -#include - #include "utilities.h" #include @@ -980,4 +978,4 @@ void* GEOM_Function::GetCallBackData() return reinterpret_cast ( address ); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient ); diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index 5c4b530c6..4e7f16f1e 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -36,8 +36,6 @@ #include #include -#include - class GEOM_Function; DEFINE_STANDARD_HANDLE (GEOM_Function, Standard_Transient); @@ -197,7 +195,7 @@ public: //Returns top label of this function's naming tree Standard_EXPORT TDF_Label GetNamingEntry (const Standard_Boolean create = Standard_True); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient) + DEFINE_STANDARD_RTTIEXT(GEOM_Function,Standard_Transient) private: diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index 1c3a07612..7b5ce77bd 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -296,5 +296,5 @@ GEOM_Object::GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObject return funs; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); +IMPLEMENT_STANDARD_RTTIEXT(GEOM_Object, GEOM_BaseObject ); diff --git a/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx index 716073151..5c3756125 100644 --- a/src/GEOM/GEOM_Object.hxx +++ b/src/GEOM/GEOM_Object.hxx @@ -115,7 +115,7 @@ class GEOM_Object : public GEOM_BaseObject GetLastFunctions( const std::list< Handle(GEOM_Object) >& theObjects ); public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject) + DEFINE_STANDARD_RTTIEXT(GEOM_Object,GEOM_BaseObject) }; #endif diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx index 633fd44d0..a189af2e1 100644 --- a/src/GEOM/GEOM_PythonDump.hxx +++ b/src/GEOM/GEOM_PythonDump.hxx @@ -48,10 +48,8 @@ namespace GEOM //operator TCollection_AsciiString () const; -#if OCC_VERSION_MAJOR >= 7 template Standard_EXPORT TPythonDump& operator<< (const Handle(T)& theObject) { return *this << theObject.get(); } -#endif Standard_EXPORT TPythonDump& operator<< (bool theArg); Standard_EXPORT TPythonDump& operator<< (long int theArg); Standard_EXPORT TPythonDump& operator<< (int theArg); diff --git a/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx index 2e6475362..d8e07e714 100644 --- a/src/GEOM/GEOM_Solver.cxx +++ b/src/GEOM/GEOM_Solver.cxx @@ -64,11 +64,7 @@ bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction) aDriver->Init(theFunction->GetEntry()); -#if OCC_VERSION_MAJOR < 7 - TFunction_Logbook aLog; -#else Handle(TFunction_Logbook) aLog = TFunction_Logbook::Set( aDriver->Label() ); -#endif if(aDriver->Execute(aLog) == 0) return false; return true; diff --git a/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx index 3715f3e6c..1f4e675fe 100644 --- a/src/GEOM/GEOM_SubShapeDriver.cxx +++ b/src/GEOM/GEOM_SubShapeDriver.cxx @@ -48,7 +48,7 @@ GEOM_SubShapeDriver::GEOM_SubShapeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOM_SubShapeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -101,11 +101,7 @@ Standard_Integer GEOM_SubShapeDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -159,4 +155,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOM_SubShapeDriver,GEOM_BaseDriver); diff --git a/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx index 2ac04f9d8..810d71eeb 100644 --- a/src/GEOM/GEOM_SubShapeDriver.hxx +++ b/src/GEOM/GEOM_SubShapeDriver.hxx @@ -35,9 +35,9 @@ class GEOM_SubShapeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOM_SubShapeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOM_SubShapeDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOM_SubShapeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMAlgo/FILES b/src/GEOMAlgo/FILES index 91e59813f..cc8fd6328 100644 --- a/src/GEOMAlgo/FILES +++ b/src/GEOMAlgo/FILES @@ -106,6 +106,4 @@ GEOMAlgo_ShapeInfo.hxx GEOMAlgo_ShapeInfo.cxx GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx -Basics_OCCTVersion.hxx - GEOMAlgo_KindOfDef.hxx diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx index 27c3737b7..b9fb15a9e 100644 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx @@ -25,8 +25,6 @@ #include -#include - #include #include #include @@ -197,12 +195,7 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace (const TopoDS_Edge& aEold, const TopoDS_Edge& aEnew, const TopoDS_Face& aF, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Boolean bIsClosed, bUClosed, bHasOld; Standard_Integer iRet, aNbPoints; @@ -222,7 +215,6 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace return iRet; } // -#if OCC_VERSION_LARGE > 0x06080000 // Try to copy PCurve from old edge to the new one. iRet = BOPTools_AlgoTools2D::AttachExistingPCurve(aEold, aEnew, aF, aCtx); @@ -233,7 +225,6 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace // The PCurve is attached successfully. return iRet; } -#endif // BOPTools_AlgoTools2D::BuildPCurveForEdgeOnFace(aEnew, aF); aC2D=BRep_Tool::CurveOnSurface(aEnew, aF, aT1, aT2); @@ -446,12 +437,7 @@ void GEOMAlgo_AlgoTools::RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE, Standard_Boolean GEOMAlgo_AlgoTools::IsSplitToReverse (const TopoDS_Edge& aEF1, const TopoDS_Edge& aEF2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aContext -#else - const Handle(BOPInt_Context)& aContext -#endif - ) + const Handle(IntTools_Context)& aContext) { Standard_Boolean aFlag; Standard_Real aT1, aT2, aScPr, a, b; @@ -496,12 +482,7 @@ Standard_Boolean GEOMAlgo_AlgoTools::ProjectPointOnShape (const gp_Pnt& aP1, const TopoDS_Shape& aS, gp_Pnt& aP2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Boolean bIsDone = Standard_False; Standard_Real aT2; @@ -648,12 +629,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_ListOfShape& aLESD, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Boolean bIsDone; Standard_Real aTol2, aD2; @@ -692,12 +668,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes (const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_IndexedDataMapOfShapeListOfShape& aMEE, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Integer aNbE, aNbEProcessed, aNbESD, iErr; TopTools_ListOfShape aLESD; @@ -765,12 +736,7 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes (GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMPKLE, const Standard_Real aTol, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) + const Handle(IntTools_Context)& aCtx) { Standard_Integer i, aNbE, iErr, j, aNbEE, aNbToAdd; TopTools_IndexedDataMapOfShapeListOfShape aMEE, aMSDE, aMEToAdd; diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx index c670dd486..a737460dc 100755 --- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.hxx @@ -26,16 +26,10 @@ #ifndef _GEOMAlgo_AlgoTools_HeaderFile #define _GEOMAlgo_AlgoTools_HeaderFile -#include - #include #include #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -92,34 +86,19 @@ class GEOMAlgo_AlgoTools { static Standard_Integer RefineSDShapes (GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMSD, const Standard_Real aTol, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Integer FindSDShapes(const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_IndexedDataMapOfShapeListOfShape& aMEE, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static Standard_Integer FindSDShapes(const TopoDS_Shape& aE1, const TopTools_ListOfShape& aLE, const Standard_Real aTol, TopTools_ListOfShape& aLESD, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void PointOnShape(const TopoDS_Shape& aS, @@ -146,12 +125,7 @@ class GEOMAlgo_AlgoTools { static Standard_Boolean ProjectPointOnShape(const gp_Pnt& aP1, const TopoDS_Shape& aS, gp_Pnt& aP2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void CorrectTolerances(const TopoDS_Shape& aShape, @@ -169,12 +143,7 @@ class GEOMAlgo_AlgoTools { Standard_EXPORT static Standard_Boolean IsSplitToReverse1 (const TopoDS_Edge& aEF1, const TopoDS_Edge& aEF2, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; Standard_EXPORT static void RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE, const TopoDS_Face& aF, @@ -191,42 +160,22 @@ class GEOMAlgo_AlgoTools { Standard_EXPORT static Standard_Boolean IsSplitToReverse(const TopoDS_Edge& theSplit, const TopoDS_Edge& theEdge, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& theCtx -#else - const Handle(BOPInt_Context)& theCtx -#endif - ) ; + const Handle(IntTools_Context)& theCtx) ; Standard_EXPORT static Standard_Boolean IsSplitToReverse (const TopoDS_Face& theFSp, const TopoDS_Face& theFSr, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& theCtx -#else - const Handle(BOPInt_Context)& theCtx -#endif - ) ; + const Handle(IntTools_Context)& theCtx) ; Standard_EXPORT static Standard_Boolean IsSplitToReverse (const TopoDS_Shape& theSp, const TopoDS_Shape& theSr, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& theCtx -#else - const Handle(BOPInt_Context)& theCtx -#endif - ) ; + const Handle(IntTools_Context)& theCtx) ; Standard_EXPORT static Standard_Integer BuildPCurveForEdgeOnFace (const TopoDS_Edge& aEold, const TopoDS_Edge& aEnew, const TopoDS_Face& aF, -#if OCC_VERSION_LARGE > 0x06070100 - const Handle(IntTools_Context)& aCtx -#else - const Handle(BOPInt_Context)& aCtx -#endif - ) ; + const Handle(IntTools_Context)& aCtx) ; // Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx index ca035f35a..5f6ef23b5 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.cxx @@ -27,7 +27,7 @@ // #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_Clsf, GEOMAlgo_HAlgo); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx index 46564f2d8..ef2f5ac87 100644 --- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx @@ -69,7 +69,7 @@ class GEOMAlgo_Clsf : public GEOMAlgo_HAlgo Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_Clsf,GEOMAlgo_HAlgo) protected: Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx index 3da3f8bb9..7c6b9f5c6 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.cxx @@ -47,7 +47,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx index 2af5f487f..e89b559c0 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx @@ -71,7 +71,7 @@ class GEOMAlgo_ClsfBox : public GEOMAlgo_Clsf Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfBox,GEOMAlgo_Clsf) protected: TopoDS_Shape myBox; diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx index c16ea5f5d..3c7cb4279 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.cxx @@ -31,7 +31,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad, GEOMAlgo_Clsf); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx index c940a9a25..95ec33d5a 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfQuad.hxx @@ -78,7 +78,7 @@ public: Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfQuad,GEOMAlgo_Clsf) protected: diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx index 9257dece7..4f0a0e0a0 100755 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.cxx @@ -32,7 +32,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid, GEOMAlgo_Clsf) //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx index 6f945dcbb..5d13525a7 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx @@ -58,7 +58,7 @@ class GEOMAlgo_ClsfSolid : public GEOMAlgo_Clsf Standard_EXPORT virtual void CheckData() ; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSolid,GEOMAlgo_Clsf) protected: TopoDS_Shape myShape; diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx index 18ec5f05a..8748c71ed 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.cxx @@ -32,7 +32,7 @@ #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf, GEOMAlgo_Clsf); //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx index 8aabf7344..ff7c88731 100644 --- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx @@ -69,7 +69,7 @@ class GEOMAlgo_ClsfSurf : public GEOMAlgo_Clsf Standard_EXPORT virtual Standard_Boolean CanBeON(const Handle(Geom_Surface)& aST) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_ClsfSurf,GEOMAlgo_Clsf) protected: Handle(Geom_Surface) myS; diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx index 80e130f9e..f3834064a 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx @@ -26,8 +26,6 @@ #include -#include - #include #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index ce8bc9eb5..9bce9fe11 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -68,12 +68,7 @@ #include #include #include - -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif //======================================================================= //function : diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index dffecb720..94801bb5a 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -554,11 +554,7 @@ Standard_Integer CheckAncesstors // iRet=0; // -#if OCC_VERSION_MAJOR < 7 - pLE=const_cast(&aMVE.FindFromKey(aVSD)); -#else pLE=const_cast(aMVE).ChangeSeek(aVSD); -#endif if (!pLE) { return iRet; } @@ -566,11 +562,7 @@ Standard_Integer CheckAncesstors for (; aItLE.More(); aItLE.Next()) { const TopoDS_Shape& aE=aItLE.Value(); // -#if OCC_VERSION_MAJOR < 7 - pLV=const_cast(&aMEV.FindFromKey(aE)); -#else pLV=const_cast(aMEV).ChangeSeek(aE); -#endif if (!pLV) { continue; // it should be not so } @@ -594,11 +586,7 @@ Standard_Integer CheckAncesstors // iRet=1; // -#if OCC_VERSION_MAJOR < 7 - pLVZ=const_cast(&aMEVZ.FindFromKey(aE)); -#else pLVZ=aMEVZ.ChangeSeek(aE); -#endif if (!pLVZ) { aMEVZ.Add(aE, aLVX); } diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index de5350af9..bb09bceb2 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -78,11 +76,7 @@ #include // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include #include diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx index 736c8f10f..48a7db3f4 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.cxx @@ -25,12 +25,7 @@ // // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif - //======================================================================= //function : GEOMAlgo_GluerAlgo @@ -101,11 +96,7 @@ Standard_Boolean GEOMAlgo_GluerAlgo::CheckGeometry() const //function : SetContext //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 void GEOMAlgo_GluerAlgo::SetContext(const Handle(IntTools_Context)& theContext) -#else -void GEOMAlgo_GluerAlgo::SetContext(const Handle(BOPInt_Context)& theContext) -#endif { myContext=theContext; } @@ -113,11 +104,7 @@ void GEOMAlgo_GluerAlgo::SetContext(const Handle(BOPInt_Context)& theContext) //function : Context //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& GEOMAlgo_GluerAlgo::Context() -#else -const Handle(BOPInt_Context)& GEOMAlgo_GluerAlgo::Context() -#endif { return myContext; } @@ -153,10 +140,6 @@ void GEOMAlgo_GluerAlgo::Clear() void GEOMAlgo_GluerAlgo::Perform() { if (myContext.IsNull()) { -#if OCC_VERSION_LARGE > 0x06070100 myContext=new IntTools_Context; -#else - myContext=new BOPInt_Context; -#endif } } diff --git a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx index 7344af81e..3fa6fce40 100644 --- a/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GluerAlgo.hxx @@ -27,18 +27,11 @@ #ifndef _GEOMAlgo_GluerAlgo_HeaderFile #define _GEOMAlgo_GluerAlgo_HeaderFile -#include - #include #include #include #include - -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -80,18 +73,10 @@ public: virtual void Clear() ; Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 void SetContext(const Handle(IntTools_Context)&) ; -#else - void SetContext(const Handle(BOPInt_Context)&) ; -#endif Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& Context() ; -#else - const Handle(BOPInt_Context)& Context() ; -#endif Standard_EXPORT const TopTools_DataMapOfShapeListOfShape& Images() const; @@ -103,11 +88,7 @@ protected: TopoDS_Shape myArgument; Standard_Real myTolerance; Standard_Boolean myCheckGeometry; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) myContext; -#else - Handle(BOPInt_Context) myContext; -#endif TopTools_DataMapOfShapeListOfShape myImages; TopTools_DataMapOfShapeShape myOrigins; diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx index 5ca2cedd0..4fc51d2f2 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.cxx @@ -27,7 +27,7 @@ // #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, MMgt_TShared); +IMPLEMENT_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient); //======================================================================= // function: diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx index e1d1f02a4..6f3f684fb 100644 --- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx @@ -32,17 +32,15 @@ #include #include #include -#include +#include -#include - -DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, MMgt_TShared); +DEFINE_STANDARD_HANDLE(GEOMAlgo_HAlgo, Standard_Transient); //======================================================================= //class : GEOMAlgo_HAlgo //purpose : //======================================================================= -class GEOMAlgo_HAlgo : public MMgt_TShared +class GEOMAlgo_HAlgo : public Standard_Transient { public: Standard_EXPORT @@ -60,7 +58,7 @@ class GEOMAlgo_HAlgo : public MMgt_TShared Standard_EXPORT Standard_Integer WarningStatus() const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(GEOMAlgo_HAlgo, Standard_Transient) protected: Standard_EXPORT diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx index 05636647b..98981f651 100644 --- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx +++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx @@ -26,8 +26,6 @@ #include #include -#include - #include #include #include @@ -37,11 +35,7 @@ #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include @@ -108,11 +102,7 @@ void GEOMAlgo_RemoverWebs::Perform() if (!myContext.IsNull()) { myContext.Nullify(); } -#if OCC_VERSION_LARGE > 0x06070100 myContext=new IntTools_Context; -#else - myContext=new BOPInt_Context; -#endif // BuildSolid(); // @@ -225,11 +215,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() aSB.SetContext(myContext); aSB.SetShapes(aSFS); aSB.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 iErr=aSB.HasErrors(); -#else - iErr=aSB.ErrorStatus(); -#endif if (iErr) { myErrorStatus=20; // SolidBuilder failed return; @@ -261,11 +247,7 @@ void GEOMAlgo_RemoverWebs::AddInternalShapes(const BOPCol_ListOfShape& aLSR, TopoDS_Solid aSd; BRep_Builder aBB; BOPCol_ListIteratorOfListOfShape aItLS; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=new IntTools_Context; -#else - Handle(BOPInt_Context) aCtx=new BOPInt_Context; -#endif // aNbSI=aMSI.Extent(); for (i=1; i<=aNbSI; ++i) { diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx index 2fbac5c2f..dab662dd5 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx @@ -26,11 +26,7 @@ // // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif //======================================================================= //function : GEOMAlgo_ShapeAlgo @@ -54,11 +50,7 @@ GEOMAlgo_ShapeAlgo::~GEOMAlgo_ShapeAlgo() //function : SetContext //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 void GEOMAlgo_ShapeAlgo::SetContext(const Handle(IntTools_Context)& theContext) -#else -void GEOMAlgo_ShapeAlgo::SetContext(const Handle(BOPInt_Context)& theContext) -#endif { myContext=theContext; } @@ -66,11 +58,7 @@ void GEOMAlgo_ShapeAlgo::SetContext(const Handle(BOPInt_Context)& theContext) //function : Context //purpose : //======================================================================= -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& GEOMAlgo_ShapeAlgo::Context()const -#else -const Handle(BOPInt_Context)& GEOMAlgo_ShapeAlgo::Context()const -#endif { return myContext; } @@ -121,10 +109,6 @@ const TopoDS_Shape& GEOMAlgo_ShapeAlgo::Result()const void GEOMAlgo_ShapeAlgo::Perform() { if (myContext.IsNull()) { -#if OCC_VERSION_LARGE > 0x06070100 myContext=new IntTools_Context; -#else - myContext=new BOPInt_Context; -#endif } } diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx index 2bf1412e2..14cf3c642 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx @@ -20,25 +20,14 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: GEOMAlgo_ShapeAlgo.hxx -// Created: Tue Dec 7 12:06:54 2004 -// Author: Peter KURNEV -// -// #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile #define _GEOMAlgo_ShapeAlgo_HeaderFile -#include - #include #include #include #include -#if OCC_VERSION_LARGE > 0x06070100 - #include -#else - #include -#endif +#include #include //======================================================================= @@ -47,23 +36,15 @@ //======================================================================= class GEOMAlgo_ShapeAlgo : public GEOMAlgo_Algo { - public: +public: //! Sets cashed geometrical tools
Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 void SetContext(const Handle(IntTools_Context)& theContext) ; -#else - void SetContext(const Handle(BOPInt_Context)& theContext) ; -#endif //! Returns cashed geometrical tools
Standard_EXPORT -#if OCC_VERSION_LARGE > 0x06070100 const Handle(IntTools_Context)& Context() const; -#else - const Handle(BOPInt_Context)& Context() const; -#endif Standard_EXPORT void SetShape(const TopoDS_Shape& aS) ; @@ -90,14 +71,10 @@ protected: Standard_EXPORT virtual ~GEOMAlgo_ShapeAlgo(); - TopoDS_Shape myShape; Standard_Real myTolerance; TopoDS_Shape myResult; -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) myContext; -#else - Handle(BOPInt_Context) myContext; -#endif }; + #endif diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index cb7f85322..942538773 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -52,11 +50,7 @@ #include #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include @@ -101,9 +95,6 @@ GEOMAlgo_ShellSolidBuilder::~GEOMAlgo_ShellSolidBuilder() //======================================================================= void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFiller) { -#if OCC_VERSION_LARGE <= 0x07010000 - myErrorStatus=0; -#endif // myPaveFiller=(BOPAlgo_PaveFiller*)&theFiller; myDS=myPaveFiller->PDS(); @@ -111,97 +102,57 @@ void GEOMAlgo_ShellSolidBuilder::PerformInternal(const BOPAlgo_PaveFiller& theFi // // 1. CheckData CheckData(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // // 2. Prepare Prepare(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // // 3. Fill Images // 3.1 Vertice FillImagesVertices(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_VERTEX); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // 3.2 Edges FillImagesEdges(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_EDGE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // // 3.3 Wires FillImagesContainers(TopAbs_WIRE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_WIRE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // 3.4 Faces FillImagesFaces(); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } // BuildResult(TopAbs_FACE); -#if OCC_VERSION_LARGE > 0x07010001 if (HasErrors()) { -#else - if (myErrorStatus) { -#endif return; } } @@ -228,9 +179,6 @@ GEOMAlgo_ShellSolid::~GEOMAlgo_ShellSolid() //======================================================================= void GEOMAlgo_ShellSolid::Perform() { -#if OCC_VERSION_LARGE <= 0x07010000 - myErrorStatus=0; -#endif // try { Standard_Integer aNbArgs, iRank, iErr, iBeg, iEnd, i, aNbSp; @@ -251,11 +199,7 @@ void GEOMAlgo_ShellSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } @@ -285,11 +229,7 @@ void GEOMAlgo_ShellSolid::Perform() return; } // -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=myDSFiller->Context(); -#else - Handle(BOPInt_Context) aCtx=myDSFiller->Context(); -#endif const BOPDS_IndexRange& aRange=pDS->Range(iRank); aRange.Indices(iBeg, iEnd); const TopoDS_Solid& aSolid=(!iRank) ? *((TopoDS_Solid*)&aTool) : *((TopoDS_Solid*)&aObj); @@ -299,11 +239,7 @@ void GEOMAlgo_ShellSolid::Perform() GEOMAlgo_ShellSolidBuilder aSSB; // aSSB.PerformWithFiller(*myDSFiller); -#if OCC_VERSION_LARGE > 0x07010001 iErr=aSSB.HasErrors(); -#else - iErr=aSSB.ErrorStatus(); -#endif if (iErr) { myErrorStatus=15; return; diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx index b7f49b6ab..069ca0a2d 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx @@ -37,8 +37,6 @@ #include #include -#include - #include //======================================================================= @@ -85,11 +83,7 @@ void GEOMAlgo_SolidSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx index fb5b8099b..db1a8ad58 100644 --- a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx @@ -41,8 +41,6 @@ #include -#include - static void TreatCompound(const TopoDS_Shape& aC, BOPCol_ListOfShape& aLSX); @@ -150,10 +148,6 @@ void GEOMAlgo_Splitter::Clear() //======================================================================= void GEOMAlgo_Splitter::BuildResult(const TopAbs_ShapeEnum theType) { -#if OCC_VERSION_LARGE <= 0x07010000 - myErrorStatus=0; -#endif - // TopAbs_ShapeEnum aType; BRep_Builder aBB; BOPCol_MapOfShape aM; diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index b669f5caf..8be6ab038 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -48,11 +46,7 @@ #include // #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif // #include #include @@ -90,11 +84,7 @@ void GEOMAlgo_VertexSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } @@ -152,11 +142,7 @@ void GEOMAlgo_VertexSolid::BuildResult() const TopoDS_Shape& aTool=aLS.Last(); const TopoDS_Solid& aSolid=(myRank==0) ? TopoDS::Solid(aTool) : TopoDS::Solid(aObj); // -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=myDSFiller->Context(); -#else - Handle(BOPInt_Context) aCtx=myDSFiller->Context(); -#endif BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid); // aNbRanges=aDS.NbRanges(); diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx index 8c44271a7..663bc715d 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx @@ -27,8 +27,6 @@ // #include -#include - #include #include @@ -40,17 +38,11 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#endif #include #include #include -#include - //======================================================================= //function : GEOMAlgo_WireSolid //purpose : @@ -80,11 +72,7 @@ void GEOMAlgo_WireSolid::Perform() myErrorStatus=10; return; } -#if OCC_VERSION_LARGE > 0x07010001 if(myDSFiller->HasErrors()) { -#else - if(myDSFiller->ErrorStatus()) { -#endif myErrorStatus=11; return; } @@ -154,11 +142,7 @@ void GEOMAlgo_WireSolid::BuildResult() const TopoDS_Solid& aSolid=(iRank==0) ? *((TopoDS_Solid*)&aTool) : *((TopoDS_Solid*)&aObj); // -#if OCC_VERSION_LARGE > 0x06070100 Handle(IntTools_Context) aCtx=myDSFiller->Context(); -#else - Handle(BOPInt_Context) aCtx=myDSFiller->Context(); -#endif //BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid); // const BOPDS_IndexRange& aRange=pDS->Range(iRank); diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx index c8723dac3..b9f685676 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx @@ -30,7 +30,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_OCCFilter, SelectMgr_Filter) //======================================================================= // function : GEOM_OCCFilter diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h index fd6a4ac0c..d52607340 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h @@ -27,8 +27,6 @@ #include -#include - class LightApp_SelectionMgr; class GEOM_OCCFilter : public SelectMgr_Filter @@ -44,7 +42,7 @@ private: public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter) + DEFINE_STANDARD_RTTIEXT(GEOM_OCCFilter,SelectMgr_Filter) }; diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index 4ab85d38a..7ab8db1f9 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -26,8 +26,6 @@ #include "GEOMGUI_OCCSelector.h" #include "GEOM_Annotation.hxx" -#include - #include #include @@ -179,15 +177,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, Handle(SelectMgr_Selection) sel = theObj->Selection( m ); for ( sel->Init(); sel->More(); sel->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); -#endif if ( entity.IsNull() ) continue; diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 488b426f3..db86dc2e5 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -59,8 +59,6 @@ #include #include -#include - #include #include #include @@ -90,9 +88,6 @@ #include #include #include -#if OCC_VERSION_MAJOR < 7 - #include -#endif #include #include #include @@ -113,6 +108,7 @@ #include #include #include +#include #include @@ -242,8 +238,11 @@ namespace if ( aAISShape.IsNull() ) continue; -#ifdef USE_TEXTURED_SHAPE - const Handle(Image_PixMap)& aPixmap = aAISShape->TexturePixMap(); + const Handle(Graphic3d_TextureMap)& aTexture = aAISShape->Attributes()->ShadingAspect()->Aspect()->TextureMap(); + if ( aTexture.IsNull() ) + continue; + + const Handle(Image_PixMap)& aPixmap = aTexture->GetImage(); if ( aPixmap.IsNull() ) continue; @@ -258,7 +257,6 @@ namespace aPixmapUsersMap.UnBind( aPixmap ); aPixmapCacheMap.remove( aPixmapCacheMap.key( aPixmap ) ); } -#endif } } @@ -512,12 +510,10 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) myViewFrame = 0; -#if OCC_VERSION_MAJOR >= 7 myColorScale = new AIS_ColorScale; myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD); myColorScale->SetTransformPersistence ( Graphic3d_TransformPers::FromDeprecatedParams(Graphic3d_TMF_2d, gp_Pnt (-1,-1,0))); -#endif myFieldDataType = GEOM::FDT_Double; myFieldDimension = 0; @@ -866,11 +862,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap AISShape->SetLabelColor( qColorFromResources( "label_color", QColor( 255, 255, 255 ) ) ); // set display mode - AISShape->SetDisplayMode( HasDisplayMode() ? - // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function - GetDisplayMode() : - // display mode from properties - propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt() ); + int displayMode = HasDisplayMode() ? + // predefined display mode, manually set to displayer via GEOM_Displayer::SetDisplayMode() function + GetDisplayMode() : + // display mode from properties + propMap.value( GEOM::propertyName( GEOM::DisplayMode ) ).toInt(); + AISShape->SetDisplayMode( displayMode ); // - face boundaries color and line width anAspect = AISShape->Attributes()->FaceBoundaryAspect(); @@ -960,7 +957,6 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap aImagePath = propMap.value( GEOM::propertyName( GEOM::Texture ) ).toString(); } -#ifdef USE_TEXTURED_SHAPE Handle(Image_PixMap) aPixmap; if ( !aImagePath.isEmpty() ) aPixmap = cacheTextureFor( aImagePath, AISShape ); @@ -969,14 +965,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap // apply image to shape if ( !aPixmap.IsNull() ) { - AISShape->SetTexturePixMap( aPixmap ); - AISShape->SetTextureMapOn(); - AISShape->DisableTextureModulate(); + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMap( new Graphic3d_Texture2Dmanual( aPixmap ) ); } - else { - AISShape->SetTextureMapOff(); - } -#endif + if ( displayMode == GEOM_AISShape::TexturedShape ) + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOn(); + else + AISShape->Attributes()->ShadingAspect()->Aspect()->SetTextureMapOff(); // set line width AISShape->SetWidth( HasWidth() ? @@ -2965,11 +2959,7 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS { QColor aQColor; Quantity_Color aColor; -#if OCC_VERSION_MAJOR < 7 - if( FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) ) -#else if( AIS_ColorScale::FindColor( aVariant.toDouble(), theFieldStepRangeMin, theFieldStepRangeMax, anIsBoolean ? 2 : aNbIntervals, aColor ) ) -#endif aQColor = QColor::fromRgbF( aColor.Red(), aColor.Green(), aColor.Blue() ); aResultList << aQColor; } @@ -2977,52 +2967,6 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS return aResultList; } -#if OCC_VERSION_MAJOR < 7 -// Note: the method is copied from Aspect_ColorScale class -Standard_Integer GEOM_Displayer::HueFromValue( const Standard_Integer aValue, - const Standard_Integer aMin, - const Standard_Integer aMax ) -{ - Standard_Integer minLimit( 0 ), maxLimit( 230 ); - - Standard_Integer aHue = maxLimit; - if ( aMin != aMax ) - aHue = (Standard_Integer)( maxLimit - ( maxLimit - minLimit ) * ( aValue - aMin ) / ( aMax - aMin ) ); - - aHue = Min( Max( minLimit, aHue ), maxLimit ); - - return aHue; -} - -// Note: the method is copied from Aspect_ColorScale class -Standard_Boolean GEOM_Displayer::FindColor( const Standard_Real aValue, - const Standard_Real aMin, - const Standard_Real aMax, - const Standard_Integer ColorsCount, - Quantity_Color& aColor ) -{ - if( aValueaMax || aMaxaMax ) - IntervNumber = ColorsCount-1; - else if( Abs( aMax-aMin ) > Precision::Approximation() ) - IntervNumber = Floor( Standard_Real( ColorsCount ) * ( aValue - aMin ) / ( aMax - aMin ) ); // 'Ceiling' replaced with 'Floor' - - Standard_Integer Interv = Standard_Integer( IntervNumber ); - - aColor = Quantity_Color( HueFromValue( Interv, 0, ColorsCount - 1 ), 1.0, 1.0, Quantity_TOC_HLS ); - - return Standard_True; - } -} -#endif - void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, const bool updateViewer ) { SalomeApp_Study* aStudy = dynamic_cast( myApp->activeStudy() ); @@ -3102,48 +3046,29 @@ void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, cons Standard_Real aHeight = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 ); Standard_Integer aTextHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 ); Standard_Integer aNbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 ); - -#if OCC_VERSION_MAJOR < 7 - Handle(Aspect_ColorScale) myColorScale = aView->ColorScale(); - if( !myColorScale.IsNull() ) - { - myColorScale->SetXPosition( anXPos ); - myColorScale->SetYPosition( anYPos ); - myColorScale->SetWidth( aWidth ); - myColorScale->SetHeight( aHeight ); -#else - Standard_Integer aWinWidth = 0, aWinHeight = 0; - aView->Window()->Size (aWinWidth, aWinHeight); - - myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos); - //myColorScale->SetBreadth (aWinWidth); // ??? - myColorScale->SetBreadth (aWinWidth*aWidth); // ??? - myColorScale->SetHeight (aWinHeight*aHeight); -#endif - - myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); - myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); - - myColorScale->SetTextHeight( aTextHeight ); - myColorScale->SetTitle( aColorScaleTitle ); - -#if OCC_VERSION_MAJOR < 7 - } - if( !aView->ColorScaleIsDisplayed() ) - aView->ColorScaleDisplay(); - } - else - if( aView->ColorScaleIsDisplayed() ) - aView->ColorScaleErase(); -#else + + Standard_Integer aWinWidth = 0, aWinHeight = 0; + aView->Window()->Size (aWinWidth, aWinHeight); + + myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos); + //myColorScale->SetBreadth (aWinWidth); // ??? + myColorScale->SetBreadth (aWinWidth*aWidth); // ??? + myColorScale->SetHeight (aWinHeight*aHeight); + + myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); + myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); + + myColorScale->SetTextHeight( aTextHeight ); + myColorScale->SetTitle( aColorScaleTitle ); + if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) aViewModel->getAISContext()->Display( myColorScale, Standard_True); } - else + else { if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) aViewModel->getAISContext()->Erase( myColorScale, Standard_True ); -#endif - + } + if( theIsRedisplayFieldSteps ) { _PTR(Study) aStudyDS = aStudy->studyDS(); diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index c7c6d879b..a776a1c1b 100755 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -45,12 +45,9 @@ class SALOME_OCCViewType; #include #include #include -#if OCC_VERSION_MAJOR >= 7 - #include -#endif +#include #include #include -#include #include #include @@ -277,20 +274,6 @@ protected: double& theFieldStepRangeMin, double& theFieldStepRangeMax ); -#if OCC_VERSION_MAJOR < 7 - // Note: the method is copied from Aspect_ColorScale class - static Standard_Integer HueFromValue( const Standard_Integer aValue, - const Standard_Integer aMin, - const Standard_Integer aMax ); - - // Note: the method is copied from Aspect_ColorScale class - static Standard_Boolean FindColor( const Standard_Real aValue, - const Standard_Real aMin, - const Standard_Real aMax, - const Standard_Integer ColorsCount, - Quantity_Color& aColor ); -#endif - protected: Handle(SALOME_InteractiveObject) myIO; TopoDS_Shape myShape; @@ -304,9 +287,7 @@ protected: std::string myTexture; int myType; SALOME_View* myViewFrame; -#if OCC_VERSION_MAJOR >= 7 Handle(AIS_ColorScale) myColorScale; -#endif int myUpdateColorScale; // IPAL54049 // Attributes diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index c15469dea..5470bbe2e 100755 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -88,7 +88,6 @@ #include -#include #include // External includes diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 78a067a67..2f9c592ae 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -29,8 +29,6 @@ #include "GEOM_GEOMGUI.hxx" -#include - #include #include diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx index cf8e5fe24..ac6a53b2a 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.cxx @@ -65,7 +65,7 @@ GEOMImpl_3DSketcherDriver::GEOMImpl_3DSketcherDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_3DSketcherDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -319,11 +319,7 @@ Standard_Integer GEOMImpl_3DSketcherDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -369,4 +365,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx index bc916a391..9d5f8307c 100755 --- a/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_3DSketcherDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_3DSketcherDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_3DSketcherDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_3DSketcherDriver() {}; @@ -42,7 +42,7 @@ public: Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_3DSketcherDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index d648798ed..136fad4f2 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -74,7 +74,7 @@ GEOMImpl_ArcDriver::GEOMImpl_ArcDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ArcDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -157,11 +157,7 @@ Standard_Integer GEOMImpl_ArcDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -207,4 +203,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArcDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx index 2cda24cb0..6c6cdb23a 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx @@ -35,16 +35,16 @@ class GEOMImpl_ArcDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ArcDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ArcDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArcDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index 01b1631f8..3f42292a6 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx @@ -26,8 +26,6 @@ #include "Archimede_VolumeSection.hxx" -#include - #include #include @@ -69,7 +67,7 @@ GEOMImpl_ArchimedeDriver::GEOMImpl_ArchimedeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ArchimedeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -138,11 +136,7 @@ Standard_Integer GEOMImpl_ArchimedeDriver::Execute(LOGBOOK& log) const aFunction->SetValue(tirant); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -174,4 +168,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ArchimedeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx index 0ebf8bc8c..22c75f5d9 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx @@ -35,16 +35,16 @@ class GEOMImpl_ArchimedeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ArchimedeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ArchimedeDriver() {}; Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ArchimedeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx index aa50b635d..2c4f4ab6c 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx @@ -28,8 +28,6 @@ #include "utilities.h" -#include - #include #include #include @@ -1363,7 +1361,6 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeAnyFace (const TopoDS_Wire& if (!theResult.IsNull()) { // try to deal with result of BRepBuilderAPI_MakeFace + ShHealOper_ShapeProcess -#if OCC_VERSION_LARGE >= 0x06080000 #ifdef MAKE_FACE_PCURVES_FIX_TOLERANCE // check and fix pcurves, if necessary Standard_Real aT, aTolE, aD, aDMax; @@ -1395,7 +1392,6 @@ TCollection_AsciiString GEOMImpl_Block6Explorer::MakeAnyFace (const TopoDS_Wire& for (; aDMETolIt.More(); aDMETolIt.Next()) { sat.LimitTolerance(aDMETolIt.Key(), aDMETolIt.Value()); } -#endif #endif } else { diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index 2aef977a0..797495fac 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -123,7 +123,7 @@ GEOMImpl_BlockDriver::GEOMImpl_BlockDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_BlockDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -755,11 +755,7 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -1160,4 +1156,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BlockDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx index 401c070d0..4ed6201c7 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx @@ -37,9 +37,9 @@ class GEOMImpl_BlockDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_BlockDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_BlockDriver() {}; @@ -63,7 +63,7 @@ private: const Standard_Integer theNbIterV, TopoDS_Shape& theResult) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_BlockDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 3d03eff3f..511708479 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -114,7 +114,7 @@ GEOMImpl_BooleanDriver::GEOMImpl_BooleanDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -150,19 +150,11 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList2.Append(aShape2); aCSI.SetArguments(aList1); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); aCSI.SetArguments(aList2); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } @@ -213,11 +205,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList1.Append(aShape); aCSI.SetArguments(aList1); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -241,11 +229,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList2.Append(aShape2); aCSI.SetArguments(aList2); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -286,11 +270,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList1.Append(aShape); aCSI.SetArguments(aList1); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -320,11 +300,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aList2.Append(aTool); aCSI.SetArguments(aList2); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is self-intersected"); } } @@ -347,11 +323,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -454,12 +426,10 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation // This allows to avoid adding empty compounds, // resulting from COMMON on two non-intersecting shapes. if (aStepResult.ShapeType() == TopAbs_COMPOUND) { -#if OCC_VERSION_MAJOR >= 7 if ((aValue1.ShapeType() == TopAbs_FACE || aValue1.ShapeType() == TopAbs_SHELL) && (aValue2.ShapeType() == TopAbs_FACE || aValue2.ShapeType() == TopAbs_SHELL)) { aStepResult = makeCompoundShellFromFaces(aStepResult); } -#endif TopoDS_Iterator aCompIter (aStepResult); for (; aCompIter.More(); aCompIter.Next()) { // add shape in a result @@ -517,12 +487,10 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation // This allows to avoid adding empty compounds, // resulting from CUT of parts if (aCut.ShapeType() == TopAbs_COMPOUND) { -#if OCC_VERSION_MAJOR >= 7 if (itSub1.Value().ShapeType() == TopAbs_FACE || itSub1.Value().ShapeType() == TopAbs_SHELL) { aCut = makeCompoundShellFromFaces(aCut); } -#endif TopoDS_Iterator aCompIter (aCut); for (; aCompIter.More(); aCompIter.Next()) { // add shape in a result @@ -550,7 +518,6 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation // perform FUSE operation else if (theType == BOOLEAN_FUSE) { -#if OCC_VERSION_MAJOR >= 7 Standard_Boolean isFaces = Standard_False; TopTools_ListOfShape listShape1, listShape2; GEOMUtils::AddSimpleShapes(theShape1, listShape1); @@ -568,7 +535,6 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation } } } -#endif // Perform BRepAlgoAPI_Fuse BO (theShape1, theShape2); @@ -576,10 +542,8 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation StdFail_NotDone::Raise("Fuse operation can not be performed on the given shapes"); } aShape = BO.Shape(); -#if OCC_VERSION_MAJOR >= 7 if (isFaces) aShape = makeCompoundShellFromFaces(aShape); -#endif } // perform SECTION operation @@ -739,4 +703,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BooleanDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx index 033e21b14..6ffc39060 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx @@ -37,9 +37,9 @@ class GEOMImpl_BooleanDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_BooleanDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_BooleanDriver() {}; @@ -54,7 +54,7 @@ private: TopoDS_Shape makeCompoundShellFromFaces(const TopoDS_Shape theShape) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_BooleanDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index 3e79b5e99..10343e06a 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_BoxDriver::GEOMImpl_BoxDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_BoxDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -116,11 +116,7 @@ Standard_Integer GEOMImpl_BoxDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -160,4 +156,4 @@ bool GEOMImpl_BoxDriver::GetCreationInformation(std::string& theOper return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_BoxDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx index a43961ae3..1ef5aba02 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_BoxDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_BoxDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_BoxDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationNameName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_BoxDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index 7685ffd63..6ac40c886 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -95,7 +95,7 @@ static Standard_Boolean isGoodForChamfer (const TopoDS_Shape& theShape) //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ChamferDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -267,11 +267,7 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -361,4 +357,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx index 7347b531b..88b6d50d0 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ChamferDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ChamferDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ChamferDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ChamferDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index 53dc21545..046d4e026 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx @@ -71,7 +71,7 @@ GEOMImpl_CircleDriver::GEOMImpl_CircleDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_CircleDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -187,11 +187,7 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -237,4 +233,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CircleDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx index e75144b9d..109c8a3fd 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_CircleDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_CircleDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_CircleDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_CircleDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index e25b5537d..63fbaeff3 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx @@ -67,7 +67,7 @@ GEOMImpl_ConeDriver::GEOMImpl_ConeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ConeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -137,11 +137,7 @@ Standard_Integer GEOMImpl_ConeDriver::Execute(LOGBOOK& log) const } if (aShape.IsNull()) return 0; -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif aFunction->SetValue(aShape); return 1; @@ -185,4 +181,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ConeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx index 6ca640923..d08889523 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ConeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ConeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ConeDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ConeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index 21df551eb..c9bd7bc8d 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -66,7 +66,7 @@ GEOMImpl_CopyDriver::GEOMImpl_CopyDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_CopyDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -98,11 +98,7 @@ Standard_Integer GEOMImpl_CopyDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aCopy); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -150,7 +146,7 @@ GetCreationInformation(std::string& theOperationName, * \brief Performs Transfer Data operation. */ //================================================================================ -Standard_Integer GEOMImpl_CopyDriver::transferData(LOGBOOK& log) const +Standard_Integer GEOMImpl_CopyDriver::transferData(Handle(TFunction_Logbook)& log) const { Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); GEOMImpl_ITransferData aTD (aFunction); @@ -414,4 +410,4 @@ Standard_Boolean GEOMImpl_CopyDriver::getInPlaceByHistory return Standard_True; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CopyDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx index e3f8bcf15..fcfe4f804 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx @@ -41,9 +41,9 @@ class GEOMImpl_CopyDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_CopyDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_CopyDriver() {}; @@ -51,11 +51,11 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_CopyDriver,GEOM_BaseDriver) private: - Standard_Integer transferData(LOGBOOK& log) const; + Standard_Integer transferData(Handle(TFunction_Logbook)& log) const; Standard_Boolean getInPlace (const TopoDS_Shape &theSourceShape, diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index 79ee42148..27689d7a9 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx @@ -65,7 +65,7 @@ GEOMImpl_CylinderDriver::GEOMImpl_CylinderDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_CylinderDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -142,11 +142,7 @@ Standard_Integer GEOMImpl_CylinderDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -198,4 +194,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_CylinderDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx index b85457edb..ff39f51eb 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_CylinderDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_CylinderDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_CylinderDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_CylinderDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx index 05fa46439..9c2ba294c 100644 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.cxx @@ -69,7 +69,7 @@ GEOMImpl_DiskDriver::GEOMImpl_DiskDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_DiskDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,11 +165,7 @@ Standard_Integer GEOMImpl_DiskDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -214,4 +210,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_DiskDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx index 7ede29b2b..c638b0072 100755 --- a/src/GEOMImpl/GEOMImpl_DiskDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_DiskDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_DiskDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_DiskDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_DiskDriver() {}; @@ -42,7 +42,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_DiskDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index 291894b69..7e6878745 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx @@ -62,7 +62,7 @@ GEOMImpl_EllipseDriver::GEOMImpl_EllipseDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_EllipseDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -154,11 +154,7 @@ Standard_Integer GEOMImpl_EllipseDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -196,4 +192,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx index fc86df15b..818b846f3 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_EllipseDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_EllipseDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_EllipseDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_EllipseDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 2ee22d9d9..8f574c85f 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -57,7 +57,7 @@ GEOMImpl_ExportDriver::GEOMImpl_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -88,11 +88,7 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(LOGBOOK& log) const if( !GEOMImpl_IECallBack::GetCallBack( aFormatName )->Export( GetDocID(), obj, aFileName, aFormatName ) ); return 0; -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -110,4 +106,4 @@ GetCreationInformation(std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ExportDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx index 35a0ac394..c3ba65857 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ExportDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ExportDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ExportDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ExportDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx index 0562601de..1d632c839 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.cxx @@ -63,7 +63,7 @@ GEOMImpl_FaceDriver::GEOMImpl_FaceDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FaceDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -118,11 +118,7 @@ Standard_Integer GEOMImpl_FaceDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -170,4 +166,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FaceDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx index b477df995..751b42498 100755 --- a/src/GEOMImpl/GEOMImpl_FaceDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FaceDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_FaceDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FaceDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FaceDriver() {}; @@ -42,7 +42,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FaceDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx index 2e12e8651..5da0b8141 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.cxx @@ -44,7 +44,7 @@ GEOMImpl_FieldDriver::GEOMImpl_FieldDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FieldDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FieldDriver::Execute(Handle(TFunction_Logbook)& log) const { return 0; } @@ -105,4 +105,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FieldDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx index bd5bb4751..a4891dde3 100644 --- a/src/GEOMImpl/GEOMImpl_FieldDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FieldDriver.hxx @@ -34,9 +34,9 @@ class GEOMImpl_FieldDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FieldDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FieldDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FieldDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx index 7b6cd60e1..49a509ba6 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1d.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1d.cxx @@ -22,8 +22,6 @@ #include "GEOMImpl_Fillet1d.hxx" -#include - #include #include #include @@ -182,33 +180,7 @@ static Standard_Boolean isRadiusIntersected(const Handle(Geom2d_Curve)& theCurve for(a = anInter.NbSegments(); a > 0; a--) { // Porting to DEV version of OCCT 10.02.2017 BEGIN -#if OCC_VERSION_LARGE > 0x07010000 Standard_NotImplemented::Raise("The treatment of tangential intersection is not implemented"); -#else - // This piece of code seems never worked, because: - // 1. In case of two curves intersection - // method Segment with TWO output curves HAS TO be used. - // 2. Method Segment with ONE output curve (as below) just raises - // Standard_NotImplemented exception since 05.03.2012 (at least) - // and that is why has been eliminated 03.02.2017. - anInter.Segment(a, aCurve); - aPoint = aCurve->Value(aCurve->FirstParameter()); - if (aPoint.Distance(theStart) < aTol) - if (!theStartConnected) - return Standard_True; - if (aPoint.Distance(theEnd) < aTol) - return Standard_True; - if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol)) - return Standard_True; - aPoint = aCurve->Value(aCurve->LastParameter()); - if (aPoint.Distance(theStart) < aTol) - if (!theStartConnected) - return Standard_True; - if (aPoint.Distance(theEnd) < aTol) - return Standard_True; - if (gp_Vec2d(aPoint, theStart).IsOpposite(gp_Vec2d(aPoint, theEnd), anAngTol)) - return Standard_True; -#endif // Porting to DEV version of OCCT 10.02.2017 END } return Standard_False; diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx index bd2ece120..32dcbdc62 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.cxx @@ -149,7 +149,7 @@ static void addEdgeRelation(TopTools_DataMapOfShapeShape& theMap, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_Fillet1dDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -258,11 +258,7 @@ Standard_Integer GEOMImpl_Fillet1dDriver::Execute(LOGBOOK& log) const } aFunction->SetValue(aResult); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -449,4 +445,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet1dDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx index c530e1171..a4600de07 100644 --- a/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet1dDriver.hxx @@ -39,9 +39,9 @@ public: Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT virtual bool GetCreationInformation(std::string& theOperationName, @@ -51,7 +51,7 @@ private: Standard_EXPORT bool MakeFillet(const TopoDS_Wire&, const TopTools_ListOfShape&, const Standard_Real, bool, TopoDS_Wire&) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet1dDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx index 28b54364d..e1267a0f7 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.cxx @@ -61,7 +61,7 @@ GEOMImpl_Fillet2dDriver::GEOMImpl_Fillet2dDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_Fillet2dDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,11 +165,7 @@ Standard_Integer GEOMImpl_Fillet2dDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -209,4 +205,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_Fillet2dDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx index ab30ca0bc..cde717bd6 100755 --- a/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_Fillet2dDriver.hxx @@ -32,9 +32,9 @@ class GEOMImpl_Fillet2dDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_Fillet2dDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_Fillet2dDriver() {}; @@ -43,7 +43,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_Fillet2dDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index 6a903c635..40f27b7fa 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx @@ -67,7 +67,7 @@ GEOMImpl_FilletDriver::GEOMImpl_FilletDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FilletDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -147,11 +147,7 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -218,4 +214,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FilletDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx index 6d5d58462..a69230b1b 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_FilletDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FilletDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FilletDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FilletDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index 3175f6e65..bd1109aea 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -28,8 +28,6 @@ #include -#include - #include #include #include @@ -94,7 +92,7 @@ GEOMImpl_FillingDriver::GEOMImpl_FillingDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_FillingDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -357,11 +355,7 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -413,4 +407,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_FillingDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx index 62a466d98..2167a3461 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_FillingDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_FillingDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_FillingDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_FillingDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index a9c72ec93..6d56d9355 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -34,8 +34,6 @@ #include "GEOMAlgo_CoupleOfShapes.hxx" #include "GEOMAlgo_ListOfCoupleOfShapes.hxx" -#include - #include "utilities.h" #include @@ -739,7 +737,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueByList (const TopoDS_Shape& theShape, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_GlueDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -824,11 +822,7 @@ Standard_Integer GEOMImpl_GlueDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif if (!aWrn.IsEmpty()) { Standard_Failure::Raise(aWrn.ToCString()); @@ -886,4 +880,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_GlueDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx index ab132e8d8..ffa5fb83a 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx @@ -40,9 +40,9 @@ class GEOMImpl_GlueDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_GlueDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_GlueDriver() {}; @@ -78,7 +78,7 @@ public: const TopTools_MapOfShape& theShapesList, const Standard_Boolean doGlueAllEdges); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_GlueDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index db43dcf43..c75a775b2 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx @@ -98,7 +98,7 @@ GEOMImpl_HealingDriver::GEOMImpl_HealingDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_HealingDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -163,11 +163,7 @@ Standard_Integer GEOMImpl_HealingDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -1161,4 +1157,4 @@ void GEOMImpl_HealingDriver::SaveStatistics( const ShHealOper_Tool& healer, bool *stats = healer.GetStatistics(); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_HealingDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx index eeaa2a35c..235fdf8e1 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx @@ -47,9 +47,9 @@ public: Standard_EXPORT static const Standard_GUID& GetID(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static Standard_Boolean AreEdgesC1 (const TopoDS_Edge& E1, const TopoDS_Edge& E2); Standard_EXPORT static void FuseCollinearEdges (const TopoDS_Shape&, @@ -59,7 +59,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_HealingDriver,GEOM_BaseDriver) private: Standard_Boolean ShapeProcess ( GEOMImpl_IHealing*, const TopoDS_Shape&, TopoDS_Shape& ) const; diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index ba87e9c4f..0a1a786b7 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -22,8 +22,6 @@ #include -#include - #include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index 1dc269f68..2817ef568 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -24,8 +24,6 @@ #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index db35fe4a4..111f7dc69 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -46,8 +46,6 @@ #include #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx index 19812c257..8e950aa14 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx @@ -35,8 +35,6 @@ #include #include -#include - #include #include "utilities.h" diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index 3d9bf31ad..89dc6cf0d 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -62,8 +62,6 @@ #include "GEOMImpl_IIsoline.hxx" #include "GEOMImpl_PolylineDumper.hxx" -#include - #include "utilities.h" #include @@ -1513,9 +1511,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2D // Compute the isoline curve try { -#if OCC_VERSION_LARGE > 0x06010000 OCC_CATCH_SIGNALS; -#endif if (!GetSolver()->ComputeFunction(aFunction)) { SetErrorCode("Polyline driver failed"); return NULL; @@ -1592,9 +1588,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2DOnPlane //Compute the isoline curve try { -#if OCC_VERSION_LARGE > 0x06010000 OCC_CATCH_SIGNALS; -#endif if (!GetSolver()->ComputeFunction(aFunction)) { SetErrorCode("Polyline driver failed"); return NULL; diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index baf47d45d..6a6d99829 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -37,8 +37,6 @@ #include #include -#include - #include #include #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 8da09ad37..90acf17a6 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -40,8 +40,6 @@ #include #include "GEOM_ISubShape.hxx" -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx index c4e41b09b..def40028c 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx @@ -28,8 +28,6 @@ #include "GEOM_Object.hxx" #include "GEOM_Field.hxx" -#include - #include "Utils_SALOME_Exception.hxx" #include diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index fdd3c307b..309c2bcc7 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -45,8 +45,6 @@ #include #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index ad2f75f9f..8b87bd8cf 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -20,8 +20,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include - #include #include #include @@ -43,10 +41,8 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x07010000 #include #include -#endif #include #include #include @@ -55,10 +51,8 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x06090000 #include #include -#endif #include #include #include @@ -1576,39 +1570,22 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersections // 1. Launch the checker aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 Standard_Boolean iErr = aCSI.HasErrors(); -#else - Standard_Integer iErr = aCSI.ErrorStatus(); -#endif // Standard_Integer aNbS, n1, n2; -#if OCC_VERSION_LARGE > 0x07010000 BOPDS_MapIteratorOfMapOfPair aItMPK; -#else - BOPDS_MapIteratorMapOfPassKey aItMPK; -#endif // // 2. Take the shapes from DS const BOPDS_DS& aDS = aCSI.DS(); aNbS=aDS.NbShapes(); // // 3. Get the pairs of interfered shapes -#if OCC_VERSION_LARGE > 0x07010000 const BOPDS_MapOfPair& aMPK=aDS.Interferences(); -#else - const BOPDS_MapOfPassKey& aMPK=aDS.Interferences(); -#endif aItMPK.Initialize(aMPK); for (; aItMPK.More(); aItMPK.Next()) { -#if OCC_VERSION_LARGE > 0x07010000 const BOPDS_Pair& aPK=aItMPK.Value(); aPK.Indices(n1, n2); -#else - const BOPDS_PassKey& aPK=aItMPK.Value(); - aPK.Ids(n1, n2); -#endif // if (n1 > aNbS || n2 > aNbS){ return false; // Error @@ -1663,7 +1640,6 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersectionsFast TopTools_IndexedMapOfShape anIndices; TopExp::MapShapes(aScopy, anIndices); -#if OCC_VERSION_LARGE > 0x06090000 // Checker of fast interferences BRepExtrema_SelfIntersection aTool(aScopy, (theTolerance <= 0.) ? 0.0 : theTolerance); @@ -1691,7 +1667,6 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersectionsFast if (aTool.IsDone()) SetErrorCode(OK); -#endif return theIntersections->IsEmpty(); } @@ -1794,21 +1769,13 @@ bool GEOMImpl_IMeasureOperations::FastIntersect (Handle(GEOM_Object) theShape1, aBSP.Perform(); // 2. Get sets of IDs of overlapped faces -#if OCC_VERSION_LARGE > 0x06090000 for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next()) -#else - for (BRepExtrema_OverlappedSubShapes::Iterator anIt1 (aBSP.OverlapSubShapes1()); anIt1.More(); anIt1.Next()) -#endif { const TopoDS_Shape& aS1 = aBSP.GetSubShape1(anIt1.Key()); theIntersections1->Append(anIndices1.FindIndex(aS1)); } -#if OCC_VERSION_LARGE > 0x06090000 for (BRepExtrema_MapOfIntegerPackedMapOfInteger::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next()) -#else - for (BRepExtrema_OverlappedSubShapes::Iterator anIt2 (aBSP.OverlapSubShapes2()); anIt2.More(); anIt2.Next()) -#endif { const TopoDS_Shape& aS2 = aBSP.GetSubShape2(anIt2.Key()); theIntersections2->Append(anIndices2.FindIndex(aS2)); diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 34af46dff..0a3c2d831 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -46,8 +46,6 @@ #include #include -#include - #include "utilities.h" #include #include diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index 867845185..3a7159a2f 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -55,7 +55,7 @@ GEOMImpl_ImportDriver::GEOMImpl_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -76,11 +76,7 @@ Standard_Integer GEOMImpl_ImportDriver::Execute(LOGBOOK& log) const Handle(GEOM_Object) anImported = Handle(GEOM_Object)::DownCast( aSeq->Value(1) ); TopoDS_Shape aShape = anImported->GetValue(); aFunction->SetValue( aShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -110,4 +106,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ImportDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx index 9016284d6..31fb62b1b 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ImportDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ImportDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ImportDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ImportDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index bddbe3ec2..a5c42940c 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx @@ -68,7 +68,7 @@ GEOMImpl_LineDriver::GEOMImpl_LineDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_LineDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -177,11 +177,7 @@ Standard_Integer GEOMImpl_LineDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -224,4 +220,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_LineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx index a873a825b..567b38381 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_LineDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_LineDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_LineDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_LineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index 80d046394..36332dbea 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx @@ -74,7 +74,7 @@ GEOMImpl_MarkerDriver::GEOMImpl_MarkerDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_MarkerDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -157,11 +157,7 @@ Standard_Integer GEOMImpl_MarkerDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -211,4 +207,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MarkerDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx index 4ee615bb8..5fd49222a 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_MarkerDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_MarkerDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_MarkerDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_MarkerDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index 9be99da0a..ab3c01973 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -84,7 +84,7 @@ GEOMImpl_MeasureDriver::GEOMImpl_MeasureDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_MeasureDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -317,11 +317,7 @@ Standard_Integer GEOMImpl_MeasureDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -369,4 +365,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MeasureDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx index 2524d54f9..fa03f349b 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_MeasureDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_MeasureDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_MeasureDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_MeasureDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index b4364a39d..96efab24d 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx @@ -73,7 +73,7 @@ GEOMImpl_MirrorDriver::GEOMImpl_MirrorDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_MirrorDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -156,11 +156,7 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -206,4 +202,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_MirrorDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx index ca2f3d766..555fec652 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_MirrorDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_MirrorDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_MirrorDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_MirrorDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 6fd616265..413ccff7c 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -60,7 +60,7 @@ GEOMImpl_OffsetDriver::GEOMImpl_OffsetDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -180,11 +180,7 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -232,4 +228,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_OffsetDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx index f0312c941..913e45538 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_OffsetDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_OffsetDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_OffsetDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_OffsetDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 5a95d6ec4..0988e6ddc 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -44,9 +44,7 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x07010001 #include -#endif #include #include #include @@ -109,11 +107,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape) aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); aCSI.SetArguments(aList); aCSI.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aCSI.HasErrors() || aCSI.DS().Interferences().Extent() > 0) { -#else - if (aCSI.ErrorStatus() || aCSI.DS().Interferences().Extent() > 0) { -#endif StdFail_NotDone::Raise("Partition operation will not be performed, because argument shape is self-intersected"); } } @@ -122,7 +116,7 @@ static void CheckSelfIntersection(const TopoDS_Shape &theShape) //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -417,11 +411,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const aShape = PS.Shape(); if (aShape.IsNull()) { // Mantis issue 22009 -#if OCC_VERSION_LARGE > 0x07010001 if (PS.HasError(STANDARD_TYPE(BOPAlgo_AlertTooFewArguments)) && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1) -#else - if (PS.ErrorStatus() == 100 && PS.Tools().Extent() == 0 && PS.Arguments().Extent() == 1) -#endif aShape = PS.Arguments().First(); else return 0; @@ -507,11 +497,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(LOGBOOK& log) const } } -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -569,4 +555,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PartitionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx index 4e34d1ba6..c7d7848b5 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PartitionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PartitionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PartitionDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PartitionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index ca48f41bf..655d7a796 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -3021,7 +3021,7 @@ static bool CreateGroups2(const TopoDS_Shape &theProfile, //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PipeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -3375,11 +3375,7 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(LOGBOOK& log) const TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape); aFunction->SetValue(aRes); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -3458,4 +3454,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipeDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx index 43eeb1741..ac2df1640 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx @@ -39,9 +39,9 @@ class GEOMImpl_PipeDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PipeDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK& log) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK& log) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)& log) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)& log) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipeDriver() {}; @@ -59,7 +59,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipeDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx index 521795203..06664db5b 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.cxx @@ -53,7 +53,7 @@ GEOMImpl_PipePathDriver::GEOMImpl_PipePathDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PipePathDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -120,11 +120,7 @@ Standard_Integer GEOMImpl_PipePathDriver::Execute(LOGBOOK& log) const if (aRes.IsNull()) return 0; aFunction->SetValue(aRes); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -165,4 +161,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PipePathDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx index e4efdaf83..b07de6be1 100644 --- a/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipePathDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PipePathDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PipePathDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PipePathDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PipePathDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 3fc0821e0..f5603b35c 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -29,8 +29,6 @@ #include -#include - // OCCT Includes #include #include @@ -80,7 +78,7 @@ GEOMImpl_PlaneDriver::GEOMImpl_PlaneDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PlaneDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -238,11 +236,7 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -305,4 +299,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PlaneDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx index 6846ceaa9..1c76a3202 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PlaneDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PlaneDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PlaneDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PlaneDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index 0e73047d9..908076627 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx @@ -110,7 +110,7 @@ static Standard_Boolean getExtremaSolution //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PointDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -362,11 +362,7 @@ Standard_Integer GEOMImpl_PointDriver::Execute(LOGBOOK& log) const //aShape.Infinite(Standard_True); // VSR: 05/04/2010: Fix 20668 (Fit All for points & lines) aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -442,4 +438,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PointDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx index 371d5ee8b..2d28eaf76 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PointDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PointDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PointDriver() {}; @@ -45,7 +45,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PointDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index e1cfea99e..d9d32a486 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -69,7 +69,7 @@ GEOMImpl_PolylineDriver::GEOMImpl_PolylineDriver() //function : MakePolyline2D //purpose : //======================================================================= -Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const +Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) { return 0; @@ -178,11 +178,7 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const } aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -191,7 +187,7 @@ Standard_Integer GEOMImpl_PolylineDriver::MakePolyline2D(LOGBOOK& log) const //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PolylineDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -276,11 +272,7 @@ Standard_Integer GEOMImpl_PolylineDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -445,4 +437,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PolylineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx index 5bee45c8b..39115d242 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PolylineDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PolylineDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PolylineDriver() {}; @@ -47,9 +47,9 @@ public: std::vector& params); private: - Standard_Integer MakePolyline2D(LOGBOOK& log) const; + Standard_Integer MakePolyline2D(Handle(TFunction_Logbook)& log) const; - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PolylineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index 7c3f9a7fd..e84ca1eb0 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx @@ -90,7 +90,7 @@ GEOMImpl_PositionDriver::GEOMImpl_PositionDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PositionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -214,11 +214,7 @@ Standard_Integer GEOMImpl_PositionDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -266,4 +262,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PositionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx index 6f6639384..cd0ea863b 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_PositionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_PositionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_PositionDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PositionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index 89f466df0..c70ba4969 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -95,7 +95,7 @@ GEOMImpl_PrismDriver::GEOMImpl_PrismDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_PrismDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -256,11 +256,7 @@ Standard_Integer GEOMImpl_PrismDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aRes); } -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -559,4 +555,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_PrismDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx index 8712ede83..c992ca367 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx @@ -41,9 +41,9 @@ public: Standard_EXPORT GEOMImpl_PrismDriver(); Standard_EXPORT ~GEOMImpl_PrismDriver() {}; - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate (LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute (const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate (Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute (const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); @@ -65,7 +65,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_PrismDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index c9cde5f0f..966ebc824 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -93,7 +93,7 @@ GEOMImpl_ProjectionDriver::GEOMImpl_ProjectionDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ProjectionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -247,11 +247,7 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif } else if (aType == PROJECTION_ON_WIRE) { // Perform projection of point on a wire or an edge. GEOMImpl_IProjection aProj (aFunction); @@ -713,11 +709,7 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder } // Transform the curve to cylinder's parametric space. -#if OCC_VERSION_MAJOR < 7 - GEOMUtils::Handle(HTrsfCurve2d) aTrsfCurve = -#else Handle(GEOMUtils::HTrsfCurve2d) aTrsfCurve = -#endif new GEOMUtils::HTrsfCurve2d(aCurve, aPar[0], aPar[1], aTrsf2d); Approx_Curve2d aConv (aTrsfCurve, aPar[0], aPar[1], aUResol, aVResol, GeomAbs_C1, @@ -807,4 +799,4 @@ TopoDS_Shape GEOMImpl_ProjectionDriver::projectOnCylinder return aResult; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ProjectionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx index ec2050c63..7abaf8208 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.hxx @@ -37,9 +37,9 @@ class GEOMImpl_ProjectionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ProjectionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ProjectionDriver() {}; @@ -48,7 +48,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ProjectionDriver,GEOM_BaseDriver) private: diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index 19426f389..38788bdde 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx @@ -72,7 +72,7 @@ GEOMImpl_RevolutionDriver::GEOMImpl_RevolutionDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_RevolutionDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -133,11 +133,7 @@ Standard_Integer GEOMImpl_RevolutionDriver::Execute(LOGBOOK& log) const TopoDS_Shape aRes = GEOMUtils::CompsolidToCompound(aShape); aFunction->SetValue(aRes); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -175,4 +171,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RevolutionDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx index 72bf2c47d..9ed1655f3 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_RevolutionDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_RevolutionDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_RevolutionDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_RevolutionDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index 6da731792..8811fde53 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx @@ -79,7 +79,7 @@ GEOMImpl_RotateDriver::GEOMImpl_RotateDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_RotateDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -311,11 +311,7 @@ Standard_Integer GEOMImpl_RotateDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -381,4 +377,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_RotateDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx index 547881ae3..c0736535d 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_RotateDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_RotateDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_RotateDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_RotateDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index fbfc99845..f3bbc3e5d 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_ScaleDriver::GEOMImpl_ScaleDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ScaleDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -173,11 +173,7 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -222,4 +218,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ScaleDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx index 1d29154e6..77a768929 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ScaleDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ScaleDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ScaleDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ScaleDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 13544e81b..06b7fdc95 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -408,7 +408,7 @@ GEOMImpl_ShapeDriver::GEOMImpl_ShapeDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -770,11 +770,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const aMV.SetArguments(aLS); aMV.SetIntersect(aCI.GetIsIntersect()); aMV.Perform(); -#if OCC_VERSION_LARGE > 0x07010001 if (aMV.HasErrors()) return 0; -#else - if (aMV.ErrorStatus()) return 0; -#endif aShape = aMV.Shape(); } @@ -1083,11 +1079,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif if (!aWarning.IsEmpty()) Standard_Failure::Raise(aWarning.ToCString()); @@ -2034,7 +2026,7 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ShapeDriver,GEOM_BaseDriver); //modified by NIZNHY-PKV Wed Dec 28 13:48:31 2011f #include diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 489d2f2fb..6af068f6e 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -44,9 +44,9 @@ public: Standard_EXPORT GEOMImpl_ShapeDriver(); Standard_EXPORT ~GEOMImpl_ShapeDriver() {}; - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); @@ -61,7 +61,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ShapeDriver,GEOM_BaseDriver) private: diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index dc4270c30..ed5f99565 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx @@ -63,7 +63,7 @@ GEOMImpl_SketcherDriver::GEOMImpl_SketcherDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_SketcherDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -127,11 +127,7 @@ Standard_Integer GEOMImpl_SketcherDriver::Execute(LOGBOOK& log) const // set the function result aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -181,4 +177,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SketcherDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx index 7974f6f28..c95977a30 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_SketcherDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_SketcherDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_SketcherDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_SketcherDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index 2c514ef65..82d256285 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx @@ -58,7 +58,7 @@ GEOMImpl_SphereDriver::GEOMImpl_SphereDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_SphereDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -97,11 +97,7 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -139,4 +135,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SphereDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx index 300e8bb06..315852b4a 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_SphereDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_SphereDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_SphereDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_SphereDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index 317127015..ccc9a793f 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -128,7 +128,7 @@ GEOMImpl_SplineDriver::GEOMImpl_SplineDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_SplineDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -325,11 +325,7 @@ Standard_Integer GEOMImpl_SplineDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -401,4 +397,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_SplineDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx index 507d40848..95a490281 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_SplineDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_SplineDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_SplineDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_SplineDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx index 6a53822bf..c72b15eb6 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_ThruSectionsDriver::GEOMImpl_ThruSectionsDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -133,11 +133,7 @@ Standard_Integer GEOMImpl_ThruSectionsDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -175,4 +171,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx index 6aad13272..47d8072cf 100644 --- a/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ThruSectionsDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_ThruSectionsDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_ThruSectionsDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_ThruSectionsDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_ThruSectionsDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index 119712a49..be4ef43e1 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx @@ -65,7 +65,7 @@ GEOMImpl_TorusDriver::GEOMImpl_TorusDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_TorusDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -115,11 +115,7 @@ Standard_Integer GEOMImpl_TorusDriver::Execute(LOGBOOK& log) const if (aShape.IsNull()) return 0; aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -160,4 +156,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TorusDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx index 179868182..e0ab7f6ff 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_TorusDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_TorusDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_TorusDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_TorusDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index a3370f64c..b8354ba16 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx @@ -64,7 +64,7 @@ GEOMImpl_TranslateDriver::GEOMImpl_TranslateDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_TranslateDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -241,11 +241,7 @@ Standard_Integer GEOMImpl_TranslateDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -318,4 +314,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_TranslateDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx index 1f3469892..a61c215cd 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_TranslateDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_TranslateDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_TranslateDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_TranslateDriver,GEOM_BaseDriver) }; #endif diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index b825c206f..494622175 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -81,7 +81,7 @@ GEOMImpl_VectorDriver::GEOMImpl_VectorDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const +Standard_Integer GEOMImpl_VectorDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); @@ -165,11 +165,7 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(LOGBOOK& log) const aFunction->SetValue(aShape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -223,4 +219,4 @@ GetCreationInformation(std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_VectorDriver,GEOM_BaseDriver); diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx index 3d5c86a97..396d2e203 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx @@ -35,9 +35,9 @@ class GEOMImpl_VectorDriver : public GEOM_BaseDriver { public: Standard_EXPORT GEOMImpl_VectorDriver(); - Standard_EXPORT virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_EXPORT virtual void Validate(LOGBOOK&) const {} - Standard_EXPORT Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } + Standard_EXPORT virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_EXPORT virtual void Validate(Handle(TFunction_Logbook)&) const {} + Standard_EXPORT Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } Standard_EXPORT static const Standard_GUID& GetID(); Standard_EXPORT ~GEOMImpl_VectorDriver() {}; @@ -46,7 +46,7 @@ public: bool GetCreationInformation(std::string& theOperationName, std::vector& params); - OCCT_DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(GEOMImpl_VectorDriver,GEOM_BaseDriver) }; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 67ed48db0..05f27880a 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -55,8 +55,6 @@ #include #endif -#include - #include #include diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx index 58a79a562..245715152 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx @@ -26,8 +26,6 @@ #include #include -#include - #include #include #include diff --git a/src/GEOMUtils/GEOMUtils.cxx b/src/GEOMUtils/GEOMUtils.cxx index 27d89edda..3c1761027 100644 --- a/src/GEOMUtils/GEOMUtils.cxx +++ b/src/GEOMUtils/GEOMUtils.cxx @@ -24,8 +24,6 @@ #include -#include - #include #include @@ -96,9 +94,7 @@ #include #include -#if OCC_VERSION_LARGE >= 0x07010000 #include -#endif #include #include diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx index c31cf3dae..7180c2950 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.cxx @@ -21,7 +21,7 @@ #include namespace GEOMUtils { - OCCT_IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); + IMPLEMENT_STANDARD_RTTIEXT(HTrsfCurve2d, Adaptor2d_HCurve2d); } //======================================================================= diff --git a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx index ce7f0b4f8..8d1b69c87 100644 --- a/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_HTrsfCurve2d.hxx @@ -73,7 +73,7 @@ namespace GEOMUtils public: - OCCT_DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d) + DEFINE_STANDARD_RTTIEXT(HTrsfCurve2d,Adaptor2d_HCurve2d) }; } diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx index 6c51082ef..185672eda 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.cxx @@ -139,11 +139,7 @@ Handle(Adaptor2d_HCurve2d) GEOMUtils::TrsfCurve2d::Trim const Standard_Real /*Tol*/) const { Handle(Geom2d_Curve) aCurve = myCurve.Curve(); -#if OCC_VERSION_MAJOR < 7 - GEOMUtils::Handle(HTrsfCurve2d) aAHCurve = -#else Handle(GEOMUtils::HTrsfCurve2d) aAHCurve = -#endif new GEOMUtils::HTrsfCurve2d(aCurve, First, Last, myTrsf); return aAHCurve; diff --git a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx index 9d14fc760..59538094f 100644 --- a/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx +++ b/src/GEOMUtils/GEOMUtils_TrsfCurve2d.hxx @@ -22,8 +22,6 @@ #include -#include - #include #include #include diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc index abf15301f..5dce2cc26 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.cc +++ b/src/GEOM_I/GEOM_BaseObject_i.cc @@ -51,7 +51,7 @@ GEOM_BaseObject_i::GEOM_BaseObject_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_BaseObject) theImpl) + Handle(::GEOM_BaseObject) theImpl) : SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl) { } @@ -181,7 +181,7 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetDependency() TCollection_AsciiString anEntry; for (int i = 1; i<=aLength; i++) { - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i)); + Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i)); if (anObj.IsNull()) continue; TDF_Tool::Entry(anObj->GetEntry(), anEntry); GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), (char*) anEntry.ToCString()); @@ -211,7 +211,7 @@ GEOM::ListOfGBO* GEOM_BaseObject_i::GetLastDependency() TCollection_AsciiString anEntry; for (int i = 1; i<=aLength; i++) { - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aSeq->Value(i)); + Handle(::GEOM_BaseObject) anObj = Handle(::GEOM_BaseObject)::DownCast(aSeq->Value(i)); if (anObj.IsNull()) continue; GEOM::GEOM_BaseObject_var obj = _engine->GetObject(anObj->GetDocID(), anObj->GetEntryString().ToCString()); @@ -277,8 +277,8 @@ GEOM::CreationInformationSeq* GEOM_BaseObject_i::GetCreationInformation() int nbI = 0; for ( int i = 1; i <= nbFun; ++i ) { - HANDLE_NAMESPACE(GEOM_BaseDriver) driver = - HANDLE_NAMESPACE(GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i )); + Handle(::GEOM_BaseDriver) driver = + Handle(::GEOM_BaseDriver)::DownCast( _impl->GetCreationDriver( i )); if ( !driver.IsNull() ) { std::vector params; diff --git a/src/GEOM_I/GEOM_BaseObject_i.hh b/src/GEOM_I/GEOM_BaseObject_i.hh index a9966da60..f3875eb0c 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.hh +++ b/src/GEOM_I/GEOM_BaseObject_i.hh @@ -37,7 +37,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject, public virtual SALOME::GenericObj_i { public: - GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_BaseObject) theImpl); + GEOM_BaseObject_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_BaseObject) theImpl); ~GEOM_BaseObject_i(); virtual char* GetEntry(); @@ -68,7 +68,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject virtual GEOM::CreationInformationSeq* GetCreationInformation(); - HANDLE_NAMESPACE(GEOM_BaseObject) GetImpl() { return _impl; } + Handle(::GEOM_BaseObject) GetImpl() { return _impl; } protected: @@ -76,7 +76,7 @@ class GEOM_I_EXPORT GEOM_BaseObject_i : public virtual POA_GEOM::GEOM_BaseObject private: - HANDLE_NAMESPACE(GEOM_BaseObject) _impl; + Handle(::GEOM_BaseObject) _impl; }; #endif diff --git a/src/GEOM_I/GEOM_Field_i.cc b/src/GEOM_I/GEOM_Field_i.cc index 6b0f6ca44..48a7858c3 100644 --- a/src/GEOM_I/GEOM_Field_i.cc +++ b/src/GEOM_I/GEOM_Field_i.cc @@ -39,7 +39,7 @@ GEOM_Field_i::GEOM_Field_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_Field) theImpl): + Handle(::GEOM_Field) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), _impl( theImpl ) @@ -66,7 +66,7 @@ GEOM_Field_i::~GEOM_Field_i() GEOM::GEOM_Object_ptr GEOM_Field_i::GetShape() { GEOM::GEOM_Object_var shapeVar; - HANDLE_NAMESPACE(GEOM_Object) shape = _impl->GetShape(); + Handle(::GEOM_Object) shape = _impl->GetShape(); if ( !shape.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( shape->GetDocID(), @@ -135,7 +135,7 @@ GEOM::string_array* GEOM_Field_i::GetComponents() GEOM::GEOM_FieldStep_ptr GEOM_Field_i::AddStep(::CORBA::Long stepID, ::CORBA::Long stamp) { GEOM::GEOM_FieldStep_var stepVar; - HANDLE_NAMESPACE(GEOM_FieldStep) step = _impl->AddStep( stepID, stamp ); + Handle(::GEOM_FieldStep) step = _impl->AddStep( stepID, stamp ); if ( !step.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(), @@ -175,8 +175,8 @@ CORBA::Long GEOM_Field_i::CountSteps() GEOM::ListOfLong* GEOM_Field_i::GetSteps() { - std::list< HANDLE_NAMESPACE(GEOM_FieldStep)> stepList = _impl->GetSteps(); - std::list< HANDLE_NAMESPACE(GEOM_FieldStep)>::iterator stp = stepList.begin(); + std::list< Handle(::GEOM_FieldStep)> stepList = _impl->GetSteps(); + std::list< Handle(::GEOM_FieldStep)>::iterator stp = stepList.begin(); GEOM::ListOfLong_var stepIds = new GEOM::ListOfLong(); stepIds->length( stepList.size() ); @@ -198,7 +198,7 @@ GEOM::ListOfLong* GEOM_Field_i::GetSteps() GEOM::GEOM_FieldStep_ptr GEOM_Field_i::GetStep(CORBA::Long stepID) { GEOM::GEOM_FieldStep_var stepVar; - HANDLE_NAMESPACE(GEOM_FieldStep) step = _impl->GetStep(stepID); + Handle(::GEOM_FieldStep) step = _impl->GetStep(stepID); if ( !step.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( step->GetDocID(), @@ -229,7 +229,7 @@ CORBA::Long GEOM_Field_i::GetArraySize() GEOM_FieldStep_i::GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): + Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), _impl( theImpl ) @@ -288,7 +288,7 @@ void GEOM_FieldStep_i::SetStamp(::CORBA::Long stamp) GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField() { GEOM::GEOM_Field_var fieldVar; - HANDLE_NAMESPACE(GEOM_Field) field = _impl->GetField(); + Handle(::GEOM_Field) field = _impl->GetField(); if ( !field.IsNull() ) { GEOM::GEOM_BaseObject_var obj = _engine->GetObject( field->GetDocID(), @@ -304,7 +304,7 @@ GEOM::GEOM_Field_ptr GEOM_FieldStep_i::GetField() */ //================================================================================ -GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_BoolFieldStep_i::GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) @@ -355,7 +355,7 @@ GEOM::short_array* GEOM_BoolFieldStep_i::GetValues() */ //================================================================================ -GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_IntFieldStep_i::GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) @@ -406,7 +406,7 @@ GEOM::ListOfLong* GEOM_IntFieldStep_i::GetValues() */ //================================================================================ -GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_DoubleFieldStep_i::GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) @@ -457,7 +457,7 @@ GEOM::ListOfDouble* GEOM_DoubleFieldStep_i::GetValues() */ //================================================================================ -GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl): +GEOM_StringFieldStep_i::GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl): SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), GEOM_FieldStep_i( thePOA, theEngine, theImpl ) diff --git a/src/GEOM_I/GEOM_Field_i.hh b/src/GEOM_I/GEOM_Field_i.hh index c60641174..c1f26d541 100644 --- a/src/GEOM_I/GEOM_Field_i.hh +++ b/src/GEOM_I/GEOM_Field_i.hh @@ -39,7 +39,7 @@ class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public virtual GEOM_BaseObject_i { public: - GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_Field) theImpl); + GEOM_Field_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_Field) theImpl); ~GEOM_Field_i(); virtual GEOM::GEOM_Object_ptr GetShape(); @@ -56,7 +56,7 @@ class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public v private: - HANDLE_NAMESPACE(GEOM_Field) _impl; + Handle(::GEOM_Field) _impl; }; //================================================================================ @@ -66,7 +66,7 @@ class GEOM_I_EXPORT GEOM_Field_i : public virtual POA_GEOM::GEOM_Field, public v class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, public virtual GEOM_BaseObject_i { public: - GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_FieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); ~GEOM_FieldStep_i(); virtual void SetStamp(::CORBA::Long stamp); @@ -77,7 +77,7 @@ class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, protected: - HANDLE_NAMESPACE(GEOM_FieldStep) _impl; + Handle(::GEOM_FieldStep) _impl; }; //================================================================================ @@ -87,7 +87,7 @@ class GEOM_I_EXPORT GEOM_FieldStep_i : public virtual POA_GEOM::GEOM_FieldStep, class GEOM_I_EXPORT GEOM_BoolFieldStep_i : public virtual POA_GEOM::GEOM_BoolFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_BoolFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::short_array& boolValues); virtual GEOM::short_array* GetValues(); @@ -100,7 +100,7 @@ class GEOM_I_EXPORT GEOM_BoolFieldStep_i : public virtual POA_GEOM::GEOM_BoolFie class GEOM_I_EXPORT GEOM_IntFieldStep_i : public virtual POA_GEOM::GEOM_IntFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_IntFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::ListOfLong& intValues); virtual GEOM::ListOfLong* GetValues(); @@ -113,7 +113,7 @@ class GEOM_I_EXPORT GEOM_IntFieldStep_i : public virtual POA_GEOM::GEOM_IntField class GEOM_I_EXPORT GEOM_DoubleFieldStep_i : public virtual POA_GEOM::GEOM_DoubleFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_DoubleFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::ListOfDouble& doubleValues); virtual GEOM::ListOfDouble* GetValues(); @@ -126,7 +126,7 @@ class GEOM_I_EXPORT GEOM_DoubleFieldStep_i : public virtual POA_GEOM::GEOM_Doubl class GEOM_I_EXPORT GEOM_StringFieldStep_i : public virtual POA_GEOM::GEOM_StringFieldStep, public virtual GEOM_FieldStep_i { public: - GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_FieldStep) theImpl); + GEOM_StringFieldStep_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_FieldStep) theImpl); virtual ::CORBA::Boolean SetValues(const ::GEOM::string_array& strValues); virtual GEOM::string_array* GetValues(); diff --git a/src/GEOM_I/GEOM_GEOM_I.hxx b/src/GEOM_I/GEOM_GEOM_I.hxx index 6da092805..e37504900 100755 --- a/src/GEOM_I/GEOM_GEOM_I.hxx +++ b/src/GEOM_I/GEOM_GEOM_I.hxx @@ -20,12 +20,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : GEOM_GEOM_I.hxx -// Author : Alexander A. BORODIN -// Module : GEOM -// -#ifndef _GEOM_GEOM_I_HXX_ -#define _GEOM_GEOM_I_HXX_ +#ifndef GEOM_GEOM_I_HXX +#define GEOM_GEOM_I_HXX #ifdef WIN32 #if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS @@ -37,11 +33,4 @@ #define GEOM_I_EXPORT #endif -#include -#if OCC_VERSION_MAJOR < 7 - #define HANDLE_NAMESPACE(CLS) Handle(CLS) -#else - #define HANDLE_NAMESPACE(CLS) Handle(::CLS) -#endif - -#endif //_GEOM_GEOM_I_HXX_ +#endif // GEOM_GEOM_I_HXX diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 782124624..63064b051 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -178,7 +178,7 @@ char* GEOM_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObject = + Handle(::GEOM_BaseObject) anObject = _impl->GetObject(aStudy->StudyId(), aLocalPersistentID); if ( !anObject.IsNull() ) { @@ -264,7 +264,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, { // recieve current TopoDS shape CORBA::String_var entry = aShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aGShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( aShape->GetStudyID(), entry )); TopoDS_Shape TopoSh = aGShape->GetValue(); // find label of main shape @@ -273,7 +273,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, aMainSh = aMainSh->GetMainShape(); } entry = aMainSh->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry ); + Handle(::GEOM_BaseObject) anObj = _impl->GetObject( aMainSh->GetStudyID(), entry ); TDF_Label aMainLbl = anObj->GetFunction(1)->GetNamingEntry(); // check all named shapes using iterator @@ -461,7 +461,7 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::ListOfGO_var aResList) { CORBA::String_var entry = theMainShape->GetEntry(); - //HANDLE_NAMESPACE(GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry); + //Handle(::GEOM_Object) aMainShape = _impl->GetObject(theMainShape->GetStudyID(), entry); Handle(TColStd_HArray1OfInteger) anArray; if(SeqS.Length()>0) { // create a group @@ -469,9 +469,9 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_wrap GrObj = GOp->CreateGroup( theMainShape, SeqS(1).ShapeType() ); AddInStudy(theStudy, GrObj, GrName, theMainShape._retn()); //CORBA::String_var GrEntry = GrObj->GetEntry(); - //HANDLE_NAMESPACE(GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry); + //Handle(::GEOM_Object) HGrObj = _impl->GetObject(GrObj->GetStudyID(), GrEntry); // add named objects - //HANDLE_NAMESPACE(GEOM_Object) anObj; + //Handle(::GEOM_Object) anObj; for(int i=1; i<=SeqS.Length(); i++) { TopoDS_Shape aValue = SeqS.Value(i); //anArray = new TColStd_HArray1OfInteger(1,1); @@ -480,7 +480,7 @@ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GOp->AddObject(GrObj,anIndex); //anObj = GEOM_Engine::GetEngine()->AddObject(aMainShape->GetDocID(), GEOM_SUBSHAPE); //if (anObj.IsNull()) continue; - //HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); + //Handle(::GEOM_Function) aFunction = anObj->AddFunction(GEOM_Object::GetSubShapeID(), 1); //if (aFunction.IsNull()) continue; //GEOM_ISubShape aSSI(aFunction); //aSSI.SetMainShape(aMainShape->GetLastFunction()); @@ -514,7 +514,7 @@ GEOM::ListOfGO* GEOM_Gen_i:: if(theMainShape->_is_nil()) return aResList._retn(); CORBA::String_var entry = theMainShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aMainShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( theMainShape->GetStudyID(), entry )); if (aMainShape.IsNull()) return aResList._retn(); TopoDS_Shape MainSh = aMainShape->GetValue(); @@ -600,11 +600,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, if (isMultiFile) aNameWithExt = TCollection_AsciiString((char*)(SALOMEDS_Tool::GetNameFromPath (theComponent->GetStudy()->URL())).c_str()); -#if OCC_VERSION_MAJOR > 6 aNameWithExt += TCollection_AsciiString("_GEOM.cbf"); -#else - aNameWithExt += TCollection_AsciiString("_GEOM.sgd"); -#endif aSeq[0] = CORBA::string_dup(aNameWithExt.ToCString()); // Build a full file name of temporary file TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt; @@ -667,7 +663,6 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, TCollection_AsciiString aNameWithExt(""); SALOMEDS::Study_var study = theComponent->GetStudy(); -#if OCC_VERSION_MAJOR > 6 // Get the file name. int i; int aLength = aSeq->length(); @@ -683,14 +678,6 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, break; } } -#else - if (isMultiFile) { - CORBA::String_var url = study->URL(); - aNameWithExt = (char*)SALOMEDS_Tool::GetNameFromPath(url.in()).c_str(); - } - - aNameWithExt += "_GEOM.sgd"; -#endif TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt); @@ -826,8 +813,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, //Create a new GEOM_Object - HANDLE_NAMESPACE(GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID); - HANDLE_NAMESPACE(GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); + Handle(::GEOM_Object) anObj = _impl->AddObject(aNewSO->GetStudy()->StudyId(), theObjectID); + Handle(::GEOM_Function) aFunction = anObj->AddFunction(GEOMImpl_CopyDriver::GetID(), COPY_WITHOUT_REF); aFunction->SetValue(aTopology); TCollection_AsciiString anEntry; @@ -1145,16 +1132,16 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } /* - HANDLE_NAMESPACE(GEOM_Function) anOFun = theObject->GetLastFunction(); + Handle(::GEOM_Function) anOFun = theObject->GetLastFunction(); if (!anOFun.IsNull()) { CORBA::String_var entryArg = anArgO->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg); + Handle(::GEOM_Object) anArgOImpl = _impl->GetObject(anArgO->GetStudyID(), entryArg); if (!anArgOImpl.IsNull()) { TopoDS_Shape anArgOShape = anArgOImpl->GetValue(); TopoDS_Shape aMultiArgShape; @@ -1189,7 +1176,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, {} } GEOM::GEOM_Object_var anArgOMulti = (aMultiArgShape); // TODO - HANDLE_NAMESPACE(GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); + Handle(::GEOM_Function) anArgOMultiFun = anArgOMulti->GetLastFunction(); anArgOMultiFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOMulti); } @@ -1340,8 +1327,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, aResParts->length(nb); if (nb > 0) { - HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); - HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); + Handle(::GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1356,8 +1343,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); - HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); + Handle(::GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1374,7 +1361,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var anObj = anOutArgs[ i ]; if (CORBA::is_nil(anObj)) continue; - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -1466,8 +1453,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesOneLevel (SALOMEDS::Study_ptr th GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -1742,8 +1729,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anArgO, theObject); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aSubO = aShapesOp->GetInPlace(theObject, anArgOTrsf); } @@ -1886,8 +1873,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu aResParts->length(nb); if (nb > 0) { - HANDLE_NAMESPACE(GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); - HANDLE_NAMESPACE(GEOM_Function) aFunction = aMainObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aMainObj = _impl->GetObject(theObject->GetStudyID(), theObject->GetEntry()); + Handle(::GEOM_Function) aFunction = aMainObj->GetLastFunction(); GEOM::TPythonDump pd (aFunction, true); pd <<"["; int i = 0, j = 0; @@ -1902,8 +1889,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu anObjEntryMap.insert(anEntry); aResParts[nbRes++] = anObj; // clear python dump of object - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); - HANDLE_NAMESPACE(GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anEntry); + Handle(::GEOM_Function) anObjFun = aGeomObj->GetLastFunction(); if ( !anObjFun.IsNull() ) anObjFun->SetDescription( "" ); if ( j > 0 ) @@ -1918,7 +1905,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(SALOMEDS::Study_ptr theStu GEOM::GEOM_Object_var anObj = theArgs[ i ]; if (CORBA::is_nil(anObj)) continue; - HANDLE_NAMESPACE(GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); + Handle(::GEOM_BaseObject) aGeomObj = _impl->GetObject(anObj->GetStudyID(), anObj->GetEntry()); if ( j > 0 ) pd << ", "; pd << aGeomObj; @@ -2018,8 +2005,8 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesOneLevel (SALOMEDS::Study_ptr GEOM::GEOM_Object_var anArgOTrsf = aTrsfOpSv->TransformLikeOtherCopy(anOldSubO, theNewO); if (!CORBA::is_nil(anArgOTrsf)) { CORBA::String_var anArgOTrsfEntry = anArgOTrsf->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); - HANDLE_NAMESPACE(GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); + Handle(::GEOM_BaseObject) anArgOTrsfImpl = _impl->GetObject(anArgOTrsf->GetStudyID(), anArgOTrsfEntry); + Handle(::GEOM_Function) anArgOTrsfFun = anArgOTrsfImpl->GetLastFunction(); anArgOTrsfFun->SetDescription(""); aNewSubO = aShapesOp->GetInPlace(theNewO, anArgOTrsf); } @@ -2556,14 +2543,14 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh if (CORBA::is_nil(theMainShape) || theIndices.length() < 1) return GEOM::GEOM_Object::_nil(); CORBA::String_var entry = theMainShape->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) aMainShape = Handle(::GEOM_Object)::DownCast ( _impl->GetObject( theMainShape->GetStudyID(), entry )); if (aMainShape.IsNull()) return GEOM::GEOM_Object::_nil(); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger(1, theIndices.length()); for(Standard_Integer i = 0; iSetValue(i+1, theIndices[i]); - HANDLE_NAMESPACE(GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); + Handle(::GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); if(anObject.IsNull()) return GEOM::GEOM_Object::_nil(); TCollection_AsciiString anEntry; @@ -2579,7 +2566,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh void GEOM_Gen_i::RemoveObject(GEOM::GEOM_BaseObject_ptr theObject) { CORBA::String_var anEntry = theObject->GetEntry(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false); + Handle(::GEOM_BaseObject) anObject = _impl->GetObject(theObject->GetStudyID(), anEntry, false); if (!anObject.IsNull()) _impl->RemoveObject(anObject); } @@ -2614,7 +2601,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::GetIORFromString(const char* stringIOR) { GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const char* theEntry) { GEOM::GEOM_BaseObject_var obj; - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject(theStudyID, (char*)theEntry); if (handle_object.IsNull()) return obj._retn(); TCollection_AsciiString stringIOR = handle_object->GetIOR(); @@ -2629,12 +2616,12 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const c GEOM_BaseObject_i* servant = 0; switch( handle_object->GetType() ) { case GEOM_FIELD: { - servant = new GEOM_Field_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Field)::DownCast( handle_object )); + servant = new GEOM_Field_i (_poa, engine, Handle(::GEOM_Field)::DownCast( handle_object )); break; } case GEOM_FIELD_STEP: { - HANDLE_NAMESPACE(GEOM_FieldStep) step = HANDLE_NAMESPACE(GEOM_FieldStep)::DownCast( handle_object ); - HANDLE_NAMESPACE(GEOM_Field) field = step->GetField(); + Handle(::GEOM_FieldStep) step = Handle(::GEOM_FieldStep)::DownCast( handle_object ); + Handle(::GEOM_Field) field = step->GetField(); int type = ( !field.IsNull() ? field->GetDataType() : 0 ); switch( type ) { case GEOM::FDT_Bool: @@ -2652,7 +2639,7 @@ GEOM::GEOM_BaseObject_ptr GEOM_Gen_i::GetObject (CORBA::Long theStudyID, const c break; } default: - servant = new GEOM_Object_i (_poa, engine, HANDLE_NAMESPACE(GEOM_Object)::DownCast( handle_object )); + servant = new GEOM_Object_i (_poa, engine, Handle(::GEOM_Object)::DownCast( handle_object )); } PortableServer::ObjectId_var id = _poa->activate_object(servant); @@ -3057,7 +3044,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, std::string aGboEntry = gbo->GetEntry(); Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(gbo->GetStudyID()); Handle(TDataStd_TreeNode) aNode, aRoot; - HANDLE_NAMESPACE(GEOM_Function) aFunction; + Handle(::GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDataStd_ChildNodeIterator Itr( aRoot ); @@ -3130,7 +3117,7 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy, Handle(TDocStd_Document) aDoc = GEOM_Engine::GetEngine()->GetDocument(theStudy->StudyId()); Handle(TDataStd_TreeNode) aNode, aRoot; - HANDLE_NAMESPACE(GEOM_Function) aFunction; + Handle(::GEOM_Function) aFunction; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { // go through the whole OCAF tree TDF_Label aLabel; @@ -3176,7 +3163,7 @@ void GEOM_Gen_i::GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy, // because they could not be modified anyhow. std::set aToBeInSelected; for ( it = aSelected.begin(); it != aSelected.end(); ++it ) { - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), (*it).c_str(), false); if ( handle_object.IsNull() ) continue; @@ -3274,11 +3261,11 @@ void GEOM_Gen_i::includeSubObjects(SALOMEDS::Study_ptr theStudy, std::set& anOthers) { std::set::iterator foundIt; - HANDLE_NAMESPACE(GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false); + Handle(::GEOM_BaseObject) handle_object = _impl->GetObject( theStudy->StudyId(), aSelectedEntry.c_str(), false); if ( handle_object.IsNull() ) return; - HANDLE_NAMESPACE(GEOM_Function) aShapeFun = handle_object->GetFunction(1); + Handle(::GEOM_Function) aShapeFun = handle_object->GetFunction(1); if ( aShapeFun.IsNull() || !aShapeFun->HasSubShapeReferences() ) return; diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index 253c45ff1..1d45ccbd3 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -70,7 +70,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeBoxDXDYDZ (CORBA::Double the GetOperations()->SetNotDone(); //Create the Box - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ); + Handle(::GEOM_Object) anObject = GetOperations()->MakeBoxDXDYDZ(theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -90,13 +90,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeBoxTwoPnt //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn(); //Create the Box - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeBoxTwoPnt(aPnt1, aPnt2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -121,7 +121,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFaceHW (CORBA::Double theH, return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation); + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceHW(theH, theW, theOrientation); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -144,13 +144,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFaceObjHW GetOperations()->SetNotDone(); //Get the reference object - HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObj); + Handle(::GEOM_Object) anObj = GetObjectImpl(theObj); if (anObj.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW); + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceObjHW(anObj, theH, theW); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -172,13 +172,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskPntVecR GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); // Make Disk - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskPntVecR(aPnt, aVec, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -201,14 +201,14 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskThreePnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Disk - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskThreePnt(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -233,7 +233,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDiskR (CORBA::Double theR, return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation); + Handle(::GEOM_Object) anObject = GetOperations()->MakeDiskR(theR, theOrientation); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -254,7 +254,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderRH (CORBA::Double th GetOperations()->SetNotDone(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderRH(theR, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -276,7 +276,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderRHA (CORBA::Double t GetOperations()->SetNotDone(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderRHA(theR, theH, theA); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -298,13 +298,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderPntVecRH GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRH(aPnt, aVec, theR, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -326,13 +326,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeCylinderPntVecRHA GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cylinder - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCylinderPntVecRHA(aPnt, aVec, theR, theH, theA); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -354,7 +354,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeConeR1R2H (CORBA::Double the GetOperations()->SetNotDone(); //Create the Cone - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH); + Handle(::GEOM_Object) anObject = GetOperations()->MakeConeR1R2H(theR1, theR2, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -376,13 +376,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeConePntVecR1R2H GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Cone - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeConePntVecR1R2H(aPnt, aVec, theR1, theR2, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -403,7 +403,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeSphereR (CORBA::Double theR) GetOperations()->SetNotDone(); //Create the Cone - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSphereR(theR); + Handle(::GEOM_Object) anObject = GetOperations()->MakeSphereR(theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -424,12 +424,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeSpherePntR GetOperations()->SetNotDone(); //Get the reference point - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); //Create the Sphere - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSpherePntR(aPnt, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -451,7 +451,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeTorusRR GetOperations()->SetNotDone(); // Make Torus - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTorusRR(theRMajor, theRMinor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -474,13 +474,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeTorusPntVecRR GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aPnt.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); // Make Torus - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTorusPntVecRR(aPnt, aVec, theRMajor, theRMinor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -503,13 +503,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismVecH GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismVecH(aBase, aVec, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -532,13 +532,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismVecH2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismVecH2Ways(aBase, aVec, theH); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -561,13 +561,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismVecHWithScaling GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aVec.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismVecH(aBase, aVec, theH, theScaleFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -591,15 +591,15 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPnt GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -623,15 +623,15 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPnt2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismTwoPnt2Ways(aBase, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -656,15 +656,15 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismTwoPntWithScaling GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aBase.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismTwoPnt(aBase, aPoint1, aPoint2, theScaleFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -687,12 +687,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZ GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -715,12 +715,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZ2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismDXDYDZ2Ways(aBase, theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -744,12 +744,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePrismDXDYDZWithScaling GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePrismDXDYDZ(aBase, theDX, theDY, theDZ, theScaleFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -775,13 +775,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeDraftPrism GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aInit = GetObjectImpl(theInitShape); - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aInit = GetObjectImpl(theInitShape); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); if (aBase.IsNull() || aInit.IsNull()) return aGEOMObject._retn(); //Create the Prism - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert); + Handle(::GEOM_Object) anObject = GetOperations()->MakeDraftPrism(aInit, aBase, theHeight, theAngle, theFuse, theInvert); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -805,8 +805,8 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipe GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); if (aBase.IsNull() || aPath.IsNull()) return aSeq._retn(); @@ -819,7 +819,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipe Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -839,13 +839,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeRevolutionAxisAngle GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn(); //Create the Revolution - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeRevolutionAxisAngle(aBase, anAxis, theAngle); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -868,13 +868,13 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeRevolutionAxisAngle2Ways GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aBase.IsNull() || anAxis.IsNull()) return aGEOMObject._retn(); //Create the Revolution - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeRevolutionAxisAngle2Ways(aBase, anAxis, theAngle); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -903,7 +903,7 @@ GEOM_I3DPrimOperations_i::MakeFilling(const GEOM::ListOfGO& theContours, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theContours, aShapes )) return aGEOMObject._retn(); @@ -932,7 +932,7 @@ GEOM_I3DPrimOperations_i::MakeFilling(const GEOM::ListOfGO& theContours, } //Create the Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFilling + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilling (aShapes, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter, aMethod, theApprox); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -960,7 +960,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThruSections(const GEOM::Lis //Get the shapes aLen = theSeqSections.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSeqSections[ind]); if (!aSh.IsNull()) aSeqSections->Append(aSh); } @@ -968,7 +968,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThruSections(const GEOM::Lis return aGEOMObject._retn(); // Make shell or solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeThruSections(aSeqSections,theModeSolid,thePreci,theRuled); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1005,17 +1005,17 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithDifferentSections if (aNbLocs && aNbBases != aNbLocs) return aSeq._retn(); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); if (aPath.IsNull()) return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); if (aLoc.IsNull()) continue; aSeqLocations->Append(aLoc); @@ -1037,7 +1037,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithDifferentSections Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1074,16 +1074,16 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithShellSections if (aNbLocs && aNbBases != aNbLocs) return aSeq._retn(); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); if (aPath.IsNull()) return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); if (aLoc.IsNull()) continue; aSeqLocations->Append(aLoc); @@ -1091,7 +1091,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithShellSections aSeqBases->Append(aBase); if (aNbSubBases >= aNbBases) { - HANDLE_NAMESPACE(GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]); + Handle(::GEOM_Object) aSubBase = GetObjectImpl(theSubBases[ind]); if (aSubBase.IsNull()) { aSeqSubBases->Clear(); aNbSubBases = 0; @@ -1115,7 +1115,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeWithShellSections Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1147,11 +1147,11 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath return aSeq._retn(); for (ind = 0; ind < aNbBases; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBases[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBases[ind]); if (aBase.IsNull()) continue; if (aNbLocs) { - HANDLE_NAMESPACE(GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); + Handle(::GEOM_Object) aLoc = GetObjectImpl(theLocations[ind]); if (aLoc.IsNull()) continue; aSeqLocations->Append(aLoc); @@ -1173,7 +1173,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeShellsWithoutPath Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1195,9 +1195,9 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase); - HANDLE_NAMESPACE(GEOM_Object) aPath = GetObjectImpl(thePath); - HANDLE_NAMESPACE(GEOM_Object) aVec = GetObjectImpl(theVec); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase); + Handle(::GEOM_Object) aPath = GetObjectImpl(thePath); + Handle(::GEOM_Object) aVec = GetObjectImpl(theVec); if (aBase.IsNull() || aPath.IsNull() || aVec.IsNull()) return aSeq._retn(); @@ -1211,7 +1211,7 @@ GEOM::ListOfGO *GEOM_I3DPrimOperations_i::MakePipeBiNormalAlongVector Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1244,7 +1244,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThickening aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); // Get faces IDs. @@ -1263,7 +1263,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThickening //Create the thickened shape if (doCopy) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeThickening( + Handle(::GEOM_Object) anObject = GetOperations()->MakeThickening( aBasicObject, aFaceIDs, theOffset, doCopy, theInside); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1297,14 +1297,14 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePath GetOperations()->SetNotDone(); // Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aBase1 = GetObjectImpl(theBase1); - HANDLE_NAMESPACE(GEOM_Object) aBase2 = GetObjectImpl(theBase2); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aBase1 = GetObjectImpl(theBase1); + Handle(::GEOM_Object) aBase2 = GetObjectImpl(theBase2); if (aShape.IsNull() || aBase1.IsNull() || aBase2.IsNull()) return aGEOMObject._retn(); // Create the Path - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); + Handle(::GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aBase1, aBase2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1327,7 +1327,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges GetOperations()->SetNotDone(); // Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); Handle(TColStd_HSequenceOfTransient) aSeqBases1 = new TColStd_HSequenceOfTransient; @@ -1338,12 +1338,12 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges int aNbBases2 = theBase2.length(); for (ind = 0; ind < aNbBases1; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase1[ind]); if (!aBase.IsNull()) aSeqBases1->Append(aBase); } for (ind = 0; ind < aNbBases2; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); + Handle(::GEOM_Object) aBase = GetObjectImpl(theBase2[ind]); if (!aBase.IsNull()) aSeqBases2->Append(aBase); } @@ -1352,7 +1352,7 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::RestorePathEdges return aGEOMObject._retn(); // Create the Path - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); + Handle(::GEOM_Object) anObject = GetOperations()->RestorePath(aShape, aSeqBases1, aSeqBases2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc index 3e4f4f96a..f44df5b3c 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.cc +++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc @@ -69,7 +69,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointXYZ GetOperations()->SetNotDone(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ); + Handle(::GEOM_Object) anObject = GetOperations()->MakePointXYZ(theX, theY, theZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -90,11 +90,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointWithReference GetOperations()->SetNotDone(); //Get the reference point - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theReference); + Handle(::GEOM_Object) aReference = GetObjectImpl(theReference); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointWithReference(aReference, theX, theY, theZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -116,12 +116,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnLinesIntersection GetOperations()->SetNotDone(); //Get the reference Lines - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLine1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theLine2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theLine1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theLine2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnLinesIntersection(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -145,11 +145,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnCurve + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurve (aReference, theParameter, takeOrientationIntoAccount); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -173,17 +173,17 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurveByLength GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Get the reference point (can be NULL) - HANDLE_NAMESPACE(GEOM_Object) aRefPoint; + Handle(::GEOM_Object) aRefPoint; if (!CORBA::is_nil(theStartPoint)) { aRefPoint = GetObjectImpl(theStartPoint); } //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurveByLength(aReference, theLength, aRefPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -208,11 +208,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurveByCoord GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnCurveByCoord(aReference, theXParameter, theYParameter, theZParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -237,11 +237,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurface GetOperations()->SetNotDone(); //Get the reference surface - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface); + Handle(::GEOM_Object) aReference = GetObjectImpl(theSurface); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnSurface(aReference, theUParameter, theVParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -266,11 +266,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnSurfaceByCoord GetOperations()->SetNotDone(); //Get the reference surface - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theSurface); + Handle(::GEOM_Object) aReference = GetObjectImpl(theSurface); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnSurfaceByCoord(aReference, theXParameter, theYParameter, theZParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -292,11 +292,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnFace (GEOM::GEOM_Objec GetOperations()->SetNotDone(); //Get the reference face - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theFace); + Handle(::GEOM_Object) aReference = GetObjectImpl(theFace); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference); + Handle(::GEOM_Object) anObject = GetOperations()->MakePointOnFace(aReference); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -317,11 +317,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentOnCurve GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aReference = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aReference = GetObjectImpl(theCurve); if (aReference.IsNull()) return aGEOMObject._retn(); //Create the vector - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTangentOnCurve(aReference, theParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -344,7 +344,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeVectorDXDYDZ //Create the Vector - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ); + Handle(::GEOM_Object) anObject = GetOperations()->MakeVectorDXDYDZ(theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -365,12 +365,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeVectorTwoPnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the vector - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeVectorTwoPnt(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -392,12 +392,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLine GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theDir); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theDir); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeLine(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -418,12 +418,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLineTwoPnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeLineTwoPnt(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -444,12 +444,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeLineTwoFaces GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theFace1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theFace2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theFace1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theFace2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the Line - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeLineTwoFaces(aRef1, aRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -473,12 +473,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlanePntVec GetOperations()->SetNotDone(); //Get the references - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theVec); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlanePntVec(aRef1, aRef2, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -501,14 +501,14 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneThreePnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aRef3 = GetObjectImpl(thePnt3); if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlaneThreePnt(aRef1, aRef2, aRef3, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -530,11 +530,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneFace GetOperations()->SetNotDone(); //Get the reference face - HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace); + Handle(::GEOM_Object) aRef = GetObjectImpl(theFace); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlaneFace(aRef, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -557,12 +557,12 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlane2Vec GetOperations()->SetNotDone(); //Get the references - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theVec1); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theVec2); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theVec1); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theVec2); if (aRef1.IsNull() || aRef2.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlane2Vec(aRef1, aRef2, theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -585,10 +585,10 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePlaneLCS GetOperations()->SetNotDone(); //Get the references - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theLCS); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theLCS); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePlaneLCS(aRef1, theTrimSize, theOrientation); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -612,7 +612,7 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarker GetOperations()->SetNotDone(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ, + Handle(::GEOM_Object) anObject = GetOperations()->MakeMarker(theOX , theOY , theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -635,11 +635,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarkerFromShape GetOperations()->SetNotDone(); //Get the referenced object - HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aRef = GetObjectImpl(theShape); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef); + Handle(::GEOM_Object) anObject = GetOperations()->MakeMarkerFromShape(aRef); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -662,13 +662,13 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarkerPntTwoVec GetOperations()->SetNotDone(); //Get the referenced objects - HANDLE_NAMESPACE(GEOM_Object) aRef1 = GetObjectImpl(theOrigin); - HANDLE_NAMESPACE(GEOM_Object) aRef2 = GetObjectImpl(theXVec); - HANDLE_NAMESPACE(GEOM_Object) aRef3 = GetObjectImpl(theYVec); + Handle(::GEOM_Object) aRef1 = GetObjectImpl(theOrigin); + Handle(::GEOM_Object) aRef2 = GetObjectImpl(theXVec); + Handle(::GEOM_Object) aRef3 = GetObjectImpl(theYVec); if (aRef1.IsNull() || aRef2.IsNull() || aRef3.IsNull()) return aGEOMObject._retn(); //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1, + Handle(::GEOM_Object) anObject = GetOperations()->MakeMarkerPntTwoVec(aRef1, aRef2, aRef3); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -695,11 +695,11 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentPlaneOnFace GetOperations()->SetNotDone(); //Get the reference face - HANDLE_NAMESPACE(GEOM_Object) aRef = GetObjectImpl(theFace); + Handle(::GEOM_Object) aRef = GetObjectImpl(theFace); if (aRef.IsNull()) return aGEOMObject._retn(); //Create the plane - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index 838577adb..e24fe856b 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc @@ -73,16 +73,16 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad GetOperations()->SetNotDone(); //Get the reference edges - HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); - HANDLE_NAMESPACE(GEOM_Object) anEdge3 = GetObjectImpl(theEdge3); - HANDLE_NAMESPACE(GEOM_Object) anEdge4 = GetObjectImpl(theEdge4); + Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + Handle(::GEOM_Object) anEdge3 = GetObjectImpl(theEdge3); + Handle(::GEOM_Object) anEdge4 = GetObjectImpl(theEdge4); if (anEdge1.IsNull() || anEdge2.IsNull() || anEdge3.IsNull() || anEdge4.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeQuad(anEdge1, anEdge2, anEdge3, anEdge4); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -104,13 +104,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad2Edges GetOperations()->SetNotDone(); //Get the reference edges - HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); if (anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeQuad2Edges(anEdge1, anEdge2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -133,16 +133,16 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeQuad4Vertices GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); - HANDLE_NAMESPACE(GEOM_Object) aPnt4 = GetObjectImpl(thePnt4); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt4 = GetObjectImpl(thePnt4); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull() || aPnt4.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeQuad4Vertices(aPnt1, aPnt2, aPnt3, aPnt4); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -166,19 +166,19 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeHexa GetOperations()->SetNotDone(); //Get the reference Faces - HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1); - HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2); - HANDLE_NAMESPACE(GEOM_Object) anFace3 = GetObjectImpl(theFace3); - HANDLE_NAMESPACE(GEOM_Object) anFace4 = GetObjectImpl(theFace4); - HANDLE_NAMESPACE(GEOM_Object) anFace5 = GetObjectImpl(theFace5); - HANDLE_NAMESPACE(GEOM_Object) anFace6 = GetObjectImpl(theFace6); + Handle(::GEOM_Object) anFace1 = GetObjectImpl(theFace1); + Handle(::GEOM_Object) anFace2 = GetObjectImpl(theFace2); + Handle(::GEOM_Object) anFace3 = GetObjectImpl(theFace3); + Handle(::GEOM_Object) anFace4 = GetObjectImpl(theFace4); + Handle(::GEOM_Object) anFace5 = GetObjectImpl(theFace5); + Handle(::GEOM_Object) anFace6 = GetObjectImpl(theFace6); if (anFace1.IsNull() || anFace2.IsNull() || anFace3.IsNull() || anFace4.IsNull() || anFace5.IsNull() || anFace6.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeHexa + Handle(::GEOM_Object) anObject = GetOperations()->MakeHexa (anFace1, anFace2, anFace3, anFace4, anFace5, anFace6); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -200,13 +200,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeHexa2Faces GetOperations()->SetNotDone(); //Get the reference Faces - HANDLE_NAMESPACE(GEOM_Object) anFace1 = GetObjectImpl(theFace1); - HANDLE_NAMESPACE(GEOM_Object) anFace2 = GetObjectImpl(theFace2); + Handle(::GEOM_Object) anFace1 = GetObjectImpl(theFace1); + Handle(::GEOM_Object) anFace2 = GetObjectImpl(theFace2); if (anFace1.IsNull() || anFace2.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeHexa2Faces(anFace1, anFace2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -228,11 +228,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeBlockCompound GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Create the Blocks Compound - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeBlockCompound(aCompound); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -257,11 +257,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetPoint (GEOM::GEOM_Object_ptr GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Create the Point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetPoint(aShape, theX, theY, theZ, theEpsilon); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -284,12 +284,12 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetVertexNearPoint GetOperations()->SetNotDone(); // Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); // Create the Point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetVertexNearPoint(aShape, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -312,15 +312,15 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetEdge (GEOM::GEOM_Object_ptr t GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aShape.IsNull() || aPoint1.IsNull() || aPoint2.IsNull()) return aGEOMObject._retn(); //Create the Point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetEdge(aShape, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -342,13 +342,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetEdgeNearPoint (GEOM::GEOM_Obj GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Create the Edge - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetEdgeNearPoint(aShape, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -374,18 +374,18 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByPoints GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); - HANDLE_NAMESPACE(GEOM_Object) aPoint3 = GetObjectImpl(thePoint3); - HANDLE_NAMESPACE(GEOM_Object) aPoint4 = GetObjectImpl(thePoint4); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint3 = GetObjectImpl(thePoint3); + Handle(::GEOM_Object) aPoint4 = GetObjectImpl(thePoint4); if (aShape.IsNull() || aPoint1.IsNull() || aPoint2.IsNull() || aPoint3.IsNull() || aPoint4.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceByPoints(aShape, aPoint1, aPoint2, aPoint3, aPoint4); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -409,15 +409,15 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByEdges GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); - HANDLE_NAMESPACE(GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anEdge1 = GetObjectImpl(theEdge1); + Handle(::GEOM_Object) anEdge2 = GetObjectImpl(theEdge2); if (aShape.IsNull() || anEdge1.IsNull() || anEdge2.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceByEdges(aShape, anEdge1, anEdge2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -439,13 +439,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetOppositeFace (GEOM::GEOM_Obje GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aShape.IsNull() || aFace.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetOppositeFace(aShape, aFace); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -467,13 +467,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceNearPoint (GEOM::GEOM_Obj GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceNearPoint(aShape, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -495,13 +495,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetFaceByNormale (GEOM::GEOM_Obj GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aShape.IsNull() || aVector.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetFaceByNormale(aShape, aVector); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -526,13 +526,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetShapesNearPoint GetOperations()->SetNotDone(); // Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); // Create the Shape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetShapesNearPoint(aShape, aPoint, theShapeType, theTolerance); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -556,7 +556,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::ExplodeCompoundOfBlocks GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aSeq._retn(); //Explode @@ -568,7 +568,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::ExplodeCompoundOfBlocks Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -591,7 +591,7 @@ CORBA::Boolean GEOM_IBlocksOperations_i::IsCompoundOfBlocks GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return isComp; //Check @@ -623,7 +623,7 @@ CORBA::Boolean GEOM_IBlocksOperations_i::CheckCompoundOfBlocks GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return isComp; //Check @@ -698,7 +698,7 @@ char* GEOM_IBlocksOperations_i::PrintBCErrors const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors) { //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return NULL; // Convert the errors sequence @@ -763,12 +763,12 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetNonBlocks GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) aFaces; - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) aFaces; + Handle(::GEOM_Object) anObject = GetOperations()->GetNonBlocks(aShape, theToleranceC1, aFaces); if (!GetOperations()->IsDone()) return aGEOMObject._retn(); @@ -797,11 +797,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::RemoveExtraEdges GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces); + Handle(::GEOM_Object) anObject = GetOperations()->RemoveExtraEdges(aShape, theOptimumNbFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -822,11 +822,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::UnionFaces GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionFaces(aShape); + Handle(::GEOM_Object) anObject = GetOperations()->UnionFaces(aShape); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -846,11 +846,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::CheckAndImprove (GEOM::GEOM_Obje GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Get the result - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->CheckAndImprove(aCompound); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -872,13 +872,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockNearPoint (GEOM::GEOM_Ob GetOperations()->SetNotDone(); //Get the reference Objects - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aCompound.IsNull() || aPoint.IsNull()) return aGEOMObject._retn(); //Get the block - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetBlockNearPoint(aCompound, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -900,7 +900,7 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockByParts (GEOM::GEOM_Obje GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aGEOMObject._retn(); //Get the parts @@ -909,13 +909,13 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::GetBlockByParts (GEOM::GEOM_Obje aLen = theParts.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theParts[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aParts->Append(aSh); } //Get the Block - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetBlockByParts(aCompound, aParts); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -937,7 +937,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); //Get the reference Compound - HANDLE_NAMESPACE(GEOM_Object) aCompound = GetObjectImpl(theCompound); + Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound); if (aCompound.IsNull()) return aSeq._retn(); //Get the parts @@ -946,7 +946,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_pt aLen = theParts.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theParts[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theParts[ind]); if (aSh.IsNull()) return aSeq._retn(); aParts->Append(aSh); } @@ -960,7 +960,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::GetBlocksByParts (GEOM::GEOM_Object_pt Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -982,11 +982,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeMultiTransformation1D GetOperations()->SetNotDone(); //Get the object itself and the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theBlock); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D + Handle(::GEOM_Object) anObject = GetOperations()->MakeMultiTransformation1D (aBasicObject, theDirFace1, theDirFace2, theNbTimes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1013,11 +1013,11 @@ GEOM::GEOM_Object_ptr GEOM_IBlocksOperations_i::MakeMultiTransformation2D GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theBlock); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theBlock); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D + Handle(::GEOM_Object) anObject = GetOperations()->MakeMultiTransformation2D (aBasicObject, theDirFace1U, theDirFace2U, theNbTimesU, theDirFace1V, theDirFace2V, theNbTimesV); @@ -1039,7 +1039,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::Propagate (GEOM::GEOM_Object_ptr theSh GetOperations()->SetNotDone(); //Get the reference Shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); //Get the Propagation chains @@ -1051,7 +1051,7 @@ GEOM::ListOfGO* GEOM_IBlocksOperations_i::Propagate (GEOM::GEOM_Object_ptr theSh Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc index 2cfe521bc..0a38cd145 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc @@ -73,13 +73,13 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeBoolean GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aSh1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aSh2 = GetObjectImpl(theShape2); if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn(); // Make Boolean - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeBoolean(aSh1, aSh2, theOp, IsCheckSelfInte); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -104,13 +104,13 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeFuse GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aSh1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aSh2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aSh1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aSh2 = GetObjectImpl(theShape2); if (aSh1.IsNull() || aSh2.IsNull()) return aGEOMObject._retn(); // Make Boolean - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFuse + Handle(::GEOM_Object) anObject = GetOperations()->MakeFuse (aSh1, aSh2, IsCheckSelfInte, IsRmExtraEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -142,7 +142,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeFuseList } // Make fusion - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFuseList(aShapes, IsCheckSelfInte, IsRmExtraEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -173,7 +173,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeCommonList } // Make fusion - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCommonList(aShapes, IsCheckSelfInte); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -197,7 +197,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeCutList //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aMainShape = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aMainShape = GetObjectImpl(theMainShape); if (aMainShape.IsNull()) { return aGEOMObject._retn(); @@ -211,7 +211,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeCutList } // Make fusion - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCutList(aMainShape, aShapes, IsCheckSelfInte); if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -262,7 +262,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakePartition } // Make Partition - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns, theLimit, theRemoveWebs, aMaterials, theKeepNonlimitShapes, @@ -317,7 +317,7 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakePartitionNonSelfIntersected } // Make Partition - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePartition(aShapes, aTools, aKeepIns, aRemIns, theLimit, theRemoveWebs, aMaterials, theKeepNonlimitShapes, @@ -344,13 +344,13 @@ GEOM::GEOM_Object_ptr GEOM_IBooleanOperations_i::MakeHalfPartition GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aPl = GetObjectImpl(thePlane); + Handle(::GEOM_Object) aSh = GetObjectImpl(theShape); + Handle(::GEOM_Object) aPl = GetObjectImpl(thePlane); if (aSh.IsNull() || aPl.IsNull()) return aGEOMObject._retn(); // Make Half Partition - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeHalfPartition(aSh, aPl); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 003f1d8c8..9389fc7df 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -76,7 +76,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCirclePntVecR //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn(); //Get the arguments - HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec; + Handle(::GEOM_Object) aPnt, aVec; if (!CORBA::is_nil(thePnt)) { aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); @@ -87,7 +87,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCirclePntVecR } // Make Circle - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCirclePntVecR(aPnt, aVec, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -110,14 +110,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCircleThreePnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Circle - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCircleThreePnt(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -140,14 +140,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCircleCenter2Pnt GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Circle - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCircleCenter2Pnt(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -173,7 +173,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipse //if (thePnt == NULL || theVec == NULL) return aGEOMObject._retn(); //Get the arguments - HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj; + Handle(::GEOM_Object) aPnt, aVec, aVecMaj; if (!CORBA::is_nil(thePnt)) { aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); @@ -184,7 +184,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipse } // Make Ellipse - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeEllipse(aPnt, aVec, theRMajor, theRMinor, aVecMaj); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -213,7 +213,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipseVec //if (thePnt == NULL || theVec == NULL || theVecMaj == NULL) return aGEOMObject._retn(); //Get the arguments - HANDLE_NAMESPACE(GEOM_Object) aPnt, aVec, aVecMaj; + Handle(::GEOM_Object) aPnt, aVec, aVecMaj; if (!CORBA::is_nil(thePnt)) { aPnt = GetObjectImpl(thePnt); if (aPnt.IsNull()) return aGEOMObject._retn(); @@ -228,7 +228,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeEllipseVec } // Make Ellipse - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeEllipse(aPnt, aVec, theRMajor, theRMinor, aVecMaj); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -252,14 +252,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArc GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Arc - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeArc(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -285,14 +285,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcCenter GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make ArcCenter - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeArcCenter(aPnt1, aPnt2, aPnt3,theSense); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -316,14 +316,14 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeArcOfEllipse GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); - HANDLE_NAMESPACE(GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt3 = GetObjectImpl(thePnt3); if (aPnt1.IsNull() || aPnt2.IsNull() || aPnt3.IsNull()) return aGEOMObject._retn(); // Make Arc - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeArcOfEllipse(aPnt1, aPnt2, aPnt3); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -348,15 +348,15 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakePolyline //Get the reference point int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakePolyline(aPoints, theIsClosed); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -381,15 +381,15 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSplineBezier //Get the reference point int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Bezier curve - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSplineBezier(aPoints, theIsClosed); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -415,15 +415,15 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSplineInterpolation //Get the reference point int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSplineInterpolation(aPoints, theIsClosed, theDoReordering); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -449,21 +449,21 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSplineInterpolWithTangents //Get the reference points int ind = 0; int aLen = thePoints.length(); - std::list aPoints; + std::list aPoints; for (; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePoints[ind]); if (aPnt.IsNull()) return aGEOMObject._retn(); aPoints.push_back(aPnt); } //Get the reference vectors - HANDLE_NAMESPACE(GEOM_Object) aVec1 = GetObjectImpl(theFirstVec); - HANDLE_NAMESPACE(GEOM_Object) aVec2 = GetObjectImpl(theLastVec); + Handle(::GEOM_Object) aVec1 = GetObjectImpl(theFirstVec); + Handle(::GEOM_Object) aVec2 = GetObjectImpl(theLastVec); if (aVec1.IsNull() || aVec2.IsNull()) return aGEOMObject._retn(); // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSplineInterpolWithTangents(aPoints, aVec1, aVec2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -501,7 +501,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametric } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr, theParamMin, theParamMax, theParamStep, aType); @@ -542,7 +542,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeCurveParametricNew } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCurveParametric(thexExpr, theyExpr, thezExpr, theParamMin, theParamMax, 0.0, aType, theParamNbStep, true); @@ -568,10 +568,10 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeIsoline //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); // Make isoline - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeIsoline(aFace, IsUIsoline, theParameter); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -597,7 +597,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcher aWorkingPlane.push_back(theWorkingPlane[ind]); // Make Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSketcher(theCommand, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -616,10 +616,10 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakeSketcherOnPlane //Set a not done flag GetOperations()->SetNotDone(); - HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); + Handle(::GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); // Make Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSketcherOnPlane(theCommand, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -638,7 +638,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::Make3DSketcherCommand (const cha GetOperations()->SetNotDone(); // Make 3D Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand); + Handle(::GEOM_Object) anObject = GetOperations()->Make3DSketcherCommand(theCommand); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -663,7 +663,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::Make3DSketcher aCoords.push_back(theCoordinates[ind]); // Make Sketcher - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->Make3DSketcher(aCoords); if (!GetOperations()->IsDone() || anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -710,7 +710,7 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakePolyline2D } // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2D + Handle(::GEOM_Object) anObject = GetOperations()->MakePolyline2D (aCoords, aNames, aTypes, aCloseds, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) { @@ -743,13 +743,13 @@ GEOM::GEOM_Object_ptr GEOM_ICurvesOperations_i::MakePolyline2DOnPlane Handle(TColStd_HArray1OfByte) aCloseds = ConvertBoolArray(theClosedList); std::list > aCoords; - HANDLE_NAMESPACE(GEOM_Object) aWorkingPlane = + Handle(::GEOM_Object) aWorkingPlane = GetObjectImpl(theWorkingPlane); ConvertListListDouble(theCoordsList, aCoords); // Make Polyline - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane + Handle(::GEOM_Object) anObject = GetOperations()->MakePolyline2DOnPlane (aCoords, aNames, aTypes, aCloseds, aWorkingPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) { diff --git a/src/GEOM_I/GEOM_IFieldOperations_i.cc b/src/GEOM_I/GEOM_IFieldOperations_i.cc index 1626e25e7..3a6ceca24 100644 --- a/src/GEOM_I/GEOM_IFieldOperations_i.cc +++ b/src/GEOM_I/GEOM_IFieldOperations_i.cc @@ -76,8 +76,8 @@ GEOM_IFieldOperations_i::CreateField(GEOM::GEOM_Object_ptr theShape, for ( size_t i = 0; i < theComponentNames.length(); ++i ) compNames->SetValue( i+1, theComponentNames[ i ].in() ); } - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl( theShape ); - HANDLE_NAMESPACE(GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef, + Handle(::GEOM_Object) aShapeRef = GetObjectImpl( theShape ); + Handle(::GEOM_Field) aFieldRef = GetOperations()->CreateField( aShapeRef, theName, (int) theType, theDimension, @@ -96,7 +96,7 @@ GEOM_IFieldOperations_i::CreateField(GEOM::GEOM_Object_ptr theShape, CORBA::Long GEOM_IFieldOperations_i::CountFields( GEOM::GEOM_Object_ptr shape) { - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); return ( CORBA::Long) GetOperations()->CountFields( go ); } @@ -111,7 +111,7 @@ GEOM::ListOfFields* GEOM_IFieldOperations_i::GetFields( GEOM::GEOM_Object_ptr sh { GEOM::ListOfFields_var fields = new GEOM::ListOfFields; - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); Handle(TColStd_HSequenceOfTransient) seq = GetOperations()->GetFields( go ); if ( !seq.IsNull() ) @@ -120,7 +120,7 @@ GEOM::ListOfFields* GEOM_IFieldOperations_i::GetFields( GEOM::GEOM_Object_ptr sh int nbF = 0; for ( int i = 1; i <= seq->Length(); ++i ) { - HANDLE_NAMESPACE(GEOM_Field) f = HANDLE_NAMESPACE(GEOM_Field)::DownCast( seq->Value( i )); + Handle(::GEOM_Field) f = Handle(::GEOM_Field)::DownCast( seq->Value( i )); GEOM::GEOM_Field_var fvar = GEOM::GEOM_Field::_narrow( GetBaseObject( f )); if ( !fvar->_is_nil() ) fields[ nbF++ ] = fvar._retn(); @@ -141,9 +141,9 @@ GEOM::GEOM_Field_ptr GEOM_IFieldOperations_i::GetField( GEOM::GEOM_Object_ptr sh { GEOM::GEOM_Field_var field; - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); - HANDLE_NAMESPACE(GEOM_Field) f = GetOperations()->GetField( go, name ); + Handle(::GEOM_Field) f = GetOperations()->GetField( go, name ); field = GEOM::GEOM_Field::_narrow( GetBaseObject( f )); return field._retn(); @@ -158,6 +158,6 @@ GEOM::GEOM_Field_ptr GEOM_IFieldOperations_i::GetField( GEOM::GEOM_Object_ptr sh ::CORBA::Long GEOM_IFieldOperations_i::GetNbSubShapes(::GEOM::GEOM_Object_ptr shape, ::CORBA::Short fieldDim) { - HANDLE_NAMESPACE(GEOM_Object) go = GetObjectImpl( shape ); + Handle(::GEOM_Object) go = GetObjectImpl( shape ); return GEOM_Field::GetNbSubShapes( go, fieldDim ); } diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc index d55117e21..50728b440 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.cc +++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc @@ -74,11 +74,11 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CreateGroup(GEOM::GEOM_Object_ptr if (theShapeType < 0) return aGEOMObject._retn(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theMainShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType); + Handle(::GEOM_Object) anObject = GetOperations()->CreateGroup(aShapeRef, (TopAbs_ShapeEnum)theShapeType); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -96,7 +96,7 @@ void GEOM_IGroupOperations_i::AddObject(GEOM::GEOM_Object_ptr theGroup, CORBA::L GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; GetOperations()->AddObject(aGroupRef, theSubShapeId); @@ -116,7 +116,7 @@ void GEOM_IGroupOperations_i::RemoveObject(GEOM::GEOM_Object_ptr theGroup, CORBA GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; GetOperations()->RemoveObject(aGroupRef, theSubShapeId); @@ -137,7 +137,7 @@ void GEOM_IGroupOperations_i::UnionList (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to add @@ -145,7 +145,7 @@ void GEOM_IGroupOperations_i::UnionList (GEOM::GEOM_Object_ptr theGroup, int ind, aLen = theSubShapes.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); if (aSh.IsNull()) return; aSubShapes->Append(aSh); } @@ -166,7 +166,7 @@ void GEOM_IGroupOperations_i::DifferenceList (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to remove @@ -174,7 +174,7 @@ void GEOM_IGroupOperations_i::DifferenceList (GEOM::GEOM_Object_ptr theGroup, int ind, aLen = theSubShapes.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); if (aSh.IsNull()) return; aSubShapes->Append(aSh); } @@ -195,7 +195,7 @@ void GEOM_IGroupOperations_i::UnionIDs (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to add @@ -222,7 +222,7 @@ void GEOM_IGroupOperations_i::DifferenceIDs (GEOM::GEOM_Object_ptr theGroup, GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return; //Get sub-shape to remove @@ -251,12 +251,12 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::UnionGroups (GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); //Get the reference groups - HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2); + Handle(::GEOM_Object) anObject = GetOperations()->UnionGroups(aGroupRef1, aGroupRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -276,12 +276,12 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::IntersectGroups (GEOM::GEOM_Objec GetOperations()->SetNotDone(); //Get the reference groups - HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2); + Handle(::GEOM_Object) anObject = GetOperations()->IntersectGroups(aGroupRef1, aGroupRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -301,12 +301,12 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CutGroups (GEOM::GEOM_Object_ptr GetOperations()->SetNotDone(); //Get the reference groups - HANDLE_NAMESPACE(GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); - HANDLE_NAMESPACE(GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); + Handle(::GEOM_Object) aGroupRef1 = GetObjectImpl(theGroup1); + Handle(::GEOM_Object) aGroupRef2 = GetObjectImpl(theGroup2); if (aGroupRef1.IsNull() || aGroupRef2.IsNull()) return aGEOMObject._retn(); //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2); + Handle(::GEOM_Object) anObject = GetOperations()->CutGroups(aGroupRef1, aGroupRef2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -329,13 +329,13 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::UnionListOfGroups (const GEOM::Li int ind, aLen = theGList.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups->Append(aGr); } //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups); + Handle(::GEOM_Object) anObject = GetOperations()->UnionListOfGroups(aGroups); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -358,13 +358,13 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::IntersectListOfGroups (const GEOM int ind, aLen = theGList.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups->Append(aGr); } //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups); + Handle(::GEOM_Object) anObject = GetOperations()->IntersectListOfGroups(aGroups); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -389,19 +389,19 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::CutListOfGroups (const GEOM::List int ind, aLen = theGList1.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList1[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList1[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups1->Append(aGr); } aLen = theGList2.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aGr = GetObjectImpl(theGList2[ind]); + Handle(::GEOM_Object) aGr = GetObjectImpl(theGList2[ind]); if (aGr.IsNull()) return aGEOMObject._retn(); aGroups2->Append(aGr); } //Perform the operation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2); + Handle(::GEOM_Object) anObject = GetOperations()->CutListOfGroups(aGroups1, aGroups2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -418,7 +418,7 @@ CORBA::Long GEOM_IGroupOperations_i::GetType(GEOM::GEOM_Object_ptr theGroup) GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return -1; return GetOperations()->GetType(aGroupRef); @@ -437,10 +437,10 @@ GEOM::GEOM_Object_ptr GEOM_IGroupOperations_i::GetMainShape(GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return aGEOMObject._retn(); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef); + Handle(::GEOM_Object) anObject = GetOperations()->GetMainShape(aGroupRef); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -459,7 +459,7 @@ GEOM::ListOfLong* GEOM_IGroupOperations_i::GetObjects(GEOM::GEOM_Object_ptr theG GetOperations()->SetNotDone(); //Get the reference group - HANDLE_NAMESPACE(GEOM_Object) aGroupRef = GetObjectImpl(theGroup); + Handle(::GEOM_Object) aGroupRef = GetObjectImpl(theGroup); if (aGroupRef.IsNull()) return aList._retn(); aList = new GEOM::ListOfLong; diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index 3f4f4f366..d83e0d161 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -101,12 +101,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ProcessShape (GEOM::GEOM_Object // return aGEOMObject._retn(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject, + Handle(::GEOM_Object) aNewObject = GetOperations()->ShapeProcess( anObject, ConvertStringArray( theOperations ), ConvertStringArray( theParams ), ConvertStringArray( theValues ) ); if ( !GetOperations()->IsDone() || aNewObject.IsNull() ) @@ -211,14 +211,14 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::SuppressFaces (GEOM::GEOM_Objec GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // if theFaces is empty - it's OK, it means that ALL faces must be removed // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->SuppressFaces( anObject, Convert( theFaces ) ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -241,12 +241,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::CloseContour (GEOM::GEOM_Object GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->CloseContour( anObject, Convert( theWires ), isCommonVertex ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -268,14 +268,14 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::RemoveIntWires (GEOM::GEOM_Obje GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // if theWires is empty - it's OK, it means that ALL wires should be removed // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->RemoveIntWires( anObject, Convert( theWires ) ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -297,14 +297,14 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::FillHoles (GEOM::GEOM_Object_pt GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // if theWires is empty - it's OK, it means that ALL wires should be removed // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->FillHoles( anObject, Convert( theWires ) ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -330,12 +330,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::Sew (const GEOM::ListOfGO& theO return aGEOMObject._retn(); //Get the shapes - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theObjects, aShapes )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false ); + Handle(::GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, false ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -361,12 +361,12 @@ GEOM_IHealingOperations_i::SewAllowNonManifold (const GEOM::ListOfGO& theObjects return aGEOMObject._retn(); //Get the shapes - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theObjects, aShapes )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true ); + Handle(::GEOM_Object) aNewObject = GetOperations()->Sew( aShapes, theTolerance, true ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -387,12 +387,12 @@ GEOM_IHealingOperations_i::RemoveInternalFaces (const GEOM::ListOfGO& theSolids) GetOperations()->SetNotDone(); // Get the objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theSolids, aShapes )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes); + Handle(::GEOM_Object) aNewObject = GetOperations()->RemoveInternalFaces(aShapes); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -419,12 +419,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::DivideEdge (GEOM::GEOM_Object_p return aGEOMObject._retn(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->DivideEdge( anObject, theIndex, theValue, isByParameter ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -448,17 +448,17 @@ GEOM_IHealingOperations_i::DivideEdgeByPoint (GEOM::GEOM_Object_ptr theObject, GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Get the points - std::list< HANDLE_NAMESPACE(GEOM_Object) > aPoints; + std::list< Handle(::GEOM_Object) > aPoints; if (! GetListOfObjectsImpl( thePoints, aPoints )) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->DivideEdgeByPoint( anObject, theIndex, aPoints ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -481,21 +481,21 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::FuseCollinearEdgesWithinWire GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); int ind, aLen; - std::list aVerts; + std::list aVerts; //Get the shapes aLen = theVertices.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theVertices[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theVertices[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aVerts.push_back(aSh); } //Perform operation - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->FuseCollinearEdgesWithinWire(aWire, aVerts); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -523,7 +523,7 @@ GEOM_IHealingOperations_i::GetFreeBoundary ( const GEOM::ListOfGO & theObjects, Handle(TColStd_HSequenceOfTransient) anObjects = new TColStd_HSequenceOfTransient(); for ( size_t i = 0; i < theObjects.length(); ++i ) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObjects[i]); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObjects[i]); if (anObject.IsNull()) return false; anObjects->Append( anObject ); @@ -539,12 +539,12 @@ GEOM_IHealingOperations_i::GetFreeBoundary ( const GEOM::ListOfGO & theObjects, int i, n = aClosed->Length(); theClosedWires->length( n ); for ( i = 1; i <= n; i++ ) - (*theClosedWires)[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aClosed->Value(i))); + (*theClosedWires)[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aClosed->Value(i))); n = anOpen->Length(); theOpenWires->length( n ); for ( i = 1, n = anOpen->Length(); i <= n; i++ ) - (*theOpenWires)[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(anOpen->Value(i))); + (*theOpenWires)[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(anOpen->Value(i))); return true; } @@ -569,12 +569,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ChangeOrientation (GEOM::GEOM_O aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform -// HANDLE_NAMESPACE(GEOM_Object) aNewObject = +// Handle(::GEOM_Object) aNewObject = GetOperations()->ChangeOrientation( anObject ); // if (!GetOperations()->IsDone() || aNewObject.IsNull()) // return aGEOMObject._retn(); @@ -597,12 +597,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::ChangeOrientationCopy (GEOM::GE GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->ChangeOrientationCopy( anObject ); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); @@ -624,12 +624,12 @@ GEOM::GEOM_Object_ptr GEOM_IHealingOperations_i::LimitTolerance (GEOM::GEOM_Obje GetOperations()->SetNotDone(); // Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); // Perform - HANDLE_NAMESPACE(GEOM_Object) aNewObject = + Handle(::GEOM_Object) aNewObject = GetOperations()->LimitTolerance(anObject, theTolerance); if (!GetOperations()->IsDone() || aNewObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc index 57d768f18..87a697c9b 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -36,10 +36,7 @@ #include "GEOM_BaseObject.hxx" #include "GEOMImpl_Types.hxx" -#include - #include - #include //============================================================================= @@ -79,11 +76,11 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::MakeCopy(GEOM::GEOM_Object_ptr t GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); + Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal); if (anOriginal.IsNull()) return aGEOMObject._retn(); //Create the copy - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal); + Handle(::GEOM_Object) anObject = GetOperations()->MakeCopy(anOriginal); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -106,7 +103,7 @@ void GEOM_IInsertOperations_i::Export GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) anOriginal = GetObjectImpl(theOriginal); + Handle(::GEOM_Object) anOriginal = GetObjectImpl(theOriginal); if (anOriginal.IsNull()) return; //Export the shape to the file @@ -139,7 +136,7 @@ GEOM::ListOfGBO* GEOM_IInsertOperations_i::ImportFile aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetBaseObject(Handle(::GEOM_BaseObject)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -180,7 +177,7 @@ GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::RestoreShape (const SALOMEDS::TM char* buf = (char*)theStream.NP_data(); std::istringstream aStream (buf); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RestoreShape(aStream); + Handle(::GEOM_Object) anObject = GetOperations()->RestoreShape(aStream); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -280,8 +277,8 @@ CORBA::Boolean GEOM_IInsertOperations_i::TransferData } //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom); - HANDLE_NAMESPACE(GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo); + Handle(::GEOM_Object) aShapeFrom = GetObjectImpl(theObjectFrom); + Handle(::GEOM_Object) aShapeTo = GetObjectImpl(theObjectTo); if (aShapeFrom.IsNull() || aShapeTo.IsNull()) { diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc index 0d89b61d3..236717cb7 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.cc +++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc @@ -66,11 +66,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletAll GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletAll(aShapeRef, theR); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -90,7 +90,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdges GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -102,7 +102,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdges } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletEdges(aShapeRef, theR, anEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -122,7 +122,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdgesR1R2 GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -134,7 +134,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletEdgesR1R2 } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletEdgesR1R2(aShapeRef, theR1, theR2, anEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -154,7 +154,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFaces GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -166,7 +166,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFaces } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletFaces(aShapeRef, theR, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -186,7 +186,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFacesR1R2 GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -198,7 +198,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFilletFacesR1R2 } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFilletFacesR1R2(aShapeRef, theR1, theR2, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -218,7 +218,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet2D GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference vertex @@ -230,7 +230,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet2D } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFillet2D(aShapeRef, theR, aVertexes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -251,7 +251,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet1D GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape (wire) - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference vertex @@ -263,7 +263,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeFillet1D } //Create the Fillet - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFillet1D(aShapeRef, theR, aVertexes, doIgnoreSecantVertices); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -282,11 +282,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferAll GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferAll(aShapeRef, theD); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -307,11 +307,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdge GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdge(aShapeRef, theD1, theD2, theFace1, theFace2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -331,11 +331,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgeAD GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdgeAD(aShapeRef, theD, theAngle, theFace1, theFace2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -356,7 +356,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFaces GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -368,7 +368,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFaces } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferFaces(aShapeRef, theD1, theD2, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -388,7 +388,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFacesAD GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference faces @@ -400,7 +400,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferFacesAD } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferFacesAD(aShapeRef, theD, theAngle, aFaces); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -421,7 +421,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdges GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -433,7 +433,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdges } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdges(aShapeRef, theD1, theD2, aEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -454,7 +454,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgesAD GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Get the reference edges @@ -466,7 +466,7 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeChamferEdgesAD } //Create the Chamfer - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeChamferEdgesAD(aShapeRef, theD, theAngle, aEdges); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -487,11 +487,11 @@ GEOM::GEOM_Object_ptr GEOM_ILocalOperations_i::MakeArchimede (GEOM::GEOM_Object_ GEOM::GEOM_Object_var aGEOMObject; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); if (aShapeRef.IsNull()) return aGEOMObject._retn(); //Create the Archimede - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeArchimede + Handle(::GEOM_Object) anObject = GetOperations()->MakeArchimede (aShapeRef, theWeight, theWaterDensity, theMeshingDeflection); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -508,8 +508,8 @@ CORBA::Long GEOM_ILocalOperations_i::GetSubShapeIndex (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr theSubShape) { //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aShapeRef = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + Handle(::GEOM_Object) aShapeRef = GetObjectImpl(theShape); + Handle(::GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); if (aShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; //Get the unique ID of inside diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 97e8df969..591861013 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -355,7 +355,7 @@ GEOM::GEOM_IKindOfShape::shape_kind GEOM_IMeasureOperations_i::KindOfShape GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger; @@ -403,7 +403,7 @@ void GEOM_IMeasureOperations_i::GetPosition Zz = Xx = 1.; //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -424,11 +424,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetCentreOfMass GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); // Make Point - centre of mass of theShape - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape); + Handle(::GEOM_Object) anObject = GetOperations()->GetCentreOfMass(aShape); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -449,11 +449,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetVertexByIndex GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if ( aShape.IsNull() ) return aGEOMObject._retn(); // Get vertex by index - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex); + Handle(::GEOM_Object) anObject = GetOperations()->GetVertexByIndex(aShape, theIndex); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -475,14 +475,14 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::GetNormal GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) return aGEOMObject._retn(); // Get the OptionalPoint (can be not defined) - HANDLE_NAMESPACE(GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint); + Handle(::GEOM_Object) anOptionalPoint = GetObjectImpl(theOptionalPoint); // Make Vector - normal to theFace (in point theOptionalPoint if the face is not planar) - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint); + Handle(::GEOM_Object) anObject = GetOperations()->GetNormal(aFace, anOptionalPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -504,7 +504,7 @@ void GEOM_IMeasureOperations_i::GetBasicProperties (GEOM::GEOM_Object_ptr theSha GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -528,7 +528,7 @@ void GEOM_IMeasureOperations_i::GetInertia GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -554,7 +554,7 @@ void GEOM_IMeasureOperations_i::GetBoundingBox (GEOM::GEOM_Object_ptr theShape, GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -577,11 +577,11 @@ GEOM::GEOM_Object_ptr GEOM_IMeasureOperations_i::MakeBoundingBox GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); // Make Box - bounding box of theShape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetBoundingBox(aShape, precise); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -604,7 +604,7 @@ void GEOM_IMeasureOperations_i::GetTolerance GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; // Get shape parameters @@ -632,7 +632,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShape } //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { @@ -660,7 +660,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckShapeWithGeometry } //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { @@ -685,7 +685,7 @@ char* GEOM_IMeasureOperations_i::PrintShapeErrors const GEOM::GEOM_IMeasureOperations::ShapeErrors &theErrors) { //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { return NULL; @@ -720,7 +720,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersections (GEOM::GEOM_Obj GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { GEOMImpl_IMeasureOperations::SICheckLevel aCheckLevel; @@ -787,7 +787,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckSelfIntersectionsFast GEOM::ListOfLong_var anIntegersArray = new GEOM::ListOfLong(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (!aShape.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers = new TColStd_HSequenceOfInteger; @@ -822,7 +822,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckBOPArguments GetOperations()->SetNotDone(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); bool isGood = false; if (!aShape.IsNull()) { @@ -855,8 +855,8 @@ CORBA::Boolean GEOM_IMeasureOperations_i::FastIntersect (GEOM::GEOM_Object_ptr t GEOM::ListOfLong_var anIntegersArray2 = new GEOM::ListOfLong(); // Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (!aShape1.IsNull() && !aShape2.IsNull()) { Handle(TColStd_HSequenceOfInteger) anIntegers1 = new TColStd_HSequenceOfInteger; @@ -897,7 +897,7 @@ char* GEOM_IMeasureOperations_i::IsGoodForSolid (GEOM::GEOM_Object_ptr theShape) GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return CORBA::string_dup("WRN_NULL_OBJECT_OR_SHAPE"); // Get shape parameters @@ -916,7 +916,7 @@ char* GEOM_IMeasureOperations_i::WhatIs (GEOM::GEOM_Object_ptr theShape) GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return NULL; // Get shape parameters @@ -941,7 +941,7 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_ GEOM::ListOfBool_var aResults = new GEOM::ListOfBool; aResults->length(nb_points); - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); std::vector tmp(3*nb_points); for (int i = 0; i < 3*nb_points; i++) @@ -966,8 +966,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetMinDistance GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get shape parameters @@ -991,8 +991,8 @@ CORBA::Long GEOM_IMeasureOperations_i::ClosestPoints GEOM::ListOfDouble_var aDoublesArray = new GEOM::ListOfDouble(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (!aShape1.IsNull() && !aShape2.IsNull()) { Handle(TColStd_HSequenceOfReal) aDoubles = new TColStd_HSequenceOfReal; @@ -1022,7 +1022,7 @@ void GEOM_IMeasureOperations_i::PointCoordinates (GEOM::GEOM_Object_ptr theShape GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return; @@ -1042,8 +1042,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngle (GEOM::GEOM_Object_ptr theShap GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get the angle @@ -1062,8 +1062,8 @@ CORBA::Double GEOM_IMeasureOperations_i::GetAngleBtwVectors (GEOM::GEOM_Object_p GetOperations()->SetNotDone(); //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return -1.0; // Get the angle @@ -1083,7 +1083,7 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve); if(aShape.IsNull()) return -1.0; return GetOperations()->CurveCurvatureByParam(aShape,theParam); @@ -1101,8 +1101,8 @@ CORBA::Double GEOM_IMeasureOperations_i::CurveCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theCurve); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if( aShape.IsNull() || aPoint.IsNull() ) return -1.0; return GetOperations()->CurveCurvatureByPoint(aShape,aPoint); @@ -1123,7 +1123,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); if(aShape.IsNull()) return -1.0; return GetOperations()->MaxSurfaceCurvatureByParam(aShape,theUParam,theVParam); @@ -1141,8 +1141,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MaxSurfaceCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if( aShape.IsNull() || aPoint.IsNull() ) return -1.0; return GetOperations()->MaxSurfaceCurvatureByPoint(aShape,aPoint); @@ -1162,7 +1162,7 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByParam GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); if (aShape.IsNull()) return -1.0; return GetOperations()->MinSurfaceCurvatureByParam(aShape,theUParam,theVParam); @@ -1180,8 +1180,8 @@ CORBA::Double GEOM_IMeasureOperations_i::MinSurfaceCurvatureByPoint GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theSurf); - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theSurf); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aShape.IsNull() || aPoint.IsNull()) return -1.0; return GetOperations()->MinSurfaceCurvatureByPoint(aShape,aPoint); diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index b3d6c6125..47aadccca 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -135,7 +135,7 @@ void GEOM_IOperations_i::AbortOperation() */ //============================================================================= GEOM::GEOM_BaseObject_ptr -GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject) +GEOM_IOperations_i::GetBaseObject(Handle(::GEOM_BaseObject) theObject) { GEOM::GEOM_BaseObject_var GO; if (theObject.IsNull()) return GO._retn(); @@ -150,10 +150,10 @@ GEOM_IOperations_i::GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject) * GetObjectImpl */ //============================================================================= -HANDLE_NAMESPACE(GEOM_BaseObject) +Handle(::GEOM_BaseObject) GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject) { - HANDLE_NAMESPACE(GEOM_BaseObject) anImpl; + Handle(::GEOM_BaseObject) anImpl; if (!CORBA::is_nil(theObject)) { CORBA::String_var anEntry = theObject->GetEntry(); anImpl = GetImpl()->GetEngine()->GetObject( theObject->GetStudyID(), anEntry ); @@ -166,7 +166,7 @@ GEOM_IOperations_i::GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject) * GetObject */ //============================================================================= -GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject) +GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(::GEOM_Object) theObject) { return GEOM::GEOM_Object::_narrow( GetBaseObject( theObject )); } @@ -176,9 +176,9 @@ GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(HANDLE_NAMESPACE(GEOM_Object * GetObjectImpl */ //============================================================================= -HANDLE_NAMESPACE(GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject) +Handle(::GEOM_Object) GEOM_IOperations_i::GetObjectImpl(GEOM::GEOM_Object_ptr theObject) { - return HANDLE_NAMESPACE(GEOM_Object)::DownCast( GetBaseObjectImpl( theObject )); + return Handle(::GEOM_Object)::DownCast( GetBaseObjectImpl( theObject )); } //============================================================================= @@ -196,7 +196,7 @@ Handle(TColStd_HSequenceOfTransient) GEOM_IOperations_i::GetListOfObjectsImpl int aNbObj = theObjects.length(); for (i = 0; i < aNbObj; i++) { - HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]); + Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]); if (anObj.IsNull()) { aResult.Nullify(); @@ -215,13 +215,13 @@ Handle(TColStd_HSequenceOfTransient) GEOM_IOperations_i::GetListOfObjectsImpl //======================================================================= bool GEOM_IOperations_i::GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects, - std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList) + std::list< Handle(::GEOM_Object) >& theList) { int i; int aNbObj = theObjects.length(); for (i = 0; i < aNbObj; i++) { - HANDLE_NAMESPACE(GEOM_Object) anObj = GetObjectImpl(theObjects[i]); + Handle(::GEOM_Object) anObj = GetObjectImpl(theObjects[i]); if (anObj.IsNull()) return false; diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh index aa271fbf1..61acf9656 100644 --- a/src/GEOM_I/GEOM_IOperations_i.hh +++ b/src/GEOM_I/GEOM_IOperations_i.hh @@ -47,10 +47,10 @@ class GEOM_I_EXPORT GEOM_IOperations_i : public virtual POA_GEOM::GEOM_IOperatio virtual CORBA::Long GetStudyID(); - virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject); - virtual HANDLE_NAMESPACE(GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject); - virtual GEOM::GEOM_Object_ptr GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject); - virtual HANDLE_NAMESPACE(GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject); + virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(Handle(::GEOM_BaseObject) theObject); + virtual Handle(::GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject); + virtual GEOM::GEOM_Object_ptr GetObject(Handle(::GEOM_Object) theObject); + virtual Handle(::GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject); virtual void StartOperation(); @@ -68,7 +68,7 @@ protected: Handle(TColStd_HSequenceOfTransient) GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects); bool GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects, - std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList); + std::list< Handle(::GEOM_Object) >& theList); Handle(TColStd_HArray1OfExtendedString) ConvertStringArray(const GEOM::string_array &theInArray); diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index 31e54ba2f..0f18c5bb0 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -102,13 +102,13 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeEdge GetOperations()->SetNotDone(); //Get the reference points - HANDLE_NAMESPACE(GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); - HANDLE_NAMESPACE(GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); + Handle(::GEOM_Object) aPnt1 = GetObjectImpl(thePnt1); + Handle(::GEOM_Object) aPnt2 = GetObjectImpl(thePnt2); if (aPnt1.IsNull() || aPnt2.IsNull()) return aGEOMObject._retn(); //Create the Edge - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2); + Handle(::GEOM_Object) anObject = GetOperations()->MakeEdge(aPnt1, aPnt2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -131,17 +131,17 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeEdgeOnCurveByLength GetOperations()->SetNotDone(); //Get the reference curve - HANDLE_NAMESPACE(GEOM_Object) aRefCurve = GetObjectImpl(theCurve); + Handle(::GEOM_Object) aRefCurve = GetObjectImpl(theCurve); if (aRefCurve.IsNull()) return aGEOMObject._retn(); //Get the reference point (can be NULL) - HANDLE_NAMESPACE(GEOM_Object) aRefPoint; + Handle(::GEOM_Object) aRefPoint; if (!CORBA::is_nil(theStartPoint)) { aRefPoint = GetObjectImpl(theStartPoint); } //Create the point - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeEdgeOnCurveByLength(aRefCurve, theLength, aRefPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -165,12 +165,12 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeEdgeWire GetOperations()->SetNotDone(); //Get the source wire - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); //Create the Edge - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance); + Handle(::GEOM_Object) anObject = GetOperations()->MakeEdgeWire(aWire, theLinearTolerance, theAngularTolerance); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -192,18 +192,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeWire GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theEdgesAndWires.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theEdgesAndWires[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeWire(aShapes, theTolerance); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -226,11 +226,11 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFace GetOperations()->SetNotDone(); //Get the reference wire - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aWire.IsNull()) return aGEOMObject._retn(); //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted); + Handle(::GEOM_Object) anObject = GetOperations()->MakeFace(aWire, isPlanarWanted); //if (!GetOperations()->IsDone() || anObject.IsNull()) // enable warning status if (anObject.IsNull()) @@ -254,18 +254,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWires GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theWires.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theWires[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theWires[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceWires(aShapes, isPlanarWanted); //if (!GetOperations()->IsDone() || anObject.IsNull()) // enable warning status @@ -290,15 +290,15 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceFromSurface GetOperations()->SetNotDone(); //Get the reference face and wire - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aFace.IsNull() || aWire.IsNull()) { return aGEOMObject._retn(); } //Create the Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceFromSurface(aFace, aWire); if (anObject.IsNull()) { @@ -322,14 +322,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWithConstraints GetOperations()->SetNotDone(); //Get the shapes - std::list aConstraints; + std::list aConstraints; for( int ind = 0; ind < theConstraints.length(); ind++ ) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); + Handle(::GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); aConstraints.push_back(anObject); } // Make Face - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeFaceWithConstraints( aConstraints ); // enable warning status @@ -353,18 +353,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeShell GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theFacesAndShells.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theFacesAndShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeShell(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -386,14 +386,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSolidShell GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShell = GetObjectImpl(theShell); + Handle(::GEOM_Object) aShell = GetObjectImpl(theShell); if (aShell.IsNull()) return aGEOMObject._retn(); - std::list aShapes; + std::list aShapes; aShapes.push_back(aShell); //Create the Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); + Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -414,18 +414,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSolidShells GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theShells.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShells[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidShells(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -447,18 +447,18 @@ GEOM_IShapesOperations_i::MakeCompound (const GEOM::ListOfGO& theShapes) GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theShapes.length(); for (ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theShapes[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeCompound(aShapes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -481,18 +481,18 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSolidFromConnectedFaces GetOperations()->SetNotDone(); int ind, aLen; - std::list aShapes; + std::list aShapes; //Get the shapes aLen = theFacesOrShells.length(); for (ind = 0; ind < aLen; ind++) { - ::HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]); + ::Handle(::GEOM_Object) aSh = GetObjectImpl(theFacesOrShells[ind]); if (aSh.IsNull()) return aGEOMObject._retn(); aShapes.push_back(aSh); } // Make Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeSolidFromConnectedFaces(aShapes, isIntersect); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -516,12 +516,12 @@ GEOM_IShapesOperations_i::MakeGlueFaces (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueFaces(aShapes, theTolerance, doKeepNonSolids); //if (!GetOperations()->IsDone() || anObject.IsNull()) // to allow warning @@ -546,7 +546,7 @@ GEOM_IShapesOperations_i::GetGlueFaces (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aSeq._retn(); @@ -561,7 +561,7 @@ GEOM_IShapesOperations_i::GetGlueFaces (const GEOM::ListOfGO& theShapes, Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -584,17 +584,17 @@ GEOM_IShapesOperations_i::MakeGlueFacesByList (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Get the shapes - std::list aFaces; + std::list aFaces; if (! GetListOfObjectsImpl( theFaces, aFaces )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueFacesByList(aShapes, theTolerance, aFaces, doKeepNonSolids, doGlueAllEdges); //if (!GetOperations()->IsDone() || anObject.IsNull()) @@ -620,12 +620,12 @@ GEOM_IShapesOperations_i::MakeGlueEdges (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueEdges(aShapes, theTolerance); //if (!GetOperations()->IsDone() || anObject.IsNull()) // to allow warning @@ -650,7 +650,7 @@ GEOM_IShapesOperations_i::GetGlueEdges (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aSeq._retn(); @@ -665,7 +665,7 @@ GEOM_IShapesOperations_i::GetGlueEdges (const GEOM::ListOfGO& theShapes, Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -686,17 +686,17 @@ GEOM_IShapesOperations_i::MakeGlueEdgesByList (const GEOM::ListOfGO& theShapes, GetOperations()->SetNotDone(); //Get the reference objects - std::list< HANDLE_NAMESPACE(GEOM_Object) > aShapes; + std::list< Handle(::GEOM_Object) > aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aGEOMObject._retn(); //Get the shapes - std::list anEdges; + std::list anEdges; if (! GetListOfObjectsImpl( theEdges, anEdges )) return aGEOMObject._retn(); //Perform the gluing - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->MakeGlueEdgesByList(aShapes, theTolerance, anEdges); //if (!GetOperations()->IsDone() || anObject.IsNull()) // to allow warning @@ -717,7 +717,7 @@ GEOM_IShapesOperations_i::GetExistingSubObjects (GEOM::GEOM_Object_ptr theShape, { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -728,7 +728,7 @@ GEOM_IShapesOperations_i::GetExistingSubObjects (GEOM::GEOM_Object_ptr theShape, Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -744,7 +744,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeExplode (GEOM::GEOM_Object_ptr the { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -756,7 +756,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeExplode (GEOM::GEOM_Object_ptr the Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -772,7 +772,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeAllSubShapes (GEOM::GEOM_Object_pt { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -784,7 +784,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeAllSubShapes (GEOM::GEOM_Object_pt Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -800,7 +800,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::ExtractSubShapes (GEOM::GEOM_Object_pt { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfTransient) aHSeq = @@ -813,7 +813,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::ExtractSubShapes (GEOM::GEOM_Object_pt Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -829,7 +829,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::SubShapeAllIDs (GEOM::GEOM_Object_pt { GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfInteger) aHSeq = @@ -856,7 +856,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetAllSubShapesIDs (GEOM::GEOM_Objec { GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfInteger) aHSeq = @@ -887,10 +887,10 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSubShape GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theMainShape); if (aShape.IsNull()) return aGEOMObject._retn(); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID); + Handle(::GEOM_Object) anObject = GetOperations()->GetSubShape(aShape, theID); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -914,7 +914,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t if (theIndices.length() < 1) return aSeq._retn(); - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theMainShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger (1, theIndices.length()); @@ -928,7 +928,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (i = 0; i < aLength; i++) - aSeq[i] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i+1))); + aSeq[i] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i+1))); return aSeq._retn(); } @@ -942,8 +942,8 @@ CORBA::Long GEOM_IShapesOperations_i::GetSubShapeIndex (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape) { //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); - HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; @@ -966,14 +966,14 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSubShapesIndices GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; //Get the reference main shape - HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); if (aMainShapeRef.IsNull()) return aSeq._retn(); //Get the subshapes - std::list aShapes; + std::list aShapes; int aLen = theSubShapes.length(); for (int ind = 0; ind < aLen; ind++) { - HANDLE_NAMESPACE(GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); + Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); if (aSh.IsNull()) { MESSAGE("NULL shape") @@ -1007,8 +1007,8 @@ CORBA::Long GEOM_IShapesOperations_i::GetTopologyIndex (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape) { //Get the reference shapes - HANDLE_NAMESPACE(GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); - HANDLE_NAMESPACE(GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); + Handle(::GEOM_Object) aMainShapeRef = GetObjectImpl(theMainShape); + Handle(::GEOM_Object) aSubShapeRef = GetObjectImpl(theSubShape); if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; @@ -1028,7 +1028,7 @@ CORBA::Long GEOM_IShapesOperations_i::GetTopologyIndex char* GEOM_IShapesOperations_i::GetShapeTypeString (GEOM::GEOM_Object_ptr theShape) { //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return NULL; // Get shape parameters @@ -1046,8 +1046,8 @@ CORBA::Boolean GEOM_IShapesOperations_i::IsSubShapeBelongsTo( GEOM::GEOM_Object_ GEOM::GEOM_Object_ptr theObject, const CORBA::Long theObjectIndex) { - HANDLE_NAMESPACE(GEOM_Object) aSubObject = GetObjectImpl( theSubObject ); - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl( theObject ); + Handle(::GEOM_Object) aSubObject = GetObjectImpl( theSubObject ); + Handle(::GEOM_Object) anObject = GetObjectImpl( theObject ); if( anObject.IsNull() || aSubObject.IsNull() ) return false; @@ -1083,7 +1083,7 @@ CORBA::Long GEOM_IShapesOperations_i::NumberOfEdges (GEOM::GEOM_Object_ptr theSh CORBA::Long GEOM_IShapesOperations_i::NumberOfSubShapes (GEOM::GEOM_Object_ptr theShape, const CORBA::Long theShapeType) { - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return -1; CORBA::Long aNb = GetOperations()->NumberOfSubShapes(aShape, theShapeType); @@ -1106,11 +1106,11 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::ChangeOrientation GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aGEOMObject._retn(); //Create the Solid - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ReverseShape(aShape); + Handle(::GEOM_Object) anObject = GetOperations()->ReverseShape(aShape); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1129,7 +1129,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetFreeFacesIDs (GEOM::GEOM_Object_p GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HSequenceOfInteger) aHSeq = @@ -1159,8 +1159,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapes GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - HANDLE_NAMESPACE(GEOM_Object) aShape1 = GetObjectImpl(theShape1); - HANDLE_NAMESPACE(GEOM_Object) aShape2 = GetObjectImpl(theShape2); + Handle(::GEOM_Object) aShape1 = GetObjectImpl(theShape1); + Handle(::GEOM_Object) aShape2 = GetObjectImpl(theShape2); if (aShape1.IsNull() || aShape2.IsNull()) return aSeq._retn(); @@ -1172,7 +1172,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapes Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1193,7 +1193,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapesMulti GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; //Get the shapes - std::list aShapes; + std::list aShapes; if (! GetListOfObjectsImpl( theShapes, aShapes )) return aSeq._retn(); @@ -1205,7 +1205,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSharedShapesMulti Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1254,8 +1254,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlane GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn(); @@ -1268,7 +1268,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlane Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1291,9 +1291,9 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocation GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); - HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) anPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn(); @@ -1306,7 +1306,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocation Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1329,8 +1329,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinder GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn(); @@ -1343,7 +1343,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinder Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1367,9 +1367,9 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinderWithLocation GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn(); @@ -1382,7 +1382,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnCylinderWithLocation Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1405,8 +1405,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnSphere GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCenter = GetObjectImpl(theCenter); if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn(); @@ -1419,7 +1419,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnSphere Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1444,11 +1444,11 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnQuadrangle GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); + Handle(::GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); + Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); + Handle(::GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); if (aShape.IsNull() || aTopLeftPoint.IsNull() || @@ -1468,7 +1468,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnQuadrangle Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1490,8 +1490,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnPlaneIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); if (aShape.IsNull() || anAx1.IsNull()) return aSeq._retn(); @@ -1527,9 +1527,9 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnPlaneWithLocationIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAx1 = GetObjectImpl(theAx1); - HANDLE_NAMESPACE(GEOM_Object) anPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAx1 = GetObjectImpl(theAx1); + Handle(::GEOM_Object) anPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAx1.IsNull() || anPnt.IsNull()) return aSeq._retn(); @@ -1566,8 +1566,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnCylinderIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (aShape.IsNull() || anAxis.IsNull()) return aSeq._retn(); @@ -1604,9 +1604,9 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnCylinderWithLocationIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); - HANDLE_NAMESPACE(GEOM_Object) aPnt = GetObjectImpl(thePnt); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aPnt = GetObjectImpl(thePnt); if (aShape.IsNull() || anAxis.IsNull() || aPnt.IsNull()) return aSeq._retn(); @@ -1642,8 +1642,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnSphereIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCenter = GetObjectImpl(theCenter); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCenter = GetObjectImpl(theCenter); if (aShape.IsNull() || aCenter.IsNull()) return aSeq._retn(); @@ -1681,11 +1681,11 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnQuadrangleIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); - HANDLE_NAMESPACE(GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aTopLeftPoint = GetObjectImpl(theTopLeftPoint); + Handle(::GEOM_Object) aTopRigthPoint = GetObjectImpl(theTopRigthPoint); + Handle(::GEOM_Object) aBottomLeftPoint = GetObjectImpl(theBottomLeftPoint); + Handle(::GEOM_Object) aBottomRigthPoint = GetObjectImpl(theBottomRigthPoint); if (aShape.IsNull() || aTopLeftPoint.IsNull() || @@ -1727,8 +1727,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnBox GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aBox = GetObjectImpl(theBox); if (aShape.IsNull() || aBox.IsNull() ) return aSeq._retn(); @@ -1742,7 +1742,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnBox Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1764,8 +1764,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnBoxIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aBox = GetObjectImpl(theBox); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aBox = GetObjectImpl(theBox); if (aShape.IsNull() || aBox.IsNull() ) return aSeq._retn(); @@ -1802,8 +1802,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnShape GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aSeq._retn(); @@ -1818,7 +1818,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetShapesOnShape Standard_Integer aLength = aHSeq->Length(); aSeq->length(aLength); for (Standard_Integer i = 1; i <= aLength; i++) - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); return aSeq._retn(); } @@ -1841,14 +1841,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetShapesOnShapeAsCompound GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aGEOMObject._retn(); //Get Shapes On Shape - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound + Handle(::GEOM_Object) anObject = GetOperations()->GetShapesOnShapeAsCompound (aCheckShape,aShape, theShapeType,ShapeState(theState)); if (anObject.IsNull()) @@ -1875,8 +1875,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetShapesOnShapeIDs GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aCheckShape = GetObjectImpl(theCheckShape); if (aShape.IsNull() || aCheckShape.IsNull() ) return aSeq._retn(); @@ -1911,14 +1911,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlace GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetInPlace(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1941,14 +1941,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlaceOld GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetInPlaceOld(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1971,14 +1971,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetInPlaceByHistory GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetInPlaceByHistory(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -2001,14 +2001,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSame GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aGEOMObject._retn(); //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->GetSame(aShapeWhere, aShapeWhat); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -2027,8 +2027,8 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSameIDs GEOM::ListOfLong_var aSeq = new GEOM::ListOfLong; //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); - HANDLE_NAMESPACE(GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); + Handle(::GEOM_Object) aShapeWhere = GetObjectImpl(theShapeWhere); + Handle(::GEOM_Object) aShapeWhat = GetObjectImpl(theShapeWhat); if (aShapeWhere.IsNull() || aShapeWhat.IsNull()) return aSeq._retn(); @@ -2063,14 +2063,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::ExtendEdge GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) anEdge = GetObjectImpl(theEdge); + Handle(::GEOM_Object) anEdge = GetObjectImpl(theEdge); if (anEdge.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) aNewEdge = + Handle(::GEOM_Object) aNewEdge = GetOperations()->ExtendEdge(anEdge, theMin, theMax); if (!GetOperations()->IsDone() || aNewEdge.IsNull()) { @@ -2098,14 +2098,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::ExtendFace GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) aNewFace = + Handle(::GEOM_Object) aNewFace = GetOperations()->ExtendFace(aFace, theUMin, theUMax, theVMin, theVMax); if (!GetOperations()->IsDone() || aNewFace.IsNull()) { @@ -2129,14 +2129,14 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeSurfaceFromFace GetOperations()->SetNotDone(); //Get the reference object - HANDLE_NAMESPACE(GEOM_Object) aFace = GetObjectImpl(theFace); + Handle(::GEOM_Object) aFace = GetObjectImpl(theFace); if (aFace.IsNull()) { return aGEOMObject._retn(); } //Get Shapes in place of aShapeWhat - HANDLE_NAMESPACE(GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace); + Handle(::GEOM_Object) aNewFace = GetOperations()->MakeSurfaceFromFace(aFace); if (!GetOperations()->IsDone() || aNewFace.IsNull()) { return aGEOMObject._retn(); @@ -2160,8 +2160,8 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapeEdgeSorted GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); - HANDLE_NAMESPACE(GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aStartPoint = GetObjectImpl(theStartPoint); if (aShape.IsNull() || aStartPoint.IsNull()) { return aSeq._retn(); @@ -2180,7 +2180,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapeEdgeSorted aSeq->length(aLength); for (i = 1; i <= aLength; i++) { - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); } return aSeq._retn(); @@ -2203,7 +2203,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapesWithTolerance GetOperations()->SetNotDone(); //Get the reference objects - HANDLE_NAMESPACE(GEOM_Object) aShape = GetObjectImpl(theShape); + Handle(::GEOM_Object) aShape = GetObjectImpl(theShape); if (aShape.IsNull()) { return aSeq._retn(); @@ -2225,7 +2225,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::GetSubShapesWithTolerance aSeq->length(aLength); for (i = 1; i <= aLength; i++) { - aSeq[i-1] = GetObject(HANDLE_NAMESPACE(GEOM_Object)::DownCast(aHSeq->Value(i))); + aSeq[i-1] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i))); } return aSeq._retn(); diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc index e8e2fcd2d..55aa0eb3f 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -87,15 +87,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPoints aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the first point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -123,19 +123,19 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateTwoPointsCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the first point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Create the translated shape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->TranslateTwoPointsCopy(aBasicObject, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -167,7 +167,7 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZ aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -194,11 +194,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateDXDYDZCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the translated shape - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->TranslateDXDYDZCopy(aBasicObject, theDX, theDY, theDZ); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -230,11 +230,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVector aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -261,15 +261,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector); + Handle(::GEOM_Object) anObject = GetOperations()->TranslateVectorCopy(aBasicObject, aVector); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -302,16 +302,16 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TranslateVectorDistance aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); if (aVector.IsNull()) return aGEOMObject._retn(); //Perform the translation if (theCopy) { - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()-> + Handle(::GEOM_Object) anObject = GetOperations()-> TranslateVectorDistance(aBasicObject, aVector, theDistance, theCopy); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -351,11 +351,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::Rotate (GEOM::GEOM_Object_ptr aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the axis of revolution - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (anAxis.IsNull()) return aGEOMObject._retn(); //Perform the rotation @@ -382,15 +382,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateCopy (GEOM::GEOM_Object GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the axis of rotation - HANDLE_NAMESPACE(GEOM_Object) anAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) anAxis = GetObjectImpl(theAxis); if (anAxis.IsNull()) return aGEOMObject._retn(); //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle); + Handle(::GEOM_Object) anObject = GetOperations()->RotateCopy(aBasicObject, anAxis, theAngle); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -420,11 +420,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlane } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the plane - HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane); + Handle(::GEOM_Object) aPlane = GetObjectImpl(thePlane); if (aPlane.IsNull()) return aGEOMObject._retn(); //Perform the mirror @@ -451,15 +451,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPlaneCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aPlane = GetObjectImpl(thePlane); + Handle(::GEOM_Object) aPlane = GetObjectImpl(thePlane); if (aPlane.IsNull()) return aGEOMObject._retn(); //Perform the mirror - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane); + Handle(::GEOM_Object) anObject = GetOperations()->MirrorPlaneCopy(aBasicObject, aPlane); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -489,11 +489,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxis } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the axis - HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aAxis = GetObjectImpl(theAxis); if (aAxis.IsNull()) return aGEOMObject._retn(); //Perform the mirror @@ -520,15 +520,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorAxisCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aAxis = GetObjectImpl(theAxis); + Handle(::GEOM_Object) aAxis = GetObjectImpl(theAxis); if (aAxis.IsNull()) return aGEOMObject._retn(); //Perform the mirror - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis); + Handle(::GEOM_Object) anObject = GetOperations()->MirrorAxisCopy(aBasicObject, aAxis); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -558,11 +558,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPoint } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); //Perform the mirror @@ -589,15 +589,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPointCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); //Perform the mirror - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint); + Handle(::GEOM_Object) anObject = GetOperations()->MirrorPointCopy(aBasicObject, aPoint); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -627,7 +627,7 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape } //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape @@ -654,11 +654,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset); + Handle(::GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -680,12 +680,12 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ProjectShapeCopy GetOperations()->SetNotDone(); //Get the input objects - HANDLE_NAMESPACE(GEOM_Object) aSource = GetObjectImpl(theSource); - HANDLE_NAMESPACE(GEOM_Object) aTarget = GetObjectImpl(theTarget); + Handle(::GEOM_Object) aSource = GetObjectImpl(theSource); + Handle(::GEOM_Object) aTarget = GetObjectImpl(theTarget); if (aSource.IsNull() || aTarget.IsNull()) return aGEOMObject._retn(); //Create the projection - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget); + Handle(::GEOM_Object) anObject = GetOperations()->ProjectShapeCopy(aSource, aTarget); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -707,14 +707,14 @@ CORBA::Double GEOM_ITransformOperations_i::ProjectPointOnWire GetOperations()->SetNotDone(); //Get the reference shape - HANDLE_NAMESPACE(GEOM_Object) aPoint = GetObjectImpl(thePoint); - HANDLE_NAMESPACE(GEOM_Object) aWire = GetObjectImpl(theWire); + Handle(::GEOM_Object) aPoint = GetObjectImpl(thePoint); + Handle(::GEOM_Object) aWire = GetObjectImpl(theWire); if (aPoint.IsNull() || aWire.IsNull()) { return -1.0; } - HANDLE_NAMESPACE(GEOM_Object) aPointOnEdge; + Handle(::GEOM_Object) aPointOnEdge; Standard_Integer anEdgeIndex; CORBA::Double aResult = GetOperations()->ProjectPointOnWire (aPoint, aWire, aPointOnEdge, anEdgeIndex); @@ -751,11 +751,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShape } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); @@ -786,18 +786,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); } //Perform the scale - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->ScaleShapeCopy(aBasicObject, aPoint, theFactor); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -831,11 +831,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxes } //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); @@ -869,18 +869,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::ScaleShapeAlongAxesCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the point - HANDLE_NAMESPACE(GEOM_Object) aPoint; + Handle(::GEOM_Object) aPoint; if (!thePoint->_is_nil()) { aPoint = GetObjectImpl(thePoint); if (aPoint.IsNull()) return aGEOMObject._retn(); } //Perform the scale - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes + Handle(::GEOM_Object) anObject = GetOperations()->ScaleShapeAlongAxes (aBasicObject, aPoint, theFactorX, theFactorY, theFactorZ, /*doCopy*/true); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -913,18 +913,18 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShape } //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the Start LCS (may be NULL for positioning from global LCS) - HANDLE_NAMESPACE(GEOM_Object) aStartLCS; + Handle(::GEOM_Object) aStartLCS; if (!CORBA::is_nil(theStartLCS)) { aStartLCS = GetObjectImpl(theStartLCS); if (aStartLCS.IsNull()) return aGEOMObject._retn(); } //Get the End LCS - HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); + Handle(::GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); if (aEndLCS.IsNull()) return aGEOMObject._retn(); //Perform the Position @@ -952,22 +952,22 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionShapeCopy GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the Start LCS (may be NULL for positioning from global LCS) - HANDLE_NAMESPACE(GEOM_Object) aStartLCS; + Handle(::GEOM_Object) aStartLCS; if (!CORBA::is_nil(theStartLCS)) { aStartLCS = GetObjectImpl(theStartLCS); if (aStartLCS.IsNull()) return aGEOMObject._retn(); } //Get the End LCS - HANDLE_NAMESPACE(GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); + Handle(::GEOM_Object) aEndLCS = GetObjectImpl(theEndLCS); if (aEndLCS.IsNull()) return aGEOMObject._retn(); //Perform the position - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->PositionShapeCopy(aBasicObject, aStartLCS, aEndLCS); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -993,15 +993,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::PositionAlongPath GetOperations()->SetNotDone(); //Get the basic object - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the path object - HANDLE_NAMESPACE(GEOM_Object) aPathObject = GetObjectImpl(thePath); + Handle(::GEOM_Object) aPathObject = GetObjectImpl(thePath); if (aPathObject.IsNull()) return aGEOMObject._retn(); //Perform the position - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->PositionAlongPath(aBasicObject, aPathObject, theDistance, theCopy, theReverse); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1030,15 +1030,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate1D GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector of translation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DX by default //Perform the translation - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->Translate1D(aBasicObject, aVector, theStep, theNbTimes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1064,19 +1064,19 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiTranslate2D (GEOM::GEOM_ GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the vector1 of translation - HANDLE_NAMESPACE(GEOM_Object) aVector1 = GetObjectImpl(theVector1); + Handle(::GEOM_Object) aVector1 = GetObjectImpl(theVector1); //if (aVector1.IsNull()) return aGEOMObject._retn(); // DX by default //Get the vector2 of translation - HANDLE_NAMESPACE(GEOM_Object) aVector2 = GetObjectImpl(theVector2); + Handle(::GEOM_Object) aVector2 = GetObjectImpl(theVector2); //if (aVector2.IsNull()) return aGEOMObject._retn(); // DY by default //Perform the translation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Translate2D + Handle(::GEOM_Object) anObject = GetOperations()->Translate2D (aBasicObject, aVector1, theStep1, theNbTimes1, aVector2, theStep2, theNbTimes2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1098,15 +1098,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate1D (GEOM::GEOM_Obj GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes); + Handle(::GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theNbTimes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -1128,15 +1128,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate1DByStep (GEOM::GE GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps); + Handle(::GEOM_Object) anObject = GetOperations()->Rotate1D(aBasicObject, aVector, theAngleStep, theNbSteps); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); return GetObject(anObject); @@ -1159,15 +1159,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2DNbTimes (GEOM::G GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D + Handle(::GEOM_Object) anObject = GetOperations()->Rotate2D (aBasicObject, aVector, theNbObjects, theRadialStep, theNbSteps); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1192,15 +1192,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2DByStep (GEOM::GE GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D + Handle(::GEOM_Object) anObject = GetOperations()->Rotate2D (aBasicObject, aVector, theAngle, theNbTimes1, theStep, theNbTimes2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1225,17 +1225,17 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MultiRotate2D (GEOM::GEOM_Obj GEOM::GEOM_Object_var aGEOMObject; //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the a directon of rotation - HANDLE_NAMESPACE(GEOM_Object) aVector = GetObjectImpl(theVector); + Handle(::GEOM_Object) aVector = GetObjectImpl(theVector); //if (aVector.IsNull()) return aGEOMObject._retn(); // DZ by default double anAngle = M_PI * theAngle / 180.; //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = GetOperations()->Rotate2D + Handle(::GEOM_Object) anObject = GetOperations()->Rotate2D (aBasicObject, aVector, anAngle, theNbTimes1, theStep, theNbTimes2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1269,19 +1269,19 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePoints aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the central point of rotation - HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); + Handle(::GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); if (aCentPoint.IsNull()) return aGEOMObject._retn(); //Get the first point - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the translation @@ -1310,23 +1310,23 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RotateThreePointsCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) aBasicObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) aBasicObject = GetObjectImpl(theObject); if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Get the central point of rotation - HANDLE_NAMESPACE(GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); + Handle(::GEOM_Object) aCentPoint = GetObjectImpl(theCentPoint); if (aCentPoint.IsNull()) return aGEOMObject._retn(); //Get the first point - HANDLE_NAMESPACE(GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); + Handle(::GEOM_Object) aPoint1 = GetObjectImpl(thePoint1); if (aPoint1.IsNull()) return aGEOMObject._retn(); //Get the second point - HANDLE_NAMESPACE(GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); + Handle(::GEOM_Object) aPoint2 = GetObjectImpl(thePoint2); if (aPoint2.IsNull()) return aGEOMObject._retn(); //Perform the rotation - HANDLE_NAMESPACE(GEOM_Object) anObject = + Handle(::GEOM_Object) anObject = GetOperations()->RotateThreePointsCopy(aBasicObject, aCentPoint, aPoint1, aPoint2); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); @@ -1349,15 +1349,15 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::TransformLikeOtherCopy GetOperations()->SetNotDone(); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Get the sample object - HANDLE_NAMESPACE(GEOM_Object) aSample = GetObjectImpl(theSample); + Handle(::GEOM_Object) aSample = GetObjectImpl(theSample); if (aSample.IsNull()) return aGEOMObject._retn(); //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) aResObject = + Handle(::GEOM_Object) aResObject = GetOperations()->TransformLikeOtherCopy(anObject, aSample); if (!GetOperations()->IsDone() || aResObject.IsNull()) return aGEOMObject._retn(); @@ -1382,11 +1382,11 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::RecomputeObject aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); //Get the object itself - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) return aGEOMObject._retn(); //Perform the recomputation - HANDLE_NAMESPACE(GEOM_Function) aLastFunction = anObject->GetLastFunction(); + Handle(::GEOM_Function) aLastFunction = anObject->GetLastFunction(); if (aLastFunction.IsNull()) return aGEOMObject._retn(); GetOperations()->GetSolver()->ComputeFunction(aLastFunction); @@ -1411,14 +1411,14 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MakeProjectionOnCylinder GetOperations()->SetNotDone(); //Get the object - HANDLE_NAMESPACE(GEOM_Object) anObject = GetObjectImpl(theObject); + Handle(::GEOM_Object) anObject = GetObjectImpl(theObject); if (anObject.IsNull()) { return aGEOMObject._retn(); } //Perform the transformation - HANDLE_NAMESPACE(GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder + Handle(::GEOM_Object) aResObject = GetOperations()->MakeProjectionOnCylinder (anObject, theRadius, theStartAngle, theAngleLength, theAngleRotation); if (!GetOperations()->IsDone() || aResObject.IsNull()) { diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 3894aff78..165613dc6 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -61,7 +61,7 @@ //============================================================================= GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - HANDLE_NAMESPACE(GEOM_Object) theImpl) : + Handle(::GEOM_Object) theImpl) : SALOME::GenericObj_i( thePOA ), GEOM_BaseObject_i( thePOA, theEngine, theImpl ), _impl( theImpl ) @@ -169,7 +169,7 @@ char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID) { CORBA::String_var name(""); - HANDLE_NAMESPACE(GEOM_Function) aMainFun = _impl->GetLastFunction(); + Handle(::GEOM_Function) aMainFun = _impl->GetLastFunction(); if ( aMainFun.IsNull() ) return name._retn(); const TDataStd_ListOfExtendedString& aListEntries = aMainFun->GetSubShapeReferences(); @@ -177,14 +177,14 @@ char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID) for (; anIt.More(); anIt.Next()) { TCollection_AsciiString anEntry = anIt.Value(); - HANDLE_NAMESPACE(GEOM_BaseObject) anObj = + Handle(::GEOM_BaseObject) anObj = GEOM_Engine::GetEngine()->GetObject( _impl->GetDocID(), anEntry.ToCString(), false ); if ( anObj.IsNull() ) continue; TCollection_AsciiString aSubName = anObj->GetName(); if ( aSubName.IsEmpty() ) continue; - HANDLE_NAMESPACE(GEOM_Function) aFun = anObj->GetLastFunction(); + Handle(::GEOM_Function) aFun = anObj->GetLastFunction(); if ( aFun.IsNull() ) continue; GEOM_ISubShape ISS( aFun ); @@ -359,7 +359,7 @@ GEOM::ListOfLong* GEOM_Object_i::GetSubShapeIndices() GEOM::ListOfLong_var anIndices = new GEOM::ListOfLong; if(!_impl->IsMainShape()) { - HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one) + Handle(::GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one) if(aFunction.IsNull()) return anIndices._retn(); GEOM_ISubShape ISS(aFunction); Handle(TColStd_HArray1OfInteger) anArray = ISS.GetIndices(); @@ -384,7 +384,7 @@ GEOM::GEOM_Object_ptr GEOM_Object_i::GetMainShape() { GEOM::GEOM_Object_var obj; if(!_impl->IsMainShape()) { - HANDLE_NAMESPACE(GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one) + Handle(::GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one) if(aFunction.IsNull()) return obj._retn(); GEOM_ISubShape ISS(aFunction); @@ -413,7 +413,7 @@ bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other) GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other ); if ( !CORBA::is_nil( shapePtr ) ) { CORBA::String_var entry = shapePtr->GetEntry(); - HANDLE_NAMESPACE(GEOM_Object) otherObject = HANDLE_NAMESPACE(GEOM_Object)::DownCast + Handle(::GEOM_Object) otherObject = Handle(::GEOM_Object)::DownCast ( GEOM_Engine::GetEngine()->GetObject( shapePtr->GetStudyID(), entry, false )); if ( !otherObject.IsNull() ) { TopoDS_Shape thisShape = _impl->GetValue(); diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index c825acd59..9a1d5adc6 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -36,7 +36,7 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual GEOM_BaseObject_i { public: - GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, HANDLE_NAMESPACE(GEOM_Object) theImpl); + GEOM_Object_i(PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, Handle(::GEOM_Object) theImpl); ~GEOM_Object_i(); virtual GEOM::shape_type GetShapeType(); @@ -81,11 +81,11 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual bool IsShape(); - HANDLE_NAMESPACE(GEOM_Object) GetImpl() { return _impl; } + Handle(::GEOM_Object) GetImpl() { return _impl; } private: - HANDLE_NAMESPACE(GEOM_Object) _impl; + Handle(::GEOM_Object) _impl; TopoDS_Shape _geom; }; diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx index d8cea0968..1b311aa3e 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.cxx @@ -115,7 +115,7 @@ IGESPlugin_ExportDriver::IGESPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer IGESPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer IGESPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -185,4 +185,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx index 35a799ab3..81c5f254b 100644 --- a/src/IGESPlugin/IGESPlugin_ExportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~IGESPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(IGESPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _IGESPlugin_ExportDriver_HXX diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx index 3cc0c7cb5..f82173160 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx @@ -80,7 +80,7 @@ IGESPlugin_ImportDriver::IGESPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer IGESPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -195,11 +195,7 @@ Standard_Integer IGESPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aResShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -282,4 +278,4 @@ IGESPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return TCollection_AsciiString(); } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( IGESPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx index 35c5ab87f..7d3f11eaf 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.hxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.hxx @@ -32,9 +32,9 @@ public: ~IGESPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); @@ -44,7 +44,7 @@ public: const TCollection_AsciiString&, TCollection_AsciiString& ); - OCCT_DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(IGESPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _IGESPlugin_ImportDriver_HXX diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx index ae7a8326b..b964bcdab 100644 --- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx @@ -28,8 +28,6 @@ #include #include -#include - #include #include #include diff --git a/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx b/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx index 65c158550..6b0cbb9fe 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionFilter.cxx @@ -32,7 +32,7 @@ // SALOME includes #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter) +IMPLEMENT_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter, SelectMgr_Filter) //======================================================================= // function : Constructor diff --git a/src/MeasureGUI/MeasureGUI_DimensionFilter.h b/src/MeasureGUI/MeasureGUI_DimensionFilter.h index 60e83db1d..273653efb 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionFilter.h +++ b/src/MeasureGUI/MeasureGUI_DimensionFilter.h @@ -27,9 +27,6 @@ #ifndef MEASUREGUI_DIMENSIONFILTER_H #define MEASUREGUI_DIMENSIONFILTER_H -// KERNEL includes -#include - // GEOM includes #include @@ -49,7 +46,7 @@ class MeasureGUI_DimensionFilter : public SelectMgr_Filter { public: - OCCT_DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter) + DEFINE_STANDARD_RTTIEXT(MeasureGUI_DimensionFilter,SelectMgr_Filter) public: Standard_EXPORT MeasureGUI_DimensionFilter( const Handle(AIS_InteractiveObject)& theIO ); diff --git a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx index fa63bceb9..296fc8594 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx @@ -55,10 +55,7 @@ #include #include #include - -#if OCC_VERSION_LARGE >= 0x07010000 #include -#endif //================================================================================= // function : Constructor diff --git a/src/OBJECT/GEOM_AISDimension.cxx b/src/OBJECT/GEOM_AISDimension.cxx index e4bccc9ec..748bef3a5 100755 --- a/src/OBJECT/GEOM_AISDimension.cxx +++ b/src/OBJECT/GEOM_AISDimension.cxx @@ -26,9 +26,9 @@ #include "GEOM_AISDimension.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension) -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension) -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISLength, AIS_LengthDimension) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISDiameter, AIS_DiameterDimension) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISAngle, AIS_AngleDimension) /* ****************************************************************************** * * * diff --git a/src/OBJECT/GEOM_AISDimension.hxx b/src/OBJECT/GEOM_AISDimension.hxx index 17ffd27e5..26f07380b 100755 --- a/src/OBJECT/GEOM_AISDimension.hxx +++ b/src/OBJECT/GEOM_AISDimension.hxx @@ -31,8 +31,6 @@ #include #include -#include - DEFINE_STANDARD_HANDLE(GEOM_AISLength, AIS_LengthDimension) DEFINE_STANDARD_HANDLE(GEOM_AISDiameter, AIS_DiameterDimension) DEFINE_STANDARD_HANDLE(GEOM_AISAngle, AIS_AngleDimension) @@ -45,7 +43,7 @@ class GEOM_AISLength : public AIS_LengthDimension { public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension) + DEFINE_STANDARD_RTTIEXT(GEOM_AISLength,AIS_LengthDimension) public: Standard_EXPORT GEOM_AISLength( const Standard_Integer theId ); @@ -64,7 +62,7 @@ class GEOM_AISDiameter : public AIS_DiameterDimension { public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension) + DEFINE_STANDARD_RTTIEXT(GEOM_AISDiameter,AIS_DiameterDimension) public: Standard_EXPORT GEOM_AISDiameter( const Standard_Integer theId ); @@ -83,7 +81,7 @@ class GEOM_AISAngle : public AIS_AngleDimension { public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension) + DEFINE_STANDARD_RTTIEXT(GEOM_AISAngle,AIS_AngleDimension) public: Standard_EXPORT GEOM_AISAngle( const Standard_Integer theId ); diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 71212889b..d2cbff7b4 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -30,8 +30,6 @@ #include -#include - // Open CASCADE Includes #include #include @@ -67,22 +65,14 @@ #include #include #include - -#if OCC_VERSION_LARGE > 0x06070200 #include -#endif - -#if OCC_VERSION_MAJOR < 7 - #include -#else - #include -#endif +#include #include #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) GEOM_AISShape::TopLevelDispMode GEOM_AISShape::myTopLevelDm = GEOM_AISShape::TopKeepCurrent; Quantity_Color GEOM_AISShape::myTopLevelColor; @@ -107,15 +97,11 @@ static void getEntityOwners( const Handle(AIS_InteractiveObject)& theObj, Handle(SelectMgr_Selection) sel = theObj->Selection( m ); for ( sel->Init(); sel->More(); sel->Next() ) { -#if OCC_VERSION_LARGE > 0x06080100 const Handle(SelectMgr_SensitiveEntity) aHSenEntity = sel->Sensitive(); if( aHSenEntity.IsNull() ) continue; Handle(SelectBasics_SensitiveEntity) entity = aHSenEntity->BaseSensitive(); -#else - Handle(SelectBasics_SensitiveEntity) entity = sel->Sensitive(); -#endif if ( entity.IsNull() ) continue; Handle(SelectMgr_EntityOwner) owner = @@ -221,7 +207,7 @@ Standard_CString GEOM_AISShape::getName() void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPrs, const Standard_Integer aMode) -{ +{ if (IsInfinite()) aPrs->SetInfiniteState(Standard_True); //pas de prise en compte lors du FITALL Handle(AIS_InteractiveContext) anIC = GetContext(); @@ -234,10 +220,8 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent bool anIsColorField = anIsField && myFieldDataType != GEOM::FDT_String; bool anIsTextField = anIsField && myFieldDataType == GEOM::FDT_String; -#if OCC_VERSION_LARGE > 0x06070200 if (isShowVertices()) myDrawer->SetVertexDrawMode(Prs3d_VDM_All); -#endif // StdSelect_DisplayMode d = (StdSelect_DisplayMode) aMode; bool isTopLev = isTopLevel() && switchTopLevel(); @@ -254,11 +238,7 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent if( !isTopLev && anIsColorField && myFieldDimension == 1 ) drawField( aPrs, false, aMode == CustomHighlight ); else -#if OCC_VERSION_MAJOR < 7 - StdPrs_WFDeflectionShape::Add(aPrs,myshape,myDrawer); -#else StdPrs_WFShape::Add(aPrs,myshape,myDrawer); -#endif break; } case Shading: @@ -278,11 +258,8 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent } case TexturedShape: { -#ifdef USE_TEXTURED_SHAPE - AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode); -#else - AIS_Shape::Compute(aPresentationManager, aPrs, aMode); -#endif + shadingMode(aPresentationManager, aPrs, Shading); + break; } } if (isShowVectors()) @@ -437,11 +414,7 @@ void GEOM_AISShape::shadingMode(const Handle(PrsMgr_PresentationManager3d)& aPre { // PAL12113: AIS_Shape::Compute() works correctly with shapes containing no faces //StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer); -#ifdef USE_TEXTURED_SHAPE - AIS_TexturedShape::Compute(aPresentationManager, aPrs, aMode); -#else - AIS_Shape::Compute(aPresentationManager, aPrs, aMode); -#endif + SALOME_AISShape::Compute(aPresentationManager, aPrs, aMode); } } @@ -604,6 +577,7 @@ void GEOM_AISShape::drawField( const Handle(Prs3d_Presentation)& thePrs, else { Quantity_Color aColor( aQColor.redF(), aQColor.greenF(), aQColor.blueF(), Quantity_TOC_RGB ); + SetCustomColor( aSubShape, aColor ); if( myFieldDimension == 0 ) { TopoDS_Vertex aVertexShape = TopoDS::Vertex( aSubShape ); @@ -630,22 +604,25 @@ void GEOM_AISShape::drawField( const Handle(Prs3d_Presentation)& thePrs, myDrawer->WireAspect()->SetWidth( myOwnWidth ); else myDrawer->WireAspect()->SetWidth( myOwnWidth + 4 ); -#if OCC_VERSION_MAJOR < 7 - StdPrs_WFDeflectionShape::Add( thePrs, aSubShape, myDrawer ); -#else + /* StdPrs_WFShape::Add( thePrs, aSubShape, myDrawer ); -#endif + */ } else if( myFieldDimension == 2 || myFieldDimension == 3 || myFieldDimension == -1 ) { - myDrawer->ShadingAspect()->SetColor( aColor ); - StdPrs_ShadedShape::Add( thePrs, aSubShape, myDrawer ); + //Handle(Prs3d_ShadingAspect) anAspect = new Prs3d_ShadingAspect(); + //anAspect->SetColor( aColor ); + //myDrawer->SetShadingAspect( anAspect ); + //StdPrs_ShadedShape::Add( thePrs, aSubShape, myDrawer ); } } } } + + SALOME_AISShape::Compute( Handle(PrsMgr_PresentationManager3d)(), + thePrs, AIS_Shaded ); } void GEOM_AISShape::drawName( const Handle(Prs3d_Presentation)& thePrs ) diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index 46d862f9f..62bf81233 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -157,7 +157,7 @@ private: static Quantity_Color myTopLevelColor; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISShape,SALOME_AISShape) + DEFINE_STANDARD_RTTIEXT(GEOM_AISShape, SALOME_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_AISShape, SALOME_AISShape) diff --git a/src/OBJECT/GEOM_AISTrihedron.cxx b/src/OBJECT/GEOM_AISTrihedron.cxx index 8468b8b05..90ab13f71 100755 --- a/src/OBJECT/GEOM_AISTrihedron.cxx +++ b/src/OBJECT/GEOM_AISTrihedron.cxx @@ -28,7 +28,7 @@ #include "GEOM_AISTrihedron.hxx" #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) /* Class : GEOM_AISTrihedron diff --git a/src/OBJECT/GEOM_AISTrihedron.hxx b/src/OBJECT/GEOM_AISTrihedron.hxx index ad9a5e5f7..0bbda269f 100755 --- a/src/OBJECT/GEOM_AISTrihedron.hxx +++ b/src/OBJECT/GEOM_AISTrihedron.hxx @@ -61,7 +61,7 @@ private: Handle(SALOME_InteractiveObject) myObject; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron) + DEFINE_STANDARD_RTTIEXT(GEOM_AISTrihedron,AIS_Trihedron) }; #endif diff --git a/src/OBJECT/GEOM_AISVector.cxx b/src/OBJECT/GEOM_AISVector.cxx index 75d909852..3f985758c 100644 --- a/src/OBJECT/GEOM_AISVector.cxx +++ b/src/OBJECT/GEOM_AISVector.cxx @@ -30,7 +30,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISVector, GEOM_AISShape) //======================================================================= //function : GEOM_AISVector diff --git a/src/OBJECT/GEOM_AISVector.hxx b/src/OBJECT/GEOM_AISVector.hxx index 05350bf32..6b5279531 100644 --- a/src/OBJECT/GEOM_AISVector.hxx +++ b/src/OBJECT/GEOM_AISVector.hxx @@ -57,7 +57,7 @@ protected: virtual bool isShowVectors() {return true;} public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape) + DEFINE_STANDARD_RTTIEXT(GEOM_AISVector,GEOM_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_AISVector, GEOM_AISShape) diff --git a/src/OBJECT/GEOM_Annotation.cxx b/src/OBJECT/GEOM_Annotation.cxx index 2ab8f8e12..808893ac8 100755 --- a/src/OBJECT/GEOM_Annotation.cxx +++ b/src/OBJECT/GEOM_Annotation.cxx @@ -66,9 +66,6 @@ GEOM_Annotation::GEOM_Annotation() : AIS_InteractiveObject() SetDisplayMode( 0 ); SetZLayer( Graphic3d_ZLayerId_Default ); SetAutoHide( Standard_True ); -#if OCC_VERSION_LARGE <= 0x07010001 - SetHilightMode( HighlightAll ); -#endif SetMutable( Standard_True ); SetDepthCulling( Standard_True ); @@ -749,7 +746,6 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& return; } } -#if OCC_VERSION_LARGE > 0x07010001 const Handle(Graphic3d_PresentationAttributes) aHighlightStyle = theWorkspace->HighlightStyle(); if (!aHighlightStyle.IsNull() && myAISObject->myHilightMode == HighlightLabel) { @@ -757,15 +753,6 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& theWorkspace->SetHighlightStyle(empty); theWorkspace->ApplyAspectLine(); } -#else - const bool toHighlight = theWorkspace->ToHighlight(); - - if (toHighlight && myAISObject->myHilightMode == HighlightLabel) - { - theWorkspace->SetHighlight( false ); - theWorkspace->ApplyAspectLine(); - } -#endif GLint myOldDepthMode = 0; @@ -879,14 +866,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& aContext->ApplyModelViewMatrix(); -#if OCC_VERSION_LARGE > 0x07010001 theWorkspace->SetHighlightStyle(aHighlightStyle); -#else - if ( toHighlight != theWorkspace->ToHighlight() ) - { - theWorkspace->SetHighlight( toHighlight ); - } -#endif } // ======================================================================= @@ -895,21 +875,13 @@ void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& // purpose : Perform highlighting of the presentation. // ======================================================================= void GEOM_Annotation::GEOM_AnnotationOwner::HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, -#if OCC_VERSION_LARGE > 0x07010001 const Handle(Prs3d_Drawer)& theStyle, -#else - const Handle(Graphic3d_HighlightStyle)& theStyle, -#endif const Standard_Integer theMode ) { if ( myPrsSh.IsNull() ) { Handle(Prs3d_Drawer) aDrawer = new Prs3d_Drawer; -#if OCC_VERSION_LARGE > 0x07010001 aDrawer->Link( theStyle ); -#else - aDrawer->Link( Selectable()->HilightAttributes() ); -#endif Handle(Prs3d_IsoAspect) aUIsoAspect = new Prs3d_IsoAspect( aDrawer->UIsoAspect()->Aspect()->Color(), aDrawer->UIsoAspect()->Aspect()->Type(), @@ -942,12 +914,7 @@ void GEOM_Annotation::GEOM_AnnotationOwner::Unhilight ( const Handle(PrsMgr_Pres const Standard_Integer theMode ) { SelectMgr_EntityOwner::Unhilight( thePM, theMode ); - -#if OCC_VERSION_LARGE > 0x07010001 thePM->Unhighlight( myPrsSh ); -#else - thePM->Unhighlight( myPrsSh, theMode ); -#endif } // ======================================================================= diff --git a/src/OBJECT/GEOM_Annotation.hxx b/src/OBJECT/GEOM_Annotation.hxx index 00fc80986..360a4911e 100755 --- a/src/OBJECT/GEOM_Annotation.hxx +++ b/src/OBJECT/GEOM_Annotation.hxx @@ -27,8 +27,6 @@ #ifndef GEOM_Annotation_HeaderFile #define GEOM_Annotation_HeaderFile -#include - #include #include #include @@ -363,11 +361,7 @@ public: //! \param theMode [in] the display mode. virtual void HilightWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, -#if OCC_VERSION_LARGE > 0x07010001 const Handle(Prs3d_Drawer)& theStyle, -#else - const Handle(Graphic3d_HighlightStyle)& theStyle, -#endif const Standard_Integer theMode = 0 ) Standard_OVERRIDE; //! Removes highlighting from the type of shape. diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx index a0f5c4f24..1010f91ad 100644 --- a/src/OBJECT/GEOM_InteractiveObject.cxx +++ b/src/OBJECT/GEOM_InteractiveObject.cxx @@ -27,7 +27,7 @@ #include "GEOM_InteractiveObject.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_InteractiveObject, SALOME_InteractiveObject) GEOM_InteractiveObject::GEOM_InteractiveObject() : SALOME_InteractiveObject() diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx index 1e7fe5947..544a981f2 100644 --- a/src/OBJECT/GEOM_InteractiveObject.hxx +++ b/src/OBJECT/GEOM_InteractiveObject.hxx @@ -51,7 +51,7 @@ private: std::string myFatherIOR; public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject) + DEFINE_STANDARD_RTTIEXT(GEOM_InteractiveObject,SALOME_InteractiveObject) }; DEFINE_STANDARD_HANDLE(GEOM_InteractiveObject, SALOME_InteractiveObject) diff --git a/src/OBJECT/GEOM_TopWireframeShape.cxx b/src/OBJECT/GEOM_TopWireframeShape.cxx index 79c0cf934..7090b5906 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.cxx +++ b/src/OBJECT/GEOM_TopWireframeShape.cxx @@ -42,7 +42,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_TopWireframeShape, SALOME_AISShape) GEOM_TopWireframeShape::GEOM_TopWireframeShape( const TopoDS_Shape& shape ) :SALOME_AISShape(shape) diff --git a/src/OBJECT/GEOM_TopWireframeShape.hxx b/src/OBJECT/GEOM_TopWireframeShape.hxx index 099af8807..28c78a40a 100755 --- a/src/OBJECT/GEOM_TopWireframeShape.hxx +++ b/src/OBJECT/GEOM_TopWireframeShape.hxx @@ -50,7 +50,7 @@ public: Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ); public: - OCCT_DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape) + DEFINE_STANDARD_RTTIEXT(GEOM_TopWireframeShape,SALOME_AISShape) }; DEFINE_STANDARD_HANDLE(GEOM_TopWireframeShape, SALOME_AISShape) diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx index c6bfe8580..4ef399263 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx @@ -58,7 +58,7 @@ STEPPlugin_ExportDriver::STEPPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STEPPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer STEPPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -154,4 +154,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx index a95799a8e..7a5564afb 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~STEPPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STEPPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _STEPPlugin_ExportDriver_HXX diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx index c7fc450ac..8d2bed979 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx @@ -597,7 +597,7 @@ STEPPlugin_ImportDriver::STEPPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer STEPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -800,11 +800,7 @@ Standard_Integer STEPPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aResShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -883,4 +879,4 @@ STEPPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, return aValue; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STEPPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx index 626ff02bd..7c5978562 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.hxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.hxx @@ -32,9 +32,9 @@ public: ~STEPPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); @@ -43,7 +43,7 @@ public: const TCollection_AsciiString&, TCollection_AsciiString& ); - OCCT_DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STEPPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _STEPPlugin_ImportDriver_HXX diff --git a/src/STLPlugin/STLPlugin_ExportDriver.cxx b/src/STLPlugin/STLPlugin_ExportDriver.cxx index 3f269f304..80a8da539 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.cxx @@ -24,7 +24,6 @@ // KERNEL includes #include #include -#include // GEOM includes #include "GEOM_Function.hxx" @@ -63,7 +62,7 @@ STLPlugin_ExportDriver::STLPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer STLPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -97,7 +96,6 @@ Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const TopoDS_Shape aCopyShape = aCopy.Shape(); // ASCII mode aWriter.ASCIIMode() = anIsASCII; -#if OCC_VERSION_LARGE > 0x06080000 if ( anIsRelative ) { Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; Bnd_Box bndBox; @@ -108,20 +106,8 @@ Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const //Compute triangulation BRepTools::Clean( aCopyShape ); BRepMesh_IncrementalMesh aMesh( aCopyShape, aDeflection ); -#else - // set relative mode on false for using custom deflection coefficient - aWriter.RelativeMode( ) = anIsRelative; - if( anIsRelative ) - aWriter.SetCoefficient( aDeflection ); - else - aWriter.SetDeflection( aDeflection ); -#endif aWriter.Write( aCopyShape, aFileName.ToCString() ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } catch( Standard_Failure ) @@ -143,4 +129,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/STLPlugin/STLPlugin_ExportDriver.hxx b/src/STLPlugin/STLPlugin_ExportDriver.hxx index d3a0569db..450ff28a2 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~STLPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STLPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _STLPlugin_ExportDriver_HXX diff --git a/src/STLPlugin/STLPlugin_ImportDriver.cxx b/src/STLPlugin/STLPlugin_ImportDriver.cxx index a586767b9..368429795 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.cxx @@ -61,7 +61,7 @@ STLPlugin_ImportDriver::STLPlugin_ImportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const +Standard_Integer STLPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log) const { if( Label().IsNull() ) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -109,11 +109,7 @@ Standard_Integer STLPlugin_ImportDriver::Execute(LOGBOOK& log) const aFunction->SetValue( aShape ); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -146,4 +142,4 @@ GetCreationInformation( std::string& theOperationName, return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( STLPlugin_ImportDriver, GEOM_BaseDriver ); diff --git a/src/STLPlugin/STLPlugin_ImportDriver.hxx b/src/STLPlugin/STLPlugin_ImportDriver.hxx index 2d0adf6af..1f457745d 100644 --- a/src/STLPlugin/STLPlugin_ImportDriver.hxx +++ b/src/STLPlugin/STLPlugin_ImportDriver.hxx @@ -32,14 +32,14 @@ public: ~STLPlugin_ImportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(STLPlugin_ImportDriver,GEOM_BaseDriver) }; #endif // _STLPlugin_ImportDriver_HXX diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx index 71b27c08c..3aab7d976 100644 --- a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx +++ b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_ChangeOrientation_HeaderFile #define ShHealOper_ChangeOrientation_HeaderFile -#include #include #include diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx index d8d9d3389..2afe07bb2 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.hxx +++ b/src/ShHealOper/ShHealOper_CloseContour.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_CloseContour_HeaderFile #define ShHealOper_CloseContour_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx index 799aa8f6e..70a65d688 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.cxx +++ b/src/ShHealOper/ShHealOper_FillHoles.cxx @@ -24,8 +24,6 @@ // Created: 26.04.04 17:35:30 // Author: Galina KULIKOVA -#include - #include #include #include diff --git a/src/ShHealOper/ShHealOper_FillHoles.hxx b/src/ShHealOper/ShHealOper_FillHoles.hxx index 7b19d27b0..8202ed935 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.hxx +++ b/src/ShHealOper/ShHealOper_FillHoles.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_FillHoles_HeaderFile #define ShHealOper_FillHoles_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_RemoveFace.hxx b/src/ShHealOper/ShHealOper_RemoveFace.hxx index b5a4390af..7c3da9738 100644 --- a/src/ShHealOper/ShHealOper_RemoveFace.hxx +++ b/src/ShHealOper/ShHealOper_RemoveFace.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_RemoveFace_HeaderFile #define ShHealOper_RemoveFace_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx index fe5a7eda0..76b2ea935 100644 --- a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx +++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_RemoveInternalWires_HeaderFile #define ShHealOper_RemoveInternalWires_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx index 6f07c461b..8044f8bb0 100644 --- a/src/ShHealOper/ShHealOper_Sewing.hxx +++ b/src/ShHealOper/ShHealOper_Sewing.hxx @@ -27,7 +27,6 @@ #ifndef ShHealOper_Sewing_HeaderFile #define ShHealOper_Sewing_HeaderFile -#include #include #include #include diff --git a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx index 9f5ea9157..3f4d928e5 100644 --- a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx @@ -59,7 +59,7 @@ class ShHealOper_SplitCurve2d : public ShapeUpgrade_SplitCurve2d public: // Declaration of CASCADE RTTI - OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) + DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) }; // Definition of HANDLE object using Standard_DefineHandle.hxx diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx index b49ee85b7..90e139a0e 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx @@ -28,7 +28,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) +IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) //======================================================================= //function : Compute diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx index f50b7744f..d0aa883e4 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx @@ -27,8 +27,6 @@ #ifndef ShHealOper_SplitCurve2d_HeaderFile #define ShHealOper_SplitCurve2d_HeaderFile -#include - #include #include #include @@ -61,7 +59,7 @@ class ShHealOper_SplitCurve2d : public ShapeUpgrade_SplitCurve2d public: // Declaration of CASCADE RTTI - OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) + DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve2d,ShapeUpgrade_SplitCurve2d) }; // Definition of HANDLE object using Standard_DefineHandle.hxx diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx index cb942b932..de8a4438c 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx @@ -28,7 +28,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) +IMPLEMENT_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) //======================================================================= //function : Compute diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx index f0b436a69..874e3b285 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx @@ -27,8 +27,6 @@ #ifndef ShHealOper_SplitCurve3d_HeaderFile #define ShHealOper_SplitCurve3d_HeaderFile -#include - #include #include #include @@ -61,7 +59,7 @@ class ShHealOper_SplitCurve3d : public ShapeUpgrade_SplitCurve3d public: // Declaration of CASCADE RTTI - OCCT_DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) + DEFINE_STANDARD_RTTIEXT(ShHealOper_SplitCurve3d,ShapeUpgrade_SplitCurve3d) }; // Definition of HANDLE object using Standard_DefineHandle.hxx diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx index ae67871a2..9595d6852 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx @@ -69,7 +69,7 @@ VTKPlugin_ExportDriver::VTKPlugin_ExportDriver() //function : Execute //purpose : //======================================================================= -Standard_Integer VTKPlugin_ExportDriver::Execute(LOGBOOK& log) const +Standard_Integer VTKPlugin_ExportDriver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction( Label() ); @@ -123,4 +123,4 @@ GetCreationInformation( std::string& theOperationName, return false; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); +IMPLEMENT_STANDARD_RTTIEXT( VTKPlugin_ExportDriver,GEOM_BaseDriver ); diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx index f32345b04..3e4398428 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.hxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.hxx @@ -32,14 +32,14 @@ public: ~VTKPlugin_ExportDriver() {}; static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute( const LOGBOOK& ) const { return Standard_True; } - virtual void Validate( LOGBOOK& ) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute( const Handle(TFunction_Logbook)& ) const { return Standard_True; } + virtual void Validate( Handle(TFunction_Logbook)& ) const {} virtual bool GetCreationInformation( std::string& theOperationName, std::vector& params ); - OCCT_DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(VTKPlugin_ExportDriver,GEOM_BaseDriver) }; #endif // _VTKPlugin_ExportDriver_HXX diff --git a/src/XAOPlugin/XAOPlugin_Driver.cxx b/src/XAOPlugin/XAOPlugin_Driver.cxx index 3f463efd7..7d72d59ec 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.cxx +++ b/src/XAOPlugin/XAOPlugin_Driver.cxx @@ -63,7 +63,7 @@ XAOPlugin_Driver::~XAOPlugin_Driver() //function : Execute //purpose : //======================================================================= -Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const +Standard_Integer XAOPlugin_Driver::Execute(Handle(TFunction_Logbook)& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) function = GEOM_Function::GetFunction(Label()); @@ -88,11 +88,7 @@ Standard_Integer XAOPlugin_Driver::Execute(LOGBOOK& log) const if (shape.IsNull()) return 0; function->SetValue(shape); -#if OCC_VERSION_MAJOR < 7 - log.SetTouched(Label()); -#else log->SetTouched(Label()); -#endif return 1; } @@ -114,5 +110,5 @@ bool XAOPlugin_Driver::GetCreationInformation(std::string& theOperat return true; } -OCCT_IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); +IMPLEMENT_STANDARD_RTTIEXT(XAOPlugin_Driver, GEOM_BaseDriver); diff --git a/src/XAOPlugin/XAOPlugin_Driver.hxx b/src/XAOPlugin/XAOPlugin_Driver.hxx index f2ed811eb..11318cbe3 100644 --- a/src/XAOPlugin/XAOPlugin_Driver.hxx +++ b/src/XAOPlugin/XAOPlugin_Driver.hxx @@ -34,16 +34,16 @@ public: ~XAOPlugin_Driver(); static const Standard_GUID& GetID(); - virtual Standard_Integer Execute(LOGBOOK& log) const; - Standard_Boolean MustExecute(const LOGBOOK&) const { return Standard_True; } - virtual void Validate(LOGBOOK&) const {} + virtual Standard_Integer Execute(Handle(TFunction_Logbook)& log) const; + Standard_Boolean MustExecute(const Handle(TFunction_Logbook)&) const { return Standard_True; } + virtual void Validate(Handle(TFunction_Logbook)&) const {} virtual bool GetCreationInformation(std::string& theOperationName, std::vector& theParams); static int GetFileNameTag() { return 1; } // where to store file name in GEOM_Function - OCCT_DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver) + DEFINE_STANDARD_RTTIEXT(XAOPlugin_Driver,GEOM_BaseDriver) }; #endif // _XAOPlugin_Driver_HXX From 1f0425a582ba44d0a833d95bc6a3bb5ac5098ed4 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 26 Sep 2017 10:46:41 +0300 Subject: [PATCH 05/26] Fix regression in 'make test' caused by 7a3c2d25 --- src/XAO/tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XAO/tests/CMakeLists.txt b/src/XAO/tests/CMakeLists.txt index 15c9a5f3b..7bad36cea 100644 --- a/src/XAO/tests/CMakeLists.txt +++ b/src/XAO/tests/CMakeLists.txt @@ -60,7 +60,7 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/xao) ADD_TEST(TestXAO TestXAO) -SET_TESTS_PROPERTIES(TestXAO PROPERTIES ENVIRONMENT "XAO_DATA_DIR=${TEST_INSTALL_DIRECTORY}/data;${tests_env}") +SET_TESTS_PROPERTIES(TestXAO PROPERTIES ENVIRONMENT "XAO_DATA_DIR=${CMAKE_CURRENT_SOURCE_DIR}/data;${tests_env}") INSTALL(TARGETS TestXAO DESTINATION ${SALOME_INSTALL_BINS}) From 935cd27401bc0c8954628bcc3d58a996af46448e Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 28 Sep 2017 16:08:10 +0300 Subject: [PATCH 06/26] 0023450: Fields are not displayed in GEOM - Make color scale a property of the OCC view model - Redesign color scale management --- src/GEOMGUI/GEOM_Displayer.cxx | 206 ++++++++++------------------ src/GEOMGUI/GEOM_Displayer.h | 8 +- src/GEOMGUI/GeometryGUI.cxx | 21 ++- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 3 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 9 +- 5 files changed, 94 insertions(+), 153 deletions(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index db86dc2e5..363f312b2 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -462,7 +462,7 @@ static std::string getName( GEOM::GEOM_BaseObject_ptr object ) */ //================================================================= GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) - : myUpdateColorScale(true), myIsRedisplayed( false ) + : myUpdateColorScale( true ), myIsRedisplayed( false ) { if( st ) myApp = dynamic_cast( st->application() ); @@ -510,11 +510,6 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st ) myViewFrame = 0; - myColorScale = new AIS_ColorScale; - myColorScale->SetZLayer (Graphic3d_ZLayerId_TopOSD); - myColorScale->SetTransformPersistence ( - Graphic3d_TransformPers::FromDeprecatedParams(Graphic3d_TMF_2d, gp_Pnt (-1,-1,0))); - myFieldDataType = GEOM::FDT_Double; myFieldDimension = 0; myFieldStepRangeMin = 0; @@ -2069,7 +2064,7 @@ void GEOM_Displayer::BeforeDisplay( SALOME_View* v, const SALOME_OCCPrs* ) void GEOM_Displayer::AfterDisplay( SALOME_View* v, const SALOME_OCCPrs* p ) { - UpdateColorScale(false,false); + UpdateColorScale(); // visualize annotations for displayed presentation SUIT_Session* session = SUIT_Session::session(); @@ -2093,7 +2088,7 @@ void GEOM_Displayer::BeforeErase( SALOME_View* v, const SALOME_OCCPrs* p ) void GEOM_Displayer::AfterErase( SALOME_View* v, const SALOME_OCCPrs* p ) { LightApp_Displayer::AfterErase( v, p ); - UpdateColorScale(false,false); + UpdateColorScale(); if ( !myIsRedisplayed ) { // hide annotations for erased presentation @@ -2967,140 +2962,91 @@ QList GEOM_Displayer::groupFieldData( const QList& theFieldS return aResultList; } -void GEOM_Displayer::UpdateColorScale( const bool theIsRedisplayFieldSteps, const bool updateViewer ) +void GEOM_Displayer::UpdateColorScale() { - SalomeApp_Study* aStudy = dynamic_cast( myApp->activeStudy() ); - if( !aStudy ) + if ( !myUpdateColorScale ) return; - SOCC_Viewer* aViewModel = dynamic_cast( GetActiveView() ); - if( !aViewModel ) - return; + SUIT_Session* session = SUIT_Session::session(); + SUIT_Application* app = session->activeApplication(); + if ( !app ) return; - Handle(V3d_Viewer) aViewer = aViewModel->getViewer3d(); - if( aViewer.IsNull() ) - return; + Handle(SALOME_InteractiveObject) io = myApp->selectionMgr()->soleSelectedObject(); - aViewer->InitActiveViews(); - if( !aViewer->MoreActiveViews() ) - return; - - Handle(V3d_View) aView = aViewer->ActiveView(); - if( aView.IsNull() ) - return; - - Standard_Boolean anIsDisplayColorScale = Standard_False; - TCollection_AsciiString aColorScaleTitle; - Standard_Real aColorScaleMin = 0, aColorScaleMax = 0; - Standard_Boolean anIsBoolean = Standard_False; - - Handle(SALOME_InteractiveObject) anIO; - if ( myUpdateColorScale ) - anIO = myApp->selectionMgr()->soleSelectedObject(); - - if( !anIO.IsNull() ) + QList windows = app->desktop()->windows(); + foreach( SUIT_ViewWindow* window, windows ) { - SOCC_Prs* aPrs = dynamic_cast( aViewModel->CreatePrs( anIO->getEntry() ) ); - if( aPrs ) + OCCViewer_ViewWindow* occWindow = dynamic_cast( window ); + if ( !occWindow->getViewManager() ) continue; + if ( !window->getViewManager() ) continue; + if ( !window->getViewManager()->getViewModel() ) continue; + SOCC_Viewer* view = dynamic_cast( window->getViewManager()->getViewModel() ); + if ( !view ) continue; + Handle(V3d_Viewer) viewer = view->getViewer3d(); + if ( !io.IsNull() && view->isVisible( io ) ) { - AIS_ListOfInteractive aList; - aPrs->GetObjects( aList ); - AIS_ListIteratorOfListOfInteractive anIter( aList ); - for( ; anIter.More(); anIter.Next() ) + bool visible = false; + SOCC_Prs* prs = dynamic_cast( view->CreatePrs( io->getEntry() ) ); + if ( prs ) { - Handle(GEOM_AISShape) aShape = Handle(GEOM_AISShape)::DownCast( anIter.Value() ); - if( !aShape.IsNull() ) + AIS_ListOfInteractive presentations; + prs->GetObjects( presentations ); + AIS_ListIteratorOfListOfInteractive iter( presentations ); + for ( ; iter.More(); iter.Next() ) { - GEOM::field_data_type aFieldDataType; - int aFieldDimension; - QList aFieldStepData; - TCollection_AsciiString aFieldStepName; - double aFieldStepRangeMin, aFieldStepRangeMax; - aShape->getFieldStepInfo( aFieldDataType, - aFieldDimension, - aFieldStepData, - aFieldStepName, - aFieldStepRangeMin, - aFieldStepRangeMax ); - if( !aFieldStepData.isEmpty() && aFieldDataType != GEOM::FDT_String ) + Handle(GEOM_AISShape) shape = Handle(GEOM_AISShape)::DownCast( iter.Value() ); + if ( shape.IsNull() ) continue; + GEOM::field_data_type fieldDataType; + int fieldDimension; + QList fieldStepData; + TCollection_AsciiString fieldStepName; + Standard_Real fieldStepRangeMin, fieldStepRangeMax; + shape->getFieldStepInfo( fieldDataType, fieldDimension, fieldStepData, + fieldStepName, fieldStepRangeMin, fieldStepRangeMax ); + visible = !fieldStepData.isEmpty() && fieldDataType != GEOM::FDT_String; + if ( visible ) { - anIsDisplayColorScale = Standard_True; - aColorScaleTitle = aFieldStepName; - aColorScaleMin = aFieldStepRangeMin; - aColorScaleMax = aFieldStepRangeMax; - anIsBoolean = aFieldDataType == GEOM::FDT_Bool; - } + SUIT_Session* session = SUIT_Session::session(); + SUIT_ResourceMgr* resMgr = session->resourceMgr(); + + Standard_Real xPos = resMgr->doubleValue( "Geometry", "scalar_bar_x_position", 0.05 ); + Standard_Real yPos = resMgr->doubleValue( "Geometry", "scalar_bar_y_position", 0.1 ); + Standard_Real width = resMgr->doubleValue( "Geometry", "scalar_bar_width", 0.2 ); + Standard_Real height = resMgr->doubleValue( "Geometry", "scalar_bar_height", 0.5 ); + Standard_Integer textHeight = resMgr->integerValue( "Geometry", "scalar_bar_text_height", 14 ); + Standard_Integer nbIntervals = resMgr->integerValue( "Geometry", "scalar_bar_nb_intervals", 20 ); + + Standard_Integer viewWidth = 0, viewHeight = 0; + occWindow->getView(0)->getViewPort()->getView()->Window()->Size( viewWidth, viewHeight ); + + Handle(AIS_ColorScale) colorScale = view->getColorScale(); + + colorScale->SetPosition( viewWidth * xPos, viewHeight * yPos ); + colorScale->SetBreadth( viewWidth * width ); + colorScale->SetHeight( viewHeight * height ); + colorScale->SetRange( fieldStepRangeMin, fieldStepRangeMax ); + printf("fieldStepRangeMin, fieldStepRangeMax: %f, %f\n", fieldStepRangeMin, fieldStepRangeMax); + colorScale->SetNumberOfIntervals( fieldDataType == GEOM::FDT_Bool ? 2 : nbIntervals ); + colorScale->SetTextHeight( textHeight ); + colorScale->SetTitle( fieldStepName ); + } // if ( visible ) } } - } - } - - if( anIsDisplayColorScale ) - { - 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 ); - - Standard_Integer aWinWidth = 0, aWinHeight = 0; - aView->Window()->Size (aWinWidth, aWinHeight); - - myColorScale->SetPosition (aWinWidth*anXPos, aWinHeight*anYPos); - //myColorScale->SetBreadth (aWinWidth); // ??? - myColorScale->SetBreadth (aWinWidth*aWidth); // ??? - myColorScale->SetHeight (aWinHeight*aHeight); - - myColorScale->SetRange( aColorScaleMin, aColorScaleMax ); - myColorScale->SetNumberOfIntervals( anIsBoolean ? 2 : aNbIntervals ); - - myColorScale->SetTextHeight( aTextHeight ); - myColorScale->SetTitle( aColorScaleTitle ); - - if( !aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) - aViewModel->getAISContext()->Display( myColorScale, Standard_True); - } - else { - if( aViewModel->getAISContext()->IsDisplayed( myColorScale ) ) - aViewModel->getAISContext()->Erase( myColorScale, Standard_True ); - } - - if( theIsRedisplayFieldSteps ) - { - _PTR(Study) aStudyDS = aStudy->studyDS(); - QList vmList; - myApp->viewManagers( vmList ); - for( QList::Iterator vmIt = vmList.begin(); vmIt != vmList.end(); vmIt++ ) + view->setColorScaleShown( visible ); + } // if ( view->isVisible( io ) ) + else { - if( SUIT_ViewManager* aViewManager = *vmIt ) - { - const ObjMap& anObjects = aStudy->getObjectProperties( aViewManager->getGlobalId() ); - for( ObjMap::ConstIterator objIt = anObjects.begin(); objIt != anObjects.end(); objIt++ ) - { - _PTR(SObject) aSObj( aStudyDS->FindObjectID( objIt.key().toLatin1().constData() ) ); - if( aSObj ) - { - CORBA::Object_var anObject = GeometryGUI::ClientSObjectToObject( aSObj ); - if( !CORBA::is_nil( anObject ) ) - { - GEOM::GEOM_FieldStep_var aFieldStep = GEOM::GEOM_FieldStep::_narrow( anObject ); - if( !aFieldStep->_is_nil() ) - { - CORBA::String_var aStepEntry = aFieldStep->GetStudyEntry(); - Handle(SALOME_InteractiveObject) aStepIO = - new SALOME_InteractiveObject( aStepEntry.in(), "GEOM", "TEMP_IO" ); - Redisplay( aStepIO, false, false ); - } - } - } - } - } + view->setColorScaleShown( false ); } - } - if(updateViewer) - UpdateViewer(); + } // foreach( SUIT_ViewWindow* window, windows ) } + +bool GEOM_Displayer::SetUpdateColorScale( bool toUpdate ) // IPAL54049 +{ + bool previous = myUpdateColorScale; + myUpdateColorScale = toUpdate; + if ( myUpdateColorScale && !previous ) + UpdateColorScale(); + return previous; +} + diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index a776a1c1b..fb9f79bba 100755 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -45,7 +45,6 @@ class SALOME_OCCViewType; #include #include #include -#include #include #include #include @@ -226,8 +225,8 @@ public: SALOME_View* = 0); /* Update visibility and parameters of the currently selected field step's color scale */ - void UpdateColorScale( const bool theIsRedisplayFieldSteps = false, const bool updateViewer = true ); - void SetUpdateColorScale(bool toUpdate) { myUpdateColorScale = toUpdate; } // IPAL54049 + void UpdateColorScale(); + bool SetUpdateColorScale(bool); protected: /* internal methods */ @@ -287,8 +286,7 @@ protected: std::string myTexture; int myType; SALOME_View* myViewFrame; - Handle(AIS_ColorScale) myColorScale; - int myUpdateColorScale; // IPAL54049 + bool myUpdateColorScale; // IPAL54049 // Attributes Quantity_Color myShadingColor; diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 5470bbe2e..c024e3e65 100755 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -230,7 +230,7 @@ GeometryGUI::GeometryGUI() : myTextTreeWdg = 0; myAnnotationMgr = 0; - connect( Material_ResourceMgr::resourceMgr(), SIGNAL( changed() ), this, SLOT( updateMaterials() ) ); + connect( Material_ResourceMgr::resourceMgr(), SIGNAL( changed() ), this, SLOT( updateMaterials() ), Qt::UniqueConnection ); Q_INIT_RESOURCE( GEOMGUI ); } @@ -1863,7 +1863,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) // end of GEOM plugins loading connect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ), - this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) ); + this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ), Qt::UniqueConnection ); // Reset actions accelerator keys action(GEOMOp::OpDelete)->setEnabled( true ); // Delete: Key_Delete @@ -1874,9 +1874,9 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) LightApp_SelectionMgr* sm = getApp()->selectionMgr(); - connect( sm, SIGNAL( currentSelectionChanged() ), this, SLOT( updateCreationInfo() )); - connect( sm, SIGNAL( currentSelectionChanged() ), this, SLOT( onAutoBringToFront() )); - connect( sm, SIGNAL( currentSelectionChanged() ), this, SLOT( updateFieldColorScale() )); + connect( sm, SIGNAL( currentSelectionChanged() ), this, SLOT( updateCreationInfo() ), Qt::UniqueConnection ); + connect( sm, SIGNAL( currentSelectionChanged() ), this, SLOT( onAutoBringToFront() ), Qt::UniqueConnection ); + connect( sm, SIGNAL( currentSelectionChanged() ), this, SLOT( updateFieldColorScale() ), Qt::UniqueConnection ); if ( !myCreationInfoWdg ) myCreationInfoWdg = new GEOMGUI_CreationInfoWdg( getApp() ); @@ -1913,7 +1913,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) QMenu* viewMenu = menuMgr()->findMenu( STD_Application::MenuViewId ); if ( viewMenu ) - connect( viewMenu, SIGNAL( aboutToShow() ), this, SLOT( onViewAboutToShow() ) ); + connect( viewMenu, SIGNAL( aboutToShow() ), this, SLOT( onViewAboutToShow() ), Qt::UniqueConnection ); // 0020836 (Basic vectors and origin) SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr(); @@ -1952,7 +1952,7 @@ bool GeometryGUI::deactivateModule( SUIT_Study* study ) LightApp_SelectionMgr* selMrg = getApp()->selectionMgr(); disconnect( selMrg, SIGNAL( currentSelectionChanged() ), this, SLOT( updateCreationInfo() )); - disconnect( selMrg, SIGNAL( currentSelectionChanged() ), this, SLOT( updateFieldColorScale() )); + //disconnect( selMrg, SIGNAL( currentSelectionChanged() ), this, SLOT( updateFieldColorScale() )); if ( myCreationInfoWdg ) { getApp()->removeDockWindow( myCreationInfoWdg->getWinID() ); myCreationInfoWdg = 0; @@ -2212,8 +2212,7 @@ void GeometryGUI::updateFieldColorScale() { if( SalomeApp_Study* aStudy = dynamic_cast( getApp()->activeStudy() ) ) { - GEOM_Displayer aDisplayer( aStudy ); - aDisplayer.UpdateColorScale(); + GEOM_Displayer( aStudy ).UpdateColorScale(); } } @@ -2818,9 +2817,7 @@ void GeometryGUI::preferencesChanged( const QString& section, const QString& par param == QString("scalar_bar_nb_intervals")) { if( SalomeApp_Study* aStudy = dynamic_cast( getApp()->activeStudy() ) ) { - GEOM_Displayer aDisplayer( aStudy ); - bool anIsRedisplayFieldSteps = param == QString("scalar_bar_nb_intervals"); - aDisplayer.UpdateColorScale( anIsRedisplayFieldSteps, true ); + updateFieldColorScale(); } } else if ( param == QString("dimensions_color") || diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 002ae127e..bd79254a3 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -467,7 +467,7 @@ void GEOMToolsGUI::OnEditDelete() _PTR(StudyBuilder) aStudyBuilder (aStudy->NewBuilder()); GEOM_Displayer disp( appStudy ); - disp.SetUpdateColorScale( false ); // IPAL54049 + bool toUpdateColorScale = disp.SetUpdateColorScale( false ); // IPAL54049 if ( isComponentSelected ) { // GEOM component is selected: delete all objects recursively @@ -519,6 +519,7 @@ void GEOMToolsGUI::OnEditDelete() } } + disp.SetUpdateColorScale( toUpdateColorScale ); // IPAL54049 selected.Clear(); aSelMgr->setSelectedObjects( selected ); getGeometryGUI()->updateObjBrowser(); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 05f27880a..8f463bcbf 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -529,7 +529,7 @@ void GEOMToolsGUI::OnDiscloseConcealChildren( bool show ) } SUIT_OverrideCursor wc; - disp->SetUpdateColorScale( false ); // IPAL54049 + bool toUpdateColorScale = disp->SetUpdateColorScale( false ); // IPAL54049 for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { Handle(SALOME_InteractiveObject) IObject = It.Value(); @@ -543,7 +543,7 @@ void GEOMToolsGUI::OnDiscloseConcealChildren( bool show ) } } // if ( obj ) } // iterator - disp->SetUpdateColorScale( true ); + disp->SetUpdateColorScale( toUpdateColorScale ); } } app->updateObjectBrowser( false ); @@ -596,7 +596,7 @@ void GEOMToolsGUI::OnUnpublishObject() { return; } SUIT_OverrideCursor wc; - disp->SetUpdateColorScale( false ); // IPAL54049 + bool toUpdateColorScale = disp->SetUpdateColorScale( false ); // IPAL54049 for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) { Handle(SALOME_InteractiveObject) IObject = It.Value(); @@ -615,14 +615,13 @@ void GEOMToolsGUI::OnUnpublishObject() { } } // if ( obj ) } // iterator - disp->SetUpdateColorScale( true ); // IPAL54049 + disp->SetUpdateColorScale( toUpdateColorScale ); // IPAL54049 aSelMgr->clearSelected(); } } app->updateObjectBrowser( false ); app->updateActions(); } - } void GEOMToolsGUI::OnPublishObject() { From 579fb21c339df3afb2ec6cb52c8b1d6b2cb85597 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 28 Sep 2017 16:30:23 +0300 Subject: [PATCH 07/26] Remove debug output --- src/GEOMGUI/GEOM_Displayer.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 363f312b2..1b1c602cd 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -3025,7 +3025,6 @@ void GEOM_Displayer::UpdateColorScale() colorScale->SetBreadth( viewWidth * width ); colorScale->SetHeight( viewHeight * height ); colorScale->SetRange( fieldStepRangeMin, fieldStepRangeMax ); - printf("fieldStepRangeMin, fieldStepRangeMax: %f, %f\n", fieldStepRangeMin, fieldStepRangeMax); colorScale->SetNumberOfIntervals( fieldDataType == GEOM::FDT_Bool ? 2 : nbIntervals ); colorScale->SetTextHeight( textHeight ); colorScale->SetTitle( fieldStepName ); From 12d2cd28a6a9975ca7521f27ca1891f0f82d2323 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 29 Sep 2017 12:06:30 +0300 Subject: [PATCH 08/26] Fix regression (SIGSEGV) caused by commit 935cd274 --- src/GEOMGUI/GEOM_Displayer.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 1b1c602cd..bd364b92c 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -2977,6 +2977,7 @@ void GEOM_Displayer::UpdateColorScale() foreach( SUIT_ViewWindow* window, windows ) { OCCViewer_ViewWindow* occWindow = dynamic_cast( window ); + if ( !occWindow ) continue; if ( !occWindow->getViewManager() ) continue; if ( !window->getViewManager() ) continue; if ( !window->getViewManager()->getViewModel() ) continue; From 36a01654519e89a2938392e5b830239b3d5e48c9 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 3 Oct 2017 11:18:57 +0300 Subject: [PATCH 09/26] Increment version: 8.4.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61412c097..93d7f9919 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,11 @@ ENDIF(WIN32) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Common CMake macros # =================== From 05ae469449ebebc3ea8a6d79b168974c6ee4673e Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Mon, 9 Oct 2017 14:40:21 +0200 Subject: [PATCH 10/26] Update translation files from Crowdin --- src/GEOMGUI/GEOM_msg_ja.ts | 129 ++++++++++++++++++++++++++---- src/XAOPlugin/XAOPlugin_msg_ja.ts | 4 + 2 files changed, 116 insertions(+), 17 deletions(-) mode change 100755 => 100644 src/GEOMGUI/GEOM_msg_ja.ts diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts old mode 100755 new mode 100644 index 3ed5307c8..d63d7c2fd --- a/src/GEOMGUI/GEOM_msg_ja.ts +++ b/src/GEOMGUI/GEOM_msg_ja.ts @@ -571,6 +571,10 @@ GEOM_DIMENSIONS 寸法 + + GEOM_ANNOTATIONS + 注釈 + GEOM_SKETCHER_DIST 距離 @@ -3497,47 +3501,47 @@ PREF_SHAPE_ANNOTATIONS - Shape annotations + 形状の注釈 PREF_SHAPE_ANNOTATIONS_FONT - Font + フォント PREF_SHAPE_ANNOTATIONS_FONT_COLOR - Font color + フォント色 PREF_SHAPE_ANNOTATIONS_LINE_COLOR - Line color + 線色 PREF_SHAPE_ANNOTATIONS_LINE_WIDTH - Line width + 線幅 PREF_SHAPE_ANNOTATIONS_LINE_STYLE - Line style + 線スタイル PREF_SHAPE_ANNOTATIONS_AUTOHIDE - Hide when attachment is invisible + 添付が見えない時に非表示 PREF_SHAPE_ANNOTATIONS_LINESTYLE_SOLID - Solid + ソリッド PREF_SHAPE_ANNOTATIONS_LINESTYLE_DASH - Dashed + ダッシュ PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOT - Dotted + ドット PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOTDASH - Mixed + 混合 PREF_HIDE_INPUT_OBJECT @@ -4995,6 +4999,42 @@ STB_MANAGE_DIMENSIONS オブジェクトの基準寸法を管理 + + TOP_ANNOTATION + 注記 + + + MEN_ANNOTATION + 注記 + + + STB_ANNOTATION + 注記 + + + TOP_EDIT_ANNOTATION + 注記の編集 + + + MEN_EDIT_ANNOTATION + 編集 + + + STB_EDIT_ANNOTATION + 注記の編集 + + + TOP_DELETE_ANNOTATION + 注記の削除 + + + MEN_DELETE_ANNOTATION + 削除 + + + STB_DELETE_ANNOTATION + 注記の削除 + MEN_POP_SHOW_DEPENDENCY_TREE 依存ツリーの表示 @@ -5037,27 +5077,27 @@ MEN_POP_SHOW_ALL_ANNOTATIONS - Show all annotations + 全ての注釈を表示 STB_POP_SHOW_ALL_ANNOTATIONS - Show all shape annotations for the object + 対象オブジェクトにある全ての形状注釈を表示 TOP_POP_SHOW_ALL_ANNOTATIONS - Show all shape annotations for the object + 対象オブジェクトにある全ての形状注釈を表示 MEN_POP_HIDE_ALL_ANNOTATIONS - Hide all annotations + 全ての注釈を非表示 STB_POP_HIDE_ALL_ANNOTATIONS - Hide all shape annotations for the object + 対象オブジェクトにある全ての形状注釈の非表示 TOP_POP_HIDE_ALL_ANNOTATIONS - Hide all shape annotations for the object + 対象オブジェクトにある全ての形状注釈を非表示 TOP_POP_AUTO_COLOR @@ -6728,6 +6768,61 @@ 寸法は具体的に明記された引数のために作られることは不可能です．適した引数を明記してください． + + MeasureGUI_AnnotationDlg + + CREATE_ANNOTATION_TITLE + 注釈の作成 + + + EDIT_ANNOTATION_TITLE + 注釈の編集 + + + ANNOTATION_PREFIX + Annotation + + + ANNOTATION_NAME + 注釈名 + + + ANNOTATION_PROPERTIES + プロパティ + + + ANNOTATION_TEXT + テキスト + + + ANNOTATION_SHAPE + 形状 + + + ANNOTATION_TYPE + タイプ + + + ANNOTATION_SUB_SHAPE + 副形状タイプ + + + ANNOTATION_IS_SCREEN_FIXED + スクリーン位置の固定 + + + WHOLE_SHAPE + 形状全体 + + + ANNOTATION_STYLE + スタイル + + + ANNOTATION_FONT + 注釈のフォント + + MeasureGUI_CheckShapeDlg diff --git a/src/XAOPlugin/XAOPlugin_msg_ja.ts b/src/XAOPlugin/XAOPlugin_msg_ja.ts index 4f340dbdd..8651aef82 100644 --- a/src/XAOPlugin/XAOPlugin_msg_ja.ts +++ b/src/XAOPlugin/XAOPlugin_msg_ja.ts @@ -62,6 +62,10 @@ XAOPLUGIN_EXPORT_AUTHOR 作成者 + + XAOPLUGIN_EXPORT_SHAPEFILE + 別のファイルに形状を出力する + XAOPLUGIN_EXPORT_LGROUPS グループ From 32ffd43c79633ba270dd15bbc439e8003e29cf27 Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Mon, 9 Oct 2017 15:20:29 +0200 Subject: [PATCH 11/26] Update French translation files --- src/GEOMGUI/GEOM_msg_fr.ts | 95 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 75e6aab0c..691dace4e 100755 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -575,6 +575,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_DIMENSIONS Dimensions + + GEOM_ANNOTATIONS + Annotations + GEOM_SKETCHER_DIST Distance @@ -4992,6 +4996,42 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_MANAGE_DIMENSIONS Gérer la cotation d'un objet + + TOP_ANNOTATION + Annotation + + + MEN_ANNOTATION + Annotation + + + STB_ANNOTATION + Annotation + + + TOP_EDIT_ANNOTATION + Editer une annotation + + + MEN_EDIT_ANNOTATION + Editer + + + STB_EDIT_ANNOTATION + Editer une annotation + + + TOP_DELETE_ANNOTATION + Supprimer l'annotation + + + MEN_DELETE_ANNOTATION + Supprimer + + + STB_DELETE_ANNOTATION + Supprimer l'annotation + MEN_POP_SHOW_DEPENDENCY_TREE Montrer l'arbre des dépendances @@ -6735,6 +6775,61 @@ Voulez-vous continuer? Please specify suitable arguments. + + MeasureGUI_AnnotationDlg + + CREATE_ANNOTATION_TITLE + Créer une annotation + + + EDIT_ANNOTATION_TITLE + Editer une annotation + + + ANNOTATION_PREFIX + Annotation + + + ANNOTATION_NAME + Nom de l'annotation + + + ANNOTATION_PROPERTIES + Propriétés + + + ANNOTATION_TEXT + Texte + + + ANNOTATION_SHAPE + Pièce + + + ANNOTATION_TYPE + Type + + + ANNOTATION_SUB_SHAPE + Type du sous-objet + + + ANNOTATION_IS_SCREEN_FIXED + Position fixe sur l'écran + + + WHOLE_SHAPE + Toute la pièce + + + ANNOTATION_STYLE + Style + + + ANNOTATION_FONT + Fonte + + MeasureGUI_CheckShapeDlg From d3ae7d5ecf5656a3e8cb2d53e9ff40b902f37ceb Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Mon, 9 Oct 2017 16:06:28 +0200 Subject: [PATCH 12/26] Update French translation files --- src/GEOMGUI/GEOM_msg_fr.ts | 70 +++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index 691dace4e..bf23cc2d0 100755 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -617,7 +617,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_EDGES - Edges + Arêtes GEOM_EDGE_TITLE @@ -3498,47 +3498,47 @@ Choisissez une face, une coque ou un solide et essayez de nouveau PREF_SHAPE_ANNOTATIONS - Shape annotations + Annotations PREF_SHAPE_ANNOTATIONS_FONT - Font + Fonte PREF_SHAPE_ANNOTATIONS_FONT_COLOR - Font color + Couleur du texte PREF_SHAPE_ANNOTATIONS_LINE_COLOR - Line color + Couleur de la ligne PREF_SHAPE_ANNOTATIONS_LINE_WIDTH - Line width + Epaisseur de la ligne PREF_SHAPE_ANNOTATIONS_LINE_STYLE - Line style + Style de la ligne PREF_SHAPE_ANNOTATIONS_AUTOHIDE - Hide when attachment is invisible + Cacher quand l'objet attaché est invisible PREF_SHAPE_ANNOTATIONS_LINESTYLE_SOLID - Solid + Continu PREF_SHAPE_ANNOTATIONS_LINESTYLE_DASH - Dashed + Tirets PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOT - Dotted + Points PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOTDASH - Mixed + Mélangé PREF_HIDE_INPUT_OBJECT @@ -5074,27 +5074,27 @@ Choisissez une face, une coque ou un solide et essayez de nouveau MEN_POP_SHOW_ALL_ANNOTATIONS - Show all annotations + Montrer toutes les annotations STB_POP_SHOW_ALL_ANNOTATIONS - Show all shape annotations for the object + Montrer toutes les annotations pour l'objet TOP_POP_SHOW_ALL_ANNOTATIONS - Show all shape annotations for the object + Montrer toutes les annotations pour l'objet MEN_POP_HIDE_ALL_ANNOTATIONS - Hide all annotations + Cacher toutes les annotations STB_POP_HIDE_ALL_ANNOTATIONS - Hide all shape annotations for the object + Cacher toutes les annotations pour l'objet TOP_POP_HIDE_ALL_ANNOTATIONS - Hide all shape annotations for the object + Cacher toutes les annotations pour l'objet TOP_POP_AUTO_COLOR @@ -5338,19 +5338,19 @@ Choisissez une face, une coque ou un solide et essayez de nouveau TOP_EXTRACTION - Extract and Rebuild + Extrait et reconstruit MEN_EXTRACTION - Extract and Rebuild + Extrait et reconstruit STB_EXTRACTION - Extract and Rebuild + Extrait et reconstruit TOP_EXTENSION - Extend Edge or Face + Etend l'arête ou la face MEN_EXTENSION @@ -5358,7 +5358,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau STB_EXTENSION - Extend Edge or Face + Etend l'arête ou la face GEOM_PUBLISH_RESULT_GRP @@ -7808,51 +7808,51 @@ Voulez-vous en créer un nouveau ? OperationGUI_ExtractionDlg GEOM_EXTRACT_TITLE - Extract and Rebuild + Extrait et reconstruit GEOM_EXTRACT_TYPE - Extraction type + Type d'extraction GEOM_EXTRACT_INPUT_PARAMS - Input parameters + Paramètres d'entrée GEOM_EXTRACT_STATISTICS - Statistics + Statistiques GEOM_EXTRACT_SUB_SHAPE_TYPE - Sub-shape type + Type de sous-objet GEOM_EXTRACT_FILTERED_SHAPES - Filtered shapes + Objets filtrés GEOM_EXTRACT_SHAPES_TO_EXTRACT - Shapes to extract + Objets à extraire GEOM_EXTRACT_REBUILD - Rebuild + Reconstruit GEOM_EXTRACT_REMOVED - Removed + Supprimé GEOM_EXTRACT_MODIFIED - Modified + Modifié GEOM_EXTRACT_ADDED - Added + Ajouté GEOM_EXTRACT_NAME - Extraction + Extraction From b02853cb86e5c6e89ddcf44ca4f6aec4b2283733 Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Mon, 9 Oct 2017 16:08:04 +0200 Subject: [PATCH 13/26] Update French translation files --- src/GEOMGUI/GEOM_msg_fr.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index bf23cc2d0..e00560044 100755 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -473,7 +473,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_COMPSOLIDS - CompSolids + CompSolides GEOM_COMPOUND_TITLE @@ -2030,7 +2030,7 @@ Choisissez une face, une coque ou un solide et essayez de nouveau GEOM_SOLIDS - Solids + Solides GEOM_SOLID_TITLE From 1137dd744f03ab3f86869189f4b833cc2ac696b8 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 11 Oct 2017 15:27:38 +0300 Subject: [PATCH 14/26] 0023493: EDF 15626 - Problem with Dump Study - Fixed problem with GetExistingSubObjects() function dumping --- src/GEOM/GEOM_PythonDump.cxx | 30 +++++++++++---------- src/GEOM/GEOM_PythonDump.hxx | 6 ++--- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 26 +++++++++--------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx index 1dfd4ba91..ae1d80289 100644 --- a/src/GEOM/GEOM_PythonDump.cxx +++ b/src/GEOM/GEOM_PythonDump.cxx @@ -170,41 +170,43 @@ namespace GEOM return *this; } - Handle(GEOM_Object) GetCreatedLast(const Handle(GEOM_Object)& theObj1, - const Handle(GEOM_Object)& theObj2) + Handle(GEOM_BaseObject) GetCreatedLast(const Handle(Standard_Transient)& theObj1, + const Handle(Standard_Transient)& theObj2) { - if (theObj1.IsNull()) return theObj2; - if (theObj2.IsNull()) return theObj1; + Handle(GEOM_BaseObject) bo1 = Handle(GEOM_Object)::DownCast(theObj1); + Handle(GEOM_BaseObject) bo2 = Handle(GEOM_Object)::DownCast(theObj2); + if (bo1.IsNull()) return bo2; + if (bo2.IsNull()) return bo1; TColStd_ListOfInteger aTags1, aTags2; - TDF_Tool::TagList(theObj1->GetEntry(), aTags1); - TDF_Tool::TagList(theObj2->GetEntry(), aTags2); + TDF_Tool::TagList(bo1->GetEntry(), aTags1); + TDF_Tool::TagList(bo2->GetEntry(), aTags2); TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2); for (; aListIter1.More(); aListIter1.Next(), aListIter2.Next()) { if (!aListIter2.More()) - return theObj1; // anObj1 is stored under anObj2 + return bo1; // anObj1 is stored under anObj2 if (aListIter1.Value() > aListIter2.Value()) - return theObj1; + return bo1; else if (aListIter1.Value() < aListIter2.Value()) - return theObj2; + return bo2; } - return theObj1; + return bo1; } - Handle(GEOM_Object) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects) + Handle(GEOM_BaseObject) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects) { - Handle(GEOM_Object) anObject, aLatest; + Handle(GEOM_BaseObject) anObject, aLatest; int i, aLen = theObjects->Length(); if (aLen < 1) return aLatest; for (i = 1; i <= aLen; i++) { - anObject = Handle(GEOM_Object)::DownCast(theObjects->Value(i)); + anObject = Handle(GEOM_BaseObject)::DownCast(theObjects->Value(i)); if ( anObject.IsNull() ) { Handle(GEOM_Function) fun = Handle(GEOM_Function)::DownCast(theObjects->Value(i)); if ( !fun.IsNull() ) - anObject = GEOM_Object::GetObject( fun->GetOwnerEntry() ); + anObject = GEOM_BaseObject::GetObject( fun->GetOwnerEntry() ); } aLatest = GetCreatedLast(aLatest, anObject); } diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx index a189af2e1..9cd8bcccc 100644 --- a/src/GEOM/GEOM_PythonDump.hxx +++ b/src/GEOM/GEOM_PythonDump.hxx @@ -67,12 +67,12 @@ namespace GEOM /*! Returns an object from two given, which has the latest entry */ - Standard_EXPORT Handle(::GEOM_Object) GetCreatedLast (const Handle(::GEOM_Object)& theObj1, - const Handle(::GEOM_Object)& theObj2); + Standard_EXPORT Handle(::GEOM_BaseObject) GetCreatedLast (const Handle(Standard_Transient)& theObj1, + const Handle(Standard_Transient)& theObj2); /*! Returns an object from \a theObjects, which has the latest entry */ - Standard_EXPORT Handle(::GEOM_Object) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects); + Standard_EXPORT Handle(::GEOM_BaseObject) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects); } #endif diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 53f3c9269..34db98229 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -1231,7 +1231,7 @@ GEOMImpl_IShapesOperations::GetGlueShapes (std::list< Handle(GEOM_Object) >& the TopoDS_Shape aShape; TopTools_SequenceOfShape shapes; std::list< Handle(GEOM_Object) >::iterator s = theShapes.begin(); - Handle(GEOM_Object) lastCreatedGO; + Handle(GEOM_BaseObject) lastCreatedGO; for ( ; s != theShapes.end(); ++s ) { Handle(GEOM_Object) go = *s; @@ -1414,23 +1414,23 @@ GEOMImpl_IShapesOperations::GetExistingSubObjects(Handle(GEOM_Object) theShap Standard_Integer types = theGroupsOnly ? Groups : Groups|SubShapes; Handle(TColStd_HSequenceOfTransient) results = GetExistingSubObjects(theShape, types); + Handle(GEOM_BaseObject) lastCreatedGO = GEOM::GetCreatedLast(results); + lastCreatedGO = GEOM::GetCreatedLast(lastCreatedGO, theShape); + if (results->Length() > 0) { - //Make a Python command - TCollection_AsciiString anAsciiList; - for (int i = 1; i <= results->Length(); i++) + // Make a Python command + GEOM::TPythonDump pd (lastCreatedGO->GetLastFunction(), /*append=*/true); + pd << "["; + Standard_Integer i, aLen = results->Length(); + for (i = 1; i <= aLen; i++) { - Handle(GEOM_BaseObject) obj = Handle(GEOM_BaseObject)::DownCast( results->Value(i)); - obj->GetEntryString(); - if ( i < results->Length() ) - anAsciiList += ","; + Handle(GEOM_BaseObject) obj = Handle(GEOM_BaseObject)::DownCast(results->Value(i)); + pd << obj << ((i < aLen) ? ", " : ""); } - - GEOM::TPythonDump pd (theShape->GetLastFunction(), /*append=*/true); - pd << "[" << anAsciiList.ToCString(); pd << "] = geompy.GetExistingSubObjects("; pd << theShape << ", " << (bool)theGroupsOnly << ")"; } - + return results; } @@ -4419,7 +4419,7 @@ Handle(TColStd_HSequenceOfInteger) // Make a Python command // The GetShapesOnCylinder() doesn't change object so no new function is required. - Handle(GEOM_Object) lastObj = GEOM::GetCreatedLast(theShape,theTopLeftPoint); + Handle(GEOM_BaseObject) lastObj = GEOM::GetCreatedLast(theShape,theTopLeftPoint); lastObj = GEOM::GetCreatedLast(lastObj,theTopRigthPoint); lastObj = GEOM::GetCreatedLast(lastObj,theBottomRigthPoint); lastObj = GEOM::GetCreatedLast(lastObj,theBottomLeftPoint); From c24f6c6618b310e9950b1d866aff81a0ddfd82b3 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 12 Oct 2017 17:06:06 +0300 Subject: [PATCH 15/26] Revert commit a1bc463e for issue 0023451 as it caused regressions --- src/BlockFix/BlockFix_UnionFaces.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index b3d92b18f..35e9ff26e 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -244,9 +244,6 @@ static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge &theEdge, Standard_Boolean isValid = Standard_True; if (BRep_Tool::IsClosed(theEdge, theFace)) { - // Mantis issue 0023451, now code corresponds to the comment to this method - isValid = Standard_False; - // This is a seam edge. Check if there are another seam edges on the face. TopExp_Explorer anExp(theFace, TopAbs_EDGE); @@ -262,9 +259,7 @@ static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge &theEdge, TopoDS_Edge anEdge = TopoDS::Edge(aShEdge); if (BRep_Tool::IsClosed(anEdge, theFace)) { - // Mantis issue 0023451, now code corresponds to the comment to this method - //isValid = Standard_False; - isValid = Standard_True; + isValid = Standard_False; break; } } From 7714104ece99c9c1da551743e8cc1f199e480aca Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 13 Oct 2017 12:05:55 +0300 Subject: [PATCH 16/26] 0023473: [CEA 2163] SMESH compilation failure with a PyCompileError - Add direct dependencies between targets generated by PYQT_WRAP_UIC and SALOME_INSTALL_SCRIPTS macros to avoid races problem --- src/Tools/t_shape/CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Tools/t_shape/CMakeLists.txt b/src/Tools/t_shape/CMakeLists.txt index 7f9ffdaf0..b25c0db31 100644 --- a/src/Tools/t_shape/CMakeLists.txt +++ b/src/Tools/t_shape/CMakeLists.txt @@ -24,33 +24,36 @@ ENDIF() # --- scripts --- # base scripts -SET(base_SCRIPTS +SET(_base_SCRIPTS __init__.py t_shape_builder.py ) IF(SALOME_BUILD_GUI) # gui scripts - SET(gui_SCRIPTS + SET(_gui_SCRIPTS t_shape_dialog.py t_shape_dialog.ui t_shape_progress.py ) # uic files / to be processed by pyuic - SET(_pyuic_files + SET(_pyuic_FILES t_shape_dialog.ui ) # scripts / pyuic wrappings - PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_FILES} TARGET_NAME _target_name_pyuic) ENDIF() # --- rules --- -SALOME_INSTALL_SCRIPTS("${base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) +SALOME_INSTALL_SCRIPTS("${_base_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) IF(SALOME_BUILD_GUI) - SALOME_INSTALL_SCRIPTS("${gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) - SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) -ENDIF() \ No newline at end of file + SALOME_INSTALL_SCRIPTS("${_gui_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape) + SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/geom/t_shape TARGET_NAME _target_name_pyuic_py) + # add dependency of compiled py files on uic files in order + # to avoid races problems when compiling in parallel + ADD_DEPENDENCIES(${_target_name_pyuic_py} ${_target_name_pyuic}) +ENDIF() From 8af6f2a74ecd53c356e81e728d91af4d865b8261 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 16 Nov 2017 15:10:41 +0300 Subject: [PATCH 17/26] 0023505: Sigsegv with fuse on cylinder and cone - Switch to C++ exception handling mechanism --- .../AdvancedEngine_IOperations.cxx | 120 +++++------- src/BREPPlugin/BREPPlugin_IOperations.cxx | 10 +- src/GEOM/GEOM_Engine.cxx | 5 +- src/GEOM/GEOM_Function.cxx | 5 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 178 +++++++----------- src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 95 ++++------ src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 120 +++++------- src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx | 35 ++-- src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 95 ++++------ src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 65 +++---- src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 10 +- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 75 +++----- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 95 ++++------ src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 105 +++++------ .../GEOMImpl_ITransformOperations.cxx | 175 +++++++---------- src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx | 5 +- src/IGESPlugin/IGESPlugin_IOperations.cxx | 10 +- src/IGESPlugin/IGESPlugin_ImportDriver.cxx | 10 +- src/STEPPlugin/STEPPlugin_IOperations.cxx | 10 +- src/STEPPlugin/STEPPlugin_ImportDriver.cxx | 10 +- src/STLPlugin/STLPlugin_IOperations.cxx | 10 +- src/VTKPlugin/VTKPlugin_IOperations.cxx | 5 +- 22 files changed, 499 insertions(+), 749 deletions(-) diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index 097a1b265..8241109eb 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -1552,9 +1552,8 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the TopoDS_Shape aShape = Te3->GetValue(); theShape->GetLastFunction()->SetValue(aShape); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return false; } @@ -1963,9 +1962,8 @@ Handle(TColStd_HSequenceOfTransient) aFunction->SetValue(aResShape); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1987,9 +1985,8 @@ Handle(TColStd_HSequenceOfTransient) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2125,9 +2122,8 @@ AdvancedEngine_IOperations::MakePipeTShapeWithPosition aFunction->SetValue(aResShape); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2158,9 +2154,8 @@ AdvancedEngine_IOperations::MakePipeTShapeWithPosition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2268,9 +2263,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2321,9 +2315,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer try { aChamfer = myLocalOperations->MakeChamferEdges(aShape, theW, theH, theEdges); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } if (aChamfer.IsNull()) { @@ -2357,9 +2350,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer aFunction->SetValue(aResShape); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2381,9 +2373,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2503,9 +2494,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2554,9 +2544,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition try { aChamfer = myLocalOperations->MakeChamferEdges(aShape, theW, theH, theEdges); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } if (aChamfer.IsNull()) { @@ -2590,9 +2579,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition aFunction->SetValue(aResShape); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2620,9 +2608,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2728,9 +2715,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2780,9 +2766,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet try { aFillet = myLocalOperations->MakeFilletEdges(aShape, theRF, theEdges); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } if (aFillet.IsNull()) { @@ -2842,9 +2827,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet aFunction->SetValue(aResShape); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2866,9 +2850,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2985,9 +2968,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3037,9 +3019,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition try { aFillet = myLocalOperations->MakeFilletEdges(aShape, theRF, theEdges); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } if (aFillet.IsNull()) { @@ -3098,9 +3079,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition aFunction->SetValue(aResShape); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3128,9 +3108,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3224,9 +3203,8 @@ Handle(GEOM_Object) AdvancedEngine_IOperations::MakeDividedDisk (double theR, do return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3299,9 +3277,8 @@ Handle(GEOM_Object) AdvancedEngine_IOperations::MakeDividedDiskPntVecR (Handle(G return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3425,9 +3402,8 @@ Handle(GEOM_Object) AdvancedEngine_IOperations::MakeSmoothingSurface (std::list< return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/BREPPlugin/BREPPlugin_IOperations.cxx b/src/BREPPlugin/BREPPlugin_IOperations.cxx index 43f72dac5..589d93759 100644 --- a/src/BREPPlugin/BREPPlugin_IOperations.cxx +++ b/src/BREPPlugin/BREPPlugin_IOperations.cxx @@ -96,9 +96,8 @@ void BREPPlugin_IOperations::ExportBREP( const Handle(GEOM_Object) theOrigi return; } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return; } @@ -152,9 +151,8 @@ BREPPlugin_IOperations::ImportBREP( const TCollection_AsciiString& theFileName ) // Greate material groups. // MakeMaterialGroups( anImported, aSeq ); } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return NULL; } diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index a6c169018..90faf13fe 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -440,9 +440,8 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) th return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail.GetMessageString()); return NULL; } diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 0f64bd555..92b3ff769 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -248,9 +248,8 @@ TopoDS_Shape GEOM_Function::GetValue() return aShape; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - MESSAGE("GEOM_Function::GetValue Error: " << aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + MESSAGE("GEOM_Function::GetValue Error: " << aFail.GetMessageString()); return aShape; } } diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index 0a1a786b7..41a288f8b 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -135,9 +135,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxDXDYDZ (double theDX, dou return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -190,9 +189,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxTwoPnt (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -239,9 +237,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceHW (double theH, double return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -294,9 +291,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceObjHW (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -350,9 +346,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskPntVecR return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -408,9 +403,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskThreePnt (Handle(GEOM_Ob return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -456,9 +450,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskR (double theR, int theO return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -502,9 +495,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderRH (double theR, dou return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -549,9 +541,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderRHA (double theR, do return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -607,9 +598,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderPntVecRH (Handle(GEO return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -666,9 +656,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderPntVecRHA (Handle(GE return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -716,9 +705,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeConeR1R2H (double theR1, dou return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -777,9 +765,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeConePntVecR1R2H (Handle(GEOM return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -823,9 +810,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeSphereR (double theR) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -876,9 +862,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeSpherePntR (Handle(GEOM_Obje return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -925,9 +910,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeTorusRR return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -983,9 +967,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeTorusPntVecRR return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1043,9 +1026,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1105,9 +1087,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH2Ways (Handle(GEOM_ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1166,9 +1147,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1229,9 +1209,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt2Ways return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1287,9 +1266,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1348,9 +1326,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ2Ways return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1421,9 +1398,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDraftPrism return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1491,9 +1467,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_I3DPrimOperations::MakePipe return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1568,9 +1543,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeRevolutionAxisAngle (Handle( return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1624,9 +1598,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeRevolutionAxisAngle2Ways return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1684,12 +1657,11 @@ GEOMImpl_I3DPrimOperations::MakeFilling (std::list< Handle(GEOM_Object)> & theCo return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - if (strcmp(aFail->GetMessageString(), "Geom_BSplineSurface") == 0) + catch (Standard_Failure& aFail) { + if (strcmp(aFail.GetMessageString(), "Geom_BSplineSurface") == 0) SetErrorCode("B-Spline surface construction failed"); else - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1781,9 +1753,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeThruSections( return anObj; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return anObj; } @@ -1911,9 +1882,8 @@ Handle(TColStd_HSequenceOfTransient) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2097,9 +2067,8 @@ Handle(TColStd_HSequenceOfTransient) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2263,9 +2232,8 @@ Handle(TColStd_HSequenceOfTransient) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2377,9 +2345,8 @@ Handle(TColStd_HSequenceOfTransient) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2464,9 +2431,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeThickening return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2549,8 +2515,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + catch (Standard_Failure& aFail) { SetErrorCode("RestorePath: inappropriate arguments given"); return NULL; } @@ -2639,8 +2604,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + catch (Standard_Failure& aFail) { SetErrorCode("RestorePath: inappropriate arguments given"); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index 2817ef568..8e14834ac 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -109,9 +109,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointXYZ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -162,9 +161,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointWithReference return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -265,9 +263,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::makePointOnGeom return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -426,9 +423,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointOnLinesIntersection return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -477,9 +473,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentOnCurve return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -526,9 +521,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeVectorDXDYDZ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -579,9 +573,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeVectorTwoPnt return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -633,9 +626,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLine return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -686,9 +678,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLineTwoPnt return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -739,9 +730,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLineTwoFaces return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -796,9 +786,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneThreePnt return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -851,9 +840,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlanePntVec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -903,9 +891,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneFace return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -958,9 +945,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlane2Vec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1010,9 +996,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneLCS return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1062,9 +1047,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarker return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1114,9 +1098,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarkerFromShape return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1169,9 +1152,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarkerPntTwoVec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1226,9 +1208,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentPlaneOnFace(const Hand return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx index 111f7dc69..f4362361f 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx @@ -313,9 +313,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -369,9 +368,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad2Edges return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -432,9 +430,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad4Vertices return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -502,9 +499,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeHexa return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -559,9 +555,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeHexa2Faces return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -613,9 +608,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeBlockCompound return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -863,9 +857,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdge anArray->SetValue(1, anIndices.FindIndex(anEdge)); aResult = GetEngine()->AddSubShape(theShape, anArray); } - } catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + } catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -924,9 +917,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdgeNearPoint anArray->SetValue(1, anIndices.FindIndex(aShape)); aResult = GetEngine()->AddSubShape(theShape, anArray); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1065,9 +1057,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByPoints aResult = GetEngine()->AddSubShape(theShape, anArray); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1188,9 +1179,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByEdges aResult = GetEngine()->AddSubShape(theShape, anArray); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1256,9 +1246,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetOppositeFace anArray->SetValue(1, anIndices.FindIndex(aShape)); aResult = GetEngine()->AddSubShape(theShape, anArray); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1446,9 +1435,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceNearPoint aResult = GetEngine()->AddSubShape(theShape, anArray); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1574,9 +1562,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByNormale aResult = GetEngine()->AddSubShape(theShape, anArray); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1699,9 +1686,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint aResult = GetEngine()->AddSubShape(theShape, anArray); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1767,9 +1753,8 @@ Standard_Boolean GEOMImpl_IBlocksOperations::IsCompoundOfBlocks } } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return isCompOfBlocks; } @@ -2449,9 +2434,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::RemoveExtraEdges return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2500,9 +2484,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::UnionFaces return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2554,9 +2537,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::CheckAndImprove return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2626,9 +2608,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::ExplodeCompound } } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aBlocks; } @@ -2811,9 +2792,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetBlockNearPoint aResult = GetEngine()->AddSubShape(theCompound, anArray); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2926,9 +2906,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetBlockByParts anArray->SetValue(1, anIndices.FindIndex(aShape)); aResult = GetEngine()->AddSubShape(theCompound, anArray); } - } catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + } catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3052,9 +3031,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::GetBlocksByPart } } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3112,9 +3090,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeMultiTransformation1D return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3174,9 +3151,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeMultiTransformation2D return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx index 8e950aa14..7da07e48d 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx @@ -118,9 +118,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeBoolean return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -191,9 +190,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeFuse return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -254,9 +252,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeFuseList return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -314,9 +311,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeCommonList return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -385,9 +381,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeCutList return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -510,9 +505,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakePartition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -591,9 +585,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeHalfPartition return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index 89dc6cf0d..d25a5f216 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -242,9 +242,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCircleThreePnt (Handle(GEOM_ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -300,9 +299,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCircleCenter2Pnt (Handle(GEO return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -363,9 +361,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCirclePntVecR return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -436,9 +433,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeEllipse return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -501,9 +497,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArc (Handle(GEOM_Object) the return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -560,9 +555,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcCenter (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } //Make a Python command @@ -617,9 +611,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcOfEllipse (Handle(GEOM_Ob return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -679,9 +672,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline (std::listGetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -748,9 +740,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineBezier return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -818,9 +809,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolation return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -895,9 +885,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolWithTangents return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1144,9 +1133,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1211,9 +1199,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher (const char* theCom return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1273,9 +1260,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1322,9 +1308,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcherCommand (const cha return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1380,9 +1365,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcher (std::listGetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1453,9 +1437,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeIsoline return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1517,9 +1500,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2D return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1594,9 +1576,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2DOnPlane return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index 6a6d99829..328600221 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -144,10 +144,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ShapeProcess (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -357,10 +356,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::SuppressFaces return NULL; } } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -426,10 +424,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::CloseContour return NULL; } } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -494,10 +491,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::RemoveIntWires return NULL; } } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -561,10 +557,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FillHoles (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -636,9 +631,8 @@ GEOMImpl_IHealingOperations::Sew (std::list& theObjects, return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -703,9 +697,8 @@ GEOMImpl_IHealingOperations::RemoveInternalFaces (std::list< Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -762,9 +755,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::DivideEdge (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -829,9 +821,8 @@ GEOMImpl_IHealingOperations::DivideEdgeByPoint (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -895,9 +886,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FuseCollinearEdgesWithinWire return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1082,9 +1072,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientation (Handle(GEOM_ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1153,9 +1142,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientationCopy (Handle(G return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1213,9 +1201,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::LimitTolerance (Handle(GEOM_Obj return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 90acf17a6..578ce9e52 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -128,9 +128,8 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::MakeCopy (Handle(GEOM_Object) th return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -396,9 +395,8 @@ bool GEOMImpl_IInsertOperations::TransferData return false; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return false; } diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index 309c2bcc7..d78a1b216 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -119,9 +119,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletAll return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -178,9 +177,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -246,9 +244,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2 return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -314,9 +311,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -382,9 +378,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2 return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -449,9 +444,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet2D return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -518,9 +512,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet1D return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -577,9 +570,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferAll (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -632,9 +624,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdge return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -688,9 +679,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgeAD return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -749,9 +739,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -818,9 +807,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -888,9 +876,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -958,9 +945,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1020,9 +1006,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeArchimede (Handle(GEOM_Object return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index 8b87bd8cf..a4f76c118 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -785,9 +785,8 @@ void GEOMImpl_IMeasureOperations::GetPosition aDirZ.Coord(Zx, Zy, Zz); aDirX.Coord(Xx, Xy, Xz); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return; } @@ -832,9 +831,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetCentreOfMass return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -884,9 +882,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetVertexByIndex return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -941,9 +938,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetNormal return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1003,9 +999,8 @@ void GEOMImpl_IMeasureOperations::GetBasicProperties (Handle(GEOM_Object) theSha } } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return; } @@ -1069,9 +1064,8 @@ void GEOMImpl_IMeasureOperations::GetInertia GProp_PrincipalProps Pr = System.PrincipalProperties(); Pr.Moments(Ix,Iy,Iz); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return; } @@ -1130,9 +1124,8 @@ void GEOMImpl_IMeasureOperations::GetBoundingBox B.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return; } @@ -1179,9 +1172,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetBoundingBox return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1256,9 +1248,8 @@ void GEOMImpl_IMeasureOperations::GetTolerance VertMin = T; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return; } @@ -1299,9 +1290,8 @@ bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object) theShape, FillErrors(ana, aShape, theErrors); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return false; } @@ -1924,9 +1914,8 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object) Astr = Astr + " SOLID : " + TCollection_AsciiString(nbFlatType[TopAbs_SOLID]) + "\n"; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return Astr; } @@ -2097,9 +2086,8 @@ GEOMImpl_IMeasureOperations::GetMinDistance (Handle(GEOM_Object) theShape1, return MinDist; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return MinDist; } @@ -2173,9 +2161,8 @@ Standard_Integer GEOMImpl_IMeasureOperations::ClosestPoints (Handle(GEOM_Object) } } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return nbSolutions; } @@ -2216,10 +2203,9 @@ void GEOMImpl_IMeasureOperations::PointCoordinates (Handle(GEOM_Object) theShape SetErrorCode(OK); } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + SetErrorCode( aFail.GetMessageString() ); } } @@ -2289,10 +2275,9 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngle (Handle(GEOM_Object) theLine SetErrorCode(OK); } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); } return anAngle; @@ -2354,10 +2339,9 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngleBtwVectors (Handle(GEOM_Objec SetErrorCode(OK); } - catch (Standard_Failure) + catch (Standard_Failure& aFail) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + SetErrorCode(aFail.GetMessageString()); } return anAngle; @@ -2400,9 +2384,8 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByParam aRes = fabs(Prop.Curvature()); SetErrorCode(OK); } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aRes; } @@ -2455,9 +2438,8 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint SetErrorCode(OK); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aRes; } @@ -2507,9 +2489,8 @@ Standard_Real GEOMImpl_IMeasureOperations::getSurfaceCurvatures SetErrorCode(OK); } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aRes; } diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 34db98229..fd79eafa1 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -231,9 +231,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdge return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -290,9 +289,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdgeOnCurveByLength return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -346,9 +344,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdgeWire return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -420,9 +417,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeWire return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -485,9 +481,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFace (Handle(GEOM_Object) th return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -554,9 +549,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -640,9 +634,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceFromSurface return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -728,9 +721,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWithConstraints return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -841,9 +833,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -912,9 +903,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSolidFromConnectedFaces return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -980,9 +970,8 @@ GEOMImpl_IShapesOperations::MakeGlueFaces (std::list< Handle(GEOM_Object) >& the return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -1130,9 +1119,8 @@ GEOMImpl_IShapesOperations::MakeGlueFacesByList(std::list< Handle(GEOM_Object) > return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -1196,9 +1184,8 @@ GEOMImpl_IShapesOperations::MakeGlueEdges (std::list< Handle(GEOM_Object) >& the return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -1378,9 +1365,8 @@ GEOMImpl_IShapesOperations::MakeGlueEdgesByList (std::list< Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); // to provide warning if (!aFunction->GetValue().IsNull()) { isWarning = Standard_True; @@ -2143,9 +2129,8 @@ Standard_Integer GEOMImpl_IShapesOperations::NumberOfSubShapes nbShapes = nbTypes[theShapeType]; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return -1; } @@ -2191,9 +2176,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ReverseShape(Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3233,9 +3217,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeExtraction return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -3323,9 +3306,8 @@ Handle(TColStd_HSequenceOfInteger) VertMax = T; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aSeqOfIDs; } // END: Mantis issue 0020961 @@ -5213,9 +5195,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ExtendEdge return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -5282,9 +5263,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ExtendFace return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -5344,9 +5324,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSurfaceFromFace return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 0a3c2d831..598096391 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -133,9 +133,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateTwoPoints return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -184,9 +183,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZ return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -238,9 +236,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateTwoPointsCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -291,9 +288,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -344,9 +340,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVector return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -395,9 +390,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -454,9 +448,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorDistance return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -515,9 +508,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Translate1D return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -578,9 +570,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Translate2D (Handle(GEOM_Obje return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -774,9 +765,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPlane return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -825,9 +815,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPlaneCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -877,9 +866,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPoint return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -928,9 +916,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPointCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -980,9 +967,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxis return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1031,9 +1017,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxisCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1081,9 +1066,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShape return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1133,9 +1117,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShapeCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1203,9 +1186,8 @@ GEOMImpl_ITransformOperations::ProjectShapeCopy (Handle(GEOM_Object) theSource, return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } } @@ -1269,9 +1251,8 @@ Standard_Real GEOMImpl_ITransformOperations::ProjectPointOnWire return aResult; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aResult; } @@ -1331,9 +1312,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShape return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1390,9 +1370,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1459,9 +1438,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeAlongAxes (Handle(G return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1522,9 +1500,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShape return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1579,9 +1556,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShapeCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1639,9 +1615,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionAlongPath return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1700,9 +1675,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate (Handle(GEOM_Object) t return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1753,9 +1727,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateCopy (Handle(GEOM_Objec return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1807,9 +1780,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate1D (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1866,9 +1838,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate1D (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1928,9 +1899,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate2D (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -1992,9 +1962,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate2D (Handle(GEOM_Object) return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2053,9 +2022,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePoints (Handle(GEO return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2108,9 +2076,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePointsCopy (Handle return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2252,9 +2219,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TransformLikeOtherCopy return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return NULL; } @@ -2320,9 +2286,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MakeProjectionOnCylinder return aResult; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode(aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + SetErrorCode(aFail.GetMessageString()); return aResult; } diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index 966ebc824..5195bb8c8 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -220,9 +220,8 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(Handle(TFunction_Logbook)& l try { OrtProj.Build(); - } catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - TCollection_AsciiString aMsg (aFail->GetMessageString()); + } catch (Standard_Failure& aFail) { + TCollection_AsciiString aMsg (aFail.GetMessageString()); if (!aMsg.Length()) aMsg = "Projection aborted : possibly the source shape intersects the cylinder's axis"; Standard_ConstructionError::Raise(aMsg.ToCString()); diff --git a/src/IGESPlugin/IGESPlugin_IOperations.cxx b/src/IGESPlugin/IGESPlugin_IOperations.cxx index c53752cf4..d8131444e 100644 --- a/src/IGESPlugin/IGESPlugin_IOperations.cxx +++ b/src/IGESPlugin/IGESPlugin_IOperations.cxx @@ -100,9 +100,8 @@ void IGESPlugin_IOperations::ExportIGES( const Handle(GEOM_Object) theOrigi return; } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return; } @@ -158,9 +157,8 @@ IGESPlugin_IOperations::ImportIGES( const TCollection_AsciiString& theFileName, // Greate material groups. // MakeMaterialGroups( anImported, aSeq ); } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return NULL; } diff --git a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx index f82173160..d2c20fc89 100644 --- a/src/IGESPlugin/IGESPlugin_ImportDriver.cxx +++ b/src/IGESPlugin/IGESPlugin_ImportDriver.cxx @@ -182,9 +182,8 @@ Standard_Integer IGESPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log aResShape.Nullify(); } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - anError = aFail->GetMessageString(); + catch( Standard_Failure& aFail ) { + anError = aFail.GetMessageString(); aResShape.Nullify(); } @@ -268,9 +267,8 @@ IGESPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, theError = theFileName + " reading failed"; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - theError = aFail->GetMessageString(); + catch (Standard_Failure& aFail) { + theError = aFail.GetMessageString(); } if (!aValue.IsNull()) return aValue->String(); diff --git a/src/STEPPlugin/STEPPlugin_IOperations.cxx b/src/STEPPlugin/STEPPlugin_IOperations.cxx index ec5943759..c1bb68656 100644 --- a/src/STEPPlugin/STEPPlugin_IOperations.cxx +++ b/src/STEPPlugin/STEPPlugin_IOperations.cxx @@ -145,9 +145,8 @@ void STEPPlugin_IOperations::ExportSTEP return; } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return; } @@ -205,9 +204,8 @@ STEPPlugin_IOperations::ImportSTEP(const TCollection_AsciiString& theFileName, // Greate material groups. MakeMaterialGroups( anImported, aSeq ); } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return NULL; } diff --git a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx index 8d2bed979..2fcb37f8e 100644 --- a/src/STEPPlugin/STEPPlugin_ImportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ImportDriver.cxx @@ -787,9 +787,8 @@ Standard_Integer STEPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log aResShape.Nullify(); } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - anError = aFail->GetMessageString(); + catch( Standard_Failure& aFail ) { + anError = aFail.GetMessageString(); aResShape.Nullify(); } @@ -872,9 +871,8 @@ STEPPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName, theError = theFileName + " reading failed"; } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - theError = aFail->GetMessageString(); + catch( Standard_Failure& aFail ) { + theError = aFail.GetMessageString(); } return aValue; } diff --git a/src/STLPlugin/STLPlugin_IOperations.cxx b/src/STLPlugin/STLPlugin_IOperations.cxx index 0008bf779..20337539d 100644 --- a/src/STLPlugin/STLPlugin_IOperations.cxx +++ b/src/STLPlugin/STLPlugin_IOperations.cxx @@ -105,9 +105,8 @@ void STLPlugin_IOperations::ExportSTL( const Handle(GEOM_Object) theOrigina return; } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return; } @@ -162,9 +161,8 @@ STLPlugin_IOperations::ImportSTL( const TCollection_AsciiString& theFileName ) // Greate material groups. // MakeMaterialGroups( anImported, aSeq ); } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return NULL; } diff --git a/src/VTKPlugin/VTKPlugin_IOperations.cxx b/src/VTKPlugin/VTKPlugin_IOperations.cxx index ab8f79fb2..22dd21d55 100644 --- a/src/VTKPlugin/VTKPlugin_IOperations.cxx +++ b/src/VTKPlugin/VTKPlugin_IOperations.cxx @@ -95,9 +95,8 @@ void VTKPlugin_IOperations::ExportVTK( const Handle(GEOM_Object) theOrigina return; } } - catch( Standard_Failure ) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - SetErrorCode( aFail->GetMessageString() ); + catch( Standard_Failure& aFail ) { + SetErrorCode( aFail.GetMessageString() ); return; } From def38fecf89311783161fdbff7104dc505251afb Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 4 Dec 2017 14:40:22 +0300 Subject: [PATCH 18/26] Typo-fix by Kunda http://www.salome-platform.org/forum/forum_9/948131982/228851081 --- CMakeLists.txt | 2 +- README | 4 +- SalomeGEOMConfig.cmake.in | 2 +- doc/salome/examples/complex_objs_ex07.py | 2 +- .../examples/topological_geom_objs_ex06.py | 2 +- .../gui/GEOM/input/creating_divideddisk.doc | 2 +- .../GEOM/input/extruded_boss_operation.doc | 2 +- .../gui/GEOM/input/extruded_cut_operation.doc | 2 +- .../gui/GEOM/input/geompy_migration.doc | 2 +- doc/salome/gui/GEOM/input/pictures.doc | 2 +- .../input/restore_presentation_parameters.doc | 2 +- .../gui/GEOM/input/translation_operation.doc | 2 +- idl/GEOM_Gen.idl | 32 +++++++------- .../AdvancedEngine_IOperations.cxx | 2 +- .../AdvancedEngine_PipeTShapeDriver.cxx | 2 +- src/BlockFix/BlockFix.cxx | 2 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 2 +- src/BlockFix/BlockFix_UnionEdges.cxx | 2 +- src/BlockFix/BlockFix_UnionFaces.cxx | 6 +-- src/CurveCreator/CurveCreator_Diff.cxx | 2 +- src/CurveCreator/CurveCreator_Widget.cxx | 2 +- src/EntityGUI/EntityGUI.cxx | 2 +- src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 8 ++-- .../EntityGUI_FeatureDetectorDlg.cxx | 2 +- src/EntityGUI/EntityGUI_FieldDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 8 ++-- src/GEOM/GEOM_BaseObject.cxx | 2 +- src/GEOM/GEOM_Engine.cxx | 4 +- src/GEOM/GEOM_Engine.hxx | 8 ++-- src/GEOM/GEOM_Field.cxx | 6 +-- src/GEOM/GEOM_Function.cxx | 2 +- src/GEOM/GEOM_Function.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx | 2 +- src/GEOMBase/GEOMBase_Helper.cxx | 4 +- src/GEOMBase/GEOMBase_Skeleton.cxx | 2 +- src/GEOMBase/GEOM_GenericObjPtr.h | 2 +- src/GEOMGUI/GEOM_Displayer.cxx | 2 +- src/GEOMGUI/GEOM_Displayer.h | 2 +- src/GEOMGUI/GEOM_msg_en.ts | 8 ++-- src/GEOMGUI/GeometryGUI.cxx | 8 ++-- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 6 +-- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 4 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 4 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 4 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 42 +++++++++---------- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ThruSectionsDriver.cxx | 4 +- src/GEOMUtils/GEOMUtils.hxx | 2 +- src/GEOM_I/GEOM_Gen_i.cc | 6 +-- src/GEOM_I/GEOM_Gen_i.hh | 2 +- src/GEOM_I/GEOM_IMeasureOperations_i.hh | 2 +- src/GEOM_PY/geomtools.py | 10 ++--- src/GEOM_PY/sketcher.py | 2 +- src/GEOM_SWIG/GEOM_TestAll.py | 2 +- src/GEOM_SWIG/GEOM_TestOthers.py | 2 +- src/GEOM_SWIG/GEOM_shellSolid.py | 8 ++-- 61 files changed, 133 insertions(+), 133 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61412c097..fc8f8bba5 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_GEOM_USE_OPENCV SALOME_GEOM_USE_VTK) # Prerequisites # ============= # Find "big" prerequisites first - they reference themselves many others -# -> this can help finding the smaller prerequisites and detect conficts. +# -> this can help find the smaller prerequisites and detect conflicts. # In our case KERNEL has already loaded many prereq: ## diff --git a/README b/README index 54eb2a32a..946cb42e0 100644 --- a/README +++ b/README @@ -34,8 +34,8 @@ Installation Pre-requisites -------------- -SALOME platform relies on a set of third-party softwares; some of them are needed -at build time only, while other ones are needed in runtime also. +SALOME platform relies on a set of third-party software; some of them are needed +at build time only, while other ones are needed at runtime as well. For more information about the pre-requisites please visit SALOME platform web site: diff --git a/SalomeGEOMConfig.cmake.in b/SalomeGEOMConfig.cmake.in index 701655953..175fa3d2c 100644 --- a/SalomeGEOMConfig.cmake.in +++ b/SalomeGEOMConfig.cmake.in @@ -19,7 +19,7 @@ # - Config file for the @PROJECT_NAME@ package # It defines the following variables. -# Specific to the pacakge @PROJECT_NAME@ itself: +# Specific to the package @PROJECT_NAME@ itself: # @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # diff --git a/doc/salome/examples/complex_objs_ex07.py b/doc/salome/examples/complex_objs_ex07.py index d9e72ae96..b3b5b8551 100644 --- a/doc/salome/examples/complex_objs_ex07.py +++ b/doc/salome/examples/complex_objs_ex07.py @@ -60,7 +60,7 @@ def MakeComplexSect(pnt,vec,rmax,rmin,nb): #======================================================= -# Create simple path and recieve points +# Create simple path and receive points # for section creation #======================================================= WirePath = geompy.MakeSketcher("Sketcher:F 0 0:T 60 0:T 40 0:R 0:C 100 90:", diff --git a/doc/salome/examples/topological_geom_objs_ex06.py b/doc/salome/examples/topological_geom_objs_ex06.py index 7ae16d8e6..3c9190cb1 100644 --- a/doc/salome/examples/topological_geom_objs_ex06.py +++ b/doc/salome/examples/topological_geom_objs_ex06.py @@ -21,7 +21,7 @@ while i <= 3 : ShapeListCompound.append(S) i = i + 1 -# create a compund of the given shapes +# create a compound of the given shapes compound = geompy.MakeCompound(ShapeListCompound) # add object in the study diff --git a/doc/salome/gui/GEOM/input/creating_divideddisk.doc b/doc/salome/gui/GEOM/input/creating_divideddisk.doc index 6b6011b17..d8702675d 100644 --- a/doc/salome/gui/GEOM/input/creating_divideddisk.doc +++ b/doc/salome/gui/GEOM/input/creating_divideddisk.doc @@ -33,7 +33,7 @@ The result of each operation will be a GEOM_Object. Arguments: - \b Radius - Radius of the disk -- \b Orientation - Plane on wich the disk will be built +- \b Orientation - Plane on which the disk will be built - \b Pattern - Division pattern \image html divided_disk_dlg.png diff --git a/doc/salome/gui/GEOM/input/extruded_boss_operation.doc b/doc/salome/gui/GEOM/input/extruded_boss_operation.doc index 8338c6db4..d75e0bf69 100644 --- a/doc/salome/gui/GEOM/input/extruded_boss_operation.doc +++ b/doc/salome/gui/GEOM/input/extruded_boss_operation.doc @@ -37,7 +37,7 @@ The input arguments are: - The \b height of extrusion. It is calculated from the base profile along the normal to its plane. -And optionnaly: +And optionally: - A draft angle in degrees. Activated by clicking on \image html draft.png diff --git a/doc/salome/gui/GEOM/input/extruded_cut_operation.doc b/doc/salome/gui/GEOM/input/extruded_cut_operation.doc index 0d4d76581..d94d1df89 100644 --- a/doc/salome/gui/GEOM/input/extruded_cut_operation.doc +++ b/doc/salome/gui/GEOM/input/extruded_cut_operation.doc @@ -37,7 +37,7 @@ The input arguments are: - The \b height of extrusion. It's calculated from the base profile along the normal to its plane. -And optionnaly: +And optionally: - A draft angle in degrees. Activated by clicking on \image html draft.png diff --git a/doc/salome/gui/GEOM/input/geompy_migration.doc b/doc/salome/gui/GEOM/input/geompy_migration.doc index fcac5fb05..83fdfc23d 100644 --- a/doc/salome/gui/GEOM/input/geompy_migration.doc +++ b/doc/salome/gui/GEOM/input/geompy_migration.doc @@ -34,7 +34,7 @@ geompy = geomBuilder.New(salome.myStudy) Of course, from geompy import * is no more possible. -\n You have to explicitely write geompy.some_method(). +\n You have to explicitly write geompy.some_method(). \n Some variables have been transferred from the namespace geompy.GEOM to the namespace GEOM. \n All occurrences of geompy.GEOM. can be replaced by GEOM.. diff --git a/doc/salome/gui/GEOM/input/pictures.doc b/doc/salome/gui/GEOM/input/pictures.doc index de4a44859..98a1f6582 100644 --- a/doc/salome/gui/GEOM/input/pictures.doc +++ b/doc/salome/gui/GEOM/input/pictures.doc @@ -5,7 +5,7 @@ Some tools in GEOM allow you to create shapes, basing the design on imported pictures (engineering drawings, nautical charts ...) :
    -
  • \subpage import_picture_page, such as engeneering drawings or nautical charts as a support for shape design. +
  • \subpage import_picture_page, such as engineering drawings or nautical charts as a support for shape design.
  • \subpage shape_recognition_page previously imported in the OCC viewer .
diff --git a/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc b/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc index d7705a3f0..abbc08358 100644 --- a/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc +++ b/doc/salome/gui/GEOM/input/restore_presentation_parameters.doc @@ -17,7 +17,7 @@ faces and Cylinder_1 with free published edges. \image html restore-ss-viewer-before.png "The initial box and cylinder" First, we examine the case when the resulting shape corresponds to one argument (after transformation, -after the Boolean operation Cut, or after the partiton with one object shape). +after the Boolean operation Cut, or after the partition with one object shape). We create a Cut of Box_1 with Cylinder_1. diff --git a/doc/salome/gui/GEOM/input/translation_operation.doc b/doc/salome/gui/GEOM/input/translation_operation.doc index 4ebe45b14..d72a1d19a 100644 --- a/doc/salome/gui/GEOM/input/translation_operation.doc +++ b/doc/salome/gui/GEOM/input/translation_operation.doc @@ -30,7 +30,7 @@ components of translation vector. \image html transformation2.png -\n Finally you can define the \b Vector explicitely. The \b Object will be translated by the length of the vector. +\n Finally you can define the \b Vector explicitly. The \b Object will be translated by the length of the vector. If a curve has been selected instead of the vector, only its first and last vertices will be used to get the vector direction and the dialog preview will display the vector along which the object will be translated. \n Activate Distance checkbox and Distance field allow defining a custom distance of translation. diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 66f23e436..cb8a07058 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -682,7 +682,7 @@ module GEOM /*! * \brief Set the operation error code - * \param theErrorID is a string describing the error occured + * \param theErrorID is a string describing the error occurred * \note This method is supposed to be used only by interfaces inheriting from IOperations. */ void SetErrorCode (in string theErrorID); @@ -703,7 +703,7 @@ module GEOM void StartOperation(); /*! - * \brief Closes the previously opened trasaction + * \brief Closes the previously opened transaction */ void FinishOperation(); @@ -855,7 +855,7 @@ module GEOM /*! * C\brief reate a line, passing through the given point - * and parrallel to the given direction + * and parallel to the given direction * \param thePnt Point. The resulting line will pass through it. * \param theDir Direction. The resulting line will be parallel to it. * \return New GEOM_Object, containing the created line. @@ -3217,7 +3217,7 @@ module GEOM * * Propagation group is a set of all edges, opposite to one (main) * edge of this group directly or through other opposite edges. - * Notion of Opposite Edge make sence only on quadrangle face. + * Notion of Opposite Edge make sense only on quadrangle face. * \param theShape Shape to build propagation groups on. * \return List of GEOM_Object, each of them is a propagation group. */ @@ -3316,7 +3316,7 @@ module GEOM * \param theRemoveInside Shapes, inside which the results will be deleted. * Each shape from theRemoveInside must belong to theShapes also. * \param theRemoveWebs If TRUE, perform Glue 3D algorithm. - * \param theMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE. + * \param theMaterials Material indices for each shape. Make sense, only if theRemoveWebs is TRUE. * * \return New GEOM_Object, containing the result shapes. */ @@ -3332,7 +3332,7 @@ module GEOM /*! * \brief Perform partition operation. * - * This method may be usefull if it is needed to make a partition for + * This method may be useful if it is needed to make a partition for * a compound containing nonintersected shapes. Performance will be better * since intersection between shapes from compound is not performed. * @@ -3795,7 +3795,7 @@ module GEOM * \param theVertexes Global indices of vertexes to perform fillet on. * \note Global index of sub-shape can be obtained, using method * GEOM_IShapesOperations.GetSubShapeIndex(). - * \note The list of vertices coudl be empty, in this case fillet fill be done + * \note The list of vertices could be empty, in this case fillet fill be done * at all vertices in given wire * \param doIgnoreSecantVertices If FALSE, fillet radius is always limited * by the length of the edges, nearest to the fillet vertex. @@ -3834,7 +3834,7 @@ module GEOM in double theD1, in double theD2, in long theFace1, in long theFace2); /*! - * \brief The Same but with params theD = Chamfer Lenght + * \brief The Same but with params theD = Chamfer Length * and theAngle = Chamfer Angle (Angle in radians) */ GEOM_Object MakeChamferEdgeAD (in GEOM_Object theShape, @@ -3858,7 +3858,7 @@ module GEOM in double theD1, in double theD2, in ListOfLong theFaces); /*! - * The Same but with params theD = Chamfer Lenght + * The Same but with params theD = Chamfer Length * and theAngle = Chamfer Angle (Angle in radians) */ GEOM_Object MakeChamferFacesAD (in GEOM_Object theShape, @@ -3877,7 +3877,7 @@ module GEOM in double theD1, in double theD2, in ListOfLong theEdges); /*! - * The Same but with params theD = Chamfer Lenght + * The Same but with params theD = Chamfer Length * and theAngle = Chamfer Angle (Angle in radians) */ GEOM_Object MakeChamferEdgesAD (in GEOM_Object theShape, @@ -4064,7 +4064,7 @@ module GEOM * \param theObjects Shapes to get free boundary of. * \param theClosedWires Output. Closed wires on the free boundary of the given shape. * \param theOpenWires Output. Open wires on the free boundary of the given shape. - * \return FALSE, if an error(s) occured during the method execution. + * \return FALSE, if an error(s) occurred during the method execution. */ boolean GetFreeBoundary (in ListOfGO theObjects, out ListOfGO theClosedWires, @@ -4194,7 +4194,7 @@ module GEOM }; /*! - * \brief Sequence of non-topological information tranfer data. + * \brief Sequence of non-topological information transfer data. */ typedef sequence ListOfTransferDatum; @@ -4209,7 +4209,7 @@ module GEOM * \param theResult statistics of the operation. Output parameter. It * represents a sequence of Transfer Datum. A datum has the type * (string code), the total number of items of this type and - * the number of transfered items. + * the number of transferred items. * \return true in case of success; otherwise false. */ boolean TransferData(in GEOM_Object theObjectFrom, @@ -4912,7 +4912,7 @@ module GEOM * in place of sub-shapes of the first argument, * because the whole shape corresponds to the first argument. * Mainly to be used after transformations, but it also can be - * usefull after partition with one object shape, and some other + * useful after partition with one object shape, and some other * operations, where only the first argument has to be considered. * If theObject has only one argument shape, this flag is automatically * considered as True, not regarding really passed value. @@ -4943,7 +4943,7 @@ module GEOM * in place of sub-shapes of the first argument, * because the whole shape corresponds to the first argument. * Mainly to be used after transformations, but it also can be - * usefull after partition with one object shape, and some other + * useful after partition with one object shape, and some other * operations, where only the first argument has to be considered. * If theObject has only one argument shape, this flag is automatically * considered as True, not regarding really passed value. @@ -4975,7 +4975,7 @@ module GEOM * in place of sub-shapes of the first argument, * because the whole shape corresponds to the first argument. * Mainly to be used after transformations, but it also can be - * usefull after partition with one object shape, and some other + * useful after partition with one object shape, and some other * operations, where only the first argument has to be considered. * If theObject has only one argument shape, this flag is automatically * considered as True, not regarding really passed value. diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index 88bd4a37f..1059def64 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -830,7 +830,7 @@ bool AdvancedEngine_IOperations::GetFacesOnSurf // Default value=3 aFinder.SetNbPntsMin(3); // Sets the maximal number of inner points for edges or faces. - // It is usefull for the cases when this number is very big (e.g =2000) to improve + // It is useful for the cases when this number is very big (e.g =2000) to improve // the performance. If this value =0, all inner points will be taken into account. // Default value=0 aFinder.SetNbPntsMax(100); diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index 1b890ef36..c0e8cd6b2 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx @@ -200,7 +200,7 @@ Handle(TColStd_HSequenceOfInteger) // Default value=3 aFinder.SetNbPntsMin(3); // Sets the maximal number of inner points for edges or faces. - // It is usefull for the cases when this number is very big (e.g =2000) to improve + // It is useful for the cases when this number is very big (e.g =2000) to improve // the performance. If this value =0, all inner points will be taken into account. // Default value=0 aFinder.SetNbPntsMax(0); diff --git a/src/BlockFix/BlockFix.cxx b/src/BlockFix/BlockFix.cxx index 7c62b754b..3c095f058 100644 --- a/src/BlockFix/BlockFix.cxx +++ b/src/BlockFix/BlockFix.cxx @@ -87,7 +87,7 @@ //======================================================================= //function : FixResult -//purpose : auxilary +//purpose : auxiliary //======================================================================= static void FixResult(const TopoDS_Shape& result, Handle(ShapeBuild_ReShape)& Context, diff --git a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx index 77f0f11e4..378a3b7c1 100644 --- a/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/BlockFix/BlockFix_PeriodicSurfaceModifier.cxx @@ -81,7 +81,7 @@ void BlockFix_PeriodicSurfaceModifier::SetTolerance(const Standard_Real Tol) //======================================================================= //function : ModifySurface -//purpose : auxilary +//purpose : auxiliary //======================================================================= static Standard_Boolean ModifySurface(const TopoDS_Face& aFace, const Handle(Geom_Surface)& aSurface, diff --git a/src/BlockFix/BlockFix_UnionEdges.cxx b/src/BlockFix/BlockFix_UnionEdges.cxx index a4d0c0c01..642953f67 100644 --- a/src/BlockFix/BlockFix_UnionEdges.cxx +++ b/src/BlockFix/BlockFix_UnionEdges.cxx @@ -463,7 +463,7 @@ static TopoDS_Edge GlueEdgesWithPCurves(const TopTools_SequenceOfShape& aChain, //======================================================================= //function : MergeEdges -//purpose : auxilary +//purpose : auxiliary //======================================================================= static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges, const Standard_Real Tol, diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 02765bfb4..feeadff83 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -127,7 +127,7 @@ Standard_Integer& BlockFix_UnionFaces::GetOptimumNbFaces() //======================================================================= //function : AddOrdinaryEdges -//purpose : auxilary +//purpose : auxiliary // adds edges from the shape to the sequence // seams and equal edges are dropped // Returns true if one of original edges dropped @@ -179,7 +179,7 @@ static Standard_Boolean AddOrdinaryEdges(TopTools_SequenceOfShape& edges, //======================================================================= //function : ClearRts -//purpose : auxilary +//purpose : auxiliary //======================================================================= static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface) { @@ -193,7 +193,7 @@ static Handle(Geom_Surface) ClearRts(const Handle(Geom_Surface)& aSurface) //======================================================================= //function : IsFacesOfSameSolids -//purpose : auxilary +//purpose : auxiliary //======================================================================= static Standard_Boolean IsFacesOfSameSolids (const TopoDS_Face &theFace1, diff --git a/src/CurveCreator/CurveCreator_Diff.cxx b/src/CurveCreator/CurveCreator_Diff.cxx index a9f08d302..e27bd0aad 100644 --- a/src/CurveCreator/CurveCreator_Diff.cxx +++ b/src/CurveCreator/CurveCreator_Diff.cxx @@ -103,7 +103,7 @@ bool CurveCreator_Diff::init(const CurveCreator_Curve *theCurve, if (myPRedo->init(theType, theIntParam)) { // Construct undo for RemoveSection command. // If the last section is removed, one AddSection command is enough. - // If not last section is removed, two commands are requred: AddSection + // If not last section is removed, two commands are required: AddSection // and MoveSection. const int aLastIndex = theCurve->getNbSections() - 1; diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx index 1906c758d..a76f408f1 100644 --- a/src/CurveCreator/CurveCreator_Widget.cxx +++ b/src/CurveCreator/CurveCreator_Widget.cxx @@ -954,7 +954,7 @@ void CurveCreator_Widget::SetViewer2DMode(const bool To2D) //================================================================================= // function : GeometryGUI::addCoordsByClick() -// purpose : Manage mouse press events in Additon mode +// purpose : Manage mouse press events in Addition mode //================================================================================= void CurveCreator_Widget::addCoordsByClick( QMouseEvent* pe ) { diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index 019e0ad47..5c7e913d8 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -390,7 +390,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha ic->UpdateCurrentViewer(); } catch( Standard_Failure ) { - MESSAGE( "Exception catched in EntityGUI::DisplaySimulationShape" ); + MESSAGE( "Exception caught in EntityGUI::DisplaySimulationShape" ); } } diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index fd7b86889..1f2790d60 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -1285,7 +1285,7 @@ gp_Dir EntityGUI_3DSketcherDlg::getPresentationPlane() const gp_Vec V = Vec1.Transformed(aTransform.Inverted()); gp_Vec Vec3(V.X(),V.Y(),0.0); - // Express the coordinates in the refernce coordinate system (OXY) + // Express the coordinates in the reference coordinate system (OXY) Vec3.Transform(aTransform); if(Abs(Vec1.CrossMagnitude(Vec3)) > Precision::Confusion()) { @@ -1482,7 +1482,7 @@ void EntityGUI_3DSketcherDlg::displayDimensions (bool store) aLength * sin(anAngle1 * M_PI / 180. ), 0.0); - // Express the coordinates in the refernce coordinate system (OXY) + // Express the coordinates in the reference coordinate system (OXY) gp_Trsf aTranform = toReferenceSystem(P0); P1.Transform(aTranform); P2.Transform(aTranform); @@ -1656,7 +1656,7 @@ void EntityGUI_3DSketcherDlg::displayText ( std::string theText, //================================================================ // Function : createAISLengthDimension() // Purpose : Method for creation of a length dimension object -// Returns an Handle on the AIS_LengthDimension obect +// Returns an Handle on the AIS_LengthDimension object //================================================================ Handle(AIS_LengthDimension) EntityGUI_3DSketcherDlg::createAISLengthDimension(double theLength, gp_Pnt P1, @@ -1694,7 +1694,7 @@ Handle(AIS_LengthDimension) EntityGUI_3DSketcherDlg::createAISLengthDimension(do //================================================================ // Function : createAISAngleDimension() // Purpose : Method for creation of an angle dimension object -// Returns an Handle on the AIS_AngleDimension obect +// Returns an Handle on the AIS_AngleDimension object //================================================================ Handle(AIS_AngleDimension) EntityGUI_3DSketcherDlg::createAISAngleDimension(double theAngle, gp_Pnt P0, diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx index bd0a18fc3..88dbb4edd 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx +++ b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx @@ -281,7 +281,7 @@ EntityGUI_FeatureDetectorDlg::EntityGUI_FeatureDetectorDlg( GeometryGUI* theGeom // about what will be considered INSIDE the zone we want to find the frontier of // This makes the algorithm more robust against a bit inhomogeneous parts in the zone // that we want to delimitate. - // The drawback is if we want to delimitate a zone wich color is very similar to the zone + // The drawback is if we want to delimitate a zone which color is very similar to the zone // we consider as the OUTSIDE, the result will be bad. // The current use cases are more of the first form : // - Strongly contrasted INSIDE and OUTSIDE zones diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx index 38b891fdb..58d99914e 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.cxx +++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx @@ -1634,7 +1634,7 @@ void EntityGUI_FieldDlg::activateSelection() // local selection if (!myShape->_is_nil() && !myEditCurrentArgument && - myShapeIDs.size() > 1 ) // shape type is already choosen by user + myShapeIDs.size() > 1 ) // shape type is already chosen by user { GEOM_Displayer* aDisplayer = getDisplayer(); CORBA::String_var aMainEntry = myShape->GetStudyEntry(); diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 45ecde755..29b0692c2 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -908,7 +908,7 @@ void EntityGUI_SketcherDlg::Dir2Clicked( int constructorId ) { InitClick(); Group3Spin->SpinBox_DX->blockSignals(true); // Block signals in order not to modify - Group3Spin->SpinBox_DY->blockSignals(true); // defaut values + Group3Spin->SpinBox_DY->blockSignals(true); // default values Group3Spin->SpinBox_DZ->blockSignals(true); Group2Spin->SpinBox_DX->blockSignals(true); @@ -1591,7 +1591,7 @@ void EntityGUI_SketcherDlg::LineEditReturnPressed() myEditCurrentArgument = Group2Sel->LineEdit2; /* User name of object input management */ - /* If successfull the selection is changed and signal emitted... */ + /* If successful the selection is changed and signal emitted... */ /* so SelectionIntoArgument() is automatically called. */ const QString objectUserName = myEditCurrentArgument->text(); QWidget* thisWidget = (QWidget*)this; @@ -1692,8 +1692,8 @@ void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e ) void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, const gp_Pnt& thePnt, bool isStart ) { - // NOTE Basing the autoapply functionnality on the background picture has no sense anymore - // The import picture functionnality is now used for drawing on top of a picture + // NOTE Basing the autoapply functionality on the background picture has no sense anymore + // The import picture functionality is now used for drawing on top of a picture // SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow(); // OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort(); diff --git a/src/GEOM/GEOM_BaseObject.cxx b/src/GEOM/GEOM_BaseObject.cxx index a0ced3b4d..a84f63a37 100644 --- a/src/GEOM/GEOM_BaseObject.cxx +++ b/src/GEOM/GEOM_BaseObject.cxx @@ -322,7 +322,7 @@ TCollection_AsciiString GEOM_BaseObject::GetName() aName = aNameAttr->Get(); // do not return pointer of local variable // return aName.ToCString(); - // the following code could lead to memory leak, so take care about recieved pointer + // the following code could lead to memory leak, so take care about received pointer return aName; } diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index b8d540a74..efd32b96f 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -529,7 +529,7 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_BaseObject)& theObject) if ( aFreeLabels.empty() || aFreeLabels.back() != aLabel ) aFreeLabels.push_back(aLabel); - // we can't explicitely delete theObject. At least prevent its functioning + // we can't explicitly delete theObject. At least prevent its functioning // as an alive object when aLabel is reused for a new object theObject->_label = aLabel.Root(); theObject->_ior.Clear(); @@ -679,7 +679,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, // a map containing copies of TObjectData from theObjectData TSting2ObjDataMap aEntry2ObjData; // contains pointers to TObjectData of either aEntry2ObjData or theObjectData; the latter - // occures when several StudyEntries correspond to one Entry + // occurs when several StudyEntries correspond to one Entry TSting2ObjDataPtrMap aStEntry2ObjDataPtr; //Resource_DataMapOfAsciiStringAsciiString aEntry2StEntry, aStEntry2Entry, theObjectNames; diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx index 564774078..47b9e6dc7 100644 --- a/src/GEOM/GEOM_Engine.hxx +++ b/src/GEOM/GEOM_Engine.hxx @@ -91,11 +91,11 @@ typedef std::map > TFreeLabelsList; class GEOM_Engine { - public: +public: Standard_EXPORT GEOM_Engine(); Standard_EXPORT virtual ~GEOM_Engine(); - //Retuns the engine + //Returns the engine Standard_EXPORT static GEOM_Engine* GetEngine(); //Returns the OCAF document by its ID, if document doesn't exists it will be created @@ -175,10 +175,10 @@ class GEOM_Engine Standard_EXPORT bool DocumentModified(const int theDocId); - protected: +protected: Standard_EXPORT static void SetEngine(GEOM_Engine* theEngine); - private: +private: Handle(GEOM_Application) _OCAFApp; TColStd_DataMapOfIntegerTransient _mapIDDocument; diff --git a/src/GEOM/GEOM_Field.cxx b/src/GEOM/GEOM_Field.cxx index b975e5d08..f490f81bc 100644 --- a/src/GEOM/GEOM_Field.cxx +++ b/src/GEOM/GEOM_Field.cxx @@ -46,7 +46,7 @@ namespace { //================================================================================ /*! - * \brief Returns a funtion with a given type OR the 1st function + * \brief Returns a function with a given type OR the 1st function */ //================================================================================ @@ -101,7 +101,7 @@ void GEOM_Field::Init(const Handle(GEOM_Object)& theShape, { Handle(GEOM_Function) fun = GetFunction(1); if ( !fun.IsNull() ) - Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_Field is forbiden" ); + Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_Field is forbidden" ); fun = AddFunction( GetFieldID(), FUN_ADD_FIELD ); GEOM_IField data( fun ); @@ -498,7 +498,7 @@ void GEOM_FieldStep::Init(const Handle(GEOM_Field)& theField, { Handle(GEOM_Function) fun = GetFunction(1); if ( !fun.IsNull() ) - Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_FieldStep is forbiden" ); + Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_FieldStep is forbidden" ); fun = AddFunction( GEOM_Field::GetFieldID(), GEOM_Field::FUN_ADD_STEP ); GEOM_IField data( fun ); diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 952dbd3e9..5c0bb896a 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -155,7 +155,7 @@ GEOM_Function::~GEOM_Function() //================================================================================ /*! - * \brief Retuns true if this function is the last one in the study + * \brief Returns true if this function is the last one in the study */ //================================================================================ diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index 5c4b530c6..8e06d58c1 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -174,7 +174,7 @@ public: //Returns true if the last method succided Standard_EXPORT bool IsDone() { return _isDone; } - //Retuns true if this function is the last one in the study + //Returns true if this function is the last one in the study Standard_EXPORT bool IsLastFuntion(); //Returns a sequence of the external dependencies of this function diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx index 91ab6c010..94e769894 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx @@ -632,7 +632,7 @@ void GEOMAlgo_FinderShapeOn1::InnerPoints(const TopoDS_Face& aF, for (; aIt.More(); aIt.Next()) { iCnt=aIt.Value(); if (iCnt>1) { - // take the first having occured inner link + // take the first having occurred inner link // and discretize it const GEOMAlgo_PassKey& aPK=aIt.Key(); // diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx index 7140cc77f..a24738cdb 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx @@ -187,7 +187,7 @@ Standard_Integer GEOMAlgo_GetInPlaceAPI::GetInPlaceOld if (aWhereDistance.IsDone() && aWhatDistance.IsDone() && fabs(aWhereDistance.Value() - aWhatDistance.Value()) <= aTolConf) { - // 0020162: "EDF 961 GEOM : Getinplace is getting additionnal orthogonal faces" + // 0020162: "EDF 961 GEOM : Getinplace is getting additional orthogonal faces" // aVertex must be projected to the same point on Where and on What gp_Pnt pOnWhat = aWhatDistance.PointOnShape2(1); gp_Pnt pOnWhere = aWhereDistance.PointOnShape2(1); diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx index 037ef847c..1bb4db079 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.hxx @@ -60,7 +60,7 @@ public: GEOMAlgo_GetInPlace &theGIP); /*! - * \brief Old implementation of GetInPlace algoritm. + * \brief Old implementation of GetInPlace algorithm. * This method searches among sub shapes of the shape theWhere parts that are * coincident with the shape theWhat. The result list of shape is returned as * an output parameter. It returns the error code with the following possible diff --git a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx index dffecb720..eb581c823 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueDetector.cxx @@ -219,7 +219,7 @@ void GEOMAlgo_GlueDetector::DetectVertices() // aNbVSD=aBBTree.Select(aSelector); if (!aNbVSD) { - continue; // it shoild not be so [at least IP itself] + continue; // it should not be so [at least IP itself] } // const TColStd_ListOfInteger& aLI=aSelector.Indices(); diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index c183e3ec6..c38769a9a 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -836,7 +836,7 @@ bool GEOMBase_Helper::checkViewWindow() //================================================================ // Function : onAccept // Purpose : This method should be called from dialog's slots onOk() and onApply() -// It perfroms user input validation, then it +// It performs user input validation, then it // performs a proper operation and manages transactions, etc. //================================================================ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, bool erasePreviewFlag ) @@ -955,7 +955,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b catch( const SALOME::SALOME_Exception& e ) { SalomeApp_Tools::QtCatchCorbaException( e ); abortCommand(); - MESSAGE("Exception catched") + MESSAGE("Exception caught") } updateViewer(); diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx index 637648cac..486aff4da 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.cxx +++ b/src/GEOMBase/GEOMBase_Skeleton.cxx @@ -225,7 +225,7 @@ void GEOMBase_Skeleton::LineEditReturnPressed() return; /* User name of object input management */ - /* If successfull the selection is changed and signal emitted... */ + /* If successful the selection is changed and signal emitted... */ /* so SelectionIntoArgument() is automatically called. */ const QString objectUserName = myEditCurrentArgument->text(); QWidget* thisWidget = (QWidget*)this; diff --git a/src/GEOMBase/GEOM_GenericObjPtr.h b/src/GEOMBase/GEOM_GenericObjPtr.h index 355f22d75..8058076eb 100644 --- a/src/GEOMBase/GEOM_GenericObjPtr.h +++ b/src/GEOMBase/GEOM_GenericObjPtr.h @@ -57,7 +57,7 @@ namespace GEOM object that should be removed by the caller as soon as the object is no more required. For example, function GetSubShape() of the GEOM_IShapesOperation interface always creates new servant object and returns new object reference to it. If the object is not published - in the study, it has to be destroyed and the coresponding servant should be deleted. + in the study, it has to be destroyed and the corresponding servant should be deleted. Examples: \code diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 488b426f3..e3398b2eb 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -951,7 +951,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap study->setObjectProperty( aMgrId, entry, GEOM::propertyName( GEOM::Texture ), QString( GetTexture().c_str() ) ); study->setObjectProperty( aMgrId, entry, GEOM::propertyName( GEOM::DisplayMode ), 3 ); - // Update propeties map + // Update properties map propMap = getObjectProperties( study, entry, myViewFrame ); } } diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index c7c6d879b..3d93411bc 100755 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -196,7 +196,7 @@ public: virtual void BeforeErase ( SALOME_View*, const SALOME_OCCPrs* ); virtual void AfterErase ( SALOME_View*, const SALOME_OCCPrs* ); - /* This methos is used for activisation/deactivisation of objects to be displayed*/ + /* This methods is used for activisation/deactivisation of objects to be displayed*/ void SetToActivate( const bool ); bool ToActivate() const; diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 22fc71ae4..69e84b9f9 100755 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -970,7 +970,7 @@ Please, select face, shell or solid and try again GEOM_INERTIA_TITLE - Calculs Of Inertia + Calculus Of Inertia GEOM_INF_LOADED @@ -1150,7 +1150,7 @@ Please, select face, shell or solid and try again GEOM_MINDIST_TITLE - Minimun Distance Between Two Objects + Minimum Distance Between Two Objects GEOM_MIRROR @@ -1830,7 +1830,7 @@ Please, select face, shell or solid and try again GEOM_SKETCHER_ADD_PARAMS - Additionnal Parameters + Additional Parameters GEOM_SKETCHER_ANGLE @@ -5210,7 +5210,7 @@ Please, select face, shell or solid and try again GEOM_CLOSEDUNCLOSED - Not defined, Closed or Opened. Possibly, error occured. + Not defined, Closed or Opened. Possibly, error occurred. GEOM_DISK_CIRCLE diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index c15469dea..2a785b325 100755 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -173,7 +173,7 @@ CORBA::Object_var GeometryGUI::ClientSObjectToObject (_PTR(SObject) theSObject) anObj = anORB->string_to_object(aValue.c_str()); } } catch(...) { - INFOS("ClientSObjectToObject - Unknown exception was occured!!!"); + INFOS("ClientSObjectToObject - Unknown exception has occurred!!!"); } return anObj._retn(); } @@ -624,7 +624,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam ) case GEOMOp::OpFace: // MENU BUILD - FACE case GEOMOp::OpShell: // MENU BUILD - SHELL case GEOMOp::OpSolid: // MENU BUILD - SOLID - case GEOMOp::OpCompound: // MENU BUILD - COMPUND + case GEOMOp::OpCompound: // MENU BUILD - COMPOUND libName = "BuildGUI"; break; case GEOMOp::OpFuse: // MENU BOOLEAN - FUSE @@ -2980,7 +2980,7 @@ void GeometryGUI::storeVisualParameters (int savePoint) _PTR(SObject) obj( studyDS->FindObjectID( o_it.key().toLatin1().data() ) ); if ( !obj || !(aProps.count() > 0)) continue; - // entry is "encoded" = it does NOT contain component adress, since it is a + // entry is "encoded" = it does NOT contain component address, since it is a // subject to change on next component loading std::string entry = ip->encodeEntry(o_it.key().toLatin1().data(), componentName); @@ -3154,7 +3154,7 @@ void GeometryGUI::restoreVisualParameters (int savePoint) for (std::vector::iterator entIt = entries.begin(); entIt != entries.end(); ++entIt) { - // entry is a normal entry - it should be "decoded" (setting base adress of component) + // entry is a normal entry - it should be "decoded" (setting base address of component) QString entry (ip->decodeEntry(*entIt).c_str()); // Check that the entry corresponds to a real object in the Study diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 3d03eff3f..224d59c46 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -450,7 +450,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation TopoDS_Shape aStepResult = BO.Shape(); // check result of this step: if it is a compound (boolean operations - // allways return a compound), we add all sub-shapes of it. + // always return a compound), we add all sub-shapes of it. // This allows to avoid adding empty compounds, // resulting from COMMON on two non-intersecting shapes. if (aStepResult.ShapeType() == TopAbs_COMPOUND) { @@ -513,7 +513,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation } if (isCompound) { // check result of this step: if it is a compound (boolean operations - // allways return a compound), we add all sub-shapes of it. + // always return a compound), we add all sub-shapes of it. // This allows to avoid adding empty compounds, // resulting from CUT of parts if (aCut.ShapeType() == TopAbs_COMPOUND) { @@ -620,7 +620,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::performOperation TopoDS_Shape aStepResult = BO.Shape(); // check result of this step: if it is a compound (boolean operations - // allways return a compound), we add all sub-shapes of it. + // always return a compound), we add all sub-shapes of it. // This allows to avoid adding empty compounds, // resulting from SECTION on two non-intersecting shapes. if (aStepResult.ShapeType() == TopAbs_COMPOUND) { diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index 7685ffd63..b8e4dd345 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -217,7 +217,7 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const } else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD) { - // chamfer on selected edges with lenght param D1 & D2. + // chamfer on selected edges with length param D1 & D2. int aLen = aCI.GetLength(); int ind = 1; diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index a9c72ec93..9cd01950c 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -117,7 +117,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueFacesWithWarnings (const TopoDS_Shape& the Standard_Failure::Raise(MSG_BAD_ARG_SHAPE); break; case 200: - Standard_Failure::Raise("Error occured during check of geometric coincidence"); + Standard_Failure::Raise("Error occurred during check of geometric coincidence"); break; default: { @@ -236,7 +236,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueFaces (const TopoDS_Shape& theShape, Standard_Failure::Raise("Result shape is Null"); break; case 200: - Standard_Failure::Raise("Error occured during check of geometric coincidence"); + Standard_Failure::Raise("Error occurred during check of geometric coincidence"); break; default: { diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index ad2f75f9f..0b61485c0 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -154,10 +154,10 @@ GEOMImpl_IMeasureOperations::ShapeKind GEOMImpl_IMeasureOperations::KindOfShape } const GEOMAlgo_ShapeInfo& anInfo = aSF.Info(); - // specific processing for some "advandced" objects + // specific processing for some "advanced" objects switch ( geom_type ) { case GEOM_MARKER: - // local coordinate systen + // local coordinate system // (+) geompy.kind.LCS xc yc zc xx xy xz yx yy yz zx zy zz TopoDS_Face aFace = TopoDS::Face( aShape ); diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index abc02def7..7767daa14 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -198,7 +198,7 @@ class GEOMImpl_IMeasureOperations : public GEOM_IOperations { Standard_EXPORT Standard_Real GetAngleBtwVectors (Handle(GEOM_Object) theVec1, Handle(GEOM_Object) theVec2); - // Methods for recieving radiuses of curvature of curves and surfaces + // Methods for receiving radiuses of curvature of curves and surfaces // in the given point Standard_EXPORT Standard_Real CurveCurvatureByParam (Handle(GEOM_Object) theCurve, Standard_Real& theParam); diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 53f3c9269..d75d01834 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -3347,7 +3347,7 @@ Handle(TColStd_HSequenceOfInteger) // Default value=3 aFinder.SetNbPntsMin(3); // Sets the maximal number of inner points for edges or faces. - // It is usefull for the cases when this number is very big (e.g =2000) to improve + // It is useful for the cases when this number is very big (e.g =2000) to improve // the performance. If this value =0, all inner points will be taken into account. // Default value=0 aFinder.SetNbPntsMax(100); @@ -4275,7 +4275,7 @@ Handle(TColStd_HSequenceOfInteger) // Default value=3 aFinder.SetNbPntsMin(3); // Sets the maximal number of inner points for edges or faces. - // It is usefull for the cases when this number is very big (e.g =2000) to improve + // It is useful for the cases when this number is very big (e.g =2000) to improve // the performance. If this value =0, all inner points will be taken into account. // Default value=0 aFinder.SetNbPntsMax(100); diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index ca48f41bf..e230a23a4 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -146,7 +146,7 @@ GEOMImpl_PipeDriver::GEOMImpl_PipeDriver() //======================================================================= //function : EvaluateBestSweepMode -//purpose : auxilary for right call of MakePipe and MakePipeShell +//purpose : auxiliary for right call of MakePipe and MakePipeShell //======================================================================= static GeomFill_Trihedron EvaluateBestSweepMode(const TopoDS_Shape& Spine) { @@ -202,7 +202,7 @@ static Standard_Boolean BuildPipeShell(BRepOffsetAPI_MakePipeShell &theBuilder) //======================================================================= //function : FillForOtherEdges -//purpose : auxilary for CreatePipeForShellSections() +//purpose : auxiliary for CreatePipeForShellSections() //======================================================================= static bool FillForOtherEdges(const TopoDS_Shape& F1, const TopoDS_Shape& E1, @@ -278,7 +278,7 @@ static bool FillForOtherEdges(const TopoDS_Shape& F1, //======================================================================= //function : FillCorrespondingEdges -//purpose : auxilary for CreatePipeForShellSections() +//purpose : auxiliary for CreatePipeForShellSections() //======================================================================= static bool FillCorrespondingEdges(const TopoDS_Shape& FS1, const TopoDS_Shape& FS2, @@ -406,7 +406,7 @@ static bool FillCorrespondingEdges(const TopoDS_Shape& FS1, //======================================================================= //function : FillCorrespondingEdges -//purpose : auxilary for CreatePipeShellsWithoutPath() +//purpose : auxiliary for CreatePipeShellsWithoutPath() //======================================================================= static bool FillCorrespondingEdges(const TopoDS_Shape& FS1, const TopoDS_Shape& FS2, @@ -508,7 +508,7 @@ static bool FillCorrespondingEdges(const TopoDS_Shape& FS1, //======================================================================= //function : FindNextPairOfFaces -//purpose : auxilary for CreatePipeForShellSections() +//purpose : auxiliary for CreatePipeForShellSections() //======================================================================= static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace, TopTools_IndexedDataMapOfShapeListOfShape& aMapEdgeFaces1, @@ -578,7 +578,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace, //======================================================================= //function : FindFirstPairFaces -//purpose : auxilary for Execute() +//purpose : auxiliary for Execute() //======================================================================= static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2, TopoDS_Vertex& V1, TopoDS_Vertex& V2, @@ -700,7 +700,7 @@ static void FindFirstPairFaces(const TopoDS_Shape& S1, const TopoDS_Shape& S2, //function : RemoveFaces //purpose : This function returns theShapeFrom without faces of the shape // theFacesToRm. It returns a shell if theShapeFrom is a solid or -// a compound otherwise. Auxilary for CreatePipeWithDifferentSections +// a compound otherwise. Auxiliary for CreatePipeWithDifferentSections // method. //======================================================================= static TopoDS_Shape RemoveFaces(const TopoDS_Shape &theShapeFrom, @@ -1309,7 +1309,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections //======================================================================= //function : CreatePipeForShellSections -//purpose : auxilary for Execute() +//purpose : auxiliary for Execute() //======================================================================= static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath, GEOMImpl_IPipe* aCI) @@ -2034,7 +2034,7 @@ static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath, //======================================================================= //function : CreatePipeShellsWithoutPath -//purpose : auxilary for Execute() +//purpose : auxiliary for Execute() //======================================================================= static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI) { @@ -2154,13 +2154,13 @@ static TopoDS_Shape CreatePipeShellsWithoutPath(GEOMImpl_IPipe* aCI) if (aCI) delete aCI; Standard_ConstructionError::Raise("Can not create correct pipe"); } - MESSAGE (" correspondences for sub-shapes of first pair of faces is found"); + MESSAGE (" correspondences for sub-shapes of first pair of faces found"); FindNextPairOfFaces(FS1, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI); - MESSAGE (" other correspondences is found, make pipe for all pairs of faces"); + MESSAGE (" other correspondences found, make pipe for all pairs of faces"); // make pipe for each pair of faces - // auxilary map vertex->edge for created pipe edges + // auxiliary map vertex->edge for created pipe edges TopTools_IndexedDataMapOfShapeShape VPE; ShapeAnalysis_Edge sae; //cout<<"FF.Extent()="<SetValue(aShape); diff --git a/src/GEOMUtils/GEOMUtils.hxx b/src/GEOMUtils/GEOMUtils.hxx index 8bee52fad..20201f799 100644 --- a/src/GEOMUtils/GEOMUtils.hxx +++ b/src/GEOMUtils/GEOMUtils.hxx @@ -323,7 +323,7 @@ namespace GEOMUtils /*! * \brief Extract single SOLID from COMPSOLID or COMPOUND. * - * If the argument shape is a COMPUND or COMPSOLID and there's + * If the argument shape is a COMPOUND or COMPSOLID and there's * only single simple-shape type inside, this sub-shape is returned as a result; * otherwise, the shape is not changed. * diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 782124624..862d95beb 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -262,7 +262,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, // BEGIN: try to find existed name for current shape if ( !aShape->_is_nil() && mytype != GEOM_GROUP) { - // recieve current TopoDS shape + // receive current TopoDS shape CORBA::String_var entry = aShape->GetEntry(); HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast ( _impl->GetObject( aShape->GetStudyID(), entry )); @@ -450,7 +450,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, //============================================================================ // function : CreateAndPublishGroup -// purpose : auxilary for PublishNamedShapesInStudy +// purpose : auxiliary for PublishNamedShapesInStudy //============================================================================ void GEOM_Gen_i::CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var theMainShape, @@ -2516,7 +2516,7 @@ void GEOM_Gen_i::LoadPlugin(const std::string& theLibName) // load plugin library LibHandle libHandle = LoadLib( aPlatformLibName.c_str() ); if (!libHandle) { - // report any error, if occured + // report any error, if occurred #ifndef WIN32 throw(SALOME_Exception(dlerror())); #else diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index 34641ec7e..3413d9d97 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -364,7 +364,7 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi GEOM::find_shape_method theFindMethod, CORBA::Boolean theAddPrefix); - // auxilary for PublishNamedShapesInStudy + // auxiliary for PublishNamedShapesInStudy void CreateAndPublishGroup(SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var theMainShape, const TopTools_IndexedMapOfShape& anIndices, diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh index 80b55c2c1..09fe8344a 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh @@ -141,7 +141,7 @@ class GEOM_I_EXPORT GEOM_IMeasureOperations_i : CORBA::Double GetAngleBtwVectors (GEOM::GEOM_Object_ptr theShape1, GEOM::GEOM_Object_ptr theShape2); - // Methods for recieving radiuses of curvature of curves and surfaces + // Methods for receiving radiuses of curvature of curves and surfaces // in the given point CORBA::Double CurveCurvatureByParam (GEOM::GEOM_Object_ptr theCurve, CORBA::Double theParam); diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py index a6e18abac..27d70d002 100644 --- a/src/GEOM_PY/geomtools.py +++ b/src/GEOM_PY/geomtools.py @@ -230,13 +230,13 @@ class GeomStudyTools: ## Display the geometrical shape whose entry is given by \em entry. # You should prefer use this function instead of the - # displayShapeByName() which can have an unpredictible behavior in + # displayShapeByName() which can have an unpredictable behavior in # the case where several objects exist with the same name in the study. def displayShapeByEntry(self, shapeStudyEntry, color = None, fit=True): """ Display the geometrical shape whose entry is given by `entry`. You should prefer use this function instead of the - displayShapeByName which can have an unpredictible behavior in + displayShapeByName which can have an unpredictable behavior in the case where several objects exist with the same name in the study. """ @@ -271,7 +271,7 @@ class GeomStudyTools: # Helper functions for a complete suppression of a shape from the # SALOME session. # ====================================================================== - ## This completly deletes a geom shape. + ## This completely deletes a geom shape. # \warning Please be aware that to delete a geom object, # you have three operations to perform: # @@ -280,7 +280,7 @@ class GeomStudyTools: # 3. destroy the underlying geom object def deleteShape(self,shapeStudyEntry): """ - This completly deletes a geom shape. + This completely deletes a geom shape. WARNING: please be aware that to delete a geom object, you have three operations to perform: @@ -416,7 +416,7 @@ def TEST_createAndDeleteShape(): gst.eraseShapeByEntry(sphereStudyEntry) # -------------------------------------------------- - # In this last example, we completly delete an object from the + # In this last example, we completely delete an object from the # SALOME session (erase from viewer, remove from study and finnaly # destroy the object). This is done by a simple call to # deleteShape(). diff --git a/src/GEOM_PY/sketcher.py b/src/GEOM_PY/sketcher.py index 84bca3961..2e4c98292 100644 --- a/src/GEOM_PY/sketcher.py +++ b/src/GEOM_PY/sketcher.py @@ -51,7 +51,7 @@ Example:: geompy = geomBuilder.New(salome.myStudy) geompy.addToStudy( wire, 'mysketch' ) -Additionnal examples can be found as unit tests in the source code. +Additional examples can be found as unit tests in the source code. """ geompyEnable = True diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index 00b2d7a98..1d8b6b9c4 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -325,7 +325,7 @@ def TestAll (geompy, math): MultiRot2Dt = geompy.MultiRotate2DNbTimes(Chamfer, vx, nbtimes1, step1, nbtimes2) MultiRot2Ds = geompy.MultiRotate2DByStep(Chamfer, vx, angle1, nbtimes1, step1, nbtimes2) - #Create Informations objects + #Create Information objects CDG = geompy.MakeCDG(Prism) #(GEOM_Object)->GEOM_Object Archimede = geompy.Archimede(Box, weight, waterdensity, meshingdeflection) #(GEOM_Object, 3 Doubles)->GEOM_Object diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 0b20c5e6e..afad24292 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -818,7 +818,7 @@ def TestOtherOperations (geompy, math): for aface in afaces: ssname = "Reflection of face " + `ifa` + " of box " + `ibb` + " (by history)" if ibb == 6 and (ifa == 2 or ifa == 4): - # use IDL interface directly to avoid error message appearence in Python console + # use IDL interface directly to avoid error message appearance in Python console refl_box_face = geompy.ShapesOp.GetInPlaceByHistory(part, aface) if refl_box_face is not None: geompy.addToStudyInFather(part, refl_box_face, ssname) diff --git a/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py index c776a0366..ee95adf8b 100755 --- a/src/GEOM_SWIG/GEOM_shellSolid.py +++ b/src/GEOM_SWIG/GEOM_shellSolid.py @@ -255,7 +255,7 @@ def MakeRotation(g, pt, ve, angle): def MakeMirrorByPoint(s, point): """ - Creates a symmetric object by point symetry + Creates a symmetric object by point symmetry """ return fkl @@ -263,7 +263,7 @@ def MakeMirrorByPoint(s, point): def MakeMirrorByLine(s, line): """ - Creates a symmetric object by line symetry + Creates a symmetric object by line symmetry """ return fkl @@ -271,7 +271,7 @@ def MakeMirrorByLine(s, line): def MakeMirrorByPlane(s, pt, ve): """ - Creates a symmetric object by plane symetry defined by a point and a normal vector + Creates a symmetric object by plane symmetry defined by a point and a normal vector """ p = plane(pt, ve) r = geompy.MakeMirrorByplane(s, p) @@ -301,7 +301,7 @@ def mergePointsNearBy(l, v): """ return fkl -# Acces operators +# Access operators # --------------- def getCoords(v): From b4c1887ab3b6b5a3385ce716bfea4745a0020d7c Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 4 Dec 2017 14:42:45 +0300 Subject: [PATCH 19/26] Typo-fix by Kunda http://www.salome-platform.org/forum/forum_9/948131982/228851081 --- src/GEOM_SWIG/geomBuilder.py | 46 +++++++++---------- src/GEOM_SWIG/gsketcher.py | 2 +- src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx | 4 +- src/GroupGUI/GroupGUI_GroupDlg.cxx | 2 +- .../MeasureGUI_AnnotationInteractor.h | 2 +- .../MeasureGUI_DimensionCreateTool.cxx | 4 +- .../MeasureGUI_ManageDimensionsDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_Skeleton.cxx | 2 +- src/OBJECT/GEOM_Annotation.hxx | 2 +- src/RepairGUI/RepairGUI.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 2 +- src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx | 2 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 2 +- src/STEPPlugin/STEPPlugin_ExportDriver.cxx | 2 +- src/STLPlugin/STLPlugin_ExportDriver.cxx | 2 +- .../ShHealOper_ChangeOrientation.hxx | 4 +- src/ShHealOper/ShHealOper_CloseContour.cxx | 2 +- src/ShHealOper/ShHealOper_CloseContour.hxx | 2 +- src/ShHealOper/ShHealOper_EdgeDivide.cxx | 4 +- src/ShHealOper/ShHealOper_EdgeDivide.hxx | 2 +- src/ShHealOper/ShHealOper_FillHoles.cxx | 2 +- src/ShHealOper/ShHealOper_FillHoles.hxx | 2 +- src/ShHealOper/ShHealOper_RemoveFace.hxx | 2 +- .../ShHealOper_RemoveInternalWires.hxx | 4 +- src/ShHealOper/ShHealOper_Sewing.hxx | 4 +- src/ShHealOper/ShHealOper_Tool.hxx | 2 +- .../ShapeRec_FeatureDetector.cxx | 2 +- src/VTKPlugin/VTKPlugin_ExportDriver.cxx | 4 +- src/XAO/XAO_BrepGeometry.cxx | 2 +- src/XAO/XAO_Field.hxx | 2 +- 30 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index 5de7403b3..d8945d2fc 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -123,7 +123,7 @@ ## vertices = geompy.SubShapeAll(box, geomBuilder.ShapeType['VERTEX']) ## # only 5 first vertices will be published, with default names ## print len(vertices) -## # note, that result value still containes all 8 vertices +## # note, that result value still contains all 8 vertices ## geompy.addToStudyAuto(-1) # disable automatic publication ## @endcode ## @@ -976,7 +976,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # in place of sub-shapes of the first argument, # because the whole shape corresponds to the first argument. # Mainly to be used after transformations, but it also can be - # usefull after partition with one object shape, and some other + # useful after partition with one object shape, and some other # operations, where only the first argument has to be considered. # If theObject has only one argument shape, this flag is automatically # considered as True, not regarding really passed value. @@ -1002,7 +1002,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): in place of sub-shapes of the first argument, because the whole shape corresponds to the first argument. Mainly to be used after transformations, but it also can be - usefull after partition with one object shape, and some other + useful after partition with one object shape, and some other operations, where only the first argument has to be considered. If theObject has only one argument shape, this flag is automatically considered as True, not regarding really passed value. @@ -1027,7 +1027,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # in place of sub-shapes of the first argument, # because the whole shape corresponds to the first argument. # Mainly to be used after transformations, but it also can be - # usefull after partition with one object shape, and some other + # useful after partition with one object shape, and some other # operations, where only the first argument has to be considered. # If theObject has only one argument shape, this flag is automatically # considered as True, not regarding really passed value. @@ -1053,7 +1053,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): in place of sub-shapes of the first argument, because the whole shape corresponds to the first argument. Mainly to be used after transformations, but it also can be - usefull after partition with one object shape, and some other + useful after partition with one object shape, and some other operations, where only the first argument has to be considered. If theObject has only one argument shape, this flag is automatically considered as True, not regarding really passed value. @@ -1560,7 +1560,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): return anObj ## Create a line, passing through the given point - # and parrallel to the given direction + # and parallel to the given direction # @param thePnt Point. The resulting line will pass through it. # @param theDir Direction. The resulting line will be parallel to it. # @param theName Object name; when specified, this parameter is used @@ -1574,7 +1574,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): def MakeLine(self, thePnt, theDir, theName=None): """ Create a line, passing through the given point - and parrallel to the given direction + and parallel to the given direction Parameters: thePnt Point. The resulting line will pass through it. @@ -3893,7 +3893,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # possible to generate groups along with the result by means of # setting the flag \a IsGenerateGroups.
# If \a thePath is a closed edge or wire and \a IsGenerateGroups is - # set, an error is occured. If \a thePath is not closed edge/wire, + # set, an error is occurred. If \a thePath is not closed edge/wire, # the following groups are returned: # - If \a theBase is unclosed edge or wire: "Down", "Up", "Side1", # "Side2"; @@ -3933,7 +3933,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): possible to generate groups along with the result by means of setting the flag IsGenerateGroups. If thePath is a closed edge or wire and IsGenerateGroups is - set, an error is occured. If thePath is not closed edge/wire, + set, an error is occurred. If thePath is not closed edge/wire, the following groups are returned: - If theBase is unclosed edge or wire: "Down", "Up", "Side1", "Side2"; @@ -4182,7 +4182,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): ## Create a shape by extrusion of the profile shape along # the path shape. This function is used only for debug pipe # functionality - it is a version of function MakePipeWithShellSections() - # which give a possibility to recieve information about + # which give a possibility to receive information about # creating pipe between each pair of sections step by step. @ManageTransactions("PrimOp") def MakePipeWithShellSectionsBySteps(self, theSeqBases, theSeqSubBases, @@ -4194,7 +4194,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): the path shape. This function is used only for debug pipe functionality - it is a version of previous function geompy.MakePipeWithShellSections() which give a possibility to - recieve information about creating pipe between each pair of + receive information about creating pipe between each pair of sections step by step. """ res = [] @@ -7378,7 +7378,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # publication is switched on, default value is used for result name. # # @return [\a status, \a theClosedWires, \a theOpenWires] - # \n \a status: FALSE, if an error(s) occured during the method execution. + # \n \a status: FALSE, if an error(s) occurred during the method execution. # \n \a theClosedWires: Closed wires on the free boundary of the given shape. # \n \a theOpenWires: Open wires on the free boundary of the given shape. # @@ -7397,7 +7397,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): Returns: [status, theClosedWires, theOpenWires] - status: FALSE, if an error(s) occured during the method execution. + status: FALSE, if an error(s) occurred during the method execution. theClosedWires: Closed wires on the free boundary of the given shape. theOpenWires: Open wires on the free boundary of the given shape. """ @@ -8094,7 +8094,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # @param ListRemoveInside Shapes, inside which the results will be deleted. # Each shape from theRemoveInside must belong to theShapes also. # @param RemoveWebs If TRUE, perform Glue 3D algorithm. - # @param ListMaterials Material indices for each shape. Make sence, + # @param ListMaterials Material indices for each shape. Make sense, # only if theRemoveWebs is TRUE. # # @return New GEOM.GEOM_Object, containing the result shapes. @@ -8136,7 +8136,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): ListRemoveInside Shapes, inside which the results will be deleted. Each shape from theRemoveInside must belong to theShapes also. RemoveWebs If TRUE, perform Glue 3D algorithm. - ListMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE. + ListMaterials Material indices for each shape. Make sense, only if theRemoveWebs is TRUE. Returns: New GEOM.GEOM_Object, containing the result shapes. @@ -10277,14 +10277,14 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self._autoPublish(anObj, theName, "chamfer") return anObj - ## The Same that MakeChamferFaces() but with params theD is chamfer lenght and + ## The Same that MakeChamferFaces() but with params theD is chamfer length and # theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees) # # @ref swig_FilletChamfer "Example" @ManageTransactions("LocalOp") def MakeChamferFacesAD(self, theShape, theD, theAngle, theFaces, theName=None): """ - The Same that geompy.MakeChamferFaces but with params theD is chamfer lenght and + The Same that geompy.MakeChamferFaces but with params theD is chamfer length and theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees) """ flag = False @@ -10335,12 +10335,12 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self._autoPublish(anObj, theName, "chamfer") return anObj - ## The Same that MakeChamferEdges() but with params theD is chamfer lenght and + ## The Same that MakeChamferEdges() but with params theD is chamfer length and # theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees) @ManageTransactions("LocalOp") def MakeChamferEdgesAD(self, theShape, theD, theAngle, theEdges, theName=None): """ - The Same that geompy.MakeChamferEdges but with params theD is chamfer lenght and + The Same that geompy.MakeChamferEdges but with params theD is chamfer length and theAngle is Angle of chamfer (angle in radians or a name of variable which defines angle in degrees) """ flag = False @@ -12769,7 +12769,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): ## Build all possible propagation groups. # Propagation group is a set of all edges, opposite to one (main) # edge of this group directly or through other opposite edges. - # Notion of Opposite Edge make sence only on quadrangle face. + # Notion of Opposite Edge make sense only on quadrangle face. # @param theShape Shape to build propagation groups on. # @param theName Object name; when specified, this parameter is used # for result publication in the study. Otherwise, if automatic @@ -12784,7 +12784,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): Build all possible propagation groups. Propagation group is a set of all edges, opposite to one (main) edge of this group directly or through other opposite edges. - Notion of Opposite Edge make sence only on quadrangle face. + Notion of Opposite Edge make sense only on quadrangle face. Parameters: theShape Shape to build propagation groups on. @@ -13209,7 +13209,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): return aType ## Convert a type of geom object from id to string value - # @param theId is a GEOM obect type id. + # @param theId is a GEOM object type id. # @return type of geom object (POINT, VECTOR, PLANE, LINE, TORUS, ... ) # @ref swig_GetType "Example" def ShapeIdToType(self, theId): @@ -13217,7 +13217,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): Convert a type of geom object from id to string value Parameters: - theId is a GEOM obect type id. + theId is a GEOM object type id. Returns: type of geom object (POINT, VECTOR, PLANE, LINE, TORUS, ... ) diff --git a/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py index 965f17c96..b9f8a5b3e 100644 --- a/src/GEOM_SWIG/gsketcher.py +++ b/src/GEOM_SWIG/gsketcher.py @@ -50,7 +50,7 @@ # # update object browser # salome.sg.updateObjBrowser(True) # @endcode -# @n Additionnal examples can be found as unit tests in the source code. +# @n Additional examples can be found as unit tests in the source code. # @} """ diff --git a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx index 9a810d39c..2d3306979 100644 --- a/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx +++ b/src/GEOM_SWIG_WITHIHM/libGEOM_Swig.cxx @@ -432,8 +432,8 @@ void GEOM_Swig::setColor( const char* theEntry, int theRed, int theGreen, int th /*! \brief Set number of iso-lines to the presentation \param theEntry geometry object's entry - \param theNbU number of iso-lines along U axis (interger value >= 0) - \param theNbV number of iso-lines along V axis (interger value >= 0) + \param theNbU number of iso-lines along U axis (integer value >= 0) + \param theNbV number of iso-lines along V axis (integer value >= 0) \param theUpdateViewer \c true to update active view's contents */ void GEOM_Swig::setIsos( const char* theEntry, int theNbU, int theNbV, bool theUpdateViewer ) diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index a7ce624ec..9566f50f7 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -1029,7 +1029,7 @@ void GroupGUI_GroupDlg::activateSelection() // local selection if (!myMainObj->_is_nil() && !myEditCurrentArgument && - myIsShapeType) // check if shape type is already choosen by user + myIsShapeType) // check if shape type is already chosen by user { GEOM_Displayer* aDisplayer = getDisplayer(); diff --git a/src/MeasureGUI/MeasureGUI_AnnotationInteractor.h b/src/MeasureGUI/MeasureGUI_AnnotationInteractor.h index 21875cc48..37a216463 100755 --- a/src/MeasureGUI/MeasureGUI_AnnotationInteractor.h +++ b/src/MeasureGUI/MeasureGUI_AnnotationInteractor.h @@ -42,7 +42,7 @@ class SUIT_ViewWindow; /*! * \class MeasureGUI_AnnotationInteractor * \brief Class implementing logical layer for interactive dragging of annotation - * labels. It includes two components: listener for GUI events occuring + * labels. It includes two components: listener for GUI events occurring * inside of OCCT 3D viewer and processor for hooked events to perform * interactive modification of the selected annotation within current * AIS context. diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx index 06d3cba25..47a2f38de 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx @@ -687,7 +687,7 @@ Handle(AIS_DiameterDimension) MeasureGUI_DimensionCreateTool::Diameter( const GE Handle(AIS_DiameterDimension) aDimension = new AIS_DiameterDimension( aRuledCirc, aPln ); // if flyout is extended in tangent direction to circle, the default flyout value is used - // if flyout is extended in plane of circle, the zero flyout value is choosen initially + // if flyout is extended in plane of circle, the zero flyout value is chosen initially Standard_Real aFlyout = aCircN.IsParallel( aPln.Axis().Direction(), Precision::Angular() ) ? 0.0 : Settings.DefaultFlyout; aDimension->SetFlyout(aFlyout); @@ -929,7 +929,7 @@ void MeasureGUI_DimensionCreateTool::PositionLength( const Bnd_Box& theBnd, // flyout plane to best match the current view projection (if any) // The points are aligned to XOY, YOZ, ZOX planes. // The flyout takes into account bounding box of main shape of face normal -// vector. The flyouts tangetial to the circle plane are directed in +// vector. The flyouts tangential to the circle plane are directed in // accordance with the face normal (if not-null), otherwise the flyouts // are turned to direct to the closest border of bounding box. //================================================================================= diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx index fa53c1aa0..ed4673e15 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx @@ -532,7 +532,7 @@ void MeasureGUI_ManageDimensionsDlg::OnSelectItem() //================================================================================= void MeasureGUI_ManageDimensionsDlg::OnShowAll() { - // read propety data + // read property data SalomeApp_Application* anApp = myGeomGUI->getApp(); if ( !anApp ) { @@ -581,7 +581,7 @@ void MeasureGUI_ManageDimensionsDlg::OnShowAll() //================================================================================= void MeasureGUI_ManageDimensionsDlg::OnHideAll() { - // read propety data + // read property data SalomeApp_Application* anApp = myGeomGUI->getApp(); if ( !anApp ) { diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx index dcab485c9..dceb80c09 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx +++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx @@ -173,7 +173,7 @@ void MeasureGUI_Skeleton::ClickOnHelp() void MeasureGUI_Skeleton::LineEditReturnPressed() { /* User name of object input management */ - /* If successfull the selection is changed and signal emitted... */ + /* If successful the selection is changed and signal emitted... */ /* so SelectionIntoArgument() is automatically called. */ if ( mySelEdit ) { diff --git a/src/OBJECT/GEOM_Annotation.hxx b/src/OBJECT/GEOM_Annotation.hxx index 00fc80986..1d5439896 100755 --- a/src/OBJECT/GEOM_Annotation.hxx +++ b/src/OBJECT/GEOM_Annotation.hxx @@ -102,7 +102,7 @@ public: //! screen, while its position is a 3D point defined in world's coordinate system. Standard_EXPORT void SetIsScreenFixed( const Standard_Boolean theIsFixed ); - //! Retuns value of "screen fixed" positioning mode. + //! Returns value of "screen fixed" positioning mode. Standard_Boolean GetIsScreenFixed() const { return myIsScreenFixed; } //! Converts annotation position to screen fixed coordinates and diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx index 663ccdc90..132aad55f 100644 --- a/src/RepairGUI/RepairGUI.cxx +++ b/src/RepairGUI/RepairGUI.cxx @@ -38,7 +38,7 @@ #include "RepairGUI_ShapeProcessDlg.h" // Method PROCESS SHAPE #include "RepairGUI_CloseContourDlg.h" // Method CLOSE CONTOUR #include "RepairGUI_RemoveIntWiresDlg.h"// Method REMOVE INTERNAL WIRES -#include "RepairGUI_DivideEdgeDlg.h" // Method DEVIDE EDGE +#include "RepairGUI_DivideEdgeDlg.h" // Method DIVIDE EDGE #include "RepairGUI_FreeBoundDlg.h" // Method FREE BOUNDARIES #include "RepairGUI_FreeFacesDlg.h" // Method FREE FACES #include "RepairGUI_GlueDlg.h" // Method GLUE FACES diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index cf4d33ba9..2e178397e 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -592,7 +592,7 @@ void RepairGUI_GlueDlg::clearShapeBufferLocal(GEOM::GEOM_Object_ptr theObj) //================================================================ // Function : onAccept // Purpose : This method should be called from dialog's slots onOk() and onApply() -// It perfroms user input validation, then it +// It performs user input validation, then it // performs a proper operation and manages transactions, etc. //================================================================ bool RepairGUI_GlueDlg::onAcceptLocal() diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx index 11ae185f2..5881526bd 100644 --- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx +++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.cxx @@ -316,7 +316,7 @@ bool RepairGUI_LimitToleranceDlg::execute(ObjectList& objects) //================================================================ // Function : onAccept // Purpose : This method should be called from dialog's slots onOk() and onApply() -// It perfroms user input validation, then it +// It performs user input validation, then it // performs a proper operation and manages transactions, etc. //================================================================ bool RepairGUI_LimitToleranceDlg::onAcceptLocal() diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 37880e93e..c073038e7 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -712,7 +712,7 @@ bool RepairGUI_ShapeProcessDlg::execute( ObjectList& objects ) } if ( !anErrorObjNames.empty() ) - MESSAGE( "ERRORS occured while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() ); + MESSAGE( "ERRORS occurred while processing the following objects: " << anErrorObjNames.join( " " ).toLatin1().data() ); return anErrorObjNames.size() < myObjects->length(); // true if at least one object was OK, false if ALL objects were nil after Healing. } diff --git a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx index c6bfe8580..3c50a64f7 100644 --- a/src/STEPPlugin/STEPPlugin_ExportDriver.cxx +++ b/src/STEPPlugin/STEPPlugin_ExportDriver.cxx @@ -137,7 +137,7 @@ Standard_Integer STEPPlugin_ExportDriver::Execute(LOGBOOK& log) const } catch (Standard_Failure) { - //THROW_SALOME_CORBA_EXCEPTION("Exception catched in STEPExport", SALOME::BAD_PARAM); + //THROW_SALOME_CORBA_EXCEPTION("Exception caught in STEPExport", SALOME::BAD_PARAM); } return 0; } diff --git a/src/STLPlugin/STLPlugin_ExportDriver.cxx b/src/STLPlugin/STLPlugin_ExportDriver.cxx index 3f269f304..d45f7a0fc 100644 --- a/src/STLPlugin/STLPlugin_ExportDriver.cxx +++ b/src/STLPlugin/STLPlugin_ExportDriver.cxx @@ -126,7 +126,7 @@ Standard_Integer STLPlugin_ExportDriver::Execute(LOGBOOK& log) const } catch( Standard_Failure ) { - //THROW_SALOME_CORBA_EXCEPTION("Exception catched in ExportSTL", SALOME::BAD_PARAM); + //THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportSTL", SALOME::BAD_PARAM); } return 0; } diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx index 71b27c08c..8c88cbdce 100644 --- a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx +++ b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx @@ -46,10 +46,10 @@ class ShHealOper_ChangeOrientation : public ShHealOper_Tool /// Copy constructor Standard_EXPORT ShHealOper_ChangeOrientation (const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT Standard_Boolean Perform(); //Change orientation diff --git a/src/ShHealOper/ShHealOper_CloseContour.cxx b/src/ShHealOper/ShHealOper_CloseContour.cxx index 5eaa14a8f..37508ce73 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.cxx +++ b/src/ShHealOper/ShHealOper_CloseContour.cxx @@ -136,7 +136,7 @@ void ShHealOper_CloseContour::build(Handle(ShapeExtend_WireData)& theSewd) //checks that all specified edges belong the one face or not. Standard_Boolean isOneFace = checkOneFace(theSewd,aCommonFaces); - //add edge or increase max tolerance in dependance on specified VertexMode. + //add edge or increase max tolerance in dependence on specified VertexMode. //if all edges belong the one face that gap will be closed in the 2D by line //else gap will be closed in the 3D by line. myDone = fixGaps(theSewd,aCommonFaces); diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx index d8d9d3389..94b189bba 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.hxx +++ b/src/ShHealOper/ShHealOper_CloseContour.hxx @@ -51,7 +51,7 @@ class ShHealOper_CloseContour : public ShHealOper_Tool //Initalizes by whole shape. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT Standard_Boolean Perform(const TopTools_SequenceOfShape& theSeqEdges, const Standard_Boolean theModeVertex = Standard_False, diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.cxx b/src/ShHealOper/ShHealOper_EdgeDivide.cxx index 8b11a8f1e..869be89b9 100644 --- a/src/ShHealOper/ShHealOper_EdgeDivide.cxx +++ b/src/ShHealOper/ShHealOper_EdgeDivide.cxx @@ -189,7 +189,7 @@ Standard_Boolean ShHealOper_EdgeDivide::build(const Handle(TColStd_HSequenceOfRe has2d = Standard_False, hasPCurves = Standard_False; - //computation of the split values in dependance from specified mode and values. + //computation of the split values in dependence from specified mode and values. if(!computeValues(theValues, has3d,has2d,hasPCurves)) { myErrorStatus = ShHealOper_InvalidParameters; return Standard_False; @@ -214,7 +214,7 @@ Standard_Boolean ShHealOper_EdgeDivide::build(const Handle(TColStd_HSequenceOfRe return Standard_False; } - //split 3d curve and pcurve for each face reffering to edge. + //split 3d curve and pcurve for each face referring to edge. Standard_Boolean isDone = Standard_True; if(hasPCurves) { const TopTools_ListOfShape& lfaces = myMapEdgesFace.FindFromKey(myEdge); diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.hxx b/src/ShHealOper/ShHealOper_EdgeDivide.hxx index 252dba9f4..1a9eebb7d 100644 --- a/src/ShHealOper/ShHealOper_EdgeDivide.hxx +++ b/src/ShHealOper/ShHealOper_EdgeDivide.hxx @@ -49,7 +49,7 @@ class ShHealOper_EdgeDivide : public ShHealOper_Tool /// Constructor initializes by shape. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT Standard_Boolean Perform(const TopoDS_Shape& theEdge, const Standard_Real theValue, diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx index 799aa8f6e..36dcaf0b6 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.cxx +++ b/src/ShHealOper/ShHealOper_FillHoles.cxx @@ -361,7 +361,7 @@ Standard_Boolean ShHealOper_FillHoles::addFace(const Handle(Geom_Surface)& theSu aB.Range (anEdge, aFace, aF, aL); // Set orientation of the edge: orientation should be changed - // if its orientation does not make sence with curve orientation + // if its orientation does not make sense with curve orientation // recommended by GeomPlate if ((anEdge.Orientation() == TopAbs_FORWARD) == (theSenses->Value (theOrders->Value (aInd)) == 1)) { diff --git a/src/ShHealOper/ShHealOper_FillHoles.hxx b/src/ShHealOper/ShHealOper_FillHoles.hxx index 7b19d27b0..44af3c08c 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.hxx +++ b/src/ShHealOper/ShHealOper_FillHoles.hxx @@ -53,7 +53,7 @@ class ShHealOper_FillHoles : public ShHealOper_Tool Standard_EXPORT ShHealOper_FillHoles (const TopoDS_Shape& theShape); Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT void InitParameters(Standard_Integer theDegree = 3,//3(2) Standard_Integer theNbPtsOnCur =5,//3, diff --git a/src/ShHealOper/ShHealOper_RemoveFace.hxx b/src/ShHealOper/ShHealOper_RemoveFace.hxx index b5a4390af..25e881ae9 100644 --- a/src/ShHealOper/ShHealOper_RemoveFace.hxx +++ b/src/ShHealOper/ShHealOper_RemoveFace.hxx @@ -50,7 +50,7 @@ class ShHealOper_RemoveFace : public ShHealOper_Tool Standard_EXPORT ShHealOper_RemoveFace (const TopoDS_Shape& theShape); // Constructor initialized by shape from which faces will be removed. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT Standard_Boolean Perform(); //Removes all faces from specified shape. diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx index fe5a7eda0..d619293ba 100644 --- a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx +++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx @@ -48,10 +48,10 @@ class ShHealOper_RemoveInternalWires : public ShHealOper_Tool /// Copy constructor Standard_EXPORT ShHealOper_RemoveInternalWires (const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT Standard_Boolean Remove(); //Removes all internal wires from all faces of the shape diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx index 6f07c461b..7ff51dc57 100644 --- a/src/ShHealOper/ShHealOper_Sewing.hxx +++ b/src/ShHealOper/ShHealOper_Sewing.hxx @@ -50,10 +50,10 @@ class ShHealOper_Sewing : public ShHealOper_Tool Standard_EXPORT ShHealOper_Sewing (const TopoDS_Shape& theShape, const Standard_Real theTolerance); - //Constructor for initalization by shape and tolerance. + //Constructor for initialization by shape and tolerance. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. Standard_EXPORT Standard_Boolean Perform(); //Performs sewing specified whole shape. diff --git a/src/ShHealOper/ShHealOper_Tool.hxx b/src/ShHealOper/ShHealOper_Tool.hxx index c07972796..665085f58 100644 --- a/src/ShHealOper/ShHealOper_Tool.hxx +++ b/src/ShHealOper/ShHealOper_Tool.hxx @@ -53,7 +53,7 @@ class ShHealOper_Tool // Constructor initialized by shape from which faces will be removed. Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape); - //Method for initalization by whole shape. + //Method for initialization by whole shape. inline const TopoDS_Shape& GetResultShape() const { diff --git a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx index 9ba1395c4..497ad04ad 100644 --- a/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx +++ b/src/ShapeRecognition/ShapeRec_FeatureDetector.cxx @@ -235,7 +235,7 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters detected_edges = cv::Mat(binary_backproject); } - // else if ( detection_method == RIDGE_DETECTOR ) // Method adapted for engineering drawings (e.g. watershed functionnality could be used here cf.OpenCV documentation and samples) + // else if ( detection_method == RIDGE_DETECTOR ) // Method adapted for engineering drawings (e.g. watershed functionality could be used here cf.OpenCV documentation and samples) // { // // TODO // return false; diff --git a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx index ae67871a2..fdd56a959 100644 --- a/src/VTKPlugin/VTKPlugin_ExportDriver.cxx +++ b/src/VTKPlugin/VTKPlugin_ExportDriver.cxx @@ -100,13 +100,13 @@ Standard_Integer VTKPlugin_ExportDriver::Execute(LOGBOOK& log) const aWriter->SetFileName( aFileName.ToCString() ); aWriter->Write(); aWriter->Delete(); - pd->Delete(); //instanciated by the GEOM::GetData(...) method + pd->Delete(); //instantiated by the GEOM::GetData(...) method return 1; } catch( Standard_Failure ) { - //THROW_SALOME_CORBA_EXCEPTION("Exception catched in ExportVTK", SALOME::BAD_PARAM); + //THROW_SALOME_CORBA_EXCEPTION("Exception caught in ExportVTK", SALOME::BAD_PARAM); } return 0; } diff --git a/src/XAO/XAO_BrepGeometry.cxx b/src/XAO/XAO_BrepGeometry.cxx index db3c162b0..f59edc305 100644 --- a/src/XAO/XAO_BrepGeometry.cxx +++ b/src/XAO/XAO_BrepGeometry.cxx @@ -97,7 +97,7 @@ void BrepGeometry::setTopoDS_Shape(const TopoDS_Shape& shape) void BrepGeometry::initIds() { - // intialization of Ids + // initialization of Ids initListIds(TopAbs_VERTEX, m_vertices); initListIds(TopAbs_EDGE, m_edges); initListIds(TopAbs_FACE, m_faces); diff --git a/src/XAO/XAO_Field.hxx b/src/XAO/XAO_Field.hxx index 5d2c373da..be5dcff2a 100644 --- a/src/XAO/XAO_Field.hxx +++ b/src/XAO/XAO_Field.hxx @@ -47,7 +47,7 @@ namespace XAO protected: /** * Constructor. - * @param dimension the dimension ot the field. + * @param dimension the dimension of the field. * @param nbElements the number of elements. * @param nbComponents the number of components. * @param name the name of the field. From ee8283cdc0d24a528686155673f87c457309d912 Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 8 Dec 2017 11:34:36 +0300 Subject: [PATCH 20/26] 0023505: Sigsegv with fuse on cylinder and cone --- src/BlockFix/BlockFix_UnionFaces.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index feeadff83..99f770afb 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -598,10 +598,13 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) sfw->SetMaxTolerance(Max(1.,myTolerance*1000.)); sfw->SetFace(aFace); for (TopoDS_Iterator iter (aFace,Standard_False); iter.More(); iter.Next()) { - TopoDS_Wire wire = TopoDS::Wire(iter.Value()); - sfw->Load(wire); - sfw->FixReorder(); - sfw->FixShifted(); + TopoDS_Shape aFaceCont = iter.Value(); + if (!aFaceCont.IsNull() && aFaceCont.ShapeType() == TopAbs_WIRE) { + TopoDS_Wire wire = TopoDS::Wire(iter.Value()); + sfw->Load(wire); + sfw->FixReorder(); + sfw->FixShifted(); + } } } } // end processing each solid From dbb1bb16ca14054d9614ea3808bacd44d6752728 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 13 Dec 2017 16:51:53 +0300 Subject: [PATCH 21/26] Fix valgrind error: Mismatched free() / delete / delete [] --- src/GEOM_I/GEOM_DumpPython.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc index eb79a3ff9..72c6b7000 100644 --- a/src/GEOM_I/GEOM_DumpPython.cc +++ b/src/GEOM_I/GEOM_DumpPython.cc @@ -134,10 +134,10 @@ Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy, anAttrStr = SALOMEDS::AttributeString::_narrow(anAttr); SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(anAttrStr->Value()); ObjectStates* aStates = new ObjectStates(); - for(int i = 0; i < aSections->length(); i++) { + for( CORBA::ULong i = 0; i < aSections->length(); i++) { TState aState; SALOMEDS::ListOfStrings aListOfVars = aSections[i]; - for(int j = 0; j < aListOfVars.length(); j++) { + for( CORBA::ULong j = 0; j < aListOfVars.length(); j++) { bool isVar = aStudy->IsVariable(aListOfVars[j].in()); TVariable aVar = TVariable( (char*)aListOfVars[j].in(), isVar ); aState.push_back(aVar); @@ -282,7 +282,7 @@ char* GEOM_Gen_i::GetDumpName (const char* theStudyEntry) { const char* name = _impl->GetDumpName( theStudyEntry ); if ( name && strlen( name ) > 0 ) - return strdup( name ); + return CORBA::string_dup( name ); return NULL; } From 1bb74b43ea0b5238e756df0b46f413e38ac2427e Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 14 Dec 2017 14:59:19 +0300 Subject: [PATCH 22/26] Porting to dev version of OCCT. --- src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 7 ++++ src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx | 27 +++++++------- src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx | 8 ++--- src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 10 +++--- src/GEOMAlgo/GEOMAlgo_Splitter.cxx | 38 ++++++++++---------- src/GEOMAlgo/GEOMAlgo_Splitter.hxx | 10 +++--- src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 12 +++---- src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 4 +-- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 14 ++++---- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 7 ++-- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 14 ++++---- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 2 +- 12 files changed, 79 insertions(+), 74 deletions(-) diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index bb09bceb2..b012b3e35 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -27,6 +27,8 @@ // #include +#include + #include #include @@ -508,7 +510,12 @@ void GEOMAlgo_Gluer::MakeSolids() myResult=aCmp; // if (aMS.Extent()) { +#if OCC_VERSION_LARGE > 0x07020001 + TopTools_IndexedMapOfShape aMapToAvoid; + BOPTools_AlgoTools::CorrectCurveOnSurface(myResult, aMapToAvoid, 0.0001); +#else BOPTools_AlgoTools::CorrectCurveOnSurface(myResult, 0.0001); +#endif } } //======================================================================= diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx index 98981f651..758fe8476 100644 --- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx +++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.cxx @@ -39,9 +39,8 @@ #include -#include #include -#include +#include //======================================================================= //function : @@ -119,11 +118,11 @@ void GEOMAlgo_RemoverWebs::BuildSolid() TopoDS_Iterator aIt1, aIt2; TopoDS_Shape aShape; BRep_Builder aBB; - BOPCol_MapOfShape aMFence; - BOPCol_IndexedMapOfShape aMSI; - BOPCol_IndexedDataMapOfShapeListOfShape aMFS; - BOPCol_ListOfShape aSFS; - BOPCol_ListIteratorOfListOfShape aItLS; + TopTools_MapOfShape aMFence; + TopTools_IndexedMapOfShape aMSI; + TopTools_IndexedDataMapOfShapeListOfShape aMFS; + TopTools_ListOfShape aSFS; + TopTools_ListIteratorOfListOfShape aItLS; BOPAlgo_BuilderSolid aSB; // //modified by NIZNHY-PKV Thu Jul 11 06:54:51 2013f @@ -144,7 +143,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() // aNbR=aMFence.Extent(); if (aNbS!=aNbR) { - BOPCol_MapIteratorOfMapOfShape aItMS; + TopTools_MapIteratorOfMapOfShape aItMS; // BOPTools_AlgoTools::MakeContainer(TopAbs_COMPOUND, aShape); // @@ -159,7 +158,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() aNbF2=0; // // 1. aSFS: Faces - BOPTools::MapShapesAndAncestors(aShape, TopAbs_FACE, TopAbs_SOLID, aMFS); + TopExp::MapShapesAndAncestors(aShape, TopAbs_FACE, TopAbs_SOLID, aMFS); // aNbF=aMFS.Extent(); for (i=1; i<=aNbF; ++i) { @@ -175,7 +174,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() aSFS.Append(aFi); } else { - const BOPCol_ListOfShape& aLSx=aMFS(i); + const TopTools_ListOfShape& aLSx=aMFS(i); aNbSx=aLSx.Extent(); if (aNbSx==1) { aSFS.Append(aFx); @@ -221,7 +220,7 @@ void GEOMAlgo_RemoverWebs::BuildSolid() return; } // - const BOPCol_ListOfShape& aLSR=aSB.Areas(); + const TopTools_ListOfShape& aLSR=aSB.Areas(); // // 4 Add the internals if (aNbSI) { @@ -239,14 +238,14 @@ void GEOMAlgo_RemoverWebs::BuildSolid() //function : AddInternalShapes //purpose : //======================================================================= -void GEOMAlgo_RemoverWebs::AddInternalShapes(const BOPCol_ListOfShape& aLSR, - const BOPCol_IndexedMapOfShape& aMSI) +void GEOMAlgo_RemoverWebs::AddInternalShapes(const TopTools_ListOfShape& aLSR, + const TopTools_IndexedMapOfShape& aMSI) { Standard_Integer i, aNbSI; TopAbs_State aState; TopoDS_Solid aSd; BRep_Builder aBB; - BOPCol_ListIteratorOfListOfShape aItLS; + TopTools_ListIteratorOfListOfShape aItLS; Handle(IntTools_Context) aCtx=new IntTools_Context; // aNbSI=aMSI.Extent(); diff --git a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx index 39002fe40..ccfea5a8f 100644 --- a/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx +++ b/src/GEOMAlgo/GEOMAlgo_RemoverWebs.hxx @@ -38,8 +38,8 @@ #include // #include -#include -#include +#include +#include //======================================================================= //function : GEOMAlgo_RemoverWebs @@ -66,8 +66,8 @@ protected: void BuildSolid() ; Standard_EXPORT - static void AddInternalShapes(const BOPCol_ListOfShape& , - const BOPCol_IndexedMapOfShape& ); + static void AddInternalShapes(const TopTools_ListOfShape& , + const TopTools_IndexedMapOfShape& ); // }; diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index 942538773..111d9911c 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -48,8 +48,8 @@ #include -#include -#include +#include +#include #include #include #include @@ -206,7 +206,7 @@ void GEOMAlgo_ShellSolid::Perform() // const BOPDS_DS& aDS=myDSFiller->DS(); BOPDS_DS* pDS=(BOPDS_DS*)&aDS; - const BOPCol_ListOfShape& aLS=pDS->Arguments(); + const TopTools_ListOfShape& aLS=pDS->Arguments(); // aNbArgs=aLS.Extent(); if (aNbArgs!=2) { @@ -245,7 +245,7 @@ void GEOMAlgo_ShellSolid::Perform() return; } // - const BOPCol_DataMapOfShapeListOfShape& aImages=aSSB.Images(); + const TopTools_DataMapOfShapeListOfShape& aImages=aSSB.Images(); // //------------------------------- for (i=iBeg; i<=iEnd; ++i) { @@ -268,7 +268,7 @@ void GEOMAlgo_ShellSolid::Perform() aState=BOPTools_AlgoTools::ComputeState(aP, aSolid, aTol, aCtx); } else { - const BOPCol_ListOfShape& aLSp=aImages.Find(aS); + const TopTools_ListOfShape& aLSp=aImages.Find(aS); aNbSp=aLSp.Extent(); if (aNbSp>0) { continue; diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx index db1a8ad58..aea5bb8dc 100644 --- a/src/GEOMAlgo/GEOMAlgo_Splitter.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Splitter.cxx @@ -36,14 +36,14 @@ #include -#include -#include +#include +#include -#include +#include static void TreatCompound(const TopoDS_Shape& aC, - BOPCol_ListOfShape& aLSX); + TopTools_ListOfShape& aLSX); //======================================================================= //function : @@ -95,7 +95,7 @@ void GEOMAlgo_Splitter::AddTool(const TopoDS_Shape& theShape) //function : Tools //purpose : //======================================================================= -const BOPCol_ListOfShape& GEOMAlgo_Splitter::Tools()const +const TopTools_ListOfShape& GEOMAlgo_Splitter::Tools()const { return myTools; } @@ -150,8 +150,8 @@ void GEOMAlgo_Splitter::BuildResult(const TopAbs_ShapeEnum theType) { TopAbs_ShapeEnum aType; BRep_Builder aBB; - BOPCol_MapOfShape aM; - BOPCol_ListIteratorOfListOfShape aIt, aItIm; + TopTools_MapOfShape aM; + TopTools_ListIteratorOfListOfShape aIt, aItIm; // aIt.Initialize(myArguments); for (; aIt.More(); aIt.Next()) { @@ -159,7 +159,7 @@ void GEOMAlgo_Splitter::BuildResult(const TopAbs_ShapeEnum theType) aType=aS.ShapeType(); if (aType==theType && !myMapTools.Contains(aS)) { if (myImages.IsBound(aS)) { - const BOPCol_ListOfShape& aLSIm=myImages.Find(aS); + const TopTools_ListOfShape& aLSIm=myImages.Find(aS); aItIm.Initialize(aLSIm); for (; aItIm.More(); aItIm.Next()) { const TopoDS_Shape& aSIm=aItIm.Value(); @@ -186,11 +186,11 @@ void GEOMAlgo_Splitter::PostTreat() Standard_Integer i, aNbS; BRep_Builder aBB; TopoDS_Compound aC; - BOPCol_IndexedMapOfShape aMx; + TopTools_IndexedMapOfShape aMx; // aBB.MakeCompound(aC); // - BOPTools::MapShapes(myShape, myLimit, aMx); + TopExp::MapShapes(myShape, myLimit, aMx); aNbS=aMx.Extent(); for (i=1; i<=aNbS; ++i) { const TopoDS_Shape& aS=aMx(i); @@ -199,9 +199,9 @@ void GEOMAlgo_Splitter::PostTreat() if (myLimitMode) { Standard_Integer iType, iLimit, iTypeX; TopAbs_ShapeEnum aType, aTypeX; - BOPCol_ListOfShape aLSP, aLSX; - BOPCol_ListIteratorOfListOfShape aIt, aItX, aItIm; - BOPCol_MapOfShape aM; + TopTools_ListOfShape aLSP, aLSX; + TopTools_ListIteratorOfListOfShape aIt, aItX, aItIm; + TopTools_MapOfShape aM; // iLimit=(Standard_Integer)myLimit; // @@ -239,13 +239,13 @@ void GEOMAlgo_Splitter::PostTreat() }// for (; aIt.More(); aIt.Next()) { // aMx.Clear(); - BOPTools::MapShapes(aC, aMx); + TopExp::MapShapes(aC, aMx); // 2. Add them to aC aIt.Initialize(aLSP); for (; aIt.More(); aIt.Next()) { const TopoDS_Shape& aS=aIt.Value(); if (myImages.IsBound(aS)) { - const BOPCol_ListOfShape& aLSIm=myImages.Find(aS); + const TopTools_ListOfShape& aLSIm=myImages.Find(aS); aItIm.Initialize(aLSIm); for (; aItIm.More(); aItIm.Next()) { const TopoDS_Shape& aSIm=aItIm.Value(); @@ -270,7 +270,7 @@ void GEOMAlgo_Splitter::PostTreat() // Standard_Integer aNbS; TopoDS_Iterator aIt; - BOPCol_ListOfShape aLS; + TopTools_ListOfShape aLS; // aIt.Initialize(myShape); for (; aIt.More(); aIt.Next()) { @@ -289,12 +289,12 @@ void GEOMAlgo_Splitter::PostTreat() //purpose : //======================================================================= void TreatCompound(const TopoDS_Shape& aC1, - BOPCol_ListOfShape& aLSX) + TopTools_ListOfShape& aLSX) { Standard_Integer aNbC1; TopAbs_ShapeEnum aType; - BOPCol_ListOfShape aLC, aLC1; - BOPCol_ListIteratorOfListOfShape aIt, aIt1; + TopTools_ListOfShape aLC, aLC1; + TopTools_ListIteratorOfListOfShape aIt, aIt1; TopoDS_Iterator aItC; // aLC.Append (aC1); diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx index 378985535..27f7260ba 100644 --- a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx @@ -37,8 +37,8 @@ #include -#include -#include +#include +#include #include @@ -63,7 +63,7 @@ class GEOMAlgo_Splitter : public BOPAlgo_Builder void AddTool(const TopoDS_Shape& theShape); Standard_EXPORT - const BOPCol_ListOfShape& Tools()const; + const TopTools_ListOfShape& Tools()const; Standard_EXPORT void SetLimit(const TopAbs_ShapeEnum aLimit); @@ -88,8 +88,8 @@ class GEOMAlgo_Splitter : public BOPAlgo_Builder virtual void PostTreat(); protected: - BOPCol_ListOfShape myTools; - BOPCol_MapOfShape myMapTools; + TopTools_ListOfShape myTools; + TopTools_MapOfShape myMapTools; TopAbs_ShapeEnum myLimit; Standard_Integer myLimitMode; }; diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index 8be6ab038..02a28c8e5 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -45,7 +45,7 @@ #include #include // -#include +#include #include // #include @@ -93,7 +93,7 @@ void GEOMAlgo_VertexSolid::Perform() TopTools_IndexedMapOfShape aM; // const BOPDS_DS& aDS=myDSFiller->DS(); - const BOPCol_ListOfShape& aLS=aDS.Arguments(); + const TopTools_ListOfShape& aLS=aDS.Arguments(); aNbArgs=aLS.Extent(); if (aNbArgs!=2) { myErrorStatus=14; @@ -136,7 +136,7 @@ void GEOMAlgo_VertexSolid::BuildResult() BOPDS_VectorOfInterfVE& aVEs=pDS->InterfVE(); BOPDS_VectorOfInterfVF& aVFs=pDS->InterfVF(); // - const BOPCol_ListOfShape& aLS=aDS.Arguments(); + const TopTools_ListOfShape& aLS=aDS.Arguments(); const TopoDS_Shape& aObj=aLS.First(); // const TopoDS_Shape& aTool=aLS.Last(); @@ -161,7 +161,7 @@ void GEOMAlgo_VertexSolid::BuildResult() iFound=0; // // 1 - aNbVV=aVVs.Extent(); + aNbVV=aVVs.Length(); for (j=0; jDS(); - const BOPCol_ListOfShape& aLS=aDS.Arguments(); + const TopTools_ListOfShape& aLS=aDS.Arguments(); aNbArgs=aLS.Extent(); if (!aNbArgs) { myErrorStatus=13; @@ -115,7 +115,7 @@ void GEOMAlgo_WireSolid::BuildResult() const BOPDS_DS& aDS=myDSFiller->DS(); BOPDS_DS* pDS=(BOPDS_DS*)&aDS; // - const BOPCol_ListOfShape& aLS=pDS->Arguments(); + const TopTools_ListOfShape& aLS=pDS->Arguments(); aNbArgs=aLS.Extent(); if (aNbArgs!=2) { myErrorStatus=14; diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index abfc738ea..9339d174d 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -145,7 +145,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) if (isCheckSelfInte) { BOPAlgo_CheckerSI aCSI; // checker of self-interferences aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); - BOPCol_ListOfShape aList1, aList2; + TopTools_ListOfShape aList1, aList2; aList1.Append(aShape1); aList2.Append(aShape2); aCSI.SetArguments(aList1); @@ -201,7 +201,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) if (isCheckSelfInte) { aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); - BOPCol_ListOfShape aList1; + TopTools_ListOfShape aList1; aList1.Append(aShape); aCSI.SetArguments(aList1); aCSI.Perform(); @@ -225,7 +225,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid"); if (isCheckSelfInte) { - BOPCol_ListOfShape aList2; + TopTools_ListOfShape aList2; aList2.Append(aShape2); aCSI.SetArguments(aList2); aCSI.Perform(); @@ -266,7 +266,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) if (isCheckSelfInte) { aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); - BOPCol_ListOfShape aList1; + TopTools_ListOfShape aList1; aList1.Append(aShape); aCSI.SetArguments(aList1); aCSI.Perform(); @@ -296,7 +296,7 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(Handle(TFunction_Logbook)& log) StdFail_NotDone::Raise("Boolean operation will not be performed, because argument shape is not valid"); if (isCheckSelfInte) { - BOPCol_ListOfShape aList2; + TopTools_ListOfShape aList2; aList2.Append(aTool); aCSI.SetArguments(aList2); aCSI.Perform(); @@ -354,7 +354,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::makeCompoundShellFromFaces } } - BOPCol_ListOfShape aListShapes; + TopTools_ListOfShape aListShapes; BOPTools_AlgoTools::MakeConnexityBlocks(aFaces, TopAbs_EDGE, TopAbs_FACE, aListShapes); if (aListShapes.IsEmpty()) @@ -362,7 +362,7 @@ TopoDS_Shape GEOMImpl_BooleanDriver::makeCompoundShellFromFaces TopoDS_Compound aResult; B.MakeCompound(aResult); - BOPCol_ListIteratorOfListOfShape anIter(aListShapes); + TopTools_ListIteratorOfListOfShape anIter(aListShapes); for (; anIter.More(); anIter.Next()) { TopoDS_Shell aShell; diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index cbf78afd3..b9598338e 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -38,9 +38,8 @@ // OCCT Includes #include #include -#include +#include #include -#include #include #include #include @@ -1551,7 +1550,7 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersections TopTools_IndexedMapOfShape anIndices; TopExp::MapShapes(aScopy, anIndices); - BOPCol_ListOfShape aLCS; + TopTools_ListOfShape aLCS; aLCS.Append(aScopy); // BOPAlgo_CheckerSI aCSI; // checker of self-interferences @@ -1748,7 +1747,7 @@ bool GEOMImpl_IMeasureOperations::FastIntersect (Handle(GEOM_Object) theShape1, TopExp::MapShapes(aScopy1, anIndices1); TopExp::MapShapes(aScopy2, anIndices2); - BOPCol_ListOfShape aLCS1, aLCS2; + TopTools_ListOfShape aLCS1, aLCS2; aLCS1.Append(aScopy1); aLCS2.Append(aScopy2); // BRepExtrema_ShapeProximity aBSP; // checker of fast interferences diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index 0988e6ddc..09ed9bb5d 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include // Depth of self-intersection check (see BOPAlgo_CheckerSI::SetLevelOfCheck() for more details) @@ -101,7 +101,7 @@ static void PrepareShapes (const TopoDS_Shape& theShape, static void CheckSelfIntersection(const TopoDS_Shape &theShape) { BOPAlgo_CheckerSI aCSI; // checker of self-interferences - BOPCol_ListOfShape aList; + TopTools_ListOfShape aList; aList.Append(theShape); aCSI.SetLevelOfCheck(BOP_SELF_INTERSECTIONS_LEVEL); @@ -436,7 +436,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& lo TopExp::MapShapes(aShape, aResIndices); // Map: source_shape/images of source_shape in Result - const BOPCol_IndexedDataMapOfShapeListOfShape& aMR = PS.ImagesResult(); + const TopTools_IndexedDataMapOfShapeListOfShape& aMR = PS.ImagesResult(); //const TopTools_IndexedDataMapOfShapeListOfShape& aMR = PS.ImagesResult(); // history for all argument shapes @@ -468,13 +468,13 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& lo // if (!aMR.Contains(anEntity)) continue; - const BOPCol_ListOfShape& aModified = aMR.FindFromKey(anEntity); + const TopTools_ListOfShape& aModified = aMR.FindFromKey(anEntity); //const TopTools_ListOfShape& aModified = aMR.FindFromKey(anEntity); Standard_Integer nbModified = aModified.Extent(); if (nbModified > 0) { // Mantis issue 0021182 int ih = 1; - BOPCol_ListIteratorOfListOfShape itM (aModified); + TopTools_ListIteratorOfListOfShape itM (aModified); for (; itM.More() && nbModified > 0; itM.Next(), ++ih) { if (!aResIndices.Contains(itM.Value())) { nbModified = 0; @@ -487,7 +487,7 @@ Standard_Integer GEOMImpl_PartitionDriver::Execute(Handle(TFunction_Logbook)& lo TDataStd_IntegerArray::Set(aWhatHistoryLabel, 1, nbModified); int ih = 1; - BOPCol_ListIteratorOfListOfShape itM (aModified); + TopTools_ListIteratorOfListOfShape itM (aModified); //TopTools_ListIteratorOfListOfShape itM (aModified); for (; itM.More(); itM.Next(), ++ih) { int id = aResIndices.FindIndex(itM.Value()); diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 06b7fdc95..11830b2a3 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -744,7 +744,7 @@ Standard_Integer GEOMImpl_ShapeDriver::Execute(Handle(TFunction_Logbook)& log) c unsigned int ind, nbshapes = aShapes->Length(); // add faces - BOPCol_ListOfShape aLS; + TopTools_ListOfShape aLS; for (ind = 1; ind <= nbshapes; ind++) { Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast(aShapes->Value(ind)); TopoDS_Shape aShape_i = aRefShape->GetValue(); From ba2e210e022e0beeffbfb56463211a1363e8c841 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 20 Dec 2017 19:58:48 +0300 Subject: [PATCH 23/26] Memory leaks --- src/GEOMGUI/GEOM_Displayer.cxx | 3 ++- src/GEOM_I/GEOM_Gen_i.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 3503704e3..c08cee809 100755 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -1790,7 +1790,8 @@ SALOME_Prs* GEOM_Displayer::buildPresentation( const QString& entry, if ( !GeomObject->_is_nil() ) { - theIO->setName( GeomObject->GetName() ); + CORBA::String_var name = GeomObject->GetName(); + theIO->setName( name ); // finally set shape setShape( GEOM_Client::get_client().GetShape( GeometryGUI::GetGeomGen(), GeomObject ) ); } diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 7ccc970dd..e487554d5 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -159,7 +159,7 @@ char* GEOM_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, GEOM::GEOM_BaseObject_var anObject = GEOM::GEOM_BaseObject::_narrow(_orb->string_to_object(IORString)); if (!CORBA::is_nil(anObject)) { - return CORBA::string_dup(anObject->GetEntry()); + return anObject->GetEntry(); } return 0; } From 939f3cca95870d93e333f2b4dfdea41ed1ba9092 Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 21 Dec 2017 19:13:17 +0300 Subject: [PATCH 24/26] GPUSPHGUI: add an option to Offset Surface opreation definig a mode of filling the gap between adjacent translated surfaces: - by pipes or - by intersection --- .../transformation_operations_ex06.py | 7 ++- .../gui/GEOM/images/transformation11.png | Bin 12250 -> 17700 bytes .../gui/GEOM/input/offset_operation.doc | 14 ++++- idl/GEOM_Gen.idl | 10 +++- src/GEOMGUI/GEOM_msg_en.ts | 7 +++ src/GEOMImpl/GEOMImpl_IOffset.hxx | 5 ++ .../GEOMImpl_ITransformOperations.cxx | 22 ++++--- .../GEOMImpl_ITransformOperations.hxx | 6 +- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 19 ++++-- src/GEOM_I/GEOM_Gen_i.cc | 28 ++++----- src/GEOM_I/GEOM_Gen_i.hh | 3 +- src/GEOM_I/GEOM_ITransformOperations_i.cc | 19 +++--- src/GEOM_I/GEOM_ITransformOperations_i.hh | 6 +- src/GEOM_SWIG/geomBuilder.py | 54 +++++++++++++++-- .../TransformationGUI_OffsetDlg.cxx | 55 ++++++++++-------- .../TransformationGUI_OffsetDlg.h | 3 +- src/XAOPlugin/XAOPlugin_IOperations_i.cc | 2 +- 17 files changed, 182 insertions(+), 78 deletions(-) mode change 100755 => 100644 doc/salome/gui/GEOM/images/transformation11.png diff --git a/doc/salome/examples/transformation_operations_ex06.py b/doc/salome/examples/transformation_operations_ex06.py index 64f8b6615..f448d4a4e 100644 --- a/doc/salome/examples/transformation_operations_ex06.py +++ b/doc/salome/examples/transformation_operations_ex06.py @@ -11,13 +11,16 @@ gg = salome.ImportComponentGUI("GEOM") box = geompy.MakeBox(20, 20, 20, 200, 200, 200) # create a new object as offset of the given object -offset = geompy.MakeOffset(box, 70.) +offset = geompy.MakeOffset(box, 70.) +offset2 = geompy.MakeOffsetIntersectionJoin(box, 70.) # add objects in the study id_box = geompy.addToStudy(box, "Box") id_offset = geompy.addToStudy(offset, "Offset") +id_offset2 = geompy.addToStudy(offset2, "Offset_intersection_join") # display the results gg.createAndDisplayGO(id_box) gg.setDisplayMode(id_box,1) -gg.createAndDisplayGO(id_offset) +gg.createAndDisplayGO(id_offset) +gg.createAndDisplayGO(id_offset2) diff --git a/doc/salome/gui/GEOM/images/transformation11.png b/doc/salome/gui/GEOM/images/transformation11.png old mode 100755 new mode 100644 index 922071e1d368849fd385c85a3bc75d58c17f8cfb..9473333980e946b6229cbbec66d1cc52703d04b0 GIT binary patch literal 17700 zcmb`v1z1$yzCONDX#u5Fx{(G6X%M6vq`MoG7$gQ%Km`OuN@75|yIZ=u8B!XChN0oN z`JQ`!_ndR@xxe%LpZ|VfGsDbUYxY`ef7bhX-*-)rs75E49t*ovq`1&OH8-!x@Xgd`Er~tXwuim^*+?n$*AXukF-)F=O76;U3 zLzwM|URiK3R-=ar>Q_|^DaQA*zFtwD=&)3|>hB-pYCuk1JfYEgl?ca!*g@ zO1^ynIF6X=#w7lzy^K_;a>lG6!Bq`qb@{fmFruZP~t87UI4HthILFd zk98+4Jyz3-iJ=vlZT;l`vt?y0%C+f+r1~8Jb--ZfdJ`}NOnowRc0D>KeMb8k&wSoU zrD+&Go7f4_N>beWo_($V(XVL=)r#rDTjj~r+ngoK0}_^od)G@w^&F+8!q zZ{K9h!NGBR?R8N}E)>JA+ct0T*5>DHnm7^H%&OSQ@fC~Ax5WweV})}Z!6C^a-fPQG zeiLE^qJb@tOrrrG^h(I5Yieo>^-5^?d06+lBiUg>MMgCv{o~OM0@&Cg8NJ%XgoJL} zGrX+)KbdA1_p02z&%lwC{``4+vcM8+eGn$(e(`OxsQ2wOE>QkqXH*CHV0EAJ2>>us zO`-g^Q}LXax|*7r`h_~xBa8=MgMguIIXXfqxo@H0j*pKCwM?)f?erOF7ZpziOM65j~~KY z1ppi7_W{KQu6e6wWCKPhzj92%wa->i0DhEa+<)uzirdrt=m;AN3rk)>0h79;qk~+q z+h*X5?g)z{hZy_tnj< z=fw+s1EoUwItJfP#7y$3x+|UZT)rIocGHU&O*a>LPKGnX0Z&Ot>`X3!58O7vxrK!j z+J|2mD+;GqpAbHM`n0yX=CQ=?d_&#)gFo#dPi{{pjRPK4QA_G=ZW9p`b`_16TJ}yZ zcM^{tlc((a8qIG`5t>$gj2@3#)C>wWwLe;7k!%VJzqnezMizCB&9?6Y^gs4KI$<8yCJFpZ<-z?jPsB+v10_Hrr zA{HrPfk}0@TG1Q^@&f5=#;Wvz(iY5ug4%OXPEH$mr6c%*^Y9@J z4Gji0xgdmsXI7 zVITE}0EtF2N?>NtVW)!o)>uwzsk)6Q!pS;B)I+1gnq18Kh3cDw(%RJYvjO@t3M(rs zk*#+Qz;7-)R3UTouXHv^Yil#Y3ZH`Hdf{y&zv-P z?dUkfKlkLguyXh1?%wDg;k>VpNT&9n#|3g{d2K6oUq$_sTTEcj_=7?Y*yT$W^KSU~2{(a~+=rM0`}xRA&~MA1TFDCb&BTv97> zL{_-8m~!r;pg*A(qSUp2f@3YE!ci@2U>8WlWKnWZ5ax(6Sgq|MDPcpOH}T37BLxK} zHYR%Eq>>1=EL`%H@Xe>n5Pu^gF)?r7(}h&xxceO&Sn%LpmY(37RJw7^TRNoo=^P3% zG1Mzzd#mz|p9uh{$DcbnT;lG`c-UmgD~(n%l#?a4aBRWFA~NdSXQU4q8;76K>cDQQZT^KE7u4J-Kj)^Enc-w^tDY z9|#^H{+}m1ObCyXy)_vC*qMcEJ2WfPq&(UJe&zhajF5e9sW9D$#qc-;963y-qxZtX zZ!rN9wshqU)>6{FTo6oe`mH|FQ#V?3xXM+ZXVUrWf*;YUt%^e`8r3W1F zmxLGM<07A1zVf@7gUk>ek7C!CiI4r__qwu^ofekCftZ`-?ZgB10wJ z^hj%=$HETjb@zN2xe&gD!RLo;OiY$N=RUp=D>Q04m-Rw$-L5JvC)-@wMXWqGG@PkE zuDHTJSH7+GRnpehmQcIzi1>-rP#>j9g^0dCQ>DYlJiE&8`$odcR^XUkQ~ce1Bey&#@*XGt1zQh9`QK{=on_Qd(e?I4jZtq<1L)wu8g@?SB#tQTK8E>UJ`wXq_H}Z6$RQvjVTh2m8cf{WS#{?X zh+{&`R46z&7)VLAYa3JkaMpUx)79Ur@h(bJGg{()iVo|Ig>iXs-g8oB;BBP*>2zFt z`~Zww$gP)8q6^JWOkxxSiv#-AQ?1Yk8qF;&W}Ao6;HP>;onqSDteBDBr zpdeNl<==qFLn3GKgA=6Dc7^XOor<|Rt>zXtAubV69kdfq4v3e1EDHG-bG&%&jlq8a z6LDrKzy?8wADl{e7s6d=N>S_n{7}CSg&NMq$o{|qLZ3y_)z#{~QCHWCHOWd#OM}Z- zNre!fa0>%K=$`|f#>5_oFY}}Qcl_vp5^DIP7<;D*gKw?VEC3G?;s7fdeB1vBj{dsY z#(wyxJ_ZMk1;lmCtack8fe$f1E4hibu!TG})0JtJSf^IkRyRqX3i8+R9E$_ud8JNs zJ>G}u3hM*zPANgCb%%$CT+0kR$Ik(A_-9;F$e*dft@5F^!s#Uh(TB3Jt0QMK5D5Kp z`YZaxTNewtZ@sB+i8$YW1Tn^mr^lC##$nK=gs!fuCOP zHO0mh88_W*45#rZO};M>L@suDr#ZEv0Xw6=Bj$GC;Qeozw=e*&eSctPVq)Uvc6_ux zc)GVh`Sd9WFQlx7TfgAJV6atVd#od!H~p2Ez={0*W~cT;%eqrUG)Gl=WeJIekkwUN z)Yu!_?sa3I%@^-Cz+oIL90M7E-nsw zz8b426c`v7$)NP&#S1X7UtFIqbSJb5lGUN`FoMu7l0o@76Pr@4ONO+kmX-8c=(fIu ze=99bMj%bZ^W8sz;(lUHAH+*uyKJ_2iWw)9s|m$rEIp2(pxBked}m}o@!-qnlG6kj zOvG(NbrWvd`q|Rjnn2>GIr{|;jVl#$=?kT_j7*c)2{RKD6B}Eo?z{eY-qB1Y7FO2T z67$Y4l)gG?s1=!L00|Dx?3=#zqem+o8joGCGfo*g{Dbpb>>NsV zqx?MhNGr6>E7@+-o>I)u%2r-}>)e>bVV1CsC+}v;PN(|qQmy+o898~DGK^WI^bYn# z(8>_A>Zq!~?uncKifh_QkwhbX_6#QAt)*AW^n7JmGf%z9NKTJ_EW zesdFS#LdWv!j+6MLiWvq9bhBD1EE^3uYao{3kbOg2nZ(gbqO9l`rX(gLkXoL4$;ondHn2|=TZx5 z=3B&6Nn>LpII!WAVoBWAxEeMV7RQUt_s3;$fzZT`Pq66dj6f;BO?_u)j-nG$0+Fnz zq|b8ZWj`e2DUA{cXR+$kw?W(9B74j`zF}fwo^PaugXp!)ZF2-%^0~}Aii^ywtzSYA zI<&ND849uTD&}J6D+KYGVBRX^wlTz{k;xfoWMnikG0`LX>$@-HBOVtJkM)npfG70} zYI=G)yJ2H$iVO;Xv$%L;^W;e-yo=84AaAk=UTK^5mZ`AwKETM6npW8%cf(3_ng;Ml zVL&RxZSLDp#827g+X{_-rnm?2JmkH-O3*1L*usv)Cm{7A1b#Wj65t1*Nx19Tm}Ql~ z>fFFEvC>wOe9&bE>~cCN*0cG)j zb;_onT1rR(hTar+vQ(NdMyO)AgHMJ6Wa*+xGaMFvegE1%t~nl%c_3^A*!2A*d!ea0 zZdRhBOI~R*SzGaLvo|(c^WH}w776@PiMn@O5(j@DzLmMyc9x%lBzeAG0 z#Y=p|NTK1jvn4F?M=oqQJG&{`T@nw(Ge7k{&24g9dnY6$i+XDbrJ(@Xj1J9(rKK-K z4-N;q$b*7nL1_E41q2sgnl63Mx`v7Gqd%6Q5c3r_N0RBwtQ&eG#mQ(S3c31fB!Vrsg(F-DwQz$ZM=$M~&KP=zWot_@4K>GO(4YxajHOgrh z%9A3TE&J=M2}xht_VCyXp@(yshr{?&YT{5nSOv08wRg0`AC~g%jrVp~4P{L6+n!%v z-jdy(XTe|IQUy4`A1|$Kc?qz`3>IAcqT` zzv{*(#^YDNi>!dP%CKl%L-&#pdKVWLU1n)KD=sg#pJXp7c}GMD{({fu+t8<5$lbevfA zw&cqtMoj$C`T$H2igtto#;o>{RhAu?p}&L#NFQnLfy6~%r@@+bq%7UVO(!kLuq{yf zhDZtkK!IlnEr;cWzApBekE`pEqrQZF5e_i)h{x3e9T@6bsw?>i-p+wi_05|%QBjSA z7~ka|10+I00jbY}N+Kdk6TgCYM|Jv`xUn%9-+x%#7dP*q>nKW3%W92~~13GSc-tKWa%8tQx9><)|7@WhgLO?!?B% zKFJvt1?q`LA(;|TQ)_y^AIx@6&AacM3L8Hzbq$-3JFMHOtItO=8VY(8swE}FW;vT| zEUu(lT>|@BAS6;hW6Y^tBS!SFFbhkEs{Q=Q2R6Hzru!SyIyEpn8bGD*mzF+KgYZUx#iVPK2^=RqB}^`O#z z;)|{U(@*PBWx@EiydtT3)9t}t{?-%J}}U;Wo>DdJ#Aj_b99O%@NN$K zoVz1oiG?Eh3Cf^qx6^89Qn}r) z)|DSGuIo+@cW>fgu3~A3laL=HJ>R~GF*7rR3ju_P*BZn+MDG4`4c@0a4vrblJ39`0 zb9Ee0xP%O&C^9uNayhIkn}p@F%xkar)r|CQo&~yK?$JT$gdM&CuTpVQr*Q?IU&ner zCL^ij;#}108F$8oy0fq-On+Y~Y6RzVTVf+;hpQ#80t*kPPPxgAO^x@cy1M${t(WO?CKZ@Y-8%O* zBqdQ0-A12> zd{mPO9^tal9NwEt`Yd7U>FFsYRg;pEB2M+4Pkp@r?Sr)JoQbv5{I;}o$G&On&#KLr zPCpY))h(sszgH_XRX9&7pETAtOsuZ1($g8;uwMMm`N_QmuY8`*;Ab$A8mR2W zi%tUr93Lytm01nw>{ajy2js#v|KRKD9BCn9Ft=X9Q{9TokVb=RFn6Pbq z18j~e;T1@k8`ilEPfo5MyuZ~)mw^ENA+<6Pr$TlXZB}d?c#n^x<7&^UQ{nC9e6}nr z#V%K__F$6Q<0W3LhxuqFQck>eW+Ul-3B(iqBb2j2)Xrb~-RM@IwWbH~EAc+(pr?25DYwNBN|*N3 z)tyeoo2=O5Doy=k>3*OoCYDSwSGT>ff$`uTIXU^cF!{ZYiz^4q?CiXIDROdhhP6IY z*P)a^lt8tZ-i?ZS%-?ZG<6CnUWotggHqBQTyHZO9j2B*B3dDWy502x9vZ3AfH`h&j z2cGpYYI=(v`pTAuN?}%pP0EvCt+yIn)NSMaHF|GO=2X^k;7GAcef4mU zKGuuV<;U$=dBP+wiSF~T^zS@Y33wE&~2njau>(M82;O)Kt;UvLbe?s??qo}?XpeSJNJh}Rt`oKe>FH0dik|Q}VbKKapZD)@n*k|+B+_kj2{DJh9rOSS9~Fps6A zV58@e=O`*!%ro z8d=JC6vF$br`A}O&RA+X;4IsOGFGFYiWBvf!0T&V>)dwaM_*rzX4p@jE+m6<>7u!? zhJN-x;;dx&Jz&12`Fc2#;dU?IW;C;(!?=Ma;OR4x&w+t20{;rk1nlestUJYwv&~?Z zKD2L9)E^k|U>n2D?SUXQbu&r5)nruI3;;rf$Gs55lu?@Mbpj7~D|0(e7N&dw0O!!_ z-=Tx+A?<%EGc&i`hG&({agK3*{4Gu2hk*QRFP@UxOKxY9XC%3!Qm&UDK0W$zx+15m zE0A>ZV924I*U{d>W-LcT25E<&ROKm;VdDBvFF=WSW-zGQ5=dMe^Ercbp*ZabSUn0r zDDkgy_kT+2RkukA1@I^v*;&ksXn8m{Osz7NIRIcwgJr6LorUzJTC;zb6iozpTOI|> zA6c7?ZGH-rb_quTWU{?U?6bRe=j!I>=0ZY3aEL@QK3sEc+ldA=;Fd4Y0yfEOln+$Z z)ZQ(E_e_D_oxFydXMbyg^W_U*@ar7!x$o6MXKHHdc%F8Z&G4s&wa6@$C+s(O$@B1! z43%UNbF7R`-Ixi!WXh|SX~(af8ztI>Mw(MCyA8?w{B;Aqeqj1Ae{y^r6qzMYiK1g@ zxWnaz05yNhZGAm>S0T+p+SSOPKYzyUCj@J7lLVpCS`a>sr=(BBEN9&G(X)olJ1NE9 z9Tu#Cu{OZ!6YMq3N?5(^3*lsthYl6kzAo`z4yRXTbvRfY7Wf_W!=X3A}EBGi%yi5B-` z|Enw>-YJL;ig@imNw)rMSsW@3{fIKDUg+z(k*BY#Tj9h6@bH82IzOLPL7~^V@%-~6 zd`ik>kU8|bx#E*gN@fJ_f65Tzz9%G4S&gcxt~+qfvF-@JqN2T}-5dUw+NRh?>-|LF zt9qPb*V1Uz7OTOQ=uKxoQlH0XHeKF)$)IE}bdT1H%}h^snkBT@UM%++-|{})A;ApKMUS^F)y|NrGrq!e?@wL!N z;Z9D_<|_FPD{xHUb7XJtsIVLF>C2ZXN)j2Tyssn+cH7LYpB=VykvoWQF@s{oLPXy( zuPL5YvTb=hxTAh$AfUhw@?>Cqnk}~-oi4NP3?skXt=r2jO)cpE)wt1g=!Q;4AJ@72QVn!&;85nx(%K zLcfW9_WoAuc@)!>tU`W46x7}-BAt<8cyx4NC691$4E^@)_~iJK3A6ezub2a8|0u=Q z3(V_KLt^jTD1>@{q08vVJbl@XnC~Wu9rt)p?C57}pqI!#0ZPsyNePKh{{EQMgi>5p z1l(aaXAOaYs7HFN#L2+|P{dhKvhS4nQjtj!j(F4#Dv7^olm4G7OO{Ghhrk zM?n;L*48UT>p{n0RG6J@g5`R2Xw~PrFfr^onbZ*QePl$Pv5LB#p1yD7&ky|dW=VxR zPsnva{@*0X`s3flP0=SegLs0q)i{&_f}1^>nVe!`eg`Ar`8#Ck=(?cs1`Jx}dk8_# znPU)}1YY0Ku$xy>Av=i%#H>b#$D7=?;dMwvg}Yl4*ZMVx5)ao@3!9=Vj!`eS4(~Vq zGjn+O=DxV388!qIMELyk`@K&}OP;wg@r5zXQcx_d{c*V?3)cxGzJ-R$cvauJAfA>T zuN#Mjx_P|h<6{Vzt%;61=?pC}O@Vv7mW30Bv}2Y$xrWwf1nO6QX@XZd&y3S;zMA+a zcT;wY@2cY*g=p7|AQ$pSbjB)ZH%eax>4Mm0Gtj|Ox%ZXM8Fv-5jOD*m%yMu)M{&l* zoU7;J6k%JfllxTE$#*tI-skhyZY zy-5kJPS?!S8WHTyVfsk=QWq}ZQ*JiCaJtL1UG@3++c&Uwj6gInyRA?1mDFQ5WC25G zAWLZxyVzn*q)01mYGt5|a9=kjHm;d10YHM6fp_mYE33Rh9cW40T3uGaSUNgK4Gi3Y zS40*~S2-s;&DCB*Hu054K}WzgJPVK7qIK<8Kk0q2FWSsX8p`s@OA8CxsbBwI*N7VF zR37G$`&O4;%&`+mSv=@f1ac_>ZEeuuVMcQ^no4K;A(VR`QY6xP}+j4=0x2E-_ur)h1;{{%d)s1xw-NwA5~e2{Yp9F zp$|aVZ0vL5ZmAhvZt>rYU(5*Y7+5Hd#?oB~g-^@(X4p?p-{?OlB;lOgd!uV;^iSR~ zWWoIp(h|0yeGi$q-WD`cMZow?42mS9ru)5cYA4_G{V_%97pq-bX+lC`VnX8D@TbjD zXI|b#CwgK|Ke9?n9$#Ycon2ZkH0~@Sn6L9q{F^9KHs2A5tg{&)mTsK=u`aKhAos4E zEi4{BTZ-^Jvig;rTyDThj0ZmZ5ktJV-Wt`HEaU;Id%RA9YL&IZe{-bG2-Tql27E?E zFLNdbc<}4jpnFn&EZb`hAAw&qK86ng{**Y%X%v9-El7bTelYpZ)9)C=d=PDiY_Y}aXfk;iZNPp_P| z&I~B2s#(7$(cXSO?(`Z#S-wDoZQ7*=?3?n7I z2AB5XWWV7#QvXSu`l$iM`j*8-!WCzuy( z@!G=-&{bffv@Aji^+BiL=RN$mFfwCxIOXlUIe_Hs|D)*j?botti(&5w2RUR7d| z(gn12w5!DN%}q4h9#0)~swBRd;2oV=M{jxyA^igay68M@qOi`9nGU<}J3kKyG}JX# zS!DA>JTKgq{@{@t&JwffUK~$zTkhnQh91ItoU2O(ll=}ddKXhbvc03Do$~DJ*Y`oLt^3bE#6hO74Scn>i)9`Y z-Q>TS4%||N|0Qa3TlMRfY%O=e>Iw}n4fQA}9&au!B}F}2udq^jYxC68)gmf7E@l5w zPGFd_4?>EOv6DPPZKUPS+ZCJaTYu7t6NrN^0pb8YG&BQ+nv4FFB2Zvw+K#9GdldRs z7@Qb!FAJS9ad5-GT0GlF?vqbU++SwDwz3tV@{vg|MQYA=ko>K4{*`L2ndoO(MhCBG z*(`WZmcjm?kJ}=MkR!PevqD-A+Vvm~;p z)8cO^wIfe(6CQAqWWVtWoAv?AuX@}Mgff90=Z&qw#=yBe|V zlD z-QD%?gfvkpwL_>Q7S{CBr;CUcP#I4&K%X=%N9?eq|L4WQTK?|Ja=$gfCRn5KRmTX?bCDX}Eu!&`i-XPHxa^gP``Yr9gW1nYooyCk_WQ7 z#S3!NZ!|SQ7sJ*{&QH+x^aA8)3+o_zZ0zj5NY(`os_#sMBu}5$cS&FfTT1A9QNNUPL}o>IapXO*Y>MMBrMB%3Z4A4wiMM0%E=K{1Ml}n z2U88v@SX{oj({0v7dbrc@Ly38Eh?E(W(RM>)og7iuYBr>AnC=gutRQowF_Nb+_5p| z@bT;8GBPDfmk*H0L%lujVb@?#acjZ4B@Oz=TqB&hEZyOMxUefI^oNG}7w>QCko>G- z4$8d~AsUacrvkMd6;F^2855?Hg1+Z>Q|`^1^@i+;=HA1j6XjYL%j(YT(nA+06q>0D z&bAkeg4en^+)@>GAM7Dp_TNcGE52dFr-XT$7NS61@t{lP02A{I9&~QV+*2rY7j#VV z=z$^JM|5Gfellk0`)7)f&*Rr!y9a49AVXs2Jl8c;tbe*|hw}&!=RI+^`0^YLP{N=% zc<}d&?td-6|N2q=okkfyNXmjA=CJLvI9h!$W@Ea|6wl4pxn&EwFmrCt&<2)Qo<$U z-$zWBDZ>Pr@?6&t0-#6=igC7;_T$}F>nj7dTU~NkWLZllr(jk~Ohi;*)KCkWxv*H? zXlXGRG?LYrd;eKY4-Ur4R5krEq{sbbg3UYM2cj&|72^mWgozE7zrC5nHr1~h-}u^< zUis!{bD1=BTqA6P`rN9ZhIds)$2`yeTP5x}L^F;+Q*X`0SI6c#Xez=Fdd*5qAYl_f zUuGTN*m(1UULi^|EF_%LLS(33n4sEmMfLpK)>|SJr5u zVO>&^@1K=!K+JgB$SyyX)jx~%@7wH33aGkkF)>n4|8FgBt^Mli>4_I`&5Vtm1ls~x z5s>hW;V`BkC+{DN7<_dwd>E~frAQ%Sw-UI(p2Y9DwfNB{l}^s4AWm{S5p12J?+J$y z=!tp#`-zX|zBuT*UcLNLn9AvI9omzdMOGkr*stem&)mz^lN1nZ*xSVTl39BfcI3?>$iSUiZc!bwz`yKH05!EC&HZ&hAIjD36HRq-$Kt)vbTQc`bE zPZ6K9x1e{*dN2ue9U(|7FS?G=C z%t!dER|&;UyuLGCq;+5tk|g4d`;=3hZv+M4q39yT2KpZycH9FNAFBYr|LrY1f9>kI zE1WpAaaVc_-ElqC@=$GhN(iLbcKvRSvIHAwotc2_LX^V}D@&_%dgC}wUjtRyY(eOf zTrluU@U8#|23@wIx^IQw|E{-G;ndU9+Y+?Uc_)XdQB$4X=D4vBrqY`cFrVFla{Eaz z@oix(^>ATgXJ-ib_Dqb6kx`}$jtwXURvvY{cug}5QhHvEM`7gw^v&5NC7?m#t9fS_ zH?N-nWVRI=0RG3#@O&0_AMIha_bEqk>Oi89v7sRpc~t}oml+uua|aJafkO4u5=5z| z`SS8|Sy@>uhw;30ccjEKFs6aZ)y5oL*yc#ub_p~BXH1^`m!x~h(7Bj6U8a?P@qV}k zl}Cy4`aJgfQZ(98wXt#N_b>A=xOlEE%I$6Wx(!=z6#K+k@*1I+i#Z2CV#auV$-}_O znJI#A$eqzF{i?zz9PJ}Ka|Qa7qEN5i!aPootmx=fj?OR*d^@miuB^dC0oRFC<0e4| zDu4%1ub(uJCa{Koy)XXc8c*zMe>r?_FsVQu$^t4jV&pJBM`mh^nev<_GO_t4F;Io_ zu;q2m4<=mu<3`C<|Esw8SFx(-bzaNG{Q_3hd(G*X%b3(j1dJFDKKb&O-d`+cNPI~Q zh!fw9F_kkb!1Ls8&_BosqW~}e%jo^TKN`bFfKuoHKLCuiQ4~#qoT&u$7>c;YD*~Db z)t;DA=u0gcVr^|rg7~$A_wN%i!6k%8X_UuMQ?q}iRqZR=RE3kH!NsAaWwbce?+g*Z zW{eJBo+jdFIiHr+N4BZWzmDyOt*szg}l5m)&toL z3?LM|D7C1zsV-Sv<=2%a+6L-&zlw_T;P`T-D8IPOe^_X1hsevzZ{s7t)yhqOv(jcb z)%Pe$ z38ivI<+lF=6X(UPG7|)ICH)_@%vC?g{hAL>j@Hr z+FeJXza#wG$E`S0G8XAbj;2d~ej^kb9-wu&0Dv>tRW?5;IpFL;$`B_XUnTA~z61~d zk9e_}3+%B)A5iHVo1afnN~ny9(OU33h4ER*?VOJxc3*2msoHcMR(6CV8Dw_mPRci&uB$bRIuj4G3VPepQF`wOe0QRsG)Nu|BX_W@QVZ z6Hc|*^C8gW{R0|zz${0|Wu*%=glrYpqRFWHPwXy@jrnwRb~?|K9Zxr^fPMndk^`Dj ztp=0&S#z6o)nTP~pQSB(n9BQdCXVdHgVA08yK2R&e|K+k39Zv@flN#JF^bD~=g&!36BRE)IKM&<}Z_avN-cK;0a&x4x zAg%vbKsCQ@cVXApMv;Dp0yKk*9U6_Z{bv6XiruxjIwwp_hJZ1f*EA_eMDR>0^vm`l zb!}|{hy@;3tP^a?{(K@JAfUmhv@w?kFP9^r6!B^!OcH^5{mcu|T@S;ZxZiY(nzeVa94 z_!*D#V6j;;MnXbXeS}Cz$h$gbA-A31?af0&AFA{>C`iS}_jP5%A|5}M{DNyg zE?*>rR|eAca#f!^BO;G%X3sD||17zf>7O*2@VJ(rKS#rq2SA%InThR5|B`cD%coB* zab;E>n=}2>?I&IrI7*?#jUHJfaQ)?ime3#Un$`ZcJ|(JWrX(SA>pheCy6^`7 z;*zQ*!aUX={v}2P1;LP<7qjyN#7Z!-|P*y$ufg+QN@d_ z68TTCHOPli>j8d2!Q)MMXLt9(aongPHTCOXX|C%7JJgb2F3=woKdG&*E#Dggg?RAe z4kw4#R`Vw`m}f>T<oG+T>I?o>^LtBR8~|R9D#c6WWFJ2 zGmncr0wFs0WRbBo*7f}>M&-o)Nn<}$R7ayStI$koorSu{@+Xmej_G0}?1WBHZaFRF zip%#kzDSFPW?)cv`rdegxSmi-DGoV5Oe?0GBp8}gypk4vjPo#t-I!}?_?1_6Uh((T z?22tDAL>PDGJjC#GSqYbcjJBIF@A~0csEZ4*?qCoy`a}LAH}H*Yt2qNYin!MI=&fJ zI526vXXABWpI7;5BzkF4luGNUC-}Z5G!=uoDJz4E?T%(vUH9u0fUe~a^^+E$Plr8w z$u8`|sPQxE=Ofp{whP`oOllv|TR;7D#4>kqDzDoL=$=v8Yq}LxQX9=uxdrY2nN6n@ z8jWV>FH$}>Z)vhPI_#uFnOM`AdIl#aJ13n>*Xbz2tNdYZg>l(e?SJMaKnKk?ZK$AkREYgT+5 z#H38^n=C18OsU6ryDy{~9-VXd%tJ43l4AJGR%8Q7r7)-id`IumvmL{$nNAPVrb3>0 zNJ(9}9B09j5uodm2lnFzy{w@W%5;79O^eK8LCe?ISA8TpAfSz2L6q+9au`*T+z?X{ zU1Z((aSF^mSg^!IMR;XskU&9J(PUn%C%A={_l0n3g^D>ZPx9UUtfW9HVi)y^-EM%o zKXLpKsKfDr>exn$b5r2n)Vr0gh>eXw3~C;!h1$68EB3FMg?8gdyT^Wx%(Yfo4rx;! zoT0Y+D&|b_sn40$+73V)%58LH?^XRvSFOJ8<-Q4DPm|j`Z4R;UdF#CmIv7S^U|-0% zeFG9&x*l?WxL4bc)h|p}S2xGmMAgu+g2m;F8xhURUP7s9AwhZXhytn#hw)D81U>_$ zS_3UDEa+CFaXKeISKdZf!K0>GcqntwG{y3q*mv5I>+a5^$OaQ+i;6dZv z_X1?T?J8bc(w7Lq!aj0woh;NlXcCPgdp~-ZmJ?|lMxMZBeo>aC@-tbW%$ic@X0KdE zX3y{Za5d`^35H+!Dg{&OqZYXLb>Upy>CUCY&I~UJ32Y7TWz_JPPoZuZ0~Hk~*MSS@ zWfQx-Iy#8=%aRaO0Br$%WV@FR$wvu>X4hVOU{Jd9JmPbnA$&qPNEr5%i-wM_yttV2 z<;&AF%U+%r!j?xlIsLITx3{M>(7d;4U;C0%u5dG7ZS5(?*I0RMoxK~((a30x=lAT% zdFkg)qgD|D11Ucil!Q;|k*USsJx$jaO&l!pi=6kJnr;qB5lyC}Tb2qkIHYD44vISd zhKp;9EU^TJ2#4oE0nf1@h5qP82S{A(84ICb3#m1GaG|lQ%Y~<8Ue~Ag><~V`+3FJ0 zqo(EZ;&Ou*xBjoLFP)B0=kO_-37s&oQf$1&_Nn&owTf}^ZEzdM_eGOU2otM?5g0MSboANAw*Ij;=Z<^k+I$9$QYd8O zJGF0PBPpK~Vl-ObhzFPY;j>^UsL7 z2|*uvFFja|S=?Rja#bD#g}zk`oCk_G4}ikA#Wh#55+aHj<-wrd&u zlpg>J?-tf8aT}9f#(i%gag*g(>_RYMQAQU`Q(fWpdlDr z)kSW~VU%#bjAZM(*rrUq@|iDHQE3!^RLfQ$Tl1Nnl=r!1!mpeV);X`A-A_aZJhSud zEn$#tQ-((vG_*7qHd}V&)B%quj1@d)Y%N5Ilo>p^lS4n=K^I;j_q7zGTdVN}*cc9^ z{LsYXXwdsGkWgyw>d2@dkH=qD#zHhBSGO=|a2S(X0Pi+}Bi)91eM#(ahlMqNI80ia zzI}3{fRQ9lB`{KsM}%=pl`lDd2KLlF2|b2fk#-EM7YjlR3(cc9qe$k^@@44N1+~p_ z{1PeaWs=nbCB2Y#Gl};n7oiboo$J_bX7B7HCr;)b{{@k6wZO6s@GWS}TaWXhdBJ;) zrHnpriP$2(rV-rwPQEGXxR>(LbfP~WC5HH(BW#ryBlw4fr6nmA&UPK`UwHPmAo~Ob zm3jqEsypL*!1O=}SbXrWP62wK3~9U1&;eBz;$w%NmzK&?Jz5;00C?>1 zG3g^@74;^42EG&O7mwZ@dFMm8z=uqXe{JK!W2oMN3 zh=PRP0we)}fj~k)YJ^b!!_0T@{Qr07dG7Z=57{|qpObwyXYci{_g!m6J=IocKXK^< z008V7k00s+z#%mFDLcjj_8>~n>HvTMpz%;uKOlon4)HOcwWh30X710CFyC zCHQz@N4mj7DXoO{%_qq8L%_WkbKx$SzdF}D0N_!+Ity^?666jL)<6IL_hZ>xpGeCp zTUm^nZR0RB=M;o6YVWSZti#y zTi+ggVie^(y4zHj?QK00a9-B#T2 zbB?x8=XMnFe!aTm8}$}Wk>B46{qeqmHUM8VmvtHMcHUKYPfw>9H1osK1uR456(|k( zAEiVTa}J+zNHXm-nqq$3s4p&mG0ySjfYD>*|Gv9cw}IPXvV)us3;b#J zg@*ln9l8Z?>h$Yb6S-c_$7qt=d%klggT8XscOQ`S%ql~S*ROi?uY(UMzaCruuEzC) z5aRwNYmK0kS~G&UGSb0cxo8K=OmZ_j*MbO(nDk|+^Jlh@a22ray1hxoxR#&MUj}>H z;dZYetl_VcI32e5Lww+{{rUWU;w3w)m-Vd`*`pTVS0;MsNKAtk|yu_Q0owJ<+Dy-@0`P&We$0beww(` zrMN~SIF3rw%$JOGGFBJ;wrYn_8I`loHoMDC`kO5-++cQ|Qt=F(R+@xvc}9*}wKPLt zI4{-R{iBtd&0~6U#}F+%>+@mHQdWbmyE(~saBiFUMP z;J)L6G(}V6kwLQH3kg!jb`bL& zrk3EHdy-6~~2DRa3Bk$|bn8brWKlesUF;Kjk5|~7H z2w1xX&X?sKukD!Kn9%qc5wR|j-#Mzq%`o}}N}xxunX#!Fkt|W?GSpDcW&~e$fKX~6 zLh~oZD7SJ6@zz5!auCeMZFYCQ*pSnQfTaGGLMv7dzPGhnS06+V4h|+1Jjj1DG)SI- zRlmVydGoZqXjFp1C|)Rq)=n?jj%M85@?!uCRH&n{u<%42gFY#{{3ter$vBUknfMB! z`!btx!IOI-mo8seFaK;Wxz@ve{)y3 zLjt#lJ@`=2)egPXPcMH+K0gddWj$2cop80KJnmob+s^GE_H=bQQWYnkQFjs*WOg6* zqg_K8rxfIq1`H&3qLty3?X|Yw65iEt15fu$&)WKhkppI8phbhPvojU_q34t3=`9|ff1a+98pYp6(lu9jBX_8-@iw!i7DQ%m&FXMIusZ3!qCWeeB-?+Y~5(2QR-(iapQZDN{OP|e!N@#RAhlaC-79z02bH9 z`@E<9SzXI&si?2@ulKCnorkv^vJD1(KG+W;)36>I;ze=J25#BS6MKB!HDUuB**`5p zHk>7?YuU`;Ru~IVjCdH)wG<=&KrFr6>081zwU?W%Y?AYPIwXEmOBk%N9Hv}&-kIR! zt{H83S+Q_4wMn>0vV=BzCdQ&t3T|!au9Gzo)o)>XOYsaXL=FfGJiGk9;X&8P*x1EJ zqhu%|vD?fKHh<#b1L6)KF7Rf;}$_B+M97LY#H#6{4rejVo+~iO|raMEp^ANv-c0*z0qPW z8O_6lQ}g*PKl`Ed6F?4!0YcsW)Ripd5bUk}=`Yb$51u4g!nf>p$=)g>3I3B6Y}^h~ zA)b#=$a-y#J1@gGY7Kz))2LFaBf7;o@)m|AKp zEELw#(dnf{A+1`Je^h*_n+VbjZKS&=K@scY`bAuu@W&24Ey!;R(WcCC&7h@s!wPwZ zywu>j0ZEmTBvB)3nsY_JuXDv<_))e5k{WO?#$a~81B%n@$834GppNdg2x)YRnU)T6 z>ZJuS6DF8nH5C-nNA?OOEHaeKQtOI*zW;HPeEX-eg+JMsy0CDwgun{iQlCbxKA^qv zp=A0)6D$L!UI#*MYvk@f*fdLr8?@|Y!!6j1_M66yn$%n1)7LEOeV!>QRt)~0tZktn zn_JhLIk3XNU(HfMe`aNsJyKy&CR$N{wSo6AF!Z|A$7nGJyD?%0p}aA{`jo(J2Hocu zin2$XCj+%Z>sJk>C5=llK5w*nw_i$RsUUZ@Y^V!RT3QleKC)JJo?3=7RLHFO*$lo& zO@nrF9!m<*z{mn|3jQO4N?jai;rnTXTOZI=*qb}b%hY&eWb80(-(8BsSr9B?$jHdZ z^$A9^5uHvy?*;*K_%5!n=z^eah_XaxW$|q=7-cAw4h&wS{^rrCo0-(1gln2ZV`C*W z)(V1n9Vri?nbL_aHy-X1DaHlPU~0;plPCqd>N z#(m&3rT%}KngnI%s!**^1QGPF8qZnBMt^?fxU3Za&S){_4Q*J}wKmFRj0|NcEXBO{&fBE};NKd=)=+Ezu zT2BJcO9SFv$!LRgzH$AJ%2GkaKk89+C`W~xuCA_GaaxssImEX3$8qJgwZm&wFlglDsXy;U%PfQpQKMmt%*@Q#h?^Umfys1Ik0rsP(2BT&0ZCpb91FR#a}4x(XRe*K zO|}bE_S5$N%Pop~_pF&N8ND&eY^XAKyf|Rq5ioplNCrjEAikojC;EX-PPhvY2p?5V zwn&btZQi{q8TjVGD8^dy=j;g)mEw>kI#m4nTV8uJjLXdzFyL1I=uhMF4NdC%*9Hl_ z6t=j`&u-+gr95kC)D;<+87%egkqnw5%|nL?;czbV9(VqErifuIxk^>K%qp z;;zqsxz;n_E7#N0%Q|qaMIgJN6I*nco6CdX>z}eeNl{2pawpf}(fBCcB3#y_>(3tF z%t24;G12ReDmbN;+3Uw{18+P2jb_cWfK=gAt^`xC$UESDg)$<36~mP+P}-j_SsxX3?l=o`J#1fV9>VgZ!cfXHU zE`fJIKg<*Ae@veQ9$&I5KMo2@)dO|;zc;3N*^AGXANj=&VUGhICKpUq5{<`FeB(6+ zrmscYnIxAdA`+9*V2j&_fW)P#UZwIPj7pO6R!T_x*i;f)7mApJi{V9-v=J9Vj)n#K zjj^VR-AsaCuNhcaZ<++cwtc}KGLL4_0JMm*FC}fU`Q{iv9k<&TvACf7r0B%&cKf4) z@Z}F1>+6pbV)-DZ>lc8hkSJCYe~ei|B1pHoy|oGYP;c3w0zIfKBFPO}c5|?xd7?RQ zIF?t%PzqiQ&;cQ>{m9YiiEHHN6i_5B2xwvT;kCE2M9@JWFoC z`?+zpS?~eo5>69>YbOL-tRJK9tpzO_C12NkO{CKm&!wlOoxt5z>~QJs?(U?lfm7QG z-phP`zc9LV-Ppc&O+@kC+}xZo?eM+)V$=993rP)iY-zEk+TyQXUj%Z3rI+6aZhV3o z$jZh)ehqlDB;OsH-mC|JiPG(=^F55lgr`yH$$%MlaSN=^#ExzxQ|Npo8?N&(kcgUt zprNnREwpdS2G`?2xTh{IiluSOwvkk4mtq1#V)L00Ol43eQQd?exb$pVm1`Cv(NcMw zDAU7q@XS;WF$HJr^y035==UTU40IBk} za2FpReMQW2Ur2VnWQoXcRlayb5J=A^JdU6Bl0SfG9=_4|hbv#letcs2*9BLYSGtUH zebp_9+^riL<8`4{XNL`jL0r&aR;~OV14<5|oM}}IIFf6S;|B^F)FV(MBTmFpd*K_I zGxoq!>!|e(QxIk2U|5)sl)wG~@UD^ZLJN*dj@Hc(SJaI8BraqKP4ZO?OrjYXTDfOa zf>CG^-$nQ<&>5TnNxv9AO*WGUU!q7vl8h@HO?3Qq`jsdOAV>zzg5ty=8He;9r&Sr@ zEbYKOoyGiaVE7UIufe(LKVB5TOW+?_5;#5xs9yP%Rb77x9p1?yDyuD*#Cd?gQMJ5) z6t-%m%9xfiB*<1Kl-at_-+XSKT?j5j4WAjeJ9iYx@0)tydK@f?P}hj{ z9ypfKi=VLy%CJ@gisK)KyEr+OdZcd;4JCqdr+t7VzP;IfZpk-1IWTEf7U#aN%+7JL zM-(4u7V^|&)6Y+S=}yz;*k)Twwm=(@6aLTYh67YLrMmkkL)NrpX{?R#r|;2DuEY;S z5T=iv{vY@&99cP4E5MJPeek+n63+O7?kwd7cL_MYz#-6`j9dE=$o@$+yLH*Sep8-; zuSWj`%CG(c<(E1wtYJdewxuPS!VUuoU%8!s0e*WFf9OAIlIO3(q|)AJ3Q8kG9e1B< z(OAQR9>#z1S;jF&3MS0laR#8IC>8cSd=Dbn@jNXxwZxYb0631AJUMa^7~&2WD;yge zGnKW@GHvl^1*{W-7?3nw0k&tjWP^-Jm!+?`i}sxgUVgy@}BM5~p`_Z}69UHdnz1XWn#mT>0uN z>oiTe8Zx`TlWCe}w!Y-wVwU=((2HGD!;qT!9sK;4Fi`r zQEs=@aAPw+rao_{w~Q5X7D*JlcXwm=Cn2Rrc}0EPM39`EFLoz+CkIOOuKO~`{?4Gp zv8%&_f+qsMS5*|4ee#}QscAeY=A#R}Z5jgcSlI-a>oX*lZ(v;h071M|kvHt5~LP=}m-> zo~c%9g8<(4&XJ2@kp@WuYbWC6a&@ClmnBxFLnJJliYd)&P0Bm{R?isHvefx>N)jGd z@;P5+U~I76$2v&2eR4-uOZ)NwZ{4YdO`=NPH}4Oo^&ZwH%Qhy-h?*qB&NLp&E-AaA zL^oaULX*@dk5ZpR3LNf>KYQv<%cstm**S6V&2iG&?ua*vR!7Qm*vHfz7sZR0tIH@W zR}f;e`aX60Q@dvdgM8PoZ|_BimT}H7he#OxyD2@i>7jZ<%R!`?k;FiQH$^JYPZvb_ zm$Q*o|spu9Kmw?7pyGLKtqY zRCDNQMv8JZA&G7{Epc&iDwR4w9WEOtlaa64xH=OIR*}1ahy2|;9U>c9se~WT8y*~J z0#i)Q1NGRY!Gy)IJKb!F%|m%{`>S*+jiv_@Uu&F;Oxb}7O@a>3s#_fjJAQV*o|VGX z)1D=%UKkN%Gh0gL!K=C9yB43!_qy^oYc=#QJNo%OGV-xcGOFgXXm~7YgdCCu@dUvX|vy@6SQzX6t0cFf|2z4Pl7ZJdJDR^U` z%$K6BlE-azx!k$&7K(Ug+g$ZjVp-mEm{QJN+cIX za>xa4ILKW%>{PoNY5_(FLBR2RvvuGC{Y4a3_AUVWEUH|3IF`Q8*@5*VT0mHuK*#ga zb{@&dky9XwP6JPSkD)(OZ+8ISy&lDX(MLUq20R)-PzhRRiyHyCE5I5q#xfE8OW3v^ zBl{o%dOG|c1m2SAZ`NS22$>E>p)P`4H-HzM2#AWwb|&7Ft1gHWahWQ>uV{i5%z~de z+TJNa`OLrPVX$WxB@lfRp?{@Kx1@m|k3JDccMoL&K7iEfrpH$6Yc}5{QiDjX@C8*a zBPd$e`}ZX6qUc}5GPOlBwF%hQz*9_)0Bvz`=xYp5t;f`TkV0YKAy*BJR7W!D$x;kt zUr+mnkR2isB&^V)L^r5tCY1Y^@{*D$(6~?UgfEtsRSXm#0 zixR1;Fdh!?;t)<(%)wTZ*X9gF+L}5gk|51iQU%t%q1$i~KF+@j4=Q~zI z!e4^TNe~D)IyP)%g@i5RjM%uuo|>7ZkB^V9JB02zV5y~L>vQSuBRNUlV1&$4Rri}m zi7<1w(nkad;@e?D@9R-#6t3`za6V`#pfKlEfd@}uqPZoL3tG`%qPe+|>FZvUo#f=? zcf6cHOgpbF1Oma%#44URG%`M7daMQ&vg?f9rj|KxvU*Lc&T$)W{>b&d&`);ucIO!? zTQi%JXe9j*BV~R>pZNS%J@)c5J-rVg>(cFGWa%iExzhcVaux{SRjeg4mTFW?%76!AWXrbf< z7_2-G_gkJoS~U6(3$+!9aEM19eLT7!|AnmFgP9GYA?t=nr1FuGk-%k0L&Q}vxdd}< z$3t&BMH8DDtBm!RjL>`OGOhz#YZPf|X#}@b@UuzS7EGG$_O~1c80{UN;eIkn-m)O0 z_qfR5h6|cYbyz27P9k5t)d1%1*W<^TZbS;da8U)z1Ye}5@74kmS7PJ%g=f8=e+Ke?UV$Y|*Wk*8Na zr@wI~9|7KqR|)X&@(zQ+8=uMROPZx8^hd$$#PPepR}G;KP&*zZMA%QcJkARcvi*FR z2TU;>T);pYw0QVQ#vl1EUq}=JgA9@$jbK!#&zGvE>*||gMz=x#r780Dl{zqPW2IWB zTvyG(_29yWB>r_%GR$%P=~dq&W9xmwttZ27pIvxgi@|X5F?<;Fj!VTsSlGKc#T1yU zvpYqi-I)iqvFMwD&vT*Gi4`L)p(X8ElLVsC$7SEk;ho~XljOft#;>m)hIgUM0|y(b zGC*_z>BWgPTwx|LC`quykq6}kj(TFS$BsPa)=S5A{uq}jMlR7aHhe&8HU5WNgaw9h z+iS@`(JNw;?A#J@^3MR!5bm!4P*cTjtC>Vg{0irKIB!k4F5Q=4!>TXc$xdw1{p^BI z7GD7i1Fl`-;g7C`pUL190f19U2ekki5OgJUbt|~PX6*~+K#dg4S`xC9!E8=Vg*OB> zB}4IQxr0lV4`i=Z6PI;tthf8(8k*=z5An{5&dF6H+L-YVf?29jZZ04(@Bfu3qaoGz zt=z5py(lv|3&ph8;N@4Kl>Jk#L8xT8UAp zTPbaCfG67dk*(=*=;h6pdp}(%|B^2ke*edik+txjAtT37*-4*jcqNUs)-4j{s^ccu z1`ItM%Kh@+nY*Y?M#p0M;nql`g#SiR@L!plTTn2iPdgj-jVJreXzk3&wrq8~M}!(Z z_|ozfq3ecS5vFfXRkYC#0Yh=R&0i62FxyubfRANq5cES8sZklUw~$XJ7;;w|1gj!G znGXl=YAbbs+pTJ(H)d9-U+^&S!JztXf@Ay`q>8LU5(k~HN{N2w+DaO2q21`Bsg&#?*(cF zBC9JWqDzcYYC~Tcm1LJZC8v^p9q5pd9uH%y;khf;u>*;?)`LGshDwgLm|$4 zB0tfH>P1noB!ph;g~|6uS9)bqZp`l(Py^2(%H`TCuE1=quW*69683C^R&}7%C8sT0 zv*xWo`>1kT4q;f5W^4HoOVxy<7ZL369ZYm}wkLrx{w8OWg*UyP(&o;ig2-@h+1N?E zJ7h!+WSGgigw70c7eRVf^Rx6EV0lWXNHk_`Q3ma155J`6xbZhaR;72p2LyfN${fcX zRK$1RgnZ?1`19*V+1WQ#&lWZ31VN|Z)=}e)Z$*nkJmbn>yKf{RDmvm{#&b1uf-tJ13lQWlFpvscdOWBj#>|=s#Y*m$fsd|ZSuF?+| za(}*d)0H&Whzz_rjX@0y<*Vq*!)O>J(Mx-}+>8qUGA7X}&22}_v3xk>TrjlV8EBc5H_&?+g%+)X zOJ{SdX7r|3-YFdu)LgITQum9U-(xNlUPiFqf6#>%LmD^ddE6@9{l=%!ROiv~ee?=P zMT(;YVMf2xL0ouTuv*1W1p4+%VBAUI();7fyK2K8{^ANMRf45XjE*NQj!scFZ{+GN zcccfZUKBGrppe^tng_c-;rY$dt@8j7)>&%rP~aBfLOA6=ypyg4S{+!?F*&ei8!*A}e zK@I^3O{tE>tkEU@rOjQAJ5100w7pipXU$2nV&}q}6D!iJj42gmLs&_I>JF>nqQRq?V|77L0p!RdnZ|R zo%l72zeWk_-ff|6jDs_0hc_#|S~tfm9E{VaF=NgaEi+RSGCd6^N~;rRtV*^c5`!#` zZrJBzBzrbE5ly-&hjq_Kh$TT6B7f(p*>7h;9xV3FU)k8$R1@iizkIuG%WgVn1nj1-w!vA{tc&6{pE$@MduR-N+BmG>@#9m|>FN|_NlN;o@SrCMk&WXt zc-33ZK1y%$cxT$}<@~)Iae7xztm{^C4 zDg z)sEkR8GqX=;hx=-Hif!>ws6O-8|T*uQnxgp?>mv3q1i=3S!~0>aD&z0@2dvGxoUXy z`iJbjhXiD^o8?=C?q2F81m*lW7SD*QJyv0UV~FOP^x*6(ov?G8Sj&y%wJeQmmcM?E zRm-r^|F&DE&+LTkS#Pwoqf|F=IiIDz59+*&+!US&b_~C|L#MI@Ly6oa6!Dx537fOw}LAI(ahH|!5y~%f!KpYc@%wb%58F4z+0JP8=K+; zHxsjBIR?xXclJF`JRQCIC2a|1rz7G5#t?6*8@O%0J^Q>we?hAX=6sN>%1VdOvzAF; zoyVO`61`ff0HAL<9CU#92z9PD@`E*MRnkCov{@|fwrV1?m23Q0p4hGCErCmy>eUB$KGTN0Vlj zUf%|bLWT`Ca@AT+i&E@QN&4lyB4hZu6rSO))B`y(PC?9&jC4qAtMHPHCnnmABbNmj z{xIK{w_Bz6?7mnOn8&;~QwEI_o99#nfE()5s$XyM00J7pF>L>9DbN9(|HqP{Yaxyv zAY?%64g+BcZ5-&TmD{{>0RmANuo#I4RPz5!*1t46-)jmWKUL=OZV6XD@lr6|3*>E zQx(==ki2yU404{-k^R!M#`hAJy?U&DtlQBeaw+{QO~n}n+1y~YM_1RA0RsW+jL%o<&Dsjp*@zoiw>>`ml6iSHV02cFSbK1?fvsaFX3LeXSl+{#v&Kk#+m%@v zmrw_D!~TFgEzavnhAVqe&&N`G2zpO?cP+V*z@8S1?Shm3s<1k?BiiZq!AO3|b*4s< ziq26uby+C~yipBrWYuU2mSFu5YX`ww&p%Pdz!YN18YA{!51{$*v!P~Y4WkI6dP6&q zI}QQss0G3v|1yItv&1$E9!QGZEfxpMQ_c-TJa+GCNPe{5XbVKMvR@x{_2pA>U}nbU zkMJV2G)huvIsL<$@x%C9i`bw`rY9AJkC>!}a|~qRVDAbE6P1{&Q&W~Q9=lp-mNPpo`RSeR6^vCg$hmV!QxP;J1C}HV1oqsnvnU1zvQoODk;# zdb;hB^Gd`GmQ3f0h@S~^EYEsu1WUid4Yo%gh4g$Zl!!RF@%nG0`!}0x`rW#Ah1^pXx6tyVolBCMLq$ME){<+d5`3M7qVrGX*2A>+&sEdbHGSdF09rC)6O<0sw@-=>GpmWB%>E{yst$ z#1&Jm2CWvr^3JCTqpC8X&s~^#006}-|7l{?Iia9p(@;a#jG31v!vciWrwP4y4wkXg z!7_Fst?a#`(3-vNl%;M0_6h*BZ7hUttJC%m7ykO~S=AHSO|WJk&`{HUSaJW?@c#oS Cx@r{w diff --git a/doc/salome/gui/GEOM/input/offset_operation.doc b/doc/salome/gui/GEOM/input/offset_operation.doc index b1baac12b..d3d1fd197 100644 --- a/doc/salome/gui/GEOM/input/offset_operation.doc +++ b/doc/salome/gui/GEOM/input/offset_operation.doc @@ -7,7 +7,12 @@ \n This operation translates each point of an \b Object (a set of Objects) along a local normal by a given \b Offset distance (signed -number, negative value meaning inner offset). +number, negative value meaning inner offset). Gaps between translated +adjacent surfaces are filled in either of two ways: +- if Join by pipes is activated, they are filled with pipes; +- else the surfaces are extended and intersected, so that sharp edges + are preserved. + \n \b Offset operation is applicable to faces, shells and solids. \n \ref restore_presentation_parameters_page "Advanced options". @@ -16,9 +21,12 @@ number, negative value meaning inner offset). \n Example: -\image html offsetsn.png "The box and its offset surface" +\image html offsetsn.png "The box and its offset surface (Join by pipes activated)" + +\n TUI Command: +- Gaps filled by pipes: geompy.MakeOffset(Shape, Offset), +- Gaps filled by intersection: geompy.MakeOffsetIntersectionJoin(Shape, Offset), -\n TUI Command: geompy.MakeOffset(Shape, Offset), where Shape is a shape(s) which has to be an offset, Offset is a value of the offset. \n Arguments: Name + Object (face(s), shell(s), solid(s)) + diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index cb8a07058..7241c256d 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -1300,17 +1300,23 @@ module GEOM * \brief Replace the given object by its offset. * \param theObject The base object for the offset. * \param theOffset Offset value. + * \param theJoinByPipes To join offset surfaces by pipes or by intersection. * \return theObject. */ - GEOM_Object OffsetShape (in GEOM_Object theObject, in double theOffset); + GEOM_Object OffsetShape (in GEOM_Object theObject, + in double theOffset, + in boolean theJoinByPipes); /*! * \brief Create new object as offset of the given one. * \param theObject The base object for the offset. * \param theOffset Offset value. + * \param theJoinByPipes To join offset surfaces by pipes or by intersection. * \return New GEOM_Object, containing the offset object. */ - GEOM_Object OffsetShapeCopy (in GEOM_Object theObject, in double theOffset); + GEOM_Object OffsetShapeCopy (in GEOM_Object theObject, + in double theOffset, + in boolean theJoinByPipes); /*! * \brief Create new object as projection of the given one on a 2D surface. diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 69e84b9f9..e1010522b 100755 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -7816,6 +7816,13 @@ Do you want to create new material? Rotation angle + + TransformationGUI_OffsetDlg + + GEOM_JOIN_BY_PIPES + Join by pipes + + OperationGUI_ExtractionDlg diff --git a/src/GEOMImpl/GEOMImpl_IOffset.hxx b/src/GEOMImpl/GEOMImpl_IOffset.hxx index 200797cb9..fea75eac9 100644 --- a/src/GEOMImpl/GEOMImpl_IOffset.hxx +++ b/src/GEOMImpl/GEOMImpl_IOffset.hxx @@ -29,6 +29,7 @@ #define OFF_ARG_VALUE 2 #define OFF_ARG_IDS 3 #define OFF_ARG_PARAM 4 +#define OFF_ARG_JOIN 5 class GEOMImpl_IOffset { @@ -48,6 +49,10 @@ class GEOMImpl_IOffset Standard_Boolean GetParam() { return _func->GetInteger(OFF_ARG_PARAM); } + void SetJoinByPipes(Standard_Boolean theValue) { _func->SetInteger(OFF_ARG_JOIN, theValue); } + + Standard_Boolean GetJoinByPipes() { return _func->GetInteger(OFF_ARG_JOIN); } + void SetFaceIDs(const Handle(TColStd_HArray1OfInteger)& theFaceIDs) { _func->SetIntegerArray(OFF_ARG_IDS, theFaceIDs); } diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 598096391..2e3f57ba2 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -1036,8 +1036,10 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxisCopy * OffsetShape */ //============================================================================= -Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShape - (Handle(GEOM_Object) theObject, double theOffset) +Handle(GEOM_Object) +GEOMImpl_ITransformOperations::OffsetShape (Handle(GEOM_Object) theObject, + double theOffset, + bool theJoinByPipes) { SetErrorCode(KO); @@ -1055,8 +1057,9 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShape if (aFunction->GetDriverGUID() != GEOMImpl_OffsetDriver::GetID()) return NULL; GEOMImpl_IOffset aTI (aFunction); - aTI.SetShape(anOriginal); - aTI.SetValue(theOffset); + aTI.SetShape( anOriginal ); + aTI.SetValue( theOffset ); + aTI.SetJoinByPipes( theJoinByPipes ); //Compute the offset try { @@ -1084,8 +1087,10 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShape * OffsetShapeCopy */ //============================================================================= -Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShapeCopy - (Handle(GEOM_Object) theObject, double theOffset) +Handle(GEOM_Object) +GEOMImpl_ITransformOperations::OffsetShapeCopy( Handle(GEOM_Object) theObject, + double theOffset, + bool theJoinByPipes) { SetErrorCode(KO); @@ -1106,8 +1111,9 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShapeCopy if (aFunction->GetDriverGUID() != GEOMImpl_OffsetDriver::GetID()) return NULL; GEOMImpl_IOffset aTI (aFunction); - aTI.SetShape(anOriginal); - aTI.SetValue(theOffset); + aTI.SetShape( anOriginal ); + aTI.SetValue( theOffset ); + aTI.SetJoinByPipes( theJoinByPipes ); //Compute the offset try { diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx index 46fb60dcb..db5adae66 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx @@ -105,10 +105,12 @@ class GEOMImpl_ITransformOperations : public GEOM_IOperations Handle(GEOM_Object) thePoint); Standard_EXPORT Handle(GEOM_Object) OffsetShape (Handle(GEOM_Object) theObject, - double theOffset); + double theOffset, + bool theJoinByPipes); Standard_EXPORT Handle(GEOM_Object) OffsetShapeCopy (Handle(GEOM_Object) theObject, - double theOffset); + double theOffset, + bool theJoinByPipes); Standard_EXPORT Handle(GEOM_Object) ProjectShapeCopy (Handle(GEOM_Object) theSource, Handle(GEOM_Object) theTarget); diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index 413ccff7c..cb80023a6 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -86,11 +86,20 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_Logbook)& log) StdFail_NotDone::Raise(aMsg.ToCString()); } - if (aType == OFFSET_SHAPE || aType == OFFSET_SHAPE_COPY) { - BRepOffsetAPI_MakeOffsetShape MO (aShapeBase, - aCI.GetValue(), - aTol); - if (MO.IsDone()) { + if ( aType == OFFSET_SHAPE || aType == OFFSET_SHAPE_COPY ) + { + BRepOffsetAPI_MakeOffsetShape MO; + BRepOffset_Mode aMode = BRepOffset_Skin; + Standard_Boolean anIntersection = Standard_False, aSelfInter = Standard_False; + MO.PerformByJoin( aShapeBase, + aCI.GetValue(), + aTol, + aMode, + anIntersection, + aSelfInter, + aCI.GetJoinByPipes() ? GeomAbs_Arc : GeomAbs_Intersection ); + + if ( MO.IsDone() ) { aShape = MO.Shape(); if ( !GEOMUtils::CheckShape(aShape, true) && !GEOMUtils::FixShapeTolerance(aShape) ) Standard_ConstructionError::Raise("Boolean operation aborted : non valid shape result"); diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index e487554d5..34365e199 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -313,6 +313,8 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_GROUP_SOLID"); aNamePrefix = "Group_Of_Solids_"; break; + default: + aNamePrefix = "Group_"; } } else if ( mytype == GEOM_MARKER ) { aResultSO->SetAttrString("AttributePixMap","ICON_OBJBROWSER_LCS"); @@ -2548,7 +2550,7 @@ GEOM::GEOM_Object_ptr GEOM_Gen_i::AddSubShape (GEOM::GEOM_Object_ptr theMainSh 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]); + for(CORBA::ULong i = 0; iSetValue(i+1, theIndices[i]); Handle(::GEOM_Object) anObject = _impl->AddSubShape(aMainShape, anArray, true); if(anObject.IsNull()) return GEOM::GEOM_Object::_nil(); @@ -2933,7 +2935,7 @@ void GEOM_Gen_i::Move( const GEOM::object_list& what, } } - for ( int i = 0; i < what.length(); i++ ) { + for ( CORBA::ULong i = 0; i < what.length(); i++ ) { SALOMEDS::SObject_var sobj = what[i]; if ( CORBA::is_nil( sobj ) ) continue; // skip bad object // insert the object to the use case tree @@ -2954,7 +2956,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::GetDependencyTree( SALOMEDS::Study_ptr theStudy, GEOMUtils::TreeModel tree; std::string entry; - for ( int i = 0; i < theObjectEntries.length(); i++ ) { + for ( CORBA::ULong i = 0; i < theObjectEntries.length(); i++ ) { // process objects one-by-one entry = theObjectEntries[i].in(); GEOM::GEOM_BaseObject_var anObj = GetObject( theStudy->StudyId(), entry.c_str() ); @@ -2997,7 +2999,7 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo, GEOMUtils::NodeLinks anEntries; GEOMUtils::LevelInfo aLevelMap; if ( level > 0 ) { - if ( level-1 >= upLevelList.size() ) { + if ( level-1 >= (int)upLevelList.size() ) { // create a new map upLevelList.push_back( aLevelMap ); } else { @@ -3011,7 +3013,7 @@ void GEOM_Gen_i::getUpwardDependency( GEOM::GEOM_BaseObject_ptr gbo, // get objects on that the current one depends GEOM::ListOfGBO_var depList = gbo->GetDependency(); std::string aDepEntry; - for( int j = 0; j < depList->length(); j++ ) { + for( CORBA::ULong j = 0; j < depList->length(); j++ ) { if ( depList[j]->_is_nil() ) continue; aDepEntry = depList[j]->GetEntry(); @@ -3067,7 +3069,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, continue; std::string aGoEntry = geomObj->GetEntry(); // go through dependencies of current object to check whether it depends on the given object - for( int i = 0; i < depList->length(); i++ ) { + for( CORBA::ULong i = 0; i < depList->length(); i++ ) { if ( depList[i]->_is_nil() ) continue; if ( depList[i]->_is_equivalent( gbo ) ) { @@ -3081,7 +3083,7 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, GEOMUtils::NodeLinks anEntries; GEOMUtils::LevelInfo aLevelMap; anEntries.push_back( aGboEntry ); - if ( level >= downLevelList.size() ) { + if ( level >= (int)downLevelList.size() ) { downLevelList.push_back( aLevelMap ); } else { aLevelMap = downLevelList.at(level); @@ -3105,13 +3107,13 @@ void GEOM_Gen_i::getDownwardDependency( GEOM::GEOM_BaseObject_ptr gbo, // purpose : Fills 3 lists that is used to clean study of redundant objects //============================================================================== void GEOM_Gen_i::GetEntriesToReduceStudy(SALOMEDS::Study_ptr theStudy, - GEOM::string_array& theSelectedEntries, - GEOM::string_array& theParentEntries, - GEOM::string_array& theSubEntries, - GEOM::string_array& theOtherEntries) + GEOM::string_array& theSelectedEntries, + GEOM::string_array& theParentEntries, + GEOM::string_array& theSubEntries, + GEOM::string_array& theOtherEntries) { std::set aSelected, aParents, aChildren, anOthers; - for ( int i = 0; i < theSelectedEntries.length(); i++ ) { + for ( CORBA::ULong i = 0; i < theSelectedEntries.length(); i++ ) { aSelected.insert( CORBA::string_dup( theSelectedEntries[i] ) ); } @@ -3237,7 +3239,7 @@ void GEOM_Gen_i::includeParentDependencies(GEOM::GEOM_BaseObject_ptr geomObj, return; // go through dependencies of current object to check whether it depends on the given object std::string aDepEntry; - for( int i = 0; i < depList->length(); i++ ) { + for( CORBA::ULong i = 0; i < depList->length(); i++ ) { aDepEntry = depList[i]->GetEntry(); if ( depList[i]->_is_nil() || aDepEntry == anEntry || // skip self-depending diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index 3413d9d97..778d57197 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -68,7 +68,7 @@ //===================================================================== class GEOM_I_EXPORT GEOM_GenericOperationsCreator { -public: + public: // Create operations virtual GEOM_IOperations_i* Create (PortableServer::POA_ptr thePOA, int theStudyId, @@ -76,6 +76,7 @@ public: ::GEOMImpl_Gen* theGenImpl) = 0; // return the name of IDL module //virtual std::string GetModuleName() = 0; + virtual ~GEOM_GenericOperationsCreator() {} }; //===================================================================== diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc index 55aa0eb3f..7d2993f2b 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -609,9 +609,10 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::MirrorPointCopy * OffsetShape */ //============================================================================= -GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape - (GEOM::GEOM_Object_ptr theObject, - CORBA::Double theOffset) +GEOM::GEOM_Object_ptr +GEOM_ITransformOperations_i::OffsetShape (GEOM::GEOM_Object_ptr theObject, + CORBA::Double theOffset, + CORBA::Boolean theJoinByPipes) { GEOM::GEOM_Object_var aGEOMObject = GEOM::GEOM_Object::_duplicate(theObject); @@ -631,7 +632,7 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape - GetOperations()->OffsetShape(aBasicObject, theOffset); + GetOperations()->OffsetShape( aBasicObject, theOffset, theJoinByPipes ); // Update GUI. UpdateGUIForObject(theObject); @@ -644,9 +645,10 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShape * OffsetShapeCopy */ //============================================================================= -GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy - (GEOM::GEOM_Object_ptr theObject, - CORBA::Double theOffset) +GEOM::GEOM_Object_ptr +GEOM_ITransformOperations_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theObject, + CORBA::Double theOffset, + CORBA::Boolean theJoinByPipes) { GEOM::GEOM_Object_var aGEOMObject; @@ -658,7 +660,8 @@ GEOM::GEOM_Object_ptr GEOM_ITransformOperations_i::OffsetShapeCopy if (aBasicObject.IsNull()) return aGEOMObject._retn(); //Create the offset shape - Handle(::GEOM_Object) anObject = GetOperations()->OffsetShapeCopy(aBasicObject, theOffset); + Handle(::GEOM_Object) anObject = + GetOperations()->OffsetShapeCopy(aBasicObject, theOffset, theJoinByPipes); if (!GetOperations()->IsDone() || anObject.IsNull()) return aGEOMObject._retn(); diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.hh b/src/GEOM_I/GEOM_ITransformOperations_i.hh index 3e06acfb8..b4b4f9a05 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.hh +++ b/src/GEOM_I/GEOM_ITransformOperations_i.hh @@ -135,10 +135,12 @@ class GEOM_I_EXPORT GEOM_ITransformOperations_i : GEOM::GEOM_Object_ptr thePoint); GEOM::GEOM_Object_ptr OffsetShape (GEOM::GEOM_Object_ptr theObject, - CORBA::Double theOffset); + CORBA::Double theOffset, + CORBA::Boolean theJoinByPipes); GEOM::GEOM_Object_ptr OffsetShapeCopy (GEOM::GEOM_Object_ptr theObject, - CORBA::Double theOffset); + CORBA::Double theOffset, + CORBA::Boolean theJoinByPipes); GEOM::GEOM_Object_ptr ProjectShapeCopy (GEOM::GEOM_Object_ptr theSource, GEOM::GEOM_Object_ptr theTarget); diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index d8945d2fc..79dd09036 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -9228,14 +9228,15 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): """ theOffset, Parameters = ParseParameters(theOffset) if theCopy: - anObj = self.TrsfOp.OffsetShapeCopy(theObject, theOffset) + anObj = self.TrsfOp.OffsetShapeCopy(theObject, theOffset, True) else: - anObj = self.TrsfOp.OffsetShape(theObject, theOffset) + anObj = self.TrsfOp.OffsetShape(theObject, theOffset, True) RaiseIfFailed("Offset", self.TrsfOp) anObj.SetParameters(Parameters) return anObj - ## Create new object as offset of the given one. + ## Create new object as offset of the given one. Gap between two adjacent + # offset surfaces is filled by a pipe. # @param theObject The base object for the offset. # @param theOffset Offset value. # @param theName Object name; when specified, this parameter is used @@ -9244,11 +9245,13 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): # # @return New GEOM.GEOM_Object, containing the offset object. # + # @sa MakeOffsetIntersectionJoin # @ref tui_offset "Example" @ManageTransactions("TrsfOp") def MakeOffset(self, theObject, theOffset, theName=None): """ - Create new object as offset of the given one. + Create new object as offset of the given one. Gap between adjacent + offset surfaces is filled by a pipe. Parameters: theObject The base object for the offset. @@ -9267,7 +9270,48 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): """ # Example: see GEOM_TestAll.py theOffset, Parameters = ParseParameters(theOffset) - anObj = self.TrsfOp.OffsetShapeCopy(theObject, theOffset) + anObj = self.TrsfOp.OffsetShapeCopy( theObject, theOffset, True ) + RaiseIfFailed("OffsetShapeCopy", self.TrsfOp) + anObj.SetParameters(Parameters) + self._autoPublish(anObj, theName, "offset") + return anObj + + ## Create new object as offset of the given one. Gap between adjacent + # offset surfaces is filled by extending and intersecting them. + # @param theObject The base object for the offset. + # @param theOffset Offset value. + # @param theName Object name; when specified, this parameter is used + # for result publication in the study. Otherwise, if automatic + # publication is switched on, default value is used for result name. + # + # @return New GEOM.GEOM_Object, containing the offset object. + # + # @sa MakeOffset + # @ref tui_offset "Example" + @ManageTransactions("TrsfOp") + def MakeOffsetIntersectionJoin(self, theObject, theOffset, theName=None): + """ + Create new object as offset of the given one. Gap between adjacent + offset surfaces is filled by extending and intersecting them. + + Parameters: + theObject The base object for the offset. + theOffset Offset value. + theName Object name; when specified, this parameter is used + for result publication in the study. Otherwise, if automatic + publication is switched on, default value is used for result name. + + Returns: + New GEOM.GEOM_Object, containing the offset object. + + Example of usage: + box = geompy.MakeBox(20, 20, 20, 200, 200, 200) + # create a new box extended by 70 + offset = geompy.MakeOffsetIntersectionJoin(box, 70.) + """ + # Example: see GEOM_TestAll.py + theOffset, Parameters = ParseParameters( theOffset ) + anObj = self.TrsfOp.OffsetShapeCopy( theObject, theOffset, False ) RaiseIfFailed("OffsetShapeCopy", self.TrsfOp) anObj.SetParameters(Parameters) self._autoPublish(anObj, theName, "offset") diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx index f4157b6bd..2e2916f03 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx @@ -58,26 +58,24 @@ TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg( GeometryGUI* theGeomet mainFrame()->RadioButton2->close(); mainFrame()->RadioButton3->setAttribute( Qt::WA_DeleteOnClose ); mainFrame()->RadioButton3->close(); - + GroupPoints = new DlgRef_1Sel1Spin1Check( centralWidget() ); GroupPoints->GroupBox1->setTitle( tr( "GEOM_ARGUMENTS" ) ); GroupPoints->TextLabel1->setText( tr( "GEOM_OBJECTS" ) ); GroupPoints->TextLabel2->setText( tr( "GEOM_OFFSET" ) ); - GroupPoints->CheckButton1->setText( tr( "GEOM_CREATE_COPY" ) ); - - // san -- modification of an exisitng object by offset is not allowed - GroupPoints->CheckButton1->hide(); + GroupPoints->CheckButton1->setText( tr( "GEOM_JOIN_BY_PIPES" ) ); + GroupPoints->CheckButton1->setChecked( true ); GroupPoints->PushButton1->setIcon( image1 ); - + QVBoxLayout* layout = new QVBoxLayout( centralWidget() ); layout->setMargin( 0 ); layout->setSpacing( 6 ); layout->addWidget( GroupPoints ); - + /***************************************************************/ setHelpFileName( "offset_operation_page.html" ); - + Init(); } @@ -97,37 +95,33 @@ TransformationGUI_OffsetDlg::~TransformationGUI_OffsetDlg() // purpose : //================================================================================= void TransformationGUI_OffsetDlg::Init() -{ +{ /* init variables */ myEditCurrentArgument = GroupPoints->LineEdit1; GroupPoints->LineEdit1->setReadOnly( true ); myObjects.clear(); - + /* Get setting of step value from file configuration */ double step = 1; - + /* min, max, step and decimals for spin boxes & initial values */ initSpinBox( GroupPoints->SpinBox_DX, COORD_MIN, COORD_MAX, step, "length_precision" ); GroupPoints->SpinBox_DX->setValue( 1e-05 ); - - // Activate Create a Copy mode - GroupPoints->CheckButton1->setChecked( true ); - CreateCopyModeChanged(); mainFrame()->GroupBoxPublish->show(); /* signals and slots connections */ connect( buttonOk(), SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); connect( buttonApply(), SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); - + connect( GroupPoints->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); - connect( myGeomGUI->getApp()->selectionMgr(), + connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); connect( GroupPoints->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox() ) ); - connect( GroupPoints->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( CreateCopyModeChanged() ) ); - + connect( GroupPoints->CheckButton1, SIGNAL( toggled( bool ) ), this, SLOT( JoinModeChanged() ) ); + initName( tr( "GEOM_OFFSET" ) ); globalSelection( GEOM_ALLSHAPES ); @@ -271,10 +265,10 @@ bool TransformationGUI_OffsetDlg::execute( ObjectList& objects ) GEOM::GEOM_ITransformOperations_var anOper = GEOM::GEOM_ITransformOperations::_narrow(getOperation()); - if ( GroupPoints->CheckButton1->isChecked() || IsPreview() ) { + if ( true /*GroupPoints->CheckButton1->isChecked() || IsPreview()*/ ) { for ( int i = 0; i < myObjects.count(); i++ ) { - anObj = anOper->OffsetShapeCopy( myObjects[i].get(), GetOffset() ); + anObj = anOper->OffsetShapeCopy( myObjects[i].get(), GetOffset(), GetIsJoinByPipes() ); if ( !anObj->_is_nil() ) { if(!IsPreview()) { anObj->SetParameters(GroupPoints->SpinBox_DX->text().toLatin1().constData()); @@ -285,7 +279,7 @@ bool TransformationGUI_OffsetDlg::execute( ObjectList& objects ) } else { for ( int i = 0; i < myObjects.count(); i++ ) { - anObj = anOper->OffsetShape( myObjects[i].get(), GetOffset() ); + anObj = anOper->OffsetShape( myObjects[i].get(), GetOffset(), GetIsJoinByPipes() ); if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); } @@ -320,13 +314,24 @@ double TransformationGUI_OffsetDlg::GetOffset() const return GroupPoints->SpinBox_DX->value(); } +//======================================================================= +//function : GetIsJoinByPipes +//purpose : +//======================================================================= + +bool TransformationGUI_OffsetDlg::GetIsJoinByPipes() const +{ + return GroupPoints->CheckButton1->isChecked(); +} + //================================================================================= -// function : CreateCopyModeChanged() +// function : JoinModeChanged() // purpose : //================================================================================= -void TransformationGUI_OffsetDlg::CreateCopyModeChanged() +void TransformationGUI_OffsetDlg::JoinModeChanged() { - mainFrame()->GroupBoxName->setEnabled( GroupPoints->CheckButton1->isChecked() ); + processPreview(); + //mainFrame()->GroupBoxName->setEnabled( GroupPoints->CheckButton1->isChecked() ); } //================================================================================= diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.h b/src/TransformationGUI/TransformationGUI_OffsetDlg.h index c2ec78c41..54295bf29 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.h +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.h @@ -57,6 +57,7 @@ private: void Init(); void enterEvent( QEvent* ); double GetOffset() const; + bool GetIsJoinByPipes() const; private: QList myObjects; @@ -70,7 +71,7 @@ private slots: void SelectionIntoArgument(); void SetEditCurrentArgument(); void ValueChangedInSpinBox(); - void CreateCopyModeChanged(); + void JoinModeChanged(); }; #endif // TRANSFORMATIONGUI_OFFSETDLG_H diff --git a/src/XAOPlugin/XAOPlugin_IOperations_i.cc b/src/XAOPlugin/XAOPlugin_IOperations_i.cc index 20581c9b9..76ea046e0 100644 --- a/src/XAOPlugin/XAOPlugin_IOperations_i.cc +++ b/src/XAOPlugin/XAOPlugin_IOperations_i.cc @@ -74,7 +74,7 @@ CORBA::Boolean XAOPlugin_IOperations_i::ExportXAO( GEOM::GEOM_Object_ptr shape, Handle(GEOM_Object) reference = GetObjectImpl( shape ); // Get the reference groups - int ind = 0; + CORBA::ULong ind = 0; std::list groupsObj; for (; ind < groups.length(); ind++) { From 693e5f65fe0f4868fe2e0f2923aef6a3afb20d67 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 22 Dec 2017 13:35:52 +0300 Subject: [PATCH 25/26] Fix compilation error and some warnings --- .../AdvancedEngine_IOperations.cxx | 3 +- .../AdvancedEngine_PipeTShapeDriver.cxx | 2 +- .../AdvancedEngine_SmoothingSurfaceDriver.cxx | 4 -- src/GEOMAlgo/GEOMAlgo_Extractor.cxx | 14 ++--- src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx | 4 +- src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 4 +- src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx | 3 +- src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx | 6 +-- src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 22 ++++---- src/GEOMGUI/GEOMGUI_DimensionProperty.cxx | 2 +- src/GEOMGUI/GeometryGUI.cxx | 2 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 4 +- src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 4 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 17 +++--- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 26 +++++----- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 6 +-- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 52 +++++++++---------- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 10 ++-- src/GEOM_I/GEOM_IInsertOperations_i.cc | 2 +- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 6 +-- src/GEOM_I/GEOM_IShapesOperations_i.cc | 7 ++- src/GEOM_I_Superv/GEOM_Superv_i.cc | 4 +- src/IGESPlugin/IGESPlugin_GUI.cxx | 2 +- src/OBJECT/GEOM_Actor.cxx | 17 +++--- src/OBJECT/GEOM_OCCReader.cxx | 15 +++--- src/STLPlugin/STLPlugin_GUI.cxx | 2 +- src/VTKPlugin/VTKPlugin_GUI.cxx | 26 +++++----- 30 files changed, 132 insertions(+), 141 deletions(-) diff --git a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx index 190acd59f..4af7dd3b6 100644 --- a/src/AdvancedEngine/AdvancedEngine_IOperations.cxx +++ b/src/AdvancedEngine/AdvancedEngine_IOperations.cxx @@ -284,8 +284,6 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh return false; } - gp_Trsf aTrsfInv = aTrsf.Inverted(); - // int expectedGroups = 0; // if (shapeType == TSHAPE_BASIC) // if (Abs(theR2+theW2-theR1-theW1) <= Precision::Approximation()) @@ -620,6 +618,7 @@ bool AdvancedEngine_IOperations::MakeGroups(Handle(GEOM_Object) theShape, int sh if (aGroup.IsNull()) continue; + gp_Trsf aTrsfInv = aTrsf.Inverted(); TopoDS_Shape aGroupShape = aGroup->GetValue(); BRepBuilderAPI_Transform aTransformationShapeInv (aGroupShape, aTrsfInv, Standard_False); TopoDS_Shape aGroupShapeTrsfInv = aTransformationShapeInv.Shape(); diff --git a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx index 44f60ceae..4549680fb 100644 --- a/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_PipeTShapeDriver.cxx @@ -312,7 +312,7 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakePipeTShape (const double r1, c gp_Pnt aP0 (0, 0, 0); gp_Pnt aP1 (-l1, 0, 0); - gp_Vec aVX = gp::DX(), aVY = gp::DY(), aVZ = gp::DZ(); + gp_Vec aVX = gp::DX(), aVZ = gp::DZ(); gp_Ax2 anAxes1 (aP1, aVX, aVZ); gp_Ax2 anAxes2 (aP0, aVZ, aVX); diff --git a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx index e76ba756f..3ec2acaae 100644 --- a/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx +++ b/src/AdvancedEngine/AdvancedEngine_SmoothingSurfaceDriver.cxx @@ -254,10 +254,6 @@ GetCreationInformation(std::string& theOperationName, for ( int i = 1, nb = aCI.GetLength(); i <= nb; ++i ) theParams[0] << aCI.GetPntOrComp( i ) << " "; - const Standard_Integer aNbMax = aCI.GetNbMax(); - const Standard_Integer aDegMax = aCI.GetDegMax(); - const Standard_Real aDMax = aCI.GetDMax(); - AddParam(theParams, "Max nbr of Bezier pieces", aCI.GetNbMax()); AddParam(theParams, "Max BSpline surface degree", aCI.GetDegMax()); AddParam(theParams, "3D tolerance of initial approximation", aCI.GetDMax()); diff --git a/src/GEOMAlgo/GEOMAlgo_Extractor.cxx b/src/GEOMAlgo/GEOMAlgo_Extractor.cxx index 1208e0a98..b9a3ec6e7 100644 --- a/src/GEOMAlgo/GEOMAlgo_Extractor.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Extractor.cxx @@ -546,15 +546,15 @@ void GEOMAlgo_Extractor::processFOrSo(const TopoDS_Shape &theFOrSo) TopTools_ListOfShape aClosedSubShapes; TopTools_ListOfShape aNewShapes; TopoDS_Shape anOuterSubShape; - TopAbs_ShapeEnum aShapeType; + //TopAbs_ShapeEnum aShapeType; TopAbs_ShapeEnum aSubShapeType; if (theFOrSo.ShapeType() == TopAbs_FACE) { - aShapeType = TopAbs_FACE; + //aShapeType = TopAbs_FACE; aSubShapeType = TopAbs_WIRE; anOuterSubShape = BRepTools::OuterWire(TopoDS::Face(theFOrSo)); } else { - aShapeType = TopAbs_SOLID; + //aShapeType = TopAbs_SOLID; aSubShapeType = TopAbs_SHELL; anOuterSubShape = BRepClass3d::OuterShell(TopoDS::Solid(theFOrSo)); } @@ -675,14 +675,14 @@ void GEOMAlgo_Extractor::processShOrCS(const TopoDS_Shape &theShOrCS) TopTools_ListOfShape aNewSubShapes; TopTools_ListOfShape aNewOtherShapes; TopAbs_ShapeEnum aSubShapeType; - TopAbs_ShapeEnum aSubSubShapeType; + //TopAbs_ShapeEnum aSubSubShapeType; if (theShOrCS.ShapeType() == TopAbs_SHELL) { aSubShapeType = TopAbs_FACE; - aSubSubShapeType = TopAbs_EDGE; + //aSubSubShapeType = TopAbs_EDGE; } else { // comp-solid aSubShapeType = TopAbs_SOLID; - aSubSubShapeType = TopAbs_FACE; + //aSubSubShapeType = TopAbs_FACE; } for (; anIter.More(); anIter.Next()) { @@ -1098,7 +1098,7 @@ void GEOMAlgo_Extractor::makeHistory(const TopoDS_Shape &theShape, getModified(theShape, aListModif, theShape.ShapeType()); Standard_Boolean isModif = !aListModif.IsEmpty(); - const TopAbs_ShapeEnum aType = theShape.ShapeType(); + //const TopAbs_ShapeEnum aType = theShape.ShapeType(); if (isModif) { // Add the new shapes. diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx index 9bce9fe11..1e7a3ec05 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.cxx @@ -594,7 +594,7 @@ void GEOMAlgo_FinderShapeOn2::ProcessSolids() void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF, GEOMAlgo_ListOfPnt& aLP) { - Standard_Integer j, j1, j2, k, n[4], aNbLinks, aNx, aNb, iCnt;//, aNbMax, *pIds; + Standard_Integer j, j1, j2, k, n[4], aNx, aNb, iCnt;//, aNbLinks, aNbMax, *pIds; TopLoc_Location aLoc; Handle(Poly_Triangulation) aTRF; TColStd_MapOfInteger aMBN; @@ -641,7 +641,6 @@ void GEOMAlgo_FinderShapeOn2::InnerPoints(const TopoDS_Face& aF, } // // boundary nodes aMBN - aNbLinks=aMPKI.Extent(); aIt.Initialize(aMPKI); for (; aIt.More(); aIt.Next()) { iCnt=aIt.Value(); diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx index a24738cdb..bc796863b 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlaceAPI.cxx @@ -321,7 +321,7 @@ Standard_Boolean GEOMAlgo_GetInPlaceAPI::GetInPlaceByHistory } // try to find in history - TDF_Label aHistoryLabel = theWhereFunction->GetHistoryEntry(Standard_False); + //TDF_Label aHistoryLabel = theWhereFunction->GetHistoryEntry(Standard_False); // search in history for all argument shapes Standard_Boolean isFound = Standard_False; diff --git a/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx b/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx index 7beb5d1a9..7dbcbbc02 100644 --- a/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GetInPlace_1.cxx @@ -92,7 +92,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1, { Standard_Boolean bOk; Standard_Integer iErr; - Standard_Real aTol2; + //Standard_Real aTol2; TopAbs_ShapeEnum aType1, aType2; TopAbs_State aState; gp_Pnt aP1, aP2; @@ -101,7 +101,7 @@ Standard_Boolean GEOMAlgo_GetInPlace::CheckCoincidence(const TopoDS_Shape& aS1, // iErr=0; bOk=Standard_False; - aTol2=myTolerance*myTolerance; + //aTol2=myTolerance*myTolerance; aType1=aS1.ShapeType(); aType2=aS2.ShapeType(); // diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index b012b3e35..b19cc9093 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -908,9 +908,9 @@ void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE, Standard_Real aTol; BRep_Builder aBB; TopoDS_Edge E; - TopAbs_Orientation anOrE; + //TopAbs_Orientation anOrE; // - anOrE=aE.Orientation(); + //anOrE=aE.Orientation(); aTol=BRep_Tool::Tolerance(aE); // E=aEx; diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx index 180786cfd..af0776b9b 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer2_3.cxx @@ -65,7 +65,7 @@ static void GEOMAlgo_Gluer2::Detect() { Standard_Boolean bCheckGeometry; - Standard_Integer iErr, aNbSD; + Standard_Integer iErr; TopTools_ListIteratorOfListOfShape aItLS; TopTools_DataMapIteratorOfDataMapOfShapeListOfShape aItDMSLS; //GEOMAlgo_GlueDetector aDetector; @@ -106,7 +106,6 @@ void GEOMAlgo_Gluer2::Detect() for (; aItDMSLS.More(); aItDMSLS.Next()) { const TopoDS_Shape& aSkey=aItDMSLS.Key(); const TopTools_ListOfShape& aLSD=aItDMSLS.Value(); - aNbSD=aLSD.Extent(); myImagesDetected.Bind(aSkey, aLSD); } // diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx index fe68b1ffe..58d1c3971 100755 --- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller_1.cxx @@ -559,7 +559,7 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF, const gp_Cylinder& aCyl) { - Standard_Integer i, aNbV, aNbE, aNbCE, aNbSE; + Standard_Integer aNbV, aNbE, aNbCE, aNbSE; Standard_Real aT0, aT1, aHeight; gp_Pnt aPC[3], aPc; TopoDS_Edge aE; @@ -578,7 +578,6 @@ void GEOMAlgo_ShapeInfoFiller::FillDetails(const TopoDS_Face& aF, const gp_Dir& aDir=aAx1.Direction(); const gp_Pnt& aPLoc=aAx1.Location(); // - i=0; aNbCE=0; aNbSE=0; aExp.Init(aF, TopAbs_EDGE); @@ -795,7 +794,7 @@ Standard_Boolean GEOMAlgo_ShapeInfoFiller::TreatStepSphere { Standard_Boolean bRet, bIsAllowedType, bOnlyClosed, bIsEqual; Standard_Integer j; - Standard_Real aTolAng, aTol; + Standard_Real aTol; Standard_Real aVolume, aVolumeS, dV, aArea, aAreaS, dA; gp_Sphere aSphere[2]; GeomAbs_SurfaceType aST; @@ -805,7 +804,6 @@ Standard_Boolean GEOMAlgo_ShapeInfoFiller::TreatStepSphere // bRet=Standard_False; aTol=Precision::Confusion(); - aTolAng=Precision::Angular(); // aExp.Init(aSd, TopAbs_FACE); for (j=0; aExp.More(); aExp.Next(), ++j) { diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx index de773a6ee..213975d92 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx @@ -163,7 +163,7 @@ Standard_Boolean GEOMAlgo_SurfaceTools::IsCoaxial if (fabs(aRadius1 - aRadius2) <= aTol) { // Check the deflection of the middle point. - gp_XYZ aMidP = 0.5*(aDP1 + aDP2); + //gp_XYZ aMidP = 0.5*(aDP1 + aDP2); //Standard_Real aMidRadius1 = aMidP.Modulus(); if (fabs(aRadius1 - aRadius2) <= aTol) { diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index 02a28c8e5..c6647f8f3 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -119,7 +119,7 @@ void GEOMAlgo_VertexSolid::Perform() //======================================================================= void GEOMAlgo_VertexSolid::BuildResult() { - Standard_Integer i, iBeg, iEnd, aNbVV, aNbVE, aNbVF, j, iFound, aNbRanges; + Standard_Integer i, iBeg, iEnd, aNbVV, aNbVE, aNbVF, j, iFound;//, aNbRanges; Standard_Real aTol; TopAbs_State aSt; TopAbs_ShapeEnum aType; @@ -145,7 +145,7 @@ void GEOMAlgo_VertexSolid::BuildResult() Handle(IntTools_Context) aCtx=myDSFiller->Context(); BRepClass3d_SolidClassifier& aSC=aCtx->SolidClassifier(aSolid); // - aNbRanges=aDS.NbRanges(); + //aNbRanges=aDS.NbRanges(); const BOPDS_IndexRange& aRange=aDS.Range(myRank); aRange.Indices(iBeg, iEnd); // @@ -165,9 +165,9 @@ void GEOMAlgo_VertexSolid::BuildResult() for (j=0; j( getApp()->activeStudy() ) ) + if( /*SalomeApp_Study* aStudy = */dynamic_cast( getApp()->activeStudy() ) ) { updateFieldColorScale(); } diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index bd1109aea..0f581fe96 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -317,7 +317,7 @@ Standard_Integer GEOMImpl_FillingDriver::Execute(Handle(TFunction_Logbook)& log) Handle(TColStd_HSequenceOfTransient) aConstraints = IF.GetShapes(); - for ( unsigned int ind = 1; ind <= aConstraints->Length(); ind++ ) { + for ( int ind = 1; ind <= aConstraints->Length(); ind++ ) { TopoDS_Edge E; TopoDS_Face F; Handle(GEOM_Function) aRefShape = Handle(GEOM_Function)::DownCast( aConstraints->Value(ind) ); @@ -396,7 +396,7 @@ GetCreationInformation(std::string& theOperationName, } case FILLING_ON_CONSTRAINTS: { - theOperationName = "FACE"; + theOperationName = "FACE"; AddParam( theParams, "Edges/Faces", aCI.GetShapes() ); break; } diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 578ce9e52..39d713281 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -281,8 +281,8 @@ int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe std::list::const_iterator it; for (it = lines.begin(); it != lines.end(); ++it) { std::string line = *it; - int lenline = (line.size()/8 + (line.size()%8 ? 1 : 0)) * 8; - for (int i = 0; i < lenline/8; i++) { + size_t lenline = (line.size()/8 + (line.size()%8 ? 1 : 0)) * 8; + for (size_t i = 0; i < lenline/8; i++) { unsigned char byte = 0; for (int j = 0; j < 8; j++) byte = (byte << 1) + ( i*8+j < line.size() && line[i*8+j] != '0' ? 1 : 0 ); diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index b9598338e..d6f255812 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -736,6 +736,7 @@ GEOMImpl_IMeasureOperations::ShapeKind GEOMImpl_IMeasureOperations::KindOfShape theDoubles->Append(aP.Z()); } break; + default:; } SetErrorCode(OK); @@ -1600,7 +1601,7 @@ bool GEOMImpl_IMeasureOperations::CheckSelfIntersections //============================================================================= bool GEOMImpl_IMeasureOperations::CheckSelfIntersectionsFast (Handle(GEOM_Object) theShape, - float theDeflection, double theTolerance, + float theDeflection, double theTolerance, Handle(TColStd_HSequenceOfInteger)& theIntersections) { SetErrorCode(KO); @@ -1881,7 +1882,7 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object) aListOfShape.Append(s); nbTypes[s.ShapeType()]++; if ((sp.ShapeType() == TopAbs_COMPOUND) || (sp.ShapeType() == TopAbs_COMPSOLID)) { - nbFlatType[s.ShapeType()]++; + nbFlatType[s.ShapeType()]++; } } } @@ -1900,17 +1901,17 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object) if ((aShape.ShapeType() == TopAbs_COMPOUND) || (aShape.ShapeType() == TopAbs_COMPSOLID)){ Astr = Astr + " --------------------- \n Flat content : \n"; if (nbFlatType[TopAbs_VERTEX] > 0) - Astr = Astr + " VERTEX : " + TCollection_AsciiString(nbFlatType[TopAbs_VERTEX]) + "\n"; + Astr = Astr + " VERTEX : " + TCollection_AsciiString(nbFlatType[TopAbs_VERTEX]) + "\n"; if (nbFlatType[TopAbs_EDGE] > 0) - Astr = Astr + " EDGE : " + TCollection_AsciiString(nbFlatType[TopAbs_EDGE]) + "\n"; + Astr = Astr + " EDGE : " + TCollection_AsciiString(nbFlatType[TopAbs_EDGE]) + "\n"; if (nbFlatType[TopAbs_WIRE] > 0) - Astr = Astr + " WIRE : " + TCollection_AsciiString(nbFlatType[TopAbs_WIRE]) + "\n"; + Astr = Astr + " WIRE : " + TCollection_AsciiString(nbFlatType[TopAbs_WIRE]) + "\n"; if (nbFlatType[TopAbs_FACE] > 0) - Astr = Astr + " FACE : " + TCollection_AsciiString(nbFlatType[TopAbs_FACE]) + "\n"; + Astr = Astr + " FACE : " + TCollection_AsciiString(nbFlatType[TopAbs_FACE]) + "\n"; if (nbFlatType[TopAbs_SHELL] > 0) - Astr = Astr + " SHELL : " + TCollection_AsciiString(nbFlatType[TopAbs_SHELL]) + "\n"; + Astr = Astr + " SHELL : " + TCollection_AsciiString(nbFlatType[TopAbs_SHELL]) + "\n"; if (nbFlatType[TopAbs_SOLID] > 0) - Astr = Astr + " SOLID : " + TCollection_AsciiString(nbFlatType[TopAbs_SOLID]) + "\n"; + Astr = Astr + " SOLID : " + TCollection_AsciiString(nbFlatType[TopAbs_SOLID]) + "\n"; } } catch (Standard_Failure& aFail) { diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index 17f3191dd..48ac61f45 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -123,9 +123,9 @@ namespace { else { TopoDS_Iterator It(S, Standard_True, Standard_True); for (; It.More(); It.Next()) { - TopoDS_Shape SS = It.Value(); - if (M.Add(SS)) - AddFlatSubShapes(SS, L, M); + TopoDS_Shape SS = It.Value(); + if (M.Add(SS)) + AddFlatSubShapes(SS, L, M); } } } @@ -1451,11 +1451,10 @@ GEOMImpl_IShapesOperations::GetExistingSubObjects(Handle(GEOM_Object) theShap bool isGroup = anObj->IsKind(STANDARD_TYPE(GEOM_Object)) && anObj->GetType() == GEOM_GROUP; bool isSubShape = anObj->IsKind(STANDARD_TYPE(GEOM_Object)) && anObj->GetType() != GEOM_GROUP; bool isField = anObj->IsKind(STANDARD_TYPE(GEOM_Field)); - if (theTypes & Groups && isGroup || - theTypes & SubShapes && isSubShape || - theTypes & Fields && isField) { + if ((theTypes & Groups && isGroup ) || + (theTypes & SubShapes && isSubShape ) || + (theTypes & Fields && isField )) aSeq->Append(anObj); - } } delete [] anEntryStr; } @@ -1501,11 +1500,11 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode for (; It.More(); It.Next()) { TopoDS_Shape SS = It.Value(); if (mapShape.Add(SS)) { - if (theShapeType == TopAbs_FLAT) { + if (theShapeType == TopAbs_FLAT) { AddFlatSubShapes(SS, listShape, mapShape); - } + } else if (theShapeType == TopAbs_SHAPE || theShapeType == SS.ShapeType()) { - listShape.Append(SS); + listShape.Append(SS); } // VSR: for EXPLODE_NEW_INCLUDE_MAIN and EXPLODE_OLD_INCLUDE_MAIN: // it seems it is necessary to add top-level shape if theShapeType == TopAbs_COMPOUND @@ -1627,9 +1626,9 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs for (; It.More(); It.Next()) { TopoDS_Shape SS = It.Value(); if (mapShape.Add(SS)) { - if (theShapeType == TopAbs_FLAT) { + if (theShapeType == TopAbs_FLAT) { AddFlatSubShapes(SS, listShape, mapShape); - } + } else if (theShapeType == TopAbs_SHAPE || theShapeType == SS.ShapeType()) { listShape.Append(SS); } @@ -2436,7 +2435,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetSharedShapes for (; itSel.More(); itSel.Next()) { const TopoDS_Shape& aSS = itSel.Value(); if (mapShape.Add(aSS) ) - aShared.Append(aSS); + aShared.Append(aSS); } } } @@ -4464,7 +4463,6 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetInPlace (Handle(GEOM_Object) if (aShapeResult.IsNull() == Standard_False) { TopoDS_Iterator anIt(aShapeResult); - Standard_Boolean isFirst = Standard_True; for (; anIt.More(); anIt.Next()) { const TopoDS_Shape &aPart = anIt.Value(); diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index cb80023a6..e33d5a283 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -175,9 +175,9 @@ Standard_Integer GEOMImpl_OffsetDriver::Execute(Handle(TFunction_Logbook)& log) } // Create a hollowed solid. - BRepOffsetAPI_MakeThickSolid aMkSolid - (aShapeBase, aFacesToRm, anOffset, aTol, BRepOffset_Skin, - Standard_False, Standard_False, GeomAbs_Intersection); + BRepOffsetAPI_MakeThickSolid aMkSolid; + aMkSolid.MakeThickSolidByJoin (aShapeBase, aFacesToRm, anOffset, aTol, BRepOffset_Skin, + Standard_False, Standard_False, GeomAbs_Intersection); if (aMkSolid.IsDone()) { aShape = aMkSolid.Shape(); diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 269c7b008..5bb530e39 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -119,12 +119,12 @@ static void StoreGroups(GEOMImpl_IPipe *theCI, // after OCCT improvement static bool DoGroups1(const TopoDS_Shape &theProfile, - BRepOffsetAPI_MakePipeShell &theSweep, - TopTools_SequenceOfShape *theGroups); + BRepOffsetAPI_MakePipeShell &theSweep, + TopTools_SequenceOfShape *theGroups); static bool CreateGroups1(const TopoDS_Shape &theProfile, - BRepOffsetAPI_MakePipeShell &theSweep, - GEOMImpl_IPipe *theCI); + BRepOffsetAPI_MakePipeShell &theSweep, + GEOMImpl_IPipe *theCI); //======================================================================= //function : GetID @@ -1071,7 +1071,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections // Make groups. TopTools_SequenceOfShape aGroups[5]; - TopoDS_Shape aProfile = aTmpSeqBases.Value(1); + TopoDS_Shape aProfile = aTmpSeqBases.Value(1); if (!DoGroups1(aProfile, aBuilder, aGroups)) { Standard_ConstructionError::Raise("Generate groups failure"); } @@ -1134,7 +1134,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections // Make groups. TopTools_SequenceOfShape aGroups[5]; - TopoDS_Shape aProfile = aTmpSeqBases.Value(1); + TopoDS_Shape aProfile = aTmpSeqBases.Value(1); if (!DoGroups1(aProfile, aBuilder, aGroups)) { Standard_ConstructionError::Raise("Generate groups failure"); } @@ -1282,13 +1282,13 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections // Make groups. TopTools_SequenceOfShape aSeqGroups[5]; - TopoDS_Shape aProfile = usedBases.Value(1); + TopoDS_Shape aProfile = usedBases.Value(1); if (!DoGroups1(aProfile, aBuilder, aSeqGroups)) { Standard_ConstructionError::Raise("Generate groups failure"); } // Fill the groups. - Handle(TColStd_HArray1OfInteger) aGroupIds[5]; + //Handle(TColStd_HArray1OfInteger) aGroupIds[5]; TopTools_IndexedMapOfShape anIndices; const TopoDS_Shape aResult = aBuilder.Shape(); @@ -2748,8 +2748,8 @@ static bool CreateDownUpGroups(BRepPrimAPI_MakeSweep *theSweep, //purpose : auxiliary for CreateGroups1() //======================================================================= bool DoGroups1 (const TopoDS_Shape &theProfile, - BRepOffsetAPI_MakePipeShell &theSweep, - TopTools_SequenceOfShape *theGroups) + BRepOffsetAPI_MakePipeShell &theSweep, + TopTools_SequenceOfShape *theGroups) { Standard_Boolean isDoSides = Standard_False; @@ -2792,11 +2792,11 @@ bool DoGroups1 (const TopoDS_Shape &theProfile, } } else if (aSideShape.ShapeType() == TopAbs_WIRE) { if (aMapFence.Add(aSideShape)) { - TopExp_Explorer anExpWE (aSideShape, TopAbs_EDGE); - for (; anExpWE.More(); anExpWE.Next()) { - theGroups[anIdSide].Append(anExpWE.Current()); - } - } + TopExp_Explorer anExpWE (aSideShape, TopAbs_EDGE); + for (; anExpWE.More(); anExpWE.Next()) { + theGroups[anIdSide].Append(anExpWE.Current()); + } + } } else { // Only edges can be in Side1 and Side2 groups. return false; @@ -2837,10 +2837,10 @@ bool DoGroups1 (const TopoDS_Shape &theProfile, } } else if (anOtherShape.ShapeType() == TopAbs_SHELL) { if (aMapFence.Add(anOtherShape)) { - TopExp_Explorer anExpSHF (anOtherShape, TopAbs_FACE); - for (; anExpSHF.More(); anExpSHF.Next()) { - theGroups[GROUP_OTHER].Append(anExpSHF.Current()); - } + TopExp_Explorer anExpSHF (anOtherShape, TopAbs_FACE); + for (; anExpSHF.More(); anExpSHF.Next()) { + theGroups[GROUP_OTHER].Append(anExpSHF.Current()); + } } } else { // Only faces can be in Other group. @@ -2859,8 +2859,8 @@ bool DoGroups1 (const TopoDS_Shape &theProfile, //purpose : auxiliary for Execute() //======================================================================= bool CreateGroups1 (const TopoDS_Shape &theProfile, - BRepOffsetAPI_MakePipeShell &theSweep, - GEOMImpl_IPipe *theCI) + BRepOffsetAPI_MakePipeShell &theSweep, + GEOMImpl_IPipe *theCI) { if (!theCI->GetGenerateGroups()) { // Nothing to do. @@ -2896,8 +2896,8 @@ bool CreateGroups1 (const TopoDS_Shape &theProfile, //purpose : auxiliary for CreateGroups() //======================================================================= static bool DoGroups2(const TopoDS_Shape &theProfile, - const TopoDS_Shape &thePath, - BRepOffsetAPI_MakePipe &theSweep, + const TopoDS_Shape &thePath, + BRepOffsetAPI_MakePipe &theSweep, TopTools_SequenceOfShape *theGroups) { Standard_Boolean isDoSides = Standard_False; @@ -2984,9 +2984,9 @@ static bool DoGroups2(const TopoDS_Shape &theProfile, //purpose : auxiliary for Execute() //======================================================================= static bool CreateGroups2(const TopoDS_Shape &theProfile, - const TopoDS_Shape &thePath, - BRepOffsetAPI_MakePipe &theSweep, - GEOMImpl_IPipe *theCI) + const TopoDS_Shape &thePath, + BRepOffsetAPI_MakePipe &theSweep, + GEOMImpl_IPipe *theCI) { if (!theCI->GetGenerateGroups()) { // Nothing to do. diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index ccc9a793f..76b58c8aa 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -374,11 +374,11 @@ GetCreationInformation(std::string& theOperationName, { Handle(TColStd_HArray1OfReal) coords = aCI.GetCoordinates(); GEOM_Param& pntParam = AddParam( theParams, "Points"); - pntParam << ( coords->Length() ) / 3 << " points: "; - for ( int i = coords->Lower(), nb = coords->Upper(); i <= nb; ) - pntParam << "( " << coords->Value( i++ ) - << ", " << coords->Value( i++ ) - << ", " << coords->Value( i++ ) << " ) "; + pntParam << ( coords->Length() / 3 ) << " points: "; + for ( int i = coords->Lower(), nb = coords->Upper(); i <= nb; i += 3 ) + pntParam << "( " << coords->Value( i+0 ) + << ", " << coords->Value( i+1 ) + << ", " << coords->Value( i+2 ) << " ) "; } else { diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc index 87a697c9b..b521f2f1d 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -210,7 +210,7 @@ CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo if ( theTexture.length() > 0 ) { aTexture = new TColStd_HArray1OfByte (1, theTexture.length()); - for ( int i = 0; i < theTexture.length(); i++ ) + for ( CORBA::ULong i = 0; i < theTexture.length(); i++ ) aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] ); } return GetOperations()->AddTexture( theWidth, theHeight, aTexture ); diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 591861013..ad7fe1b03 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -936,7 +936,7 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_ //Set a not done flag GetOperations()->SetNotDone(); - unsigned int nb_points = theCoords.length()/3; + int nb_points = theCoords.length()/3; GEOM::ListOfBool_var aResults = new GEOM::ListOfBool; aResults->length(nb_points); @@ -947,8 +947,8 @@ GEOM::ListOfBool* GEOM_IMeasureOperations_i::AreCoordsInside (GEOM::GEOM_Object_ for (int i = 0; i < 3*nb_points; i++) tmp[i] = theCoords[i]; std::vector res = GetOperations()->AreCoordsInside(aShape, tmp, tolerance); - for (int i = 0; i < nb_points; i++) - aResults[i] = i < res.size() ? res[i] : false; + for (int i = 0, resSize = res.size(); i < nb_points; i++) + aResults[i] = i < resSize ? res[i] : false; return aResults._retn(); } diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index 0f18c5bb0..e7a0b404d 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -323,7 +323,7 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::MakeFaceWithConstraints //Get the shapes std::list aConstraints; - for( int ind = 0; ind < theConstraints.length(); ind++ ) { + for( CORBA::ULong ind = 0; ind < theConstraints.length(); ind++ ) { Handle(::GEOM_Object) anObject = GetObjectImpl( theConstraints[ind] ); aConstraints.push_back(anObject); } @@ -906,7 +906,6 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t const GEOM::ListOfLong& theIndices) { GEOM::ListOfGO_var aSeq = new GEOM::ListOfGO; - Standard_Integer i; //Set a not done flag GetOperations()->SetNotDone(); @@ -918,7 +917,7 @@ GEOM::ListOfGO* GEOM_IShapesOperations_i::MakeSubShapes (GEOM::GEOM_Object_ptr t if (aShape.IsNull()) return aSeq._retn(); Handle(TColStd_HArray1OfInteger) anArray = new TColStd_HArray1OfInteger (1, theIndices.length()); - for (i = 0; i < theIndices.length(); i++) + for (CORBA::ULong i = 0; i < theIndices.length(); i++) anArray->SetValue(i+1, theIndices[i]); Handle(TColStd_HSequenceOfTransient) aHSeq = GetOperations()->MakeSubShapes(aShape, anArray); @@ -927,7 +926,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++) + for (int i = 0; i < aLength; i++) aSeq[i] = GetObject(Handle(::GEOM_Object)::DownCast(aHSeq->Value(i+1))); return aSeq._retn(); diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc index 1ba007067..426aebb56 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.cc +++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc @@ -2064,7 +2064,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShape (GEOM::GEOM_Object_ptr theObjec beginService( " GEOM_Superv_i::OffsetShape" ); MESSAGE("GEOM_Superv_i::OffsetShape"); getTransfOp(); - GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShape(theObject, theOffset); + GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShape(theObject, theOffset, true); endService( " GEOM_Superv_i::OffsetShape" ); return anObj; } @@ -2078,7 +2078,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theO beginService( " GEOM_Superv_i::OffsetShapeCopy" ); MESSAGE("GEOM_Superv_i::OffsetShapeCopy"); getTransfOp(); - GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShapeCopy(theObject, theOffset); + GEOM::GEOM_Object_ptr anObj = myTransfOp->OffsetShapeCopy(theObject, theOffset, true); endService( " GEOM_Superv_i::OffsetShapeCopy" ); return anObj; } diff --git a/src/IGESPlugin/IGESPlugin_GUI.cxx b/src/IGESPlugin/IGESPlugin_GUI.cxx index 1e9f9ac63..956303a92 100644 --- a/src/IGESPlugin/IGESPlugin_GUI.cxx +++ b/src/IGESPlugin/IGESPlugin_GUI.cxx @@ -96,7 +96,7 @@ bool IGESPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* pare getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) ); } - return true; + return true; // ????????????? } //======================================================================= diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index 3104e5007..422f2b740 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -111,20 +111,21 @@ GEOM_Actor::GEOM_Actor(): myShadingFaceSource(GEOM_ShadingFace::New(),true), myHighlightActor(GEOM_DeviceActor::New(),true), - myAppendFilter(vtkAppendPolyData::New(),true), - // Use mapper as an instance of GEOM_PainterPolyDataMapper class - // to prevent drawing of mappers' content (due to an empty definition - // of GEOM_PainterPolyDataMapper::RenderPiece(...)). - // !!! Presentation of GEOM_Actor is drawing only with help of actors - // defined in this class !!! - myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true), myTextActor( vtkTextActor::New() ), myHighlightProp(vtkProperty::New()), myPreHighlightProp(vtkProperty::New()), myShadingFaceProp(vtkProperty::New()), - myShadingBackFaceProp(vtkProperty::New()) + myShadingBackFaceProp(vtkProperty::New()), + + myAppendFilter(vtkAppendPolyData::New(),true), + // Use mapper as an instance of GEOM_PainterPolyDataMapper class + // to prevent drawing of mappers' content (due to an empty definition + // of GEOM_PainterPolyDataMapper::RenderPiece(...)). + // !!! Presentation of GEOM_Actor is drawing only with help of actors + // defined in this class !!! + myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true) { #ifdef MYDEBUG MESSAGE (this<< " GEOM_Actor::GEOM_Actor"); diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx index a52746c3a..8611d3e96 100644 --- a/src/OBJECT/GEOM_OCCReader.cxx +++ b/src/OBJECT/GEOM_OCCReader.cxx @@ -484,6 +484,7 @@ void GEOM_OCCReader::DrawIso(GeomAbs_IsoType T, case GeomAbs_Hyperbola : case GeomAbs_BezierCurve : case GeomAbs_BSplineCurve : + case GeomAbs_OffsetCurve: case GeomAbs_OtherCurve : for (j = 1; j <= myDiscret/2; j++) { @@ -558,9 +559,8 @@ void GEOM_OCCReader::PlotIso (BRepAdaptor_Surface& S, void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge, vtkPoints* Pts, - vtkCellArray* Cells) { - - + vtkCellArray* Cells) +{ Handle(Poly_PolygonOnTriangulation) aEdgePoly; Standard_Integer i = 1; Handle(Poly_Triangulation) T; @@ -786,11 +786,12 @@ void GEOM_OCCReader::TransferEdgeWData(const TopoDS_Edge& aEdge, //======================================================================= void GEOM_OCCReader::TransferVertexWData(const TopoDS_Vertex& aVertex, - vtkPoints* Pts, - vtkCellArray* Cells) { -#define ZERO_COORD coord[0] = 0.0; coord[1] = 0.0; coord[2] = 0.0 + vtkPoints* Pts, + vtkCellArray* Cells) +{ +#define ZERO_COORD coord[0] = coord[1] = coord[2] = 0.0 - gp_Pnt P = BRep_Tool::Pnt( aVertex ); + // gp_Pnt P = BRep_Tool::Pnt( aVertex ); ?????????????????????????? float delta = 1, coord[3]; vtkIdType pts[2]; // insert pt diff --git a/src/STLPlugin/STLPlugin_GUI.cxx b/src/STLPlugin/STLPlugin_GUI.cxx index 7d0ced2eb..cbe86160a 100644 --- a/src/STLPlugin/STLPlugin_GUI.cxx +++ b/src/STLPlugin/STLPlugin_GUI.cxx @@ -96,7 +96,7 @@ bool STLPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* paren getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) ); } - return true; + return true; // ????????? } //======================================================================= diff --git a/src/VTKPlugin/VTKPlugin_GUI.cxx b/src/VTKPlugin/VTKPlugin_GUI.cxx index e8124fa20..332f62c0a 100644 --- a/src/VTKPlugin/VTKPlugin_GUI.cxx +++ b/src/VTKPlugin/VTKPlugin_GUI.cxx @@ -89,7 +89,7 @@ bool VTKPlugin_GUI::OnGUIEvent( const QString& theCommandID, SUIT_Desktop* paren getGeometryGUI()->getApp()->putInfo( tr("GEOM_PRP_COMMAND").arg( theCommandID ) ); } - return true; + return true; // ??????????? } //======================================================================= @@ -125,10 +125,10 @@ bool VTKPlugin_GUI::exportVTK( SUIT_Desktop* parent ) double deflection = 0.; QString fileName = VTKPlugin_ExportDlg::getFileName( io, - tr( "VTK_FILES" ), - tr( "EXPORT_TITLE" ), - parent, - deflection ); + tr( "VTK_FILES" ), + tr( "EXPORT_TITLE" ), + parent, + deflection ); if ( fileName.isEmpty() ) return false; @@ -146,15 +146,15 @@ bool VTKPlugin_GUI::exportVTK( SUIT_Desktop* parent ) if ( vtkOp->IsDone() ) { - transaction.commit(); + transaction.commit(); } else { - transaction.abort(); - SUIT_MessageBox::critical( parent, - tr( "GEOM_ERROR" ), - tr( "GEOM_PRP_ABORT" ) + "\n" + tr( vtkOp->GetErrorCode() ) ); - return false; + transaction.abort(); + SUIT_MessageBox::critical( parent, + tr( "GEOM_ERROR" ), + tr( "GEOM_PRP_ABORT" ) + "\n" + tr( vtkOp->GetErrorCode() ) ); + return false; } } catch ( const SALOME::SALOME_Exception& e ) @@ -168,8 +168,8 @@ bool VTKPlugin_GUI::exportVTK( SUIT_Desktop* parent ) if ( !ok ) { SUIT_MessageBox::warning( parent, - tr( "WRN_WARNING" ), - tr( "GEOM_WRN_NO_APPROPRIATE_SELECTION" ) ); + tr( "WRN_WARNING" ), + tr( "GEOM_WRN_NO_APPROPRIATE_SELECTION" ) ); } return ok; } From 47d7c598f5ec82d30ff212c8262d23e760d1a908 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 14 Dec 2017 14:59:19 +0300 Subject: [PATCH 26/26] 0023451: EDF - Remove Extra edges --- src/BlockFix/BlockFix_UnionFaces.cxx | 217 ++++++++++++++++++++++++++- 1 file changed, 216 insertions(+), 1 deletion(-) diff --git a/src/BlockFix/BlockFix_UnionFaces.cxx b/src/BlockFix/BlockFix_UnionFaces.cxx index 9a42dde43..7406cd4df 100644 --- a/src/BlockFix/BlockFix_UnionFaces.cxx +++ b/src/BlockFix/BlockFix_UnionFaces.cxx @@ -26,6 +26,8 @@ #include +#include + #include #include @@ -82,6 +84,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -233,11 +239,164 @@ static Standard_Boolean IsFacesOfSameSolids return isSame; } +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV +//======================================================================= +//function : IsTangentFaces +//purpose : decides: is edge on closed surface tangent or not +//======================================================================= +static Standard_Boolean IsTangentFaces(const TopoDS_Edge& theEdge, + const TopoDS_Face& theFace) +{ + Standard_Real TolC0 = Max(0.001, 1.5*BRep_Tool::Tolerance(theEdge)); + + Standard_Real aFirst; + Standard_Real aLast; + +// Obtaining of pcurves of edge on two faces. + const Handle(Geom2d_Curve) aC2d1 = BRep_Tool::CurveOnSurface + (theEdge, theFace, aFirst, aLast); + TopoDS_Edge ReversedEdge = theEdge; + ReversedEdge.Reverse(); + const Handle(Geom2d_Curve) aC2d2 = BRep_Tool::CurveOnSurface + (ReversedEdge, theFace, aFirst, aLast); + if (aC2d1.IsNull() || aC2d2.IsNull()) + return Standard_False; + +// Obtaining of two surfaces from adjacent faces. + Handle(Geom_Surface) aSurf = BRep_Tool::Surface(theFace); + + if (aSurf.IsNull()) + return Standard_False; + +// Computation of the number of samples on the edge. + BRepAdaptor_Surface aBAS(theFace); + Handle(BRepAdaptor_HSurface) aBAHS = new BRepAdaptor_HSurface(aBAS); + Handle(BRepTopAdaptor_TopolTool) aTool = new BRepTopAdaptor_TopolTool(aBAHS); + Standard_Integer aNbSamples = aTool->NbSamples(); + const Standard_Integer aNbSamplesMax = 23; + aNbSamples = Min(aNbSamplesMax, aNbSamples); + const Standard_Real aTolAngle = M_PI/18; + + +// Computation of the continuity. + Standard_Real aPar; + Standard_Real aDelta = (aLast - aFirst)/(aNbSamples - 1); + Standard_Integer i, nbNotDone = 0; + + for (i = 1, aPar = aFirst; i <= aNbSamples; i++, aPar += aDelta) { + if (i == aNbSamples) aPar = aLast; + + LocalAnalysis_SurfaceContinuity aCont(aC2d1, aC2d2, aPar, + aSurf, aSurf, GeomAbs_G1, + 0.001, TolC0, aTolAngle, 0.1, 0.1); + if (!aCont.IsDone()) + { + nbNotDone++; + continue; + } + + if (!aCont.IsG1()) + return Standard_False; + } + + if (nbNotDone == aNbSamples) + return Standard_False; + + return Standard_True; +} + +//======================================================================= +//function : HasSeamEdge +//purpose : Detects if a face contains a seam edge +//======================================================================= +static Standard_Boolean HasSeamEdge(const TopoDS_Face& theFace) +{ + TopExp_Explorer Explo(theFace, TopAbs_EDGE); + for (; Explo.More(); Explo.Next()) + { + const TopoDS_Edge& anEdge = TopoDS::Edge(Explo.Current()); + if (BRepTools::IsReallyClosed(anEdge, theFace)) + return Standard_True; + } + + return Standard_False; +} +#endif + //======================================================================= //function : IsEdgeValidToMerge //purpose : Edge is valid if it is not seam or if it is a seam and the face // has another seam edge. //======================================================================= +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV +static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge& theEdge, + const TopoDS_Face& theFace, + const Handle(Geom_Surface)& theSurface, + Standard_Boolean& theIsEdgeOnSeam, + Standard_Boolean& theToMakeUPeriodic, + Standard_Boolean& theToMakeVPeriodic) +{ + Standard_Boolean isValid = Standard_True; + + theIsEdgeOnSeam |= BRep_Tool::IsClosed(theEdge, theFace); + + if (BRepTools::IsReallyClosed(theEdge, theFace)) { + // Mantis issue 0023451, now code corresponds to the comment to this method + isValid = Standard_False; + + // This is a seam edge. Check if there are another seam edges on the face. + TopExp_Explorer anExp(theFace, TopAbs_EDGE); + + for (; anExp.More(); anExp.Next()) { + const TopoDS_Shape &aShEdge = anExp.Current(); + + // Skip same edge. + if (theEdge.IsSame(aShEdge)) { + continue; + } + + // Check if this edge is a seam. + TopoDS_Edge anEdge = TopoDS::Edge(aShEdge); + + if (BRep_Tool::IsClosed(anEdge, theFace)) { + // Mantis issue 0023451, now code corresponds to the comment to this method + //isValid = Standard_False; + isValid = Standard_True; + break; + } + } + } + else if (theIsEdgeOnSeam) + { + Standard_Real fpar, lpar; + Handle(Geom2d_Curve) aPCurve = BRep_Tool::CurveOnSurface(theEdge, theFace, fpar, lpar); + gp_Pnt2d P2d1 = aPCurve->Value(fpar); + gp_Pnt2d P2d2 = aPCurve->Value(lpar); + if (!theSurface->IsUPeriodic() && + theSurface->IsUClosed() && + Abs(P2d1.X() - P2d2.X()) < Abs(P2d1.Y() - P2d2.Y())) + { + if (IsTangentFaces(theEdge, theFace)) + theToMakeUPeriodic = Standard_True; + else + isValid = Standard_False; + } + if (!theSurface->IsVPeriodic() && + theSurface->IsVClosed() && + Abs(P2d1.Y() - P2d2.Y()) < Abs(P2d1.X() - P2d2.X())) + { + if (IsTangentFaces(theEdge, theFace)) + theToMakeVPeriodic = Standard_True; + else + isValid = Standard_False; + } + } + + return isValid; +} +#else static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge &theEdge, const TopoDS_Face &theFace) { @@ -267,6 +426,7 @@ static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge &theEdge, return isValid; } +#endif //======================================================================= //function : Perform @@ -334,12 +494,26 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(aFace,aBaseLocation); aBaseSurface = ClearRts(aBaseSurface); aBaseSurface = Handle(Geom_Surface)::DownCast(aBaseSurface->Copy()); +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV + Standard_Boolean ToMakeUPeriodic = Standard_False, ToMakeVPeriodic = Standard_False; +#endif // find adjacent faces to union Standard_Integer i; for (i = 1; i <= edges.Length(); i++) { TopoDS_Edge edge = TopoDS::Edge(edges(i)); - if (BRep_Tool::Degenerated(edge) || !IsEdgeValidToMerge(edge, aFace)) +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV + Standard_Boolean IsEdgeOnSeam = Standard_False; +#endif + if (BRep_Tool::Degenerated(edge) || +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV + !IsEdgeValidToMerge(edge, aFace, aBaseSurface, IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic)) +#else + !IsEdgeValidToMerge(edge, aFace)) +#endif continue; const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge); @@ -352,7 +526,13 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) if (aProcessed.Contains(anCheckedFace)) continue; +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV + if (!IsEdgeValidToMerge(edge, anCheckedFace, aBaseSurface, + IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic)) { +#else if (!IsEdgeValidToMerge(edge, anCheckedFace)) { +#endif // Skip seam edge. continue; } @@ -369,6 +549,14 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) continue; } +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV + //Prevent creating a face with parametric range more than period + if (IsEdgeOnSeam && + (HasSeamEdge(aFace) || HasSeamEdge(anCheckedFace))) + continue; +#endif + // replacing pcurves TopoDS_Face aMockUpFace; BRep_Builder B; @@ -392,6 +580,30 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) NbModif++; TopoDS_Face aResult; BRep_Builder B; +#if OCC_VERSION_LARGE > 0x07020001 +// for Mantis issue 0023451 by JGV + if (ToMakeUPeriodic || ToMakeVPeriodic) + { + Handle(Geom_BSplineSurface) aBSplineSurface = Handle(Geom_BSplineSurface)::DownCast(aBaseSurface); + if (aBSplineSurface.IsNull()) + { + Standard_Real aTol = 1.e-4; + GeomAbs_Shape aUCont = GeomAbs_C1, aVCont = GeomAbs_C1; + Standard_Integer degU = 14, degV = 14; + Standard_Integer nmax = 16; + Standard_Integer aPrec = 1; + GeomConvert_ApproxSurface Approximator(aBaseSurface,aTol,aUCont,aVCont,degU,degV,nmax,aPrec); + aBSplineSurface = Approximator.Surface(); + } + + if (ToMakeUPeriodic) + aBSplineSurface->SetUPeriodic(); + if (ToMakeVPeriodic) + aBSplineSurface->SetVPeriodic(); + + aBaseSurface = aBSplineSurface; + } +#endif B.MakeFace(aResult,aBaseSurface,aBaseLocation,0); Standard_Integer nbWires = 0; @@ -516,6 +728,9 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape) sff.SetMaxTolerance(Max(1.,myTolerance*1000.)); //Setting modes sff.FixOrientationMode() = 0; +#if OCC_VERSION_LARGE > 0x07020001 + sff.FixWireTool()->CheckMissingEdgesMode() = Standard_False; +#endif //sff.FixWireMode() = 0; sff.SetContext(aContext); // Applying the fixes