X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FKERNEL_PY%2Fsalome_test.py;h=76dceacd467a9874ce0f7e58d8ff434286e39b21;hb=1119e0f3b0ead5c13e8f458fc9a75b7797420dd8;hp=7a94577602749fbae5c4d23a4ea619facc1fded7;hpb=718e0abe0126e5e53b3ba41fff1028efcf5bc887;p=modules%2Fkernel.git

diff --git a/src/KERNEL_PY/salome_test.py b/src/KERNEL_PY/salome_test.py
index 7a9457760..76dceacd4 100755
--- a/src/KERNEL_PY/salome_test.py
+++ b/src/KERNEL_PY/salome_test.py
@@ -54,7 +54,7 @@ print "======================================================================"
 obj = salome.naming_service.Resolve('Kernel/ModulCatalog')
 catalog = obj._narrow(SALOME_ModuleCatalog.ModuleCatalog)
 if not catalog:
-    raise RuntimeError, "Can't accesss module catalog"
+    raise RuntimeError, "Can't access module catalog"
 print "OK"
 
 print
@@ -163,7 +163,7 @@ print "OK"
 
 # ---- update object browser
 if salome.hasDesktop():
-    salome.sg.updateObjBrowser(1);
+    salome.sg.updateObjBrowser(True);
 
 print
 
@@ -184,10 +184,7 @@ else:
 
 # ---- create hypotheses 
 
-if sys.platform == "win32":
-  stdMeshersEngine = "StdMeshersEngine"
-else:
-  stdMeshersEngine = "libStdMeshersEngine.so"
+stdMeshersEngine = "StdMeshersEngine"
 
 print
 print "--- Create hypotheses ..."
@@ -303,7 +300,7 @@ print "OK"
 
 # ---- update object browser
 if salome.hasDesktop():
-    salome.sg.updateObjBrowser(1);
+    salome.sg.updateObjBrowser(True);
 
 print
 
@@ -355,12 +352,9 @@ print "======================================================================"
 if salome.hasDesktop(): # in gui mode
 
     print "**** Importing pvserver... It can take some time."
-    from presentations import *
     import pvserver
     import pvsimple
     
-    my_paravis = pvserver.myPVServerService
-    
     #====================Stage1: Importing MED file====================
     
     print "**** Stage1: Importing MED file"
@@ -376,75 +370,34 @@ if salome.hasDesktop(): # in gui mode
     else:
         print "OK"
     
-    cell_entity = EntityType.CELL
-    node_entity = EntityType.NODE
-    
-    #====================Stage2: Displaying vector field===============
+    #====================Stage2: Displaying presentation===============
     
-    print "**** Stage3: Displaying vector field"
+    print "**** Stage2: Displaying presentation"
     
     print 'Get view...................',
     view = pvsimple.GetRenderView()
     if view is None:
         print "FAILED"
     else:
-        reset_view(view)
         print "OK"
     
-    print "Creating Scalar Map.......",
-    scalarmap = ScalarMapOnField(med_reader, node_entity, 'vitesse', 2)
-    if scalarmap is None:
+    print "Creating presentation.......",
+    prs = pvsimple.GetRepresentation(med_reader)
+    if prs is None:
         print "FAILED"
     else:
-        bar = get_bar()
-        bar.Orientation = 'Horizontal'
-        bar.Position = [0.1, 0.1]
-        bar.Position2 = [0.1, 0.25]
-        bar.AspectRatio = 3
+	rep_list = view.Representations
+    	for rep in rep_list:
+            if hasattr(rep, 'Visibility'):
+                rep.Visibility = (rep == prs)
+        pvsimple.Render(view=view) 
         
-        display_only(scalarmap, view)
-        print "OK"
-    
-    view.ResetCamera()
-    
-    print "Creating Vectors..........",
-    vectors = VectorsOnField(med_reader, node_entity, 'vitesse', 2)
-    if vectors is None:
-        print "FAILED"
-    else:
-        display_only(vectors, view)
-        print "OK"
-    
-    print "Creating Iso Surfaces.....",
-    isosurfaces = IsoSurfacesOnField(med_reader, node_entity, 'vitesse', 2)
-    if isosurfaces is None:
-        print "FAILED"
-    else:
-        display_only(isosurfaces, view)
-        print "OK"
-    
-    print "Creating Cut Planes.......",
-    cutplanes = CutPlanesOnField(med_reader, node_entity, 'vitesse', 2,
-                                 nb_planes=30, orientation=Orientation.YZ)
-    if cutplanes is None:
-        print "FAILED"
-    else:
-        display_only(cutplanes, view)
+        # ---- surface representation
+        prs.SetRepresentationType('Surface')
+        view.ResetCamera()
+
         print "OK"
     
-    print "Creating Scalar Map On Deformed Shape.......",
-    scalarmapondefshape = DeformedShapeAndScalarMapOnField(med_reader,
-                                                           node_entity,
-                                                           'vitesse', 2,
-                                                           None,
-                                                           cell_entity,
-                                                           'pression')
-    if scalarmapondefshape is None:
-        print "FAILED"
-    else:
-        display_only(scalarmapondefshape, view)
-        print "OK"
-
 else: # not in gui mode, Paravis can not be tested
     
     print
@@ -455,4 +408,4 @@ else: # not in gui mode, Paravis can not be tested
 
 # ---- update object browser
 if salome.hasDesktop():
-    salome.sg.updateObjBrowser(1);
+    salome.sg.updateObjBrowser(True);