Further porting: ImportFile is now replaced by OpenDataFile

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

diff --git a/test/VisuPrs/3D_viewer/A6.py b/test/VisuPrs/3D_viewer/A6.py
index e73b309c23d556c6f6559734df2f7e5172bec32b..ff50c0c5283e43227b636cc7daba6c43b9bf7288 100644 (file)
--- a/test/VisuPrs/3D_viewer/A6.py
+++ b/test/VisuPrs/3D_viewer/A6.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2014  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
@@ -25,11 +25,11 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
+import pvserver as paravis
 import time
 
 # Directory for saving snapshots
-picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A6")
+picturedir = get_picture_dir("3D_viewer/A6")
 
 # Add path separator to the end of picture path if necessery
 if not picturedir.endswith(os.sep):
@@ -48,7 +48,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.")
@@ -58,7 +58,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
@@ -106,7 +106,7 @@ for reprCode in represents:
 
         for sha in shadings:
             setShaded(my_view, sha)
-            call_and_check(shape_to_show, "Shading", sha, 1)
+            call_and_check(shape_to_show, "Interpolation", sha, 1)
             Render(my_view)
 
             for opa in opacities: