X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_SWIG%2FSMESH_test.py;h=84be029ed37f5e7c81fb0b7732784eb7b6bfe566;hb=e3019524b4caa444880639745b22f30d577aba2c;hp=7b2bbbcac4058763e5ca716ee49a8cb30e82a329;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git

diff --git a/src/SMESH_SWIG/SMESH_test.py b/src/SMESH_SWIG/SMESH_test.py
index 7b2bbbcac..84be029ed 100644
--- a/src/SMESH_SWIG/SMESH_test.py
+++ b/src/SMESH_SWIG/SMESH_test.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -7,7 +7,7 @@
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,13 +21,19 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+#  SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes
 #  File   : SMESH_test.py
 #  Module : SMESH
 #
 import salome
-import geompy
-import smesh
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New()
+
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New()
 
 # ---- define a box
 
@@ -57,49 +63,49 @@ ide = geompy.addToStudyInFather(face, edge, name)
 
 # ---- SMESH
 
-smesh.SetCurrentStudy(salome.myStudy)
+smesh.UpdateStudy()
 box = salome.IDToObject(idb)
 mesh = smesh.Mesh(box, "Meshbox")
 
-print "-------------------------- add hypothesis to box"
+print("-------------------------- add hypothesis to box")
 
 algo_1 = mesh.Segment(box)
 hyp = algo_1.LocalLength(100)
-print hyp.GetName()
-print hyp.GetId()
-print hyp.GetLength()
+print(hyp.GetName())
+print(hyp.GetId())
+print(hyp.GetLength())
 
-algo_2 = mesh.Triangle(smesh.MEFISTO, box)
+algo_2 = mesh.Triangle(smeshBuilder.MEFISTO, box)
 hyp = algo_2.MaxElementArea(5000)
-print hyp.GetName()
-print hyp.GetId()
-print hyp.GetMaxElementArea()
+print(hyp.GetName())
+print(hyp.GetId())
+print(hyp.GetMaxElementArea())
 
 smesh.SetName(algo_2.GetSubMesh(), "SubMeshBox")
 
 
-print "-------------------------- add hypothesis to edge"
+print("-------------------------- add hypothesis to edge")
 
 edge = salome.IDToObject(ide)
 
 algo_3 = mesh.Segment(edge)
 hyp = algo_3.LocalLength(100)
-print hyp.GetName()
-print hyp.GetId()
-print hyp.GetLength()
+print(hyp.GetName())
+print(hyp.GetId())
+print(hyp.GetLength())
 
 smesh.SetName(algo_3.GetSubMesh(), "SubMeshEdge")
 
 
-print "-------------------------- compute face"
+print("-------------------------- compute face")
 
 face = salome.IDToObject(idf)
 
 ret = mesh.Compute(face)
-print ret
-log = mesh.GetLog(0) # 0 - GetLog without ClearLog after, else if 1 - ClearLog after
+print(ret)
+log = [] #mesh.GetLog(0) # 0 - GetLog without ClearLog after, else if 1 - ClearLog after
 for a in log:
-    print "-------"
+    print("-------")
     ii = 0
     ir = 0
     comType = a.commandType
@@ -113,7 +119,7 @@ for a in log:
             ir = ir+1
             r3 = a.coords[ir]
             ir = ir+1
-            print "AddNode %i - %g %g %g" % (ind, r1, r2, r3)
+            print("AddNode %i - %g %g %g" % (ind, r1, r2, r3))
     elif comType == 1:
         for i in range(a.number):
             ind = a.indexes[ii]
@@ -122,21 +128,23 @@ for a in log:
             ii = ii+1
             i2 = a.indexes[ii]
             ii = ii+1
-            print "AddEdge %i - %i %i" % (ind, i1, i2)
+            print("AddEdge %i - %i %i" % (ind, i1, i2))
     elif comType == 2:
         for i in range(a.number):
             ind = a.indexes[ii]
-	    print ind
+            print(ind)
             ii = ii+1
-	    print ii
+            print(ii)
             i1 = a.indexes[ii]
             ii = ii+1
             i2 = a.indexes[ii]
-	    print i2
+            print(i2)
             ii = ii+1
-	    print "ii", ii
+            print("ii", ii)
             i3 = a.indexes[ii]
-	    print i3
+            print(i3)
             #ii = ii+1
             ii = ii+1
-            print "AddTriangle %i - %i %i %i" % (ind, i1, i2, i3)
+            print("AddTriangle %i - %i %i %i" % (ind, i1, i2, i3))
+
+salome.sg.updateObjBrowser()