From 4342afbfe2200029e4f46962ee9ae797562a4a2b Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 3 Nov 2016 15:37:32 +0300 Subject: [PATCH] Delete boolean parameter of UpdateObjBrowser method --- doc/salome/examples/GEOM_box.py | 2 +- doc/salome/examples/arranging_study_objects.py | 2 +- doc/salome/examples/blocks_operations_ex03.py | 2 +- doc/salome/examples/repairing_operations_ex08.py | 2 +- doc/salome/examples/repairing_operations_ex10.py | 2 +- doc/salome/examples/repairing_operations_ex11.py | 2 +- doc/salome/examples/repairing_operations_ex12.py | 2 +- doc/salome/examples/working_with_groups_ex01.py | 2 +- doc/salome/examples/working_with_groups_ex02.py | 2 +- doc/salome/examples/working_with_groups_ex03.py | 2 +- doc/salome/examples/working_with_groups_ex04.py | 2 +- doc/salome/examples/working_with_groups_ex05.py | 2 +- doc/salome/examples/working_with_groups_ex06.py | 2 +- src/BREPPlugin/BREPPlugin_GUI.cxx | 2 +- src/GEOMBase/GEOMBase_Helper.cxx | 2 +- src/GEOMImpl/GEOMImpl_Gen.cxx | 14 ++++++++++++++ src/GEOM_PY/geomtools.py | 2 +- src/GEOM_PY/structelem/__init__.py | 6 +++--- src/GEOM_SWIG/GEOM_Nut.py | 2 +- src/GEOM_SWIG/GEOM_ObjectInfo.py | 2 +- src/GEOM_SWIG/GEOM_blocks.py | 2 +- src/GEOM_SWIG/GEOM_cyl2complementary.py | 2 +- src/GEOM_SWIG/GEOM_shellSolid.py | 2 +- src/GEOM_SWIG/GEOM_tube_geom.py | 2 +- src/GEOM_SWIG/PAL_MESH_019_020_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_028_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_030_geometry.py | 2 +- src/GEOM_SWIG/PAL_MESH_033_geometry.py | 2 +- src/GEOM_SWIG/geomBuilder.py | 2 +- src/GEOM_SWIG/gsketcher.py | 2 +- src/IGESPlugin/IGESPlugin_GUI.cxx | 2 +- src/STEPPlugin/STEPPlugin_GUI.cxx | 2 +- src/STLPlugin/STLPlugin_GUI.cxx | 2 +- 33 files changed, 48 insertions(+), 34 deletions(-) diff --git a/doc/salome/examples/GEOM_box.py b/doc/salome/examples/GEOM_box.py index 7469790b3..08815753a 100644 --- a/doc/salome/examples/GEOM_box.py +++ b/doc/salome/examples/GEOM_box.py @@ -13,4 +13,4 @@ geompy.addToStudy( Box_1, 'Box_1' ) # --- update the study object browser if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/arranging_study_objects.py b/doc/salome/examples/arranging_study_objects.py index 149cff480..e31a77a42 100644 --- a/doc/salome/examples/arranging_study_objects.py +++ b/doc/salome/examples/arranging_study_objects.py @@ -22,4 +22,4 @@ geompy.PutListToFolder([Box_1, Cylinder_1], Primitives) if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/blocks_operations_ex03.py b/doc/salome/examples/blocks_operations_ex03.py index 384c4e1ae..48c4192c5 100644 --- a/doc/salome/examples/blocks_operations_ex03.py +++ b/doc/salome/examples/blocks_operations_ex03.py @@ -20,4 +20,4 @@ for chain in listChains: ii = ii + 1 pass -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/repairing_operations_ex08.py b/doc/salome/examples/repairing_operations_ex08.py index 5266bc3a6..d76f55cef 100644 --- a/doc/salome/examples/repairing_operations_ex08.py +++ b/doc/salome/examples/repairing_operations_ex08.py @@ -30,4 +30,4 @@ geompy.addToStudy(glue1, "Glue all edges") geompy.addToStudy(glue2, "Glue two edges") if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/repairing_operations_ex10.py b/doc/salome/examples/repairing_operations_ex10.py index bf823db92..333af162f 100644 --- a/doc/salome/examples/repairing_operations_ex10.py +++ b/doc/salome/examples/repairing_operations_ex10.py @@ -40,4 +40,4 @@ edge = geompy.GetEdgeNearPoint( box, p1, theName="edge to split") div = geompy.DivideEdgeByPoint( box, edge, [p1, p2], theName="box (edge divided)") -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/repairing_operations_ex11.py b/doc/salome/examples/repairing_operations_ex11.py index c243e5118..68a2d377b 100644 --- a/doc/salome/examples/repairing_operations_ex11.py +++ b/doc/salome/examples/repairing_operations_ex11.py @@ -49,4 +49,4 @@ for wire in wires: ii = ii + 1 pass -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/repairing_operations_ex12.py b/doc/salome/examples/repairing_operations_ex12.py index 4075e1bc1..e9ff7fe99 100644 --- a/doc/salome/examples/repairing_operations_ex12.py +++ b/doc/salome/examples/repairing_operations_ex12.py @@ -23,4 +23,4 @@ geompy.addToStudy(Partition_1, 'Partition_1') Joined_1 = geompy.RemoveInternalFaces(Partition_1) geompy.addToStudy(Joined_1, 'Joined_1') -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/working_with_groups_ex01.py b/doc/salome/examples/working_with_groups_ex01.py index 4133965f4..c159a3d5f 100644 --- a/doc/salome/examples/working_with_groups_ex01.py +++ b/doc/salome/examples/working_with_groups_ex01.py @@ -37,4 +37,4 @@ id_group1 = geompy.addToStudy(group, "Group1") # display the contents of the group gg.createAndDisplayGO(id_group1) -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/working_with_groups_ex02.py b/doc/salome/examples/working_with_groups_ex02.py index 773043b88..c52b22cb2 100644 --- a/doc/salome/examples/working_with_groups_ex02.py +++ b/doc/salome/examples/working_with_groups_ex02.py @@ -26,4 +26,4 @@ id_group1 = geompy.addToStudy(group, "Group1") # display the contents of the group gg.createAndDisplayGO(id_group1) -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/working_with_groups_ex03.py b/doc/salome/examples/working_with_groups_ex03.py index a9637afc7..86318d15f 100644 --- a/doc/salome/examples/working_with_groups_ex03.py +++ b/doc/salome/examples/working_with_groups_ex03.py @@ -33,4 +33,4 @@ id_group1 = geompy.addToStudy(group, "Group1") # display the contents of the group gg.createAndDisplayGO(id_group1) -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/working_with_groups_ex04.py b/doc/salome/examples/working_with_groups_ex04.py index f48fef725..3cabc6f4c 100644 --- a/doc/salome/examples/working_with_groups_ex04.py +++ b/doc/salome/examples/working_with_groups_ex04.py @@ -29,4 +29,4 @@ geompy.addToStudyInFather(Box_1, Group_3, 'Group_3') geompy.addToStudyInFather(Box_1, Group_4, 'Group_4') geompy.addToStudyInFather(Box_1, Group_U_1_2, 'Group_U_1_2') geompy.addToStudyInFather(Box_1, Group_UL_3_4, 'Group_UL_3_4') -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/working_with_groups_ex05.py b/doc/salome/examples/working_with_groups_ex05.py index 551f84755..474655333 100644 --- a/doc/salome/examples/working_with_groups_ex05.py +++ b/doc/salome/examples/working_with_groups_ex05.py @@ -29,4 +29,4 @@ geompy.addToStudyInFather(Box_1, Group_3, 'Group_3') geompy.addToStudyInFather(Box_1, Group_4, 'Group_4') geompy.addToStudyInFather(Box_1, Group_I_1_3, 'Group_I_1_3') geompy.addToStudyInFather(Box_1, Group_IL_1_3, 'Group_IL_1_3') -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/doc/salome/examples/working_with_groups_ex06.py b/doc/salome/examples/working_with_groups_ex06.py index 155c4a115..82de29552 100644 --- a/doc/salome/examples/working_with_groups_ex06.py +++ b/doc/salome/examples/working_with_groups_ex06.py @@ -29,4 +29,4 @@ geompy.addToStudyInFather(Box_1, Group_3, 'Group_3') geompy.addToStudyInFather(Box_1, Group_4, 'Group_4') geompy.addToStudyInFather(Box_1, Group_C_2_4, 'Group_C_2_4') geompy.addToStudyInFather(Box_1, Group_CL_2_4, 'Group_CL_2_4') -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/BREPPlugin/BREPPlugin_GUI.cxx b/src/BREPPlugin/BREPPlugin_GUI.cxx index 3d28b8177..bb1a0699f 100644 --- a/src/BREPPlugin/BREPPlugin_GUI.cxx +++ b/src/BREPPlugin/BREPPlugin_GUI.cxx @@ -157,7 +157,7 @@ bool BREPPlugin_GUI::importBREP( SUIT_Desktop* parent ) transaction.abort(); } } - getGeometryGUI()->updateObjBrowser( true ); + getGeometryGUI()->updateObjBrowser(); app->browseObjects( entryList ); if ( errors.count() > 0 ) diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index 145b6b8e5..1e1293835 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -640,7 +640,7 @@ void GEOMBase_Helper::updateObjBrowser() const CAM_Module* module = app->module( "Geometry" ); SalomeApp_Module* appMod = dynamic_cast( module ); if ( appMod ) { - appMod->updateObjBrowser( true ); + appMod->updateObjBrowser(); } } } diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index 64aed53d2..eb91f194e 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -169,6 +169,20 @@ GEOMImpl_Gen::GEOMImpl_Gen() /*@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@*/ SetEngine(this); + + _BasicOperations = new GEOMImpl_IBasicOperations( this ); + _TransformOperations = new GEOMImpl_ITransformOperations( this ); + _3DPrimOperations = new GEOMImpl_I3DPrimOperations( this ); + _ShapesOperations = new GEOMImpl_IShapesOperations( this ); + _BlocksOperations = new GEOMImpl_IBlocksOperations( this ); + _BooleanOperations = new GEOMImpl_IBooleanOperations( this ); + _HealingOperations = new GEOMImpl_IHealingOperations( this ); + _CurvesOperations = new GEOMImpl_ICurvesOperations( this ); + _LocalOperations = new GEOMImpl_ILocalOperations( this ); + _InsertOperations = new GEOMImpl_IInsertOperations( this ); + _MeasureOperations = new GEOMImpl_IMeasureOperations( this ); + _GroupOperations = new GEOMImpl_IGroupOperations( this ); + _FieldOperations = new GEOMImpl_IFieldOperations( this ); } //============================================================================= diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py index ca263159f..e7a35320d 100644 --- a/src/GEOM_PY/geomtools.py +++ b/src/GEOM_PY/geomtools.py @@ -323,7 +323,7 @@ def TEST_createBox(): box = geompy.MakeBoxDXDYDZ(200, 200, 200) geompy.addToStudy( box, 'box' ) if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() def TEST_getGeomObjectSelected(): diff --git a/src/GEOM_PY/structelem/__init__.py b/src/GEOM_PY/structelem/__init__.py index 050636b78..6b985d7ae 100644 --- a/src/GEOM_PY/structelem/__init__.py +++ b/src/GEOM_PY/structelem/__init__.py @@ -50,7 +50,7 @@ # structElemManager = StructuralElementManager() # elem = structElemManager.createElement(commandList) # elem.display() -# salome.sg.updateObjBrowser(True) +# salome.sg.updateObjBrowser() # \endcode # # \defgroup orientation @@ -90,7 +90,7 @@ Example:: structElemManager = StructuralElementManager() elem = structElemManager.createElement(commandList) elem.display() - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() """ @@ -560,7 +560,7 @@ def TEST_StructuralElement(): elem = structElemManager.createElement(liste_commandes) if salome.hasDesktop(): elem.display() - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() # Main function only used to test the module diff --git a/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py index 23343c3f7..0e966957d 100755 --- a/src/GEOM_SWIG/GEOM_Nut.py +++ b/src/GEOM_SWIG/GEOM_Nut.py @@ -91,5 +91,5 @@ geompy.addToStudy(theShapeForCut, "slot.brep_1") Cut_1 = geompy.MakeBoolean(Chamfer_2, theShapeForCut, 2) geompy.addToStudy(Cut_1, "Cut_1") -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py index d3b3d63c5..d6f8f6b8d 100644 --- a/src/GEOM_SWIG/GEOM_ObjectInfo.py +++ b/src/GEOM_SWIG/GEOM_ObjectInfo.py @@ -55,4 +55,4 @@ if hasInfo == True: print "Information about fourth object: ", geompy.getObjectInfo(obj4_entry) print "Information about fifth object: ", geompy.getObjectInfo(obj5_entry) -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py index c33b2c446..74345a490 100644 --- a/src/GEOM_SWIG/GEOM_blocks.py +++ b/src/GEOM_SWIG/GEOM_blocks.py @@ -42,4 +42,4 @@ smesh = None GEOM_Spanner.MakeSpanner(geompy, math, isBlocksTest, isMeshTest, smesh) -salome.sg.updateObjBrowser(True); +salome.sg.updateObjBrowser(); diff --git a/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py index 8f2fd6f84..14addc8f9 100755 --- a/src/GEOM_SWIG/GEOM_cyl2complementary.py +++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py @@ -41,7 +41,7 @@ geomgui = salome.ImportComponentGUI("GEOM") import salome_ComponentGUI def addToStudy(shape, name): i = geompy.addToStudy(shape, name) - salome.sg.updateObjBrowser(False) + salome.sg.updateObjBrowser() if not isinstance(geomgui, type(salome_ComponentGUI)): geomgui.createAndDisplayGO(i) return i diff --git a/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py index c776a0366..902560268 100755 --- a/src/GEOM_SWIG/GEOM_shellSolid.py +++ b/src/GEOM_SWIG/GEOM_shellSolid.py @@ -48,7 +48,7 @@ geomgui = salome.ImportComponentGUI("GEOM") def addToStudy(shape, name): i = geompy.addToStudy(shape, name) - salome.sg.updateObjBrowser(False) + salome.sg.updateObjBrowser() # geomgui.createAndDisplayGO(i) return i diff --git a/src/GEOM_SWIG/GEOM_tube_geom.py b/src/GEOM_SWIG/GEOM_tube_geom.py index 1a496174d..29b197e68 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom.py +++ b/src/GEOM_SWIG/GEOM_tube_geom.py @@ -159,7 +159,7 @@ weldId = geompy.addToStudy(weld,"weld") # assemblage = geompy.Partition([base ,weld ,trav]) assemblageId = geompy.addToStudy(assemblage, "assemblage") -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() # # Display # diff --git a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py index 0278053e4..50aab0c55 100755 --- a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py @@ -57,4 +57,4 @@ geompy.addToStudy(Curve_1, "Curve_1") Line_1 = geompy.MakeLineTwoPnt(Vertex_4, Vertex_5) geompy.addToStudy(Line_1, "Line_1") -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/GEOM_SWIG/PAL_MESH_028_geometry.py b/src/GEOM_SWIG/PAL_MESH_028_geometry.py index e2c0d4906..b40548d8e 100755 --- a/src/GEOM_SWIG/PAL_MESH_028_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_028_geometry.py @@ -87,4 +87,4 @@ else: salome.myStudy.SaveAs(theFilenameToSave, 0) -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/GEOM_SWIG/PAL_MESH_030_geometry.py b/src/GEOM_SWIG/PAL_MESH_030_geometry.py index e33690b3f..46e5b043e 100755 --- a/src/GEOM_SWIG/PAL_MESH_030_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_030_geometry.py @@ -80,4 +80,4 @@ id_Face_4 = geompy.addToStudyInFather(Compound_1,Compound_1_faces[3], "Face_4") id_Compound_2 = geompy.addToStudy(Compound_2, "Compound_2") id_Solid_2 = geompy.addToStudyInFather(Compound_2,Compound_2_solids[1], "Solid_2") -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/GEOM_SWIG/PAL_MESH_033_geometry.py b/src/GEOM_SWIG/PAL_MESH_033_geometry.py index 65111eb68..c7d04a2d9 100755 --- a/src/GEOM_SWIG/PAL_MESH_033_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_033_geometry.py @@ -63,4 +63,4 @@ geompy.addToStudy(Edge_4, "Edge_4") Wire_1 = geompy.MakeWire([Edge_1, Edge_2, Edge_3, Edge_4]) geompy.addToStudy(Wire_1, "Wire_1") -salome.sg.updateObjBrowser(True) +salome.sg.updateObjBrowser() diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index ac0d831f8..25e87c8fd 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -13406,7 +13406,7 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen): self.addToStudyInFather(shape, group_edges, "Group of edges with " + `min_length` + left_str + "length" + right_str + `max_length`) - sg.updateObjBrowser(True) + sg.updateObjBrowser() return group_edges diff --git a/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py index 965f17c96..c1807068f 100644 --- a/src/GEOM_SWIG/gsketcher.py +++ b/src/GEOM_SWIG/gsketcher.py @@ -48,7 +48,7 @@ # geompy.addToStudy( Sketch_1, 'Sketch_1' ) # # # update object browser -# salome.sg.updateObjBrowser(True) +# salome.sg.updateObjBrowser() # @endcode # @n Additionnal examples can be found as unit tests in the source code. # @} diff --git a/src/IGESPlugin/IGESPlugin_GUI.cxx b/src/IGESPlugin/IGESPlugin_GUI.cxx index 78bfd9b14..007796dad 100644 --- a/src/IGESPlugin/IGESPlugin_GUI.cxx +++ b/src/IGESPlugin/IGESPlugin_GUI.cxx @@ -195,7 +195,7 @@ bool IGESPlugin_GUI::importIGES( SUIT_Desktop* parent ) } } - getGeometryGUI()->updateObjBrowser( true ); + getGeometryGUI()->updateObjBrowser(); app->browseObjects( entryList ); if ( errors.count() > 0 ) diff --git a/src/STEPPlugin/STEPPlugin_GUI.cxx b/src/STEPPlugin/STEPPlugin_GUI.cxx index 284e8fba0..6fd9cfcb9 100644 --- a/src/STEPPlugin/STEPPlugin_GUI.cxx +++ b/src/STEPPlugin/STEPPlugin_GUI.cxx @@ -206,7 +206,7 @@ bool STEPPlugin_GUI::importSTEP( SUIT_Desktop* parent ) } } - getGeometryGUI()->updateObjBrowser( true ); + getGeometryGUI()->updateObjBrowser(); app->browseObjects( entryList ); if ( errors.count() > 0 ) diff --git a/src/STLPlugin/STLPlugin_GUI.cxx b/src/STLPlugin/STLPlugin_GUI.cxx index 52a87f59f..fcf87d87e 100644 --- a/src/STLPlugin/STLPlugin_GUI.cxx +++ b/src/STLPlugin/STLPlugin_GUI.cxx @@ -155,7 +155,7 @@ bool STLPlugin_GUI::importSTL( SUIT_Desktop* parent ) transaction.abort(); } } - getGeometryGUI()->updateObjBrowser( true ); + getGeometryGUI()->updateObjBrowser(); app->browseObjects( entryList ); if ( errors.count() > 0 ) -- 2.39.2