some fixes in tests

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

diff --git a/test/VisuPrs/3D_viewer/A9.py b/test/VisuPrs/3D_viewer/A9.py
old mode 100755 (executable)
new mode 100644 (file)
index 7f452ff..02f61cb
--- a/test/VisuPrs/3D_viewer/A9.py
+++ b/test/VisuPrs/3D_viewer/A9.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,10 +24,8 @@ from paravistest import *
 from presentations import *
 from pvsimple import *
 import sys
-import paravis
 import time
 
-
 def check_value(prs, property_name, value, do_raise=1, compare_toler=-1.0):
     # compare just set value and the one got from presentation
     really_set_value = prs.GetPropertyValue(property_name)
@@ -60,9 +58,6 @@ picturedir = get_picture_dir("3D_viewer/A9")
 if not picturedir.endswith(os.sep):
     picturedir += os.sep
 
-#import file
-myParavis = paravis.myParavis
-
 # Get view
 my_view = GetRenderView()
 reset_view(my_view)
@@ -73,7 +68,7 @@ print " --------------------------------- "
 print "file ", theFileName
 print " --------------------------------- "
 
-myParavis.ImportFile(theFileName)
+OpenDataFile(theFileName)
 proxy = GetActiveSource()
 if proxy is None:
     raise RuntimeError("Error: can't import file.")
@@ -104,8 +99,7 @@ shrink_filter = Shrink(scalar_map.Input)
 shrink_filter.ShrinkFactor = 0.8
 shrink_filter.UpdatePipeline()
 shrinked_scalar_map = GetRepresentation(shrink_filter)
-shrinked_scalar_map.ColorAttributeType = EntityType.get_pvtype(EntityType.CELL)
-shrinked_scalar_map.ColorArrayName = field_name
+shrinked_scalar_map.ColorArrayName = (EntityType.get_pvtype(EntityType.CELL), field_name)
 shrinked_scalar_map.Representation = scalar_map.Representation
 lookup_table = scalar_map.LookupTable
 shrinked_scalar_map.LookupTable = lookup_table
@@ -206,8 +200,7 @@ shrink_filter = Shrink(scalar_map.Input)
 shrink_filter.ShrinkFactor = 0.8
 shrink_filter.UpdatePipeline()
 shrinked_scalar_map = GetRepresentation(shrink_filter)
-shrinked_scalar_map.ColorAttributeType = EntityType.get_pvtype(EntityType.CELL)
-shrinked_scalar_map.ColorArrayName = field_name
+shrinked_scalar_map.ColorArrayName = (EntityType.get_pvtype(EntityType.CELL), field_name)
 shrinked_scalar_map.Representation = scalar_map.Representation
 lookup_table = scalar_map.LookupTable
 shrinked_scalar_map.LookupTable = lookup_table