From: mpa Date: Fri, 3 Feb 2017 13:13:36 +0000 (+0300) Subject: Deleted Study parameter X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=60b80760808fb23ca31c3dc77b96ea54fcb78add;p=modules%2Fgeom.git Deleted Study parameter --- diff --git a/doc/salome/examples/3dsketcher.py b/doc/salome/examples/3dsketcher.py index 29f88e710..913c7d51d 100644 --- a/doc/salome/examples/3dsketcher.py +++ b/doc/salome/examples/3dsketcher.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # Create a 3D sketcher (wire) on the given points coordinates diff --git a/doc/salome/examples/GEOM_Field.py b/doc/salome/examples/GEOM_Field.py index 930ce1c31..537e21ef2 100644 --- a/doc/salome/examples/GEOM_Field.py +++ b/doc/salome/examples/GEOM_Field.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # a box diff --git a/doc/salome/examples/GEOM_box.py b/doc/salome/examples/GEOM_box.py index 08815753a..b697e6f79 100644 --- a/doc/salome/examples/GEOM_box.py +++ b/doc/salome/examples/GEOM_box.py @@ -5,7 +5,7 @@ salome.salome_init() # --- geom Python interface import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # --- Create a box and publish it into the salome study Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/advanced_geom_objs_ex01.py b/doc/salome/examples/advanced_geom_objs_ex01.py index b2499e906..fea605c3d 100644 --- a/doc/salome/examples/advanced_geom_objs_ex01.py +++ b/doc/salome/examples/advanced_geom_objs_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create PipeTShape object diff --git a/doc/salome/examples/advanced_geom_objs_ex02.py b/doc/salome/examples/advanced_geom_objs_ex02.py index 442af631e..452728a5a 100644 --- a/doc/salome/examples/advanced_geom_objs_ex02.py +++ b/doc/salome/examples/advanced_geom_objs_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create DividedDisk object diff --git a/doc/salome/examples/advanced_geom_objs_ex03.py b/doc/salome/examples/advanced_geom_objs_ex03.py index 915ee1586..d49d5db37 100644 --- a/doc/salome/examples/advanced_geom_objs_ex03.py +++ b/doc/salome/examples/advanced_geom_objs_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create DividedCylinder object diff --git a/doc/salome/examples/advanced_geom_objs_smoothingsurface.py b/doc/salome/examples/advanced_geom_objs_smoothingsurface.py index 0ad32ced8..a29818294 100644 --- a/doc/salome/examples/advanced_geom_objs_smoothingsurface.py +++ b/doc/salome/examples/advanced_geom_objs_smoothingsurface.py @@ -1,6 +1,6 @@ import salome, GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a could of points points = [ diff --git a/doc/salome/examples/angle.py b/doc/salome/examples/angle.py index 1fd60440f..ac20c506c 100644 --- a/doc/salome/examples/angle.py +++ b/doc/salome/examples/angle.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math OX = geompy.MakeVectorDXDYDZ(10, 0,0) diff --git a/doc/salome/examples/arranging_study_objects.py b/doc/salome/examples/arranging_study_objects.py index e31a77a42..f131d6b1c 100644 --- a/doc/salome/examples/arranging_study_objects.py +++ b/doc/salome/examples/arranging_study_objects.py @@ -5,7 +5,7 @@ salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() Circle_1 = geompy.MakeCircle(None, None, 100) Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/basic_geom_objs_ex01.py b/doc/salome/examples/basic_geom_objs_ex01.py index 1501633ca..22c5236cf 100644 --- a/doc/salome/examples/basic_geom_objs_ex01.py +++ b/doc/salome/examples/basic_geom_objs_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex02.py b/doc/salome/examples/basic_geom_objs_ex02.py index 858548f23..3175f2ee0 100644 --- a/doc/salome/examples/basic_geom_objs_ex02.py +++ b/doc/salome/examples/basic_geom_objs_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex03.py b/doc/salome/examples/basic_geom_objs_ex03.py index d7bdf2feb..0e01764db 100644 --- a/doc/salome/examples/basic_geom_objs_ex03.py +++ b/doc/salome/examples/basic_geom_objs_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex04.py b/doc/salome/examples/basic_geom_objs_ex04.py index 51a1304d4..0cef7779f 100644 --- a/doc/salome/examples/basic_geom_objs_ex04.py +++ b/doc/salome/examples/basic_geom_objs_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex05.py b/doc/salome/examples/basic_geom_objs_ex05.py index fe24424cc..ff0f80139 100644 --- a/doc/salome/examples/basic_geom_objs_ex05.py +++ b/doc/salome/examples/basic_geom_objs_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex06.py b/doc/salome/examples/basic_geom_objs_ex06.py index ecaec0ed5..ad115fc13 100644 --- a/doc/salome/examples/basic_geom_objs_ex06.py +++ b/doc/salome/examples/basic_geom_objs_ex06.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices and vectors diff --git a/doc/salome/examples/basic_geom_objs_ex07.py b/doc/salome/examples/basic_geom_objs_ex07.py index 04673b1f4..1bceed568 100644 --- a/doc/salome/examples/basic_geom_objs_ex07.py +++ b/doc/salome/examples/basic_geom_objs_ex07.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex08.py b/doc/salome/examples/basic_geom_objs_ex08.py index 707540a06..5826e52d0 100644 --- a/doc/salome/examples/basic_geom_objs_ex08.py +++ b/doc/salome/examples/basic_geom_objs_ex08.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/basic_geom_objs_ex09.py b/doc/salome/examples/basic_geom_objs_ex09.py index 91fa3ce6d..c1afcfc7f 100644 --- a/doc/salome/examples/basic_geom_objs_ex09.py +++ b/doc/salome/examples/basic_geom_objs_ex09.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math import SALOMEDS diff --git a/doc/salome/examples/basic_geom_objs_ex10.py b/doc/salome/examples/basic_geom_objs_ex10.py index f9f7f0165..2b994f8a7 100644 --- a/doc/salome/examples/basic_geom_objs_ex10.py +++ b/doc/salome/examples/basic_geom_objs_ex10.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math import SALOMEDS diff --git a/doc/salome/examples/basic_operations_ex01.py b/doc/salome/examples/basic_operations_ex01.py index 912c8eb03..b0c63593b 100644 --- a/doc/salome/examples/basic_operations_ex01.py +++ b/doc/salome/examples/basic_operations_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/basic_operations_ex02.py b/doc/salome/examples/basic_operations_ex02.py index ff102f0d5..a9a76e883 100644 --- a/doc/salome/examples/basic_operations_ex02.py +++ b/doc/salome/examples/basic_operations_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/basic_operations_ex03.py b/doc/salome/examples/basic_operations_ex03.py index 5fa0e9e0a..2f7c4e350 100644 --- a/doc/salome/examples/basic_operations_ex03.py +++ b/doc/salome/examples/basic_operations_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import SALOMEDS # create a box and a cylinder diff --git a/doc/salome/examples/basic_operations_ex04.py b/doc/salome/examples/basic_operations_ex04.py index 287ce39ca..61d8e2454 100644 --- a/doc/salome/examples/basic_operations_ex04.py +++ b/doc/salome/examples/basic_operations_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import SALOMEDS # create a box and partigion it by two planes diff --git a/doc/salome/examples/basic_properties.py b/doc/salome/examples/basic_properties.py index ce6e45a9c..f1a285ecf 100644 --- a/doc/salome/examples/basic_properties.py +++ b/doc/salome/examples/basic_properties.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math # create a box diff --git a/doc/salome/examples/blocks_operations_ex01.py b/doc/salome/examples/blocks_operations_ex01.py index d8040637c..46264a62f 100644 --- a/doc/salome/examples/blocks_operations_ex01.py +++ b/doc/salome/examples/blocks_operations_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/blocks_operations_ex02.py b/doc/salome/examples/blocks_operations_ex02.py index 03deab0a6..41f0c1f44 100644 --- a/doc/salome/examples/blocks_operations_ex02.py +++ b/doc/salome/examples/blocks_operations_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a box and a sphere diff --git a/doc/salome/examples/blocks_operations_ex03.py b/doc/salome/examples/blocks_operations_ex03.py index 48c4192c5..3633a6c80 100644 --- a/doc/salome/examples/blocks_operations_ex03.py +++ b/doc/salome/examples/blocks_operations_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box check_box = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/boolean_operations_ex01.py b/doc/salome/examples/boolean_operations_ex01.py index 7c365d7eb..2557639e0 100644 --- a/doc/salome/examples/boolean_operations_ex01.py +++ b/doc/salome/examples/boolean_operations_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/boolean_operations_ex02.py b/doc/salome/examples/boolean_operations_ex02.py index 212e313d4..58d5bb6f2 100644 --- a/doc/salome/examples/boolean_operations_ex02.py +++ b/doc/salome/examples/boolean_operations_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/boolean_operations_ex03.py b/doc/salome/examples/boolean_operations_ex03.py index fdb7545f1..d0a80b388 100644 --- a/doc/salome/examples/boolean_operations_ex03.py +++ b/doc/salome/examples/boolean_operations_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/boolean_operations_ex04.py b/doc/salome/examples/boolean_operations_ex04.py index a7da6a9af..e5bbb1c50 100644 --- a/doc/salome/examples/boolean_operations_ex04.py +++ b/doc/salome/examples/boolean_operations_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/bounding_box.py b/doc/salome/examples/bounding_box.py index ed8736b98..e88a8e5be 100644 --- a/doc/salome/examples/bounding_box.py +++ b/doc/salome/examples/bounding_box.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,30,100) diff --git a/doc/salome/examples/building_by_blocks_ex01.py b/doc/salome/examples/building_by_blocks_ex01.py index fe93e7c4c..b7f32c323 100644 --- a/doc/salome/examples/building_by_blocks_ex01.py +++ b/doc/salome/examples/building_by_blocks_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/building_by_blocks_ex02.py b/doc/salome/examples/building_by_blocks_ex02.py index 8d40beec5..724381b72 100644 --- a/doc/salome/examples/building_by_blocks_ex02.py +++ b/doc/salome/examples/building_by_blocks_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/center_of_mass.py b/doc/salome/examples/center_of_mass.py index 9e570f318..a3a11ea4b 100644 --- a/doc/salome/examples/center_of_mass.py +++ b/doc/salome/examples/center_of_mass.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math # create a box diff --git a/doc/salome/examples/check_compound_of_blocks.py b/doc/salome/examples/check_compound_of_blocks.py index 26f7c3012..36c99474c 100644 --- a/doc/salome/examples/check_compound_of_blocks.py +++ b/doc/salome/examples/check_compound_of_blocks.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create boxes diff --git a/doc/salome/examples/check_self_intersections.py b/doc/salome/examples/check_self_intersections.py index f70a54540..49e83bcaa 100644 --- a/doc/salome/examples/check_self_intersections.py +++ b/doc/salome/examples/check_self_intersections.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,100,100) diff --git a/doc/salome/examples/check_self_intersections_fast.py b/doc/salome/examples/check_self_intersections_fast.py index 83c8a741e..2a01efa6e 100644 --- a/doc/salome/examples/check_self_intersections_fast.py +++ b/doc/salome/examples/check_self_intersections_fast.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,100,100) diff --git a/doc/salome/examples/check_shape.py b/doc/salome/examples/check_shape.py index f10f31c8a..e3b51f3ff 100644 --- a/doc/salome/examples/check_shape.py +++ b/doc/salome/examples/check_shape.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,30,100) diff --git a/doc/salome/examples/complex_objs_ex01.py b/doc/salome/examples/complex_objs_ex01.py index 5a04f3a76..1eb8c4f80 100644 --- a/doc/salome/examples/complex_objs_ex01.py +++ b/doc/salome/examples/complex_objs_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/complex_objs_ex02.py b/doc/salome/examples/complex_objs_ex02.py index ec9f85729..046ddbb18 100644 --- a/doc/salome/examples/complex_objs_ex02.py +++ b/doc/salome/examples/complex_objs_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/complex_objs_ex03.py b/doc/salome/examples/complex_objs_ex03.py index 0c56c81e8..5edd9725e 100644 --- a/doc/salome/examples/complex_objs_ex03.py +++ b/doc/salome/examples/complex_objs_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") mindeg = 2 diff --git a/doc/salome/examples/complex_objs_ex04.py b/doc/salome/examples/complex_objs_ex04.py index 4bff05d17..de7e29421 100644 --- a/doc/salome/examples/complex_objs_ex04.py +++ b/doc/salome/examples/complex_objs_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/complex_objs_ex05.py b/doc/salome/examples/complex_objs_ex05.py index f6681b587..c1017173e 100644 --- a/doc/salome/examples/complex_objs_ex05.py +++ b/doc/salome/examples/complex_objs_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") Wire_1 = geompy.MakeSketcher("Sketcher:F 0 0:TT 100 0:R 0:C 100 90:T 0 200", [0, 0, 0, 0, 0, 1, 1, 0, -0]) diff --git a/doc/salome/examples/complex_objs_ex06.py b/doc/salome/examples/complex_objs_ex06.py index caa68c4c0..019b13a44 100644 --- a/doc/salome/examples/complex_objs_ex06.py +++ b/doc/salome/examples/complex_objs_ex06.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math gg = salome.ImportComponentGUI("GEOM") diff --git a/doc/salome/examples/complex_objs_ex07.py b/doc/salome/examples/complex_objs_ex07.py index d9e72ae96..02c4ab246 100644 --- a/doc/salome/examples/complex_objs_ex07.py +++ b/doc/salome/examples/complex_objs_ex07.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import salome gg = salome.ImportComponentGUI("GEOM") diff --git a/doc/salome/examples/complex_objs_ex08.py b/doc/salome/examples/complex_objs_ex08.py index bb4cac595..17536dbfa 100644 --- a/doc/salome/examples/complex_objs_ex08.py +++ b/doc/salome/examples/complex_objs_ex08.py @@ -3,7 +3,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() def MakeHelix(radius, height, rotation, direction): # - create a helix - diff --git a/doc/salome/examples/complex_objs_ex09.py b/doc/salome/examples/complex_objs_ex09.py index 9615ad1ef..6c6c3d868 100644 --- a/doc/salome/examples/complex_objs_ex09.py +++ b/doc/salome/examples/complex_objs_ex09.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Create a box Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/complex_objs_ex10.py b/doc/salome/examples/complex_objs_ex10.py index b51281505..ad5c8c8e9 100644 --- a/doc/salome/examples/complex_objs_ex10.py +++ b/doc/salome/examples/complex_objs_ex10.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Create Vertexes for curve Vertex_1 = geompy.MakeVertex(0, 0, 0) diff --git a/doc/salome/examples/complex_objs_ex11.py b/doc/salome/examples/complex_objs_ex11.py index 63242331a..6f5295a18 100755 --- a/doc/salome/examples/complex_objs_ex11.py +++ b/doc/salome/examples/complex_objs_ex11.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create box diff --git a/doc/salome/examples/fast_intersection.py b/doc/salome/examples/fast_intersection.py index 4854a579f..a0559c846 100644 --- a/doc/salome/examples/fast_intersection.py +++ b/doc/salome/examples/fast_intersection.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,100,100) diff --git a/doc/salome/examples/free_boundaries.py b/doc/salome/examples/free_boundaries.py index 8fe0d475b..02271d585 100644 --- a/doc/salome/examples/free_boundaries.py +++ b/doc/salome/examples/free_boundaries.py @@ -3,7 +3,7 @@ import salome salome.salome_init() from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a shape box1 = geompy.MakeBox(0, 0, 0, 100, 100, 100) diff --git a/doc/salome/examples/free_faces.py b/doc/salome/examples/free_faces.py index 2d1de5a00..c121c4bea 100644 --- a/doc/salome/examples/free_faces.py +++ b/doc/salome/examples/free_faces.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/get_non_blocks.py b/doc/salome/examples/get_non_blocks.py index 87bf934a6..6886506fe 100644 --- a/doc/salome/examples/get_non_blocks.py +++ b/doc/salome/examples/get_non_blocks.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create solids box = geompy.MakeBoxDXDYDZ(100, 100, 100) diff --git a/doc/salome/examples/import_export.py b/doc/salome/examples/import_export.py index e7ed69c37..18db87609 100644 --- a/doc/salome/examples/import_export.py +++ b/doc/salome/examples/import_export.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import tempfile, os diff --git a/doc/salome/examples/inertia.py b/doc/salome/examples/inertia.py index a63608c12..b96ea3dbb 100644 --- a/doc/salome/examples/inertia.py +++ b/doc/salome/examples/inertia.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,30,100) diff --git a/doc/salome/examples/min_distance.py b/doc/salome/examples/min_distance.py index e48804b30..3a389d609 100644 --- a/doc/salome/examples/min_distance.py +++ b/doc/salome/examples/min_distance.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Create two curves with three closest points Vertex_1 = geompy.MakeVertex(0, 0, 0) diff --git a/doc/salome/examples/normal_face.py b/doc/salome/examples/normal_face.py index 91eac0b5a..0bc0b2c56 100644 --- a/doc/salome/examples/normal_face.py +++ b/doc/salome/examples/normal_face.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math # create a box diff --git a/doc/salome/examples/notebook_geom.py b/doc/salome/examples/notebook_geom.py index 5b52d9f2c..514357983 100644 --- a/doc/salome/examples/notebook_geom.py +++ b/doc/salome/examples/notebook_geom.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import salome_notebook gg = salome.ImportComponentGUI("GEOM") diff --git a/doc/salome/examples/point_coordinates.py b/doc/salome/examples/point_coordinates.py index e31569b69..a87cc887f 100644 --- a/doc/salome/examples/point_coordinates.py +++ b/doc/salome/examples/point_coordinates.py @@ -5,7 +5,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a point point = geompy.MakeVertex(15., 23., 80.) diff --git a/doc/salome/examples/polyline.py b/doc/salome/examples/polyline.py index 8b7925607..eae5272b5 100644 --- a/doc/salome/examples/polyline.py +++ b/doc/salome/examples/polyline.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/primitives_ex01.py b/doc/salome/examples/primitives_ex01.py index 41590a544..d13fa571f 100644 --- a/doc/salome/examples/primitives_ex01.py +++ b/doc/salome/examples/primitives_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/primitives_ex02.py b/doc/salome/examples/primitives_ex02.py index 82cf5e449..6136ddbdf 100644 --- a/doc/salome/examples/primitives_ex02.py +++ b/doc/salome/examples/primitives_ex02.py @@ -6,7 +6,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") diff --git a/doc/salome/examples/primitives_ex03.py b/doc/salome/examples/primitives_ex03.py index 4f07701ef..8f93750c5 100644 --- a/doc/salome/examples/primitives_ex03.py +++ b/doc/salome/examples/primitives_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex diff --git a/doc/salome/examples/primitives_ex04.py b/doc/salome/examples/primitives_ex04.py index 4e27ac41c..4f51dd6d4 100644 --- a/doc/salome/examples/primitives_ex04.py +++ b/doc/salome/examples/primitives_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/primitives_ex05.py b/doc/salome/examples/primitives_ex05.py index 61fcc3846..bb3b245f1 100644 --- a/doc/salome/examples/primitives_ex05.py +++ b/doc/salome/examples/primitives_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/primitives_ex06.py b/doc/salome/examples/primitives_ex06.py index b639ec0ca..977fe4fb9 100644 --- a/doc/salome/examples/primitives_ex06.py +++ b/doc/salome/examples/primitives_ex06.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/primitives_ex07.py b/doc/salome/examples/primitives_ex07.py index e5989dfe4..a4de96ea6 100644 --- a/doc/salome/examples/primitives_ex07.py +++ b/doc/salome/examples/primitives_ex07.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/repairing_operations_ex01.py b/doc/salome/examples/repairing_operations_ex01.py index dc937caf0..fcc3f6ae5 100644 --- a/doc/salome/examples/repairing_operations_ex01.py +++ b/doc/salome/examples/repairing_operations_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices, an edge, an arc, a wire, a face and a prism diff --git a/doc/salome/examples/repairing_operations_ex02.py b/doc/salome/examples/repairing_operations_ex02.py index 344ec4bff..6dc223afb 100644 --- a/doc/salome/examples/repairing_operations_ex02.py +++ b/doc/salome/examples/repairing_operations_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a box diff --git a/doc/salome/examples/repairing_operations_ex03.py b/doc/salome/examples/repairing_operations_ex03.py index 8b8baedbd..a0854226c 100644 --- a/doc/salome/examples/repairing_operations_ex03.py +++ b/doc/salome/examples/repairing_operations_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices and vectors diff --git a/doc/salome/examples/repairing_operations_ex04.py b/doc/salome/examples/repairing_operations_ex04.py index 242b17231..55971195d 100644 --- a/doc/salome/examples/repairing_operations_ex04.py +++ b/doc/salome/examples/repairing_operations_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/repairing_operations_ex05.py b/doc/salome/examples/repairing_operations_ex05.py index e5fef2bb5..c8da39d13 100644 --- a/doc/salome/examples/repairing_operations_ex05.py +++ b/doc/salome/examples/repairing_operations_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/repairing_operations_ex06.py b/doc/salome/examples/repairing_operations_ex06.py index 5f6014e74..95168fc4a 100644 --- a/doc/salome/examples/repairing_operations_ex06.py +++ b/doc/salome/examples/repairing_operations_ex06.py @@ -4,7 +4,7 @@ import salome, math salome.salome_init() from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create base points diff --git a/doc/salome/examples/repairing_operations_ex07.py b/doc/salome/examples/repairing_operations_ex07.py index 1a7ff79a4..66a0c0e94 100644 --- a/doc/salome/examples/repairing_operations_ex07.py +++ b/doc/salome/examples/repairing_operations_ex07.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create boxes diff --git a/doc/salome/examples/repairing_operations_ex08.py b/doc/salome/examples/repairing_operations_ex08.py index d76f55cef..046332af4 100644 --- a/doc/salome/examples/repairing_operations_ex08.py +++ b/doc/salome/examples/repairing_operations_ex08.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create boxes diff --git a/doc/salome/examples/repairing_operations_ex09.py b/doc/salome/examples/repairing_operations_ex09.py index 2875051d2..5d97eef92 100644 --- a/doc/salome/examples/repairing_operations_ex09.py +++ b/doc/salome/examples/repairing_operations_ex09.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # import initial topology with bad tolerances (more than 1e-07) diff --git a/doc/salome/examples/repairing_operations_ex10.py b/doc/salome/examples/repairing_operations_ex10.py index 333af162f..399a22f93 100644 --- a/doc/salome/examples/repairing_operations_ex10.py +++ b/doc/salome/examples/repairing_operations_ex10.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Variant 1: using DivideEdge() diff --git a/doc/salome/examples/repairing_operations_ex11.py b/doc/salome/examples/repairing_operations_ex11.py index 68a2d377b..6aae32a81 100644 --- a/doc/salome/examples/repairing_operations_ex11.py +++ b/doc/salome/examples/repairing_operations_ex11.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create vertices p1 = geompy.MakeVertex(0, 0, 0) diff --git a/doc/salome/examples/repairing_operations_ex12.py b/doc/salome/examples/repairing_operations_ex12.py index e9ff7fe99..4218d85d4 100644 --- a/doc/salome/examples/repairing_operations_ex12.py +++ b/doc/salome/examples/repairing_operations_ex12.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create solids with some coincident faces Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/sketcher.py b/doc/salome/examples/sketcher.py index a4f20a1ce..197ecd01e 100644 --- a/doc/salome/examples/sketcher.py +++ b/doc/salome/examples/sketcher.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/tolerance.py b/doc/salome/examples/tolerance.py index ac72a3031..d82ae373a 100644 --- a/doc/salome/examples/tolerance.py +++ b/doc/salome/examples/tolerance.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,30,100) diff --git a/doc/salome/examples/topological_geom_objs_ex01.py b/doc/salome/examples/topological_geom_objs_ex01.py index 257819c3d..ead4e3a8e 100644 --- a/doc/salome/examples/topological_geom_objs_ex01.py +++ b/doc/salome/examples/topological_geom_objs_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # diff --git a/doc/salome/examples/topological_geom_objs_ex02.py b/doc/salome/examples/topological_geom_objs_ex02.py index eb12ea6a5..b3b1c8e70 100644 --- a/doc/salome/examples/topological_geom_objs_ex02.py +++ b/doc/salome/examples/topological_geom_objs_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/topological_geom_objs_ex03.py b/doc/salome/examples/topological_geom_objs_ex03.py index 6d9d5d43f..1f03e6251 100644 --- a/doc/salome/examples/topological_geom_objs_ex03.py +++ b/doc/salome/examples/topological_geom_objs_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/topological_geom_objs_ex04.py b/doc/salome/examples/topological_geom_objs_ex04.py index 31a938dda..727e428e4 100644 --- a/doc/salome/examples/topological_geom_objs_ex04.py +++ b/doc/salome/examples/topological_geom_objs_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") #create vertices diff --git a/doc/salome/examples/topological_geom_objs_ex05.py b/doc/salome/examples/topological_geom_objs_ex05.py index 67bf79084..891ffe7a4 100644 --- a/doc/salome/examples/topological_geom_objs_ex05.py +++ b/doc/salome/examples/topological_geom_objs_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") #create vertices diff --git a/doc/salome/examples/topological_geom_objs_ex06.py b/doc/salome/examples/topological_geom_objs_ex06.py index 7ae16d8e6..7c779612e 100644 --- a/doc/salome/examples/topological_geom_objs_ex06.py +++ b/doc/salome/examples/topological_geom_objs_ex06.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/topological_geom_objs_ex07.py b/doc/salome/examples/topological_geom_objs_ex07.py index f1e646a74..f3d6954b0 100644 --- a/doc/salome/examples/topological_geom_objs_ex07.py +++ b/doc/salome/examples/topological_geom_objs_ex07.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a box diff --git a/doc/salome/examples/transformation_operations_ex01.py b/doc/salome/examples/transformation_operations_ex01.py index 5a01039fd..1de25e6cc 100644 --- a/doc/salome/examples/transformation_operations_ex01.py +++ b/doc/salome/examples/transformation_operations_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a vertex and a vector diff --git a/doc/salome/examples/transformation_operations_ex02.py b/doc/salome/examples/transformation_operations_ex02.py index 564e1409d..5be970784 100644 --- a/doc/salome/examples/transformation_operations_ex02.py +++ b/doc/salome/examples/transformation_operations_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math gg = salome.ImportComponentGUI("GEOM") diff --git a/doc/salome/examples/transformation_operations_ex03.py b/doc/salome/examples/transformation_operations_ex03.py index 6870a3529..56c742857 100644 --- a/doc/salome/examples/transformation_operations_ex03.py +++ b/doc/salome/examples/transformation_operations_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math gg = salome.ImportComponentGUI("GEOM") diff --git a/doc/salome/examples/transformation_operations_ex04.py b/doc/salome/examples/transformation_operations_ex04.py index ebcd1f48d..8748d11e2 100644 --- a/doc/salome/examples/transformation_operations_ex04.py +++ b/doc/salome/examples/transformation_operations_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a box diff --git a/doc/salome/examples/transformation_operations_ex05.py b/doc/salome/examples/transformation_operations_ex05.py index 948fa0087..dc4950433 100644 --- a/doc/salome/examples/transformation_operations_ex05.py +++ b/doc/salome/examples/transformation_operations_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a box and a sphere diff --git a/doc/salome/examples/transformation_operations_ex06.py b/doc/salome/examples/transformation_operations_ex06.py index 64f8b6615..7312cd7d7 100644 --- a/doc/salome/examples/transformation_operations_ex06.py +++ b/doc/salome/examples/transformation_operations_ex06.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a box and a sphere diff --git a/doc/salome/examples/transformation_operations_ex07.py b/doc/salome/examples/transformation_operations_ex07.py index d323cf0b7..d134c1dfa 100644 --- a/doc/salome/examples/transformation_operations_ex07.py +++ b/doc/salome/examples/transformation_operations_ex07.py @@ -3,7 +3,7 @@ import salome salome.salome_init() from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a cylindric face and a curve(edge) cylinder = geompy.MakeCylinderRH(100, 300) diff --git a/doc/salome/examples/transformation_operations_ex08.py b/doc/salome/examples/transformation_operations_ex08.py index c26774d66..b4428a979 100644 --- a/doc/salome/examples/transformation_operations_ex08.py +++ b/doc/salome/examples/transformation_operations_ex08.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices and vectors diff --git a/doc/salome/examples/transformation_operations_ex09.py b/doc/salome/examples/transformation_operations_ex09.py index 3467b5be6..ee64361d3 100644 --- a/doc/salome/examples/transformation_operations_ex09.py +++ b/doc/salome/examples/transformation_operations_ex09.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") import math diff --git a/doc/salome/examples/transformation_operations_ex10.py b/doc/salome/examples/transformation_operations_ex10.py index 17747db1b..d05d7026c 100644 --- a/doc/salome/examples/transformation_operations_ex10.py +++ b/doc/salome/examples/transformation_operations_ex10.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create a face in OXY plane diff --git a/doc/salome/examples/transformation_operations_ex11.py b/doc/salome/examples/transformation_operations_ex11.py index a5b6e5b3a..7d60f45e9 100644 --- a/doc/salome/examples/transformation_operations_ex11.py +++ b/doc/salome/examples/transformation_operations_ex11.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create box diff --git a/doc/salome/examples/transformation_operations_ex12.py b/doc/salome/examples/transformation_operations_ex12.py index a59eda05f..b7c864637 100644 --- a/doc/salome/examples/transformation_operations_ex12.py +++ b/doc/salome/examples/transformation_operations_ex12.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") radius = 10. ShapeTypeEdge = geompy.ShapeType["EDGE"] diff --git a/doc/salome/examples/transformation_operations_ex13.py b/doc/salome/examples/transformation_operations_ex13.py index ba857a05b..66d9ef421 100644 --- a/doc/salome/examples/transformation_operations_ex13.py +++ b/doc/salome/examples/transformation_operations_ex13.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") d1 = 10. d2 = 10. diff --git a/doc/salome/examples/transformation_operations_ex14.py b/doc/salome/examples/transformation_operations_ex14.py index e8bc167ed..4d3b4f24d 100644 --- a/doc/salome/examples/transformation_operations_ex14.py +++ b/doc/salome/examples/transformation_operations_ex14.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create vertices diff --git a/doc/salome/examples/viewing_geom_objs_ex01.py b/doc/salome/examples/viewing_geom_objs_ex01.py index b5935764b..dfdf693a9 100644 --- a/doc/salome/examples/viewing_geom_objs_ex01.py +++ b/doc/salome/examples/viewing_geom_objs_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() box = geompy.MakeBox(0,0,0, 50,50,50) box2 = geompy.MakeBox(-50,-50,-50, 0,0,0) diff --git a/doc/salome/examples/viewing_geom_objs_ex02.py b/doc/salome/examples/viewing_geom_objs_ex02.py index b8629d61c..44859418e 100644 --- a/doc/salome/examples/viewing_geom_objs_ex02.py +++ b/doc/salome/examples/viewing_geom_objs_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() box = geompy.MakeBox(0,0,0, 50,50,50) sphere = geompy.MakeSphere(50,50,50, 30) diff --git a/doc/salome/examples/viewing_geom_objs_ex03.py b/doc/salome/examples/viewing_geom_objs_ex03.py index 9932eeec6..e7c5f4049 100644 --- a/doc/salome/examples/viewing_geom_objs_ex03.py +++ b/doc/salome/examples/viewing_geom_objs_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() box = geompy.MakeBox(0,0,0, 50,50,50) sphere = geompy.MakeSphere(50,50,50, 30) diff --git a/doc/salome/examples/viewing_geom_objs_ex04.py b/doc/salome/examples/viewing_geom_objs_ex04.py index 093fdfbe1..c0d4f5f1f 100644 --- a/doc/salome/examples/viewing_geom_objs_ex04.py +++ b/doc/salome/examples/viewing_geom_objs_ex04.py @@ -5,7 +5,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() texture_file = os.path.join(os.getenv("GEOM_ROOT_DIR"), "share", "salome", "resources", "geom", "textures", "texture1.dat") texture = geompy.LoadTexture(texture_file) diff --git a/doc/salome/examples/whatis.py b/doc/salome/examples/whatis.py index 632ab6226..241cbd754 100644 --- a/doc/salome/examples/whatis.py +++ b/doc/salome/examples/whatis.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box box = geompy.MakeBoxDXDYDZ(100,30,100) diff --git a/doc/salome/examples/working_with_groups_ex01.py b/doc/salome/examples/working_with_groups_ex01.py index c159a3d5f..c9b7e9b40 100644 --- a/doc/salome/examples/working_with_groups_ex01.py +++ b/doc/salome/examples/working_with_groups_ex01.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create two vertices diff --git a/doc/salome/examples/working_with_groups_ex02.py b/doc/salome/examples/working_with_groups_ex02.py index c52b22cb2..1bf857fc9 100644 --- a/doc/salome/examples/working_with_groups_ex02.py +++ b/doc/salome/examples/working_with_groups_ex02.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create two vertices diff --git a/doc/salome/examples/working_with_groups_ex03.py b/doc/salome/examples/working_with_groups_ex03.py index 86318d15f..1d3cf53eb 100644 --- a/doc/salome/examples/working_with_groups_ex03.py +++ b/doc/salome/examples/working_with_groups_ex03.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") # create two vertices diff --git a/doc/salome/examples/working_with_groups_ex04.py b/doc/salome/examples/working_with_groups_ex04.py index 3cabc6f4c..cdf1ac045 100644 --- a/doc/salome/examples/working_with_groups_ex04.py +++ b/doc/salome/examples/working_with_groups_ex04.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box and some groups of faces on it Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/working_with_groups_ex05.py b/doc/salome/examples/working_with_groups_ex05.py index 474655333..477cb19a9 100644 --- a/doc/salome/examples/working_with_groups_ex05.py +++ b/doc/salome/examples/working_with_groups_ex05.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box and some groups of faces on it Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/examples/working_with_groups_ex06.py b/doc/salome/examples/working_with_groups_ex06.py index 82de29552..0a3f13f57 100644 --- a/doc/salome/examples/working_with_groups_ex06.py +++ b/doc/salome/examples/working_with_groups_ex06.py @@ -4,7 +4,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # create a box and some groups of faces on it Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) diff --git a/doc/salome/gui/GEOM/input/geometrical_object_properties.doc b/doc/salome/gui/GEOM/input/geometrical_object_properties.doc index 2d9653716..1f390cb1e 100644 --- a/doc/salome/gui/GEOM/input/geometrical_object_properties.doc +++ b/doc/salome/gui/GEOM/input/geometrical_object_properties.doc @@ -77,7 +77,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() box = geompy.MakeBoxDXDYDZ(10,10,10) type = geompy.ShapeIdToType(box.GetType()) @@ -103,7 +103,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() box = geompy.MakeBoxDXDYDZ(10,10,10) type = box.GetShapeType() diff --git a/doc/salome/gui/GEOM/input/geompy_migration.doc b/doc/salome/gui/GEOM/input/geompy_migration.doc index fcac5fb05..6d77dab99 100644 --- a/doc/salome/gui/GEOM/input/geompy_migration.doc +++ b/doc/salome/gui/GEOM/input/geompy_migration.doc @@ -23,13 +23,13 @@ salome.salome_init() \n the old mode: \code import geompy -geompy.init_geom(theStudy) +geompy.init_geom() \endcode \n the new mode: \code import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() \endcode diff --git a/doc/salome/gui/GEOM/input/tui_execution_distribution.doc b/doc/salome/gui/GEOM/input/tui_execution_distribution.doc index fbf905c9e..8c2c37565 100644 --- a/doc/salome/gui/GEOM/input/tui_execution_distribution.doc +++ b/doc/salome/gui/GEOM/input/tui_execution_distribution.doc @@ -16,7 +16,7 @@ import salome salome.salome_init() from salome.geom import geomBuilder -geompy = geomBuilder.New(theStudy) +geompy = geomBuilder.New() \endcode With this initialization, the geometry engine runs in the default container, diff --git a/doc/salome/gui/GEOM/input/tui_importexport_geom_objs.doc b/doc/salome/gui/GEOM/input/tui_importexport_geom_objs.doc index 59587b825..12c30a1ee 100644 --- a/doc/salome/gui/GEOM/input/tui_importexport_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_importexport_geom_objs.doc @@ -5,7 +5,7 @@ import salome import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() gg = salome.ImportComponentGUI("GEOM") diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index de65b60d4..1293fd8ed 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -602,7 +602,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(std::vector& theObj if( isMultiFile ) aScript += "def RebuildData():"; - aScript += "\n\tgeompy = geomBuilder.New(salome.myStudy)\n"; + aScript += "\n\tgeompy = geomBuilder.New()\n"; AddTextures(aScript); diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py index e7a35320d..3123bb44b 100644 --- a/src/GEOM_PY/geomtools.py +++ b/src/GEOM_PY/geomtools.py @@ -51,7 +51,7 @@ try: except: pass -_geompy = geomBuilder.New(salome.myStudy) +_geompy = geomBuilder.New() ## Return an object behaving exactly like geompy module. # \ingroup geomtools diff --git a/src/GEOM_PY/sketcher.py b/src/GEOM_PY/sketcher.py index 84bca3961..ce31c31c7 100644 --- a/src/GEOM_PY/sketcher.py +++ b/src/GEOM_PY/sketcher.py @@ -48,7 +48,7 @@ Example:: # Put it in the study from salome.geom import geomBuilder - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() geompy.addToStudy( wire, 'mysketch' ) Additionnal examples can be found as unit tests in the source code. @@ -62,7 +62,7 @@ try: salome.salome_init() import GEOM from salome.geom import geomBuilder - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() pass pass except: diff --git a/src/GEOM_PY/structelem/__init__.py b/src/GEOM_PY/structelem/__init__.py index 689944ab9..cf5ef97aa 100644 --- a/src/GEOM_PY/structelem/__init__.py +++ b/src/GEOM_PY/structelem/__init__.py @@ -495,9 +495,9 @@ def TEST_CreateGeometry(): salome.salome_init() import GEOM from salome.geom import geomBuilder - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() import SALOMEDS - geompy.init_geom(salome.myStudy) + geompy.init_geom() Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200) edges = geompy.SubShapeAllSorted(Box_1, geompy.ShapeType["EDGE"]) geompy.addToStudy(Box_1, "Box_1") diff --git a/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py index 0e966957d..ef9530012 100755 --- a/src/GEOM_SWIG/GEOM_Nut.py +++ b/src/GEOM_SWIG/GEOM_Nut.py @@ -33,7 +33,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() #Sketcher_1 creation Sketcher_1 = geompy.MakeSketcher("Sketcher:F 100 -57.7:TT 100 57.7:TT 0 115.47:TT -100 57.7:TT -100 -57.7:TT 0 -115.47:WW") diff --git a/src/GEOM_SWIG/GEOM_ObjectInfo.py b/src/GEOM_SWIG/GEOM_ObjectInfo.py index d6f8f6b8d..84c40fdd2 100644 --- a/src/GEOM_SWIG/GEOM_ObjectInfo.py +++ b/src/GEOM_SWIG/GEOM_ObjectInfo.py @@ -27,7 +27,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Create several objects obj1 = geompy.MakeVertex(0.,0.,0.) diff --git a/src/GEOM_SWIG/GEOM_Partition1.py b/src/GEOM_SWIG/GEOM_Partition1.py index d95582e02..e81fe00a6 100755 --- a/src/GEOM_SWIG/GEOM_Partition1.py +++ b/src/GEOM_SWIG/GEOM_Partition1.py @@ -32,7 +32,7 @@ barier_height = 7.0 barier_radius = 5.6 / 2 # Rayon de la bariere colis_radius = 1.0 / 2 # Rayon du colis -colis_step = 2.0 # Distance s‰parant deux colis +colis_step = 2.0 # Distance s�parant deux colis cc_width = 0.11 # Epaisseur du complement de colisage # -- @@ -47,7 +47,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() boolean_common = 1 boolean_cut = 2 diff --git a/src/GEOM_SWIG/GEOM_Partition2.py b/src/GEOM_SWIG/GEOM_Partition2.py index c614ca92f..9de64fba5 100755 --- a/src/GEOM_SWIG/GEOM_Partition2.py +++ b/src/GEOM_SWIG/GEOM_Partition2.py @@ -35,7 +35,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() vecx = geompy.MakeVectorDXDYDZ(1.,0.,0.) vecy = geompy.MakeVectorDXDYDZ(0.,1.,0.) diff --git a/src/GEOM_SWIG/GEOM_Partition3.py b/src/GEOM_SWIG/GEOM_Partition3.py index 1016df419..942e4a2d9 100755 --- a/src/GEOM_SWIG/GEOM_Partition3.py +++ b/src/GEOM_SWIG/GEOM_Partition3.py @@ -31,7 +31,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() vecx = geompy.MakeVectorDXDYDZ(1.,0.,0.) diff --git a/src/GEOM_SWIG/GEOM_Partition4.py b/src/GEOM_SWIG/GEOM_Partition4.py index 39384041d..0e2600f17 100755 --- a/src/GEOM_SWIG/GEOM_Partition4.py +++ b/src/GEOM_SWIG/GEOM_Partition4.py @@ -27,7 +27,7 @@ # import couplex2_01_GEOM # reload(couplex2_01_GEOM) # Dimensions de alveolus -# Parall‰pipˆde rectangle de taille alDx, alDy, alDz +# Parall�pip�de rectangle de taille alDx, alDy, alDz # alDx = 2.5 alDy = 20.0 @@ -35,7 +35,7 @@ alDz = 2.5 alSepx = 18.0 # Dimensions de backfill -# Parall‰pipˆde rectangle de taille baDx, baDy, baDz +# Parall�pip�de rectangle de taille baDx, baDy, baDz baDx = 27.0 baDy = 4.8 @@ -53,7 +53,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # -- Construction de backfill diff --git a/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py index 48dfc440f..4004c0b20 100755 --- a/src/GEOM_SWIG/GEOM_Partition5.py +++ b/src/GEOM_SWIG/GEOM_Partition5.py @@ -32,15 +32,15 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() -# -- Dimensions de la boite entiˆre +# -- Dimensions de la boite enti�re LX, LY, LZ = 300.0, 150.0, 150.0 p0 = geompy.MakeVertex(0.,0.,0.) vy = geompy.MakeVectorDXDYDZ(0.,1.,0.) -# -- D‰finition du plan de sym‰trie (O,Ox,Oz) +# -- D�finition du plan de sym�trie (O,Ox,Oz) symPlane = geompy.MakePlane(p0, vy, 10.0) @@ -60,7 +60,7 @@ gal = geompy.MakeTranslation(gal, gal_x, -gal_lony/2, 0.0) # -- Galerie perpendiculaire # -- Dimensions de la galerie perpendiculaire -# -- La longueur est compt‰e € partir du centre +# -- La longueur est compt�e � partir du centre # -- de la galerie principale gpe_long, gpe_diam = 200.0, 60.0 @@ -72,14 +72,14 @@ gpe = geompy.MakeCylinder( gpe = geompy.MakeTranslation(gpe, gpe_x, 0, 0) # -- Dimensions d'une alveole -# -- Construction d'une alv‰ole +# -- Construction d'une alv�ole alv_long, alv_diam = 60.0, 18.0 alv01 = geompy.MakeCylinder(p0, vy, alv_diam/2, alv_long) alv02 = geompy.MakeMirrorByPlane(alv01, symPlane) alv0 = geompy.MakeCompound([alv01, alv02]) -# -- Construction des alv‰oles +# -- Construction des alv�oles alv_del, alv_sep = 40.0, 35.0 alv1 = geompy.MakeTranslation(alv0, gal_x-gal_diam/2-alv_sep, 0.0, 0.0) diff --git a/src/GEOM_SWIG/GEOM_Sketcher.py b/src/GEOM_SWIG/GEOM_Sketcher.py index eb76c7587..75ba16ef1 100644 --- a/src/GEOM_SWIG/GEOM_Sketcher.py +++ b/src/GEOM_SWIG/GEOM_Sketcher.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() #SKETCHER INFOS #Init Sketcher diff --git a/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py index 74345a490..a3f7f6f33 100644 --- a/src/GEOM_SWIG/GEOM_blocks.py +++ b/src/GEOM_SWIG/GEOM_blocks.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math import GEOM_Spanner diff --git a/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py index 14addc8f9..c7628b179 100755 --- a/src/GEOM_SWIG/GEOM_cyl2complementary.py +++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py @@ -35,7 +35,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() geomgui = salome.ImportComponentGUI("GEOM") import salome_ComponentGUI diff --git a/src/GEOM_SWIG/GEOM_example.py b/src/GEOM_SWIG/GEOM_example.py index 64946227e..f88d003b9 100644 --- a/src/GEOM_SWIG/GEOM_example.py +++ b/src/GEOM_SWIG/GEOM_example.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() ind = 0 boxlist = [] diff --git a/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py index 8ad2032a5..8eb62bd13 100644 --- a/src/GEOM_SWIG/GEOM_example2.py +++ b/src/GEOM_SWIG/GEOM_example2.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py index f3bd2b6ea..593eb773d 100644 --- a/src/GEOM_SWIG/GEOM_example3.py +++ b/src/GEOM_SWIG/GEOM_example3.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math from time import sleep import salome_ComponentGUI diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py index 312e47dda..c4b65ff74 100755 --- a/src/GEOM_SWIG/GEOM_example4.py +++ b/src/GEOM_SWIG/GEOM_example4.py @@ -29,7 +29,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math diff --git a/src/GEOM_SWIG/GEOM_example5.py b/src/GEOM_SWIG/GEOM_example5.py index 710181ac7..da3ad2f5e 100644 --- a/src/GEOM_SWIG/GEOM_example5.py +++ b/src/GEOM_SWIG/GEOM_example5.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() #Create Points BasicOp = geompy.GetIBasicOperations() diff --git a/src/GEOM_SWIG/GEOM_example6.py b/src/GEOM_SWIG/GEOM_example6.py index 6e40f5199..1e4e5f1a2 100755 --- a/src/GEOM_SWIG/GEOM_example6.py +++ b/src/GEOM_SWIG/GEOM_example6.py @@ -27,7 +27,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() ind = 1 circlelist = [] diff --git a/src/GEOM_SWIG/GEOM_example7.py b/src/GEOM_SWIG/GEOM_example7.py index 22db148d3..23650e622 100644 --- a/src/GEOM_SWIG/GEOM_example7.py +++ b/src/GEOM_SWIG/GEOM_example7.py @@ -27,7 +27,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() data_dir = os.getenv('DATA_DIR') if data_dir: diff --git a/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py index 847e36482..57ae8ada6 100644 --- a/src/GEOM_SWIG/GEOM_moteur.py +++ b/src/GEOM_SWIG/GEOM_moteur.py @@ -30,7 +30,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math #Variables modifiables diff --git a/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py index 902560268..8e797ee85 100755 --- a/src/GEOM_SWIG/GEOM_shellSolid.py +++ b/src/GEOM_SWIG/GEOM_shellSolid.py @@ -35,7 +35,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Interface with geometry # ----------------------- diff --git a/src/GEOM_SWIG/GEOM_tube_geom.py b/src/GEOM_SWIG/GEOM_tube_geom.py index 29b197e68..b169b6c6b 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom.py +++ b/src/GEOM_SWIG/GEOM_tube_geom.py @@ -34,7 +34,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # # base de l'assemblage diff --git a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py index aa4e782dc..f58eb8368 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py +++ b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py @@ -34,7 +34,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # # base de l'assemblage # diff --git a/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py index ce546d467..cc78f4ca0 100644 --- a/src/GEOM_SWIG/GEOM_usinggeom.py +++ b/src/GEOM_SWIG/GEOM_usinggeom.py @@ -28,7 +28,7 @@ # import salome from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import math diff --git a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py index 50aab0c55..2bc092087 100755 --- a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py @@ -31,7 +31,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() #Points creation (2.2) Vertex_1 = geompy.MakeVertex(0, 0, 0) diff --git a/src/GEOM_SWIG/PAL_MESH_028_geometry.py b/src/GEOM_SWIG/PAL_MESH_028_geometry.py index b40548d8e..5de0e34f0 100755 --- a/src/GEOM_SWIG/PAL_MESH_028_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_028_geometry.py @@ -31,7 +31,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() import os diff --git a/src/GEOM_SWIG/PAL_MESH_030_geometry.py b/src/GEOM_SWIG/PAL_MESH_030_geometry.py index 46e5b043e..a4b23893c 100755 --- a/src/GEOM_SWIG/PAL_MESH_030_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_030_geometry.py @@ -31,7 +31,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() # Stage 2: "Creation of geometry" diff --git a/src/GEOM_SWIG/PAL_MESH_033_geometry.py b/src/GEOM_SWIG/PAL_MESH_033_geometry.py index c7d04a2d9..2e769173f 100755 --- a/src/GEOM_SWIG/PAL_MESH_033_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_033_geometry.py @@ -31,7 +31,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() #Points creation (2.2) Vertex_1 = geompy.MakeVertex(0, 0, 0) diff --git a/src/GEOM_SWIG/PAL_MESH_035_geometry.py b/src/GEOM_SWIG/PAL_MESH_035_geometry.py index 753fcf94b..2b93280fa 100755 --- a/src/GEOM_SWIG/PAL_MESH_035_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_035_geometry.py @@ -31,7 +31,7 @@ import salome salome.salome_init() import GEOM from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() #Box creation (2.2) Box_1 = geompy.MakeBoxDXDYDZ(200, 400, 300) diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py index b7fa036dd..07f324b37 100644 --- a/src/GEOM_SWIG/geomBuilder.py +++ b/src/GEOM_SWIG/geomBuilder.py @@ -52,7 +52,7 @@ ## @code ## import salome ## from salome.geom import geomBuilder -## geompy = geomBuilder.New(salome.myStudy) +## geompy = geomBuilder.New() ## box = geompy.MakeBoxDXDYDZ(100, 100, 100) # box is not published in the study yet ## geompy.addToStudy(box, "box") # explicit publishing ## @endcode @@ -115,7 +115,7 @@ ## @code ## import salome ## from salome.geom import geomBuilder -## geompy = geomBuilder.New(salome.myStudy) +## geompy = geomBuilder.New() ## geompy.addToStudyAuto() # enable automatic publication ## box = geompy.MakeBoxDXDYDZ(100, 100, 100) ## # the box is created and published in the study with default name @@ -157,7 +157,7 @@ ## @code ## import salome ## from salome.geom import geomBuilder -## geompy = geomBuilder.New(salome.myStudy) +## geompy = geomBuilder.New() ## box = geompy.MakeBoxDXDYDZ(100, 100, 100, "Box") ## # the box was created and published in the study ## folder = geompy.NewFolder("Primitives") @@ -438,7 +438,7 @@ def PackData(data): ## For example, ## \code ## from salome.geom import geomBuilder -## geompy = geomBuilder.New(salome.myStudy) +## geompy = geomBuilder.New() ## texture = geompy.readtexture('mytexture.dat') ## texture = geompy.AddTexture(*texture) ## obj.SetMarkerTexture(texture) @@ -464,7 +464,7 @@ def ReadTexture(fname): Example of usage: from salome.geom import geomBuilder - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() texture = geompy.readtexture('mytexture.dat') texture = geompy.AddTexture(*texture) obj.SetMarkerTexture(texture) @@ -13869,12 +13869,11 @@ omniORB.registerObjref(GEOM._objref_GEOM_Field._NP_RepositoryId, geomField) # import salome # salome.salome_init() # from salome.geom import geomBuilder -# geompy = geomBuilder.New(salome.myStudy) +# geompy = geomBuilder.New() # \endcode -# @param study SALOME study, generally obtained by salome.myStudy. # @param instance CORBA proxy of GEOM Engine. If None, the default Engine is used. # @return geomBuilder instance -def New( study, instance=None): +def New( instance=None): """ Create a new geomBuilder instance.The geomBuilder class provides the Python interface to GEOM operations. @@ -13883,10 +13882,9 @@ def New( study, instance=None): import salome salome.salome_init() from salome.geom import geomBuilder - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() Parameters: - study SALOME study, generally obtained by salome.myStudy. instance CORBA proxy of GEOM Engine. If None, the default Engine is used. Returns: geomBuilder instance @@ -13900,7 +13898,7 @@ def New( study, instance=None): doLcc = True geom = geomBuilder() assert isinstance(geom,geomBuilder), "Geom engine class is %s but should be geomBuilder.geomBuilder. Import geomBuilder before creating the instance."%geom.__class__ - geom.init_geom(study) + geom.init_geom() return geom diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py index 99935ece9..fa4ae2c5e 100644 --- a/src/GEOM_SWIG/geompy.py +++ b/src/GEOM_SWIG/geompy.py @@ -37,7 +37,7 @@ from salome.geom.geomBuilder import info, PackData, ReadTexture, EnumToLong try: # get GEOM engine and initialize GEOM with current study engineGeom = lcc.FindOrLoadComponent( "FactoryServer", "GEOM" ) - geom = geomBuilder.New(salome.myStudy, engineGeom) + geom = geomBuilder.New(engineGeom) # export the methods of geomBuilder for k in dir( geom ): @@ -65,13 +65,13 @@ replace ------- import geompy -geompy.init_geom(theStudy) +geompy.init_geom() with ---- from salome.geom import geomBuilder -geompy = geomBuilder.New(salome.myStudy) +geompy = geomBuilder.New() See also GEOM User's Guide for more details diff --git a/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py index c1807068f..27ff6abbf 100644 --- a/src/GEOM_SWIG/gsketcher.py +++ b/src/GEOM_SWIG/gsketcher.py @@ -30,7 +30,7 @@ # @code # import GEOM # from salome.geom import geomBuilder -# geompy = geomBuilder.New(salome.myStudy) +# geompy = geomBuilder.New() # # # create a wire for sketcher # geomObj_1 = geompy.MakeMarker(0, 0, 0, 1, 0, 0, 0, 1, 0) diff --git a/src/Tools/t_shape/t_shape_builder.py b/src/Tools/t_shape/t_shape_builder.py index a65a9ec6d..a62795814 100644 --- a/src/Tools/t_shape/t_shape_builder.py +++ b/src/Tools/t_shape/t_shape_builder.py @@ -139,7 +139,7 @@ def build_shape(r1, r2, h1, h2, solid_thickness=0, progressBar=None ): with_solid = True global geompy - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() O = geompy.MakeVertex(0, 0, 0) OX = geompy.MakeVectorDXDYDZ(1, 0, 0) @@ -385,7 +385,7 @@ def jonction(r1, r2, h1, h2, a1): def test_t_shape_builder(): """For testing purpose""" salome.salome_init() - geompy = geomBuilder.New(salome.myStudy) + geompy = geomBuilder.New() for r1 in [1., 100.]: for r2 in [0.9*r1, 0.5*r1, 0.1*r1, 0.05*r1]: for thickness in [r1/100., r1/10., r1/2.]: