Merge branch 'akl/tests_update'

[modules/paravis.git] / test / VisuPrs / 2D_viewer / A0.py

diff --git a/test/VisuPrs/2D_viewer/A0.py b/test/VisuPrs/2D_viewer/A0.py
index 3d8b6173cba44ca7667b7a6b6f07eb28d321323b..acf4e793d9343d1d4b17695524920b29b7067d21 100755 (executable)
--- a/test/VisuPrs/2D_viewer/A0.py
+++ b/test/VisuPrs/2D_viewer/A0.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2012  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
@@ -36,20 +36,19 @@ aXYPlot.ChartTitle = '   '
 aXYPlot.ChartTitle = 'title of XY plot'
 print "Chart title for xyplot ...", aXYPlot.ChartTitle
 
-# Show left and bottom axis
-aXYPlot.ShowAxis = [1, 1, 0, 0]
+error = 0
+
+aXYPlot.AxisUseCustomRange = [1, 1, 0, 0]
 
 # Show grids
 aXYPlot.ShowAxisGrid = [1, 1, 0, 0]
 
-# Set axis range for left and bottom axis
-aXYPlot.AxisBehavior = [1, 1, 0, 0]
-
 aMinX = 0
 aMaxX = 100
 aMinY = 0
 aMaxY = 10
-aXYPlot.AxisRange = [aMinX, aMaxX, aMinY, aMaxY, 0.0, 1.0, 0.0, 1.0]
+aXYPlot.BottomAxisRange = [aMinX, aMaxX]
+aXYPlot.LeftAxisRange = [aMinY, aMaxY]
 
 # Set horizontal scaling for left and bottom axis
 print "Default logarithmic scaling  ...", aXYPlot.AxisLogScale
@@ -73,3 +72,6 @@ print "Title of the bottom axis          ...", aXYPlot.AxisTitle[1]
 # Show/hide legend
 aXYPlot.ShowLegend = 1
 aXYPlot.ShowLegend = 0
+
+if error > 0:
+    raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..."