Merge remote branch 'origin/V7_dev'

[modules/paravis.git] / test / VisuPrs / 3D_viewer / A2.py

diff --git a/test/VisuPrs/3D_viewer/A2.py b/test/VisuPrs/3D_viewer/A2.py
index e9926f7c3c82ee41230cf03b0d755047a2205096..d22d4e8defe6278fe329c4bbdafc1caecd8569d0 100644 (file)
--- a/test/VisuPrs/3D_viewer/A2.py
+++ b/test/VisuPrs/3D_viewer/A2.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,6 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
 import time
 
 # Directory for saving snapshots
@@ -34,9 +33,6 @@ picturedir = get_picture_dir("3D_viewer/A2")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
-#import file
-my_paravis = paravis.myParavis
-
 # Get view
 my_view = GetRenderView()
 reset_view(my_view)
@@ -47,7 +43,7 @@ print " --------------------------------- "
 print "file ", file_name
 print " --------------------------------- "
 
-my_paravis.ImportFile(file_name)
+OpenDataFile(file_name)
 proxy = GetActiveSource()
 if proxy is None:
     raise RuntimeError("Error: can't import file.")
@@ -57,12 +53,12 @@ else:
 represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\
 RepresentationType.SURFACE, RepresentationType.VOLUME]
 shrinks = [0, 1]
-shadings = [0, 1]
+shadings = ["Flat", "Gouraud"]
 opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 
 print "\nCreating Vectors.......",
 vectors = VectorsOnField(proxy, EntityType.CELL, field_name, 1,
@@ -87,7 +83,7 @@ for reprCode in represents:
         call_and_check(vectors, "Representation", repr, 1)
 
         for sha in shadings:
-            call_and_check(vectors, "Shading", sha, 1)
+            call_and_check(vectors, "Interpolation", sha, 1)
             setShaded(my_view, sha)
             Render(my_view)
             time.sleep(1)