Fixing cmake3.12 dependancy problem on // compilation

[modules/kernel.git] / src / KERNEL_PY / salome_test.py

diff --git a/src/KERNEL_PY/salome_test.py b/src/KERNEL_PY/salome_test.py
index 08070cb210dcb0fa9b8b37948d8989a141dfb34b..4c4c05110c2e0c75c31f833b4801ab8c4480bc2d 100755 (executable)
--- a/src/KERNEL_PY/salome_test.py
+++ b/src/KERNEL_PY/salome_test.py
@@ -54,7 +54,8 @@ 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()
@@ -112,7 +113,7 @@ print("           %d. Test Geometry " % step); step+=1
 print("======================================================================")
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 ShapeTypeCompSolid = 1
 ShapeTypeSolid = 2
@@ -163,7 +164,7 @@ print("OK")
 
 # ---- update object browser
 if salome.hasDesktop():
-    salome.sg.updateObjBrowser(True);
+    salome.sg.updateObjBrowser();
 
 print()
 
@@ -178,9 +179,9 @@ from salome.smesh import smeshBuilder
 smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")
 if salome.hasDesktop():
     smeshgui = salome.ImportComponentGUI("SMESH")
-    smeshgui.Init(salome.myStudyId);
+    smeshgui.Init();
 else:
-    smesh = smeshBuilder.New(salome.myStudy)
+    smesh = smeshBuilder.New()
 
 # ---- create hypotheses 
 
@@ -300,7 +301,7 @@ print("OK")
 
 # ---- update object browser
 if salome.hasDesktop():
-    salome.sg.updateObjBrowser(True);
+    salome.sg.updateObjBrowser();
 
 print()
 
@@ -352,12 +353,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")
@@ -373,75 +371,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...................', end=' ')
     view = pvsimple.GetRenderView()
     if view is None:
         print("FAILED")
     else:
-        reset_view(view)
-        print("OK")
+        print ("OK")
     
-    print("Creating Scalar Map.......", end=' ')
-    scalarmap = ScalarMapOnField(med_reader, node_entity, 'vitesse', 2)
-    if scalarmap is None:
+    print("Creating presentation.......",end='')
+    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..........", end=' ')
-    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.....", end=' ')
-    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.......", end=' ')
-    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)
-        print("OK")
-    
-    print("Creating Scalar Map On Deformed Shape.......", end=' ')
-    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")
+        # ---- surface representation
+        prs.SetRepresentationType('Surface')
+        view.ResetCamera()
 
+        print ("OK")
+    
 else: # not in gui mode, Paravis can not be tested
     
     print()
@@ -452,4 +409,4 @@ else: # not in gui mode, Paravis can not be tested
 
 # ---- update object browser
 if salome.hasDesktop():
-    salome.sg.updateObjBrowser(True);
+    salome.sg.updateObjBrowser();