From: rnv <rnv@opencascade.com>
Date: Fri, 18 Aug 2017 14:43:07 +0000 (+0300)
Subject: Merge master into V9_dev
X-Git-Tag: V9_0_0~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=910e1b8c12ac2978e64847e9694b080c8381bc60;p=modules%2Fkernel.git

Merge master into V9_dev
---

910e1b8c12ac2978e64847e9694b080c8381bc60
diff --cc src/KERNEL_PY/salome_test.py
index 60efd54fc,13f46c1b8..15fa68917
--- a/src/KERNEL_PY/salome_test.py
+++ b/src/KERNEL_PY/salome_test.py
@@@ -351,103 -351,59 +351,59 @@@ print("================================
  
  if salome.hasDesktop(): # in gui mode
  
 -    print "**** Importing pvserver... It can take some time."
 +    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"
 +    print("**** Stage1: Importing MED file")
      
 -    print 'Import "ResOK_0000.med"...............',
 +    print('Import "ResOK_0000.med"...............', end=' ')
      medFileName = "ResOK_0000.med"
      medFile = os.path.join(os.getenv('DATA_DIR'), 'MedFiles', medFileName)
      pvsimple.MEDReader( FileName=medFile )
      med_reader = pvsimple.GetActiveSource()
      
      if med_reader is None:
 -        print "FAILED"
 +        print("FAILED")
      else:
 -        print "OK"
 +        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("**** Stage2: Displaying presentation")
      
 -    print 'Get view...................',
 +    print('Get view...................', end=' ')
      view = pvsimple.GetRenderView()
      if view is None:
 -        print "FAILED"
 +        print("FAILED")
      else:
-         reset_view(view)
-         print("OK")
 -        print "OK"
++        print ("OK")
      
-     print("Creating Scalar Map.......", end=' ')
-     scalarmap = ScalarMapOnField(med_reader, node_entity, 'vitesse', 2)
-     if scalarmap is None:
 -    print "Creating presentation.......",
++    print("Creating presentation.......",end='')
+     prs = pvsimple.GetRepresentation(med_reader)
+     if prs is None:
 -        print "FAILED"
 +        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:
++        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"
++        print ("OK")
+     
  else: # not in gui mode, Paravis can not be tested
      
 -    print
 -    print "PARAVIS module requires SALOME to be running in GUI mode."
 -    print
 -    print "Skipping test for PARAVIS..."
 +    print()
 +    print("PARAVIS module requires SALOME to be running in GUI mode.")
 +    print()
 +    print("Skipping test for PARAVIS...")
      pass
  
  # ---- update object browser