Merge remote branch 'origin/V7_dev'

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

diff --git a/test/VisuPrs/3D_viewer/A1.py b/test/VisuPrs/3D_viewer/A1.py
index 3591563f7935f9f60565f33862fcddbc12d21882..c8e1d2a2112c6801ba51fff71851bd27abba920e 100644 (file)
--- a/test/VisuPrs/3D_viewer/A1.py
+++ b/test/VisuPrs/3D_viewer/A1.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  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
 # 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
@@ -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/A1")
 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,7 +53,7 @@ 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
@@ -67,7 +63,7 @@ field_name = 'VITESSE'
 # Get view
 my_view = GetRenderView()
 
-print "\nCreating plot3d.......",
+print "\nCreating plot3d......."
 plot3d = Plot3DOnField(proxy, EntityType.NODE, field_name, 1)
 if plot3d is None:
     raise RuntimeError("Error!!! Presentation wasn't created...")
@@ -90,7 +86,7 @@ for reprCode in represents:
 
     for sha in shadings:
         setShaded(my_view, sha)
-        call_and_check(plot3d, "Shading", sha, 1)
+        call_and_check(plot3d, "Interpolation", sha, 1)
         Render(my_view)
 
         for opa in opacities: