Merge remote branch 'origin/V7_dev'

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

diff --git a/test/VisuPrs/3D_viewer/A7.py b/test/VisuPrs/3D_viewer/A7.py
index 89c7b1e6724a4a2376acce9422ed6703782aa401..03b895f563cd20e2d18426f4c4ac1b0a205f8216 100644 (file)
--- a/test/VisuPrs/3D_viewer/A7.py
+++ b/test/VisuPrs/3D_viewer/A7.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,17 +24,14 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
 import time
 
 # Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A7")
+picturedir = get_picture_dir("3D_viewer/A7")
 
 # Add path separator to the end of picture path if necessery
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
-#import file
-my_paravis = paravis.myParavis
 
 # Get view
 my_view = GetRenderView()
@@ -46,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.")
@@ -56,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 = 'scalar_field'
+field_name = 'scalar field'
 
 print "\nCreating cut planes.......",
 cut_planes = CutPlanesOnField(proxy, EntityType.CELL, field_name, 1,
@@ -87,7 +84,7 @@ for reprCode in represents:
 
         for sha in shadings:
             setShaded(my_view, sha)
-            call_and_check(cut_planes, "Shading", sha, 1)
+            call_and_check(cut_planes, "Interpolation", sha, 1)
             Render(my_view)
 
             for opa in opacities: