enable make test

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

diff --git a/test/VisuPrs/3D_viewer/A5.py b/test/VisuPrs/3D_viewer/A5.py
index 7d779536133222350dc0f432a52357c3509996ec..b0b63cf0e2e21de198cf5c94bcd60db5a19364b5 100644 (file)
--- a/test/VisuPrs/3D_viewer/A5.py
+++ b/test/VisuPrs/3D_viewer/A5.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  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
@@ -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/A5")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
-#import file
-myParavis = paravis.myParavis
-
 # Get view
 my_view = GetRenderView()
 reset_view(my_view)
@@ -47,7 +43,7 @@ print " --------------------------------- "
 print "file ", file_name
 print " --------------------------------- "
 
-myParavis.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
@@ -90,8 +86,7 @@ for reprCode in represents:
                 shrink_filter.ShrinkFactor = 0.8
                 shrink_filter.UpdatePipeline()
                 shrinked_ds = GetRepresentation(shrink_filter)
-                shrinked_ds.ColorAttributeType = ds.ColorAttributeType
-                shrinked_ds.ColorArrayName = ds.ColorArrayName
+                shrinked_ds.ColorArrayName = ds.ColorArrayName[0:2]
                 shrinked_ds.LookupTable = ds.LookupTable
             ds.Visibility = 0
             shrinked_ds.Representation = ds.Representation
@@ -105,7 +100,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: