X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test%2FVisuPrs%2F2D_viewer%2FA1.py;h=a22d0903f6daee800ac84a5f164941655c4ecb91;hb=4a57db874eec7effe71cbb82377d351d1c1ae723;hp=17fc4c806872b712e5ef3291f58c689a633ce703;hpb=89c33033151baa33eeac8fb09d9c0488acb43c35;p=modules%2Fparavis.git

diff --git a/test/VisuPrs/2D_viewer/A1.py b/test/VisuPrs/2D_viewer/A1.py
index 17fc4c80..a22d0903 100755
--- a/test/VisuPrs/2D_viewer/A1.py
+++ b/test/VisuPrs/2D_viewer/A1.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2013  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
@@ -25,31 +25,51 @@ from pvsimple import CreateXYPlotView
 # Create view
 aXYPlot = CreateXYPlotView()
 
-# Set range
-axisRange = aXYPlot.AxisRange
+error = 0
+
+aXYPlot.AxisUseCustomRange = [1, 1, 0, 0]
 # Left axis range
+axisRange = aXYPlot.LeftAxisRange
 axisRange[0:2] = [200., 800.]
-Ranges = aXYPlot.AxisRange
-Etvalue = [200, 800, axisRange[2], axisRange[3],
-           axisRange[4], axisRange[5], axisRange[6], axisRange[7] ]
-error = test_values(Ranges, Etvalue)
+Ranges = aXYPlot.LeftAxisRange
+Etvalue = [200, 800]
+error = error + test_values(Ranges, Etvalue)
 # Bottom axis range
-aXYPlot.AxisRange[2:4] = [350.,750.]
-Ranges = aXYPlot.AxisRange
-Etvalue = [200, 800, 350, 750,
-           axisRange[4], axisRange[5], axisRange[6], axisRange[7]]
+axisRange = aXYPlot.BottomAxisRange
+axisRange[0:2] = [350.,750.]
+Ranges = aXYPlot.BottomAxisRange
+Etvalue = [350, 750]
 error = error + test_values(Ranges, Etvalue)
 # Left and bottom axis range
-aXYPlot.AxisRange[0:4] = [1350.,2750.,240.,2230.]
-Ranges=aXYPlot.AxisRange
-Etvalue=[1350.,2750.,240.,2230.,
-         axisRange[4], axisRange[5], axisRange[6], axisRange[7]]
-error = error + test_values(Ranges, Etvalue)
+aXYPlot.LeftAxisRange[0:2] = [1350.,2750.]
+aXYPlot.BottomAxisRange[0:2] = [240.,2230.]
+Etvalue=[1350.,2750.,240.,2230.]
+Ranges=aXYPlot.LeftAxisRange
+error = error + test_values(Ranges, Etvalue[0:2])
+Ranges=aXYPlot.BottomAxisRange
+error = error + test_values(Ranges, Etvalue[2:4])
+
+try:
+    aXYPlot.ShowAxis = [1, 1, 1, 1]
+except:
+    print "Error: ShowAxis property is not avaliable for XYPlotView"
+    error = error + 1
+
+aXYPlot.AxisUseCustomRange = [1, 1, 1, 1]
 # Left, bottom, right and top axis range
-aXYPlot.AxisRange = [0, 200, 100, 450, 0, 200, 100, 450]
-Ranges = aXYPlot.AxisRange
+aXYPlot.LeftAxisRange = [0, 200]
+aXYPlot.BottomAxisRange = [100, 450]
+aXYPlot.RightAxisRange = [0, 200]
+aXYPlot.TopAxisRange = [100, 450]
 Etvalue = [0, 200, 100, 450, 0, 200, 100, 450]
-error = error + test_values(Ranges, Etvalue)
+Ranges=aXYPlot.LeftAxisRange
+error = error + test_values(Ranges, Etvalue[0:2])
+Ranges=aXYPlot.BottomAxisRange
+error = error + test_values(Ranges, Etvalue[2:4])
+Ranges=aXYPlot.RightAxisRange
+error = error + test_values(Ranges, Etvalue[4:6])
+Ranges=aXYPlot.TopAxisRange
+error = error + test_values(Ranges, Etvalue[6:8])
 
 if error > 0:
     raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..."