X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_SWIG%2FGEOM_example3.py;h=4e0dbd1bcbf3c78850c4d46a4e8f288180b5b5f0;hb=53942415489efb924c4f072ab1767672da1fb025;hp=66a699971b0374ce8d02bd00ef9153a0d218055c;hpb=0f1369c27fd6a84ba1149c3c5f3ed181acc055f1;p=modules%2Fgeom.git

diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py
index 66a699971..4e0dbd1bc 100644
--- a/src/GEOM_SWIG/GEOM_example3.py
+++ b/src/GEOM_SWIG/GEOM_example3.py
@@ -17,7 +17,7 @@
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
@@ -30,39 +30,50 @@ import salome
 import geompy
 import math
 from time import sleep
-
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+import salome_ComponentGUI
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 
-gg = salome.ImportComponentGUI("Geometry")
+gg = salome.ImportComponentGUI("GEOM")
+
+BasicOp  = geom.GetIBasicOperations(salome.myStudyId)
+PrimOp   = geom.GetI3DPrimOperations(salome.myStudyId)
+InsertOp = geom.GetIInsertOperations(salome.myStudyId)
+TrsfOp   = geom.GetITransformOperations(salome.myStudyId)
 
-point0  = geom.MakePointStruct(0.,0.,0.)
-pointz1 = geom.MakePointStruct(0.,0.,1.)
-dirz = geom.MakeDirection(pointz1)
+point0  = BasicOp.MakePointXYZ(0.,0.,0.)
+pointz1 = BasicOp.MakePointXYZ(0.,0.,1.)
+dirz = BasicOp.MakeVectorTwoPnt(point0,pointz1)
 
-torus1 = geompy.MakeTorus(point0,dirz,150.,25.)
+torus1 = PrimOp.MakeTorusPntVecRR(point0,dirz,150.,25.)
 id_torus1 = geompy.addToStudy(torus1,"torus1")
-gg.createAndDisplayGO(id_torus1)
+if not isinstance(gg, type(salome_ComponentGUI)):
+    gg.createAndDisplayGO(id_torus1)
 
-torus2 = geom.MakeCopy(torus1)
-torus2 = geom.MakeTranslation(torus2,0.,0.,100.)
+torus2 = InsertOp.MakeCopy(torus1)
+
+vec1 = BasicOp.MakeVectorDXDYDZ(0.,0.,100.)
+torus2 = TrsfOp.TranslateVectorCopy(torus2,vec1)
 id_torus2 = geompy.addToStudy(torus2,"torus2")
-gg.createAndDisplayGO(id_torus2)
+if not isinstance(gg, type(salome_ComponentGUI)):
+    gg.createAndDisplayGO(id_torus2)
 
-cylz1 = geompy.MakeCylinder(point0,dirz,25.,100.)
+cylz1 = PrimOp.MakeCylinderPntVecRH(point0,dirz,25.,100.)
 
 ind = 0
 shapeList = []
 idList = []
 while ind < 6:
-    acyl = geom.MakeCopy(cylz1)
+    acyl = InsertOp.MakeCopy(cylz1)
     x = 150. * math.cos(ind * math.pi/3.)
     y = 150. * math.sin(ind * math.pi/3.)
     z = 0.
+    vec_i = BasicOp.MakeVectorDXDYDZ(x,y,z)
     name = "cyl%d"%(ind)
-    acyl = geompy.MakeTranslation(acyl,x,y,z)
+    acyl = TrsfOp.TranslateVectorCopy(acyl,vec_i)
     id_acyl = geompy.addToStudy(acyl,name)
-    gg.createAndDisplayGO(id_acyl)
+    if not isinstance(gg, type(salome_ComponentGUI)):
+        gg.createAndDisplayGO(id_acyl)
     shapeList.append(acyl)
     idList.append(id_acyl)
     ind = ind +1
@@ -72,13 +83,10 @@ shapeList.append(torus2)
 idList.append(id_torus1)
 idList.append(id_torus2)
 
-iorStringList = []
-for shape in shapeList:
-    iorStringList.append(shape._get_Name())
-
-cage = geompy.MakeCompound(iorStringList)
+cage = geompy.MakeCompound(shapeList)
 id_cage = geompy.addToStudy(cage,"cage")
-gg.createAndDisplayGO(id_cage)
+if not isinstance(gg, type(salome_ComponentGUI)):
+    gg.createAndDisplayGO(id_cage)
 
 from salome import sg
 sleep(1)
@@ -98,15 +106,15 @@ for id in idList:
 sg.Display(id_torus1)
 sg.Display(id_torus2)
 sg.Display(id_acyl)
-
-gg.setTransparency(id_torus1,0.5)
-
-gg.setDisplayMode(id_torus1,1)
-gg.setDisplayMode(id_torus2,1)
-gg.setDisplayMode(id_acyl,1)
-#gg.setDisplayMode(id_cage,1)
-
-gg.setColor(id_torus1,0,0,255)
-gg.setColor(id_torus2,255,0,0)
-gg.setColor(id_acyl,0,255,0)
-#gg.setColor(id_cage,255,255,0)
\ No newline at end of file
+if not isinstance(gg, type(salome_ComponentGUI)):
+    gg.setTransparency(id_torus1,0.5)
+    
+    gg.setDisplayMode(id_torus1,1)
+    gg.setDisplayMode(id_torus2,1)
+    gg.setDisplayMode(id_acyl,1)
+    #gg.setDisplayMode(id_cage,1)
+    
+    gg.setColor(id_torus1,0,0,255)
+    gg.setColor(id_torus2,255,0,0)
+    gg.setColor(id_acyl,0,255,0)
+    #gg.setColor(id_cage,255,255,0)