some fixes in tests

[modules/paravis.git] / test / VisuPrs / dump_study / A8.py

diff --git a/test/VisuPrs/dump_study/A8.py b/test/VisuPrs/dump_study/A8.py
old mode 100755 (executable)
new mode 100644 (file)
index 1595406..32a28fd
--- a/test/VisuPrs/dump_study/A8.py
+++ b/test/VisuPrs/dump_study/A8.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
@@ -21,16 +21,13 @@
 
 from paravistest import datadir, delete_with_inputs
 from presentations import *
-import paravis
 from pvsimple import *
 
-my_paravis = paravis.myParavis
-
 settings = {"Offset": [0.0001, 0.0002, 0], "ScalarMode": ("Component", 2), "Position": [0.1, 0.2], "Size": [0.15, 0.25], "Discretize": 1, "NbColors": 44, "NbLabels": 22, "Title": "My presentation", "UseLogScale": 1, "Orientation": 'Horizontal', "Scale": 0.333, "ColorArray": "", "ColorComponents": [0.111, 0.222, 0.333],  "LineWidth": 2, "GlyphType": 'Cone', "GlyphPos": [-0.5, 0.0, 0.0]}
 
 # 1. TimeStamps.med import
 file_path = datadir + "TimeStamps.med"
-my_paravis.ImportFile(file_path)
+OpenDataFile(file_path)
 med_reader = GetActiveSource()
 if med_reader is None :
     raise RuntimeError, "TimeStamps.med wasn't imported..."
@@ -49,7 +46,7 @@ vectors.LookupTable.NumberOfTableValues = settings["NbColors"]
 vectors.LookupTable.UseLogScale = settings["UseLogScale"]
 
 vectors.Input.SetScaleFactor = settings["Scale"]
-vectors.ColorArrayName = ''
+vectors.ColorArrayName = (None, '')
 vectors.AmbientColor = settings["ColorComponents"]
 
 vectors.LineWidth = settings["LineWidth"]
@@ -167,7 +164,7 @@ if abs(scale - settings["Scale"]) > tolerance:
     errors += 1
 
 # Color array name
-array_name = recreated_vectors.ColorArrayName
+array_name = recreated_vectors.ColorArrayName[1]
 if array_name != settings["ColorArray"]:
     print "ERROR!!! Color array name of presentation is incorrect: ",  array_name, " instead of ", settings["arrayName"]
     errors += 1