enable make test

[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 1aec3631aa09a6d13055e7b592dc7975ed982371..e77a16bd3c01c2116854d1b549657fb28c2e2195 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-2015  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,7 +25,6 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
 import time
 
 # Directory for saving snapshots
@@ -35,9 +34,6 @@ picturedir = get_picture_dir("3D_viewer/A6")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
-#import file
-my_paravis = paravis.myParavis
-
 # Get view
 my_view = GetRenderView()
 reset_view(my_view)
@@ -48,7 +44,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 +54,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
@@ -91,9 +87,8 @@ for reprCode in represents:
                 shrink_filter.ShrinkFactor = 0.8
                 shrink_filter.UpdatePipeline()
                 shr_sm_on_ds = GetRepresentation(shrink_filter)
-                shr_sm_on_ds.ColorArrayName = sm_on_ds.ColorArrayName
+                shr_sm_on_ds.ColorArrayName = sm_on_ds[0:2]
                 shr_sm_on_ds.LookupTable = sm_on_ds.LookupTable
-                shr_sm_on_ds.ColorAttributeType = sm_on_ds.ColorAttributeType
             sm_on_ds.Visibility = 0
             shr_sm_on_ds.Representation = sm_on_ds.Representation
             shape_to_show = shr_sm_on_ds
@@ -106,7 +101,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: