From: vsr <vsr@opencascade.com>
Date: Thu, 30 Oct 2014 08:15:40 +0000 (+0300)
Subject: Migrate tests to PV4.2
X-Git-Tag: V7_5_0b1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d11316a1b103dea4191725d8a5c258cd8769bbea;p=modules%2Fparavis.git

Migrate tests to PV4.2
---

diff --git a/test/VisuPrs/2D_viewer/A0.py b/test/VisuPrs/2D_viewer/A0.py
index acf4e793..eb6d95f7 100755
--- a/test/VisuPrs/2D_viewer/A0.py
+++ b/test/VisuPrs/2D_viewer/A0.py
@@ -19,59 +19,55 @@
 
 # This case corresponds to: /visu/2D_viewer/A0 case
 
-import paravistest
-
-from pvsimple import CreateXYPlotView, Delete
+from paravistest import *
+from presentations import *
+from pvsimple import *
 
 # Create view
 aXYPlot = CreateXYPlotView()
-# Delete view
-Delete(aXYPlot)
-# Create view again
-aXYPlot = CreateXYPlotView()
+Render(aXYPlot)
 
 # Set title
-print "Default chart title    ...", aXYPlot.ChartTitle
-aXYPlot.ChartTitle = '   '
+print "Default chart title  ...", aXYPlot.ChartTitle
 aXYPlot.ChartTitle = 'title of XY plot'
-print "Chart title for xyplot ...", aXYPlot.ChartTitle
+print "New chart title      ...", aXYPlot.ChartTitle
 
-error = 0
-
-aXYPlot.AxisUseCustomRange = [1, 1, 0, 0]
+# Apply custom axes range
+aXYPlot.LeftAxisUseCustomRange = 1
+aXYPlot.BottomAxisUseCustomRange = 1
 
 # Show grids
-aXYPlot.ShowAxisGrid = [1, 1, 0, 0]
+aXYPlot.ShowLeftAxisGrid = 1
+aXYPlot.ShowBottomAxisGrid = 1
 
 aMinX = 0
 aMaxX = 100
 aMinY = 0
 aMaxY = 10
-aXYPlot.BottomAxisRange = [aMinX, aMaxX]
-aXYPlot.LeftAxisRange = [aMinY, aMaxY]
+aXYPlot.LeftAxisRangeMinimum = aMinY
+aXYPlot.LeftAxisRangeMaximum = aMaxY
+aXYPlot.BottomAxisRangeMinimum = aMinX
+aXYPlot.BottomAxisRangeMaximum = aMaxX
 
 # Set horizontal scaling for left and bottom axis
-print "Default logarithmic scaling  ...", aXYPlot.AxisLogScale
+print "Default logarithmic scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale )
 # Set logarithmic scaling
-aXYPlot.AxisLogScale = [1, 1, 0, 0]
-print "Logarithmic scaling          ...", aXYPlot.AxisLogScale
+aXYPlot.LeftAxisLogScale = 1
+aXYPlot.BottomAxisLogScale = 1
+print "Set logarithmic scaling     ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale )
 # Set linear scaling
-aXYPlot.AxisLogScale = [0, 0, 0, 0]
-print "Linear scaling               ...", aXYPlot.AxisLogScale
+aXYPlot.LeftAxisLogScale = 0
+aXYPlot.BottomAxisLogScale = 0
+print "Set linear scaling          ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale )
 
 # Axis titles
-print "Default title of the left axis    ...", aXYPlot.AxisTitle[0]
-aXYPlot.AxisTitle[0] = '    '
-aXYPlot.AxisTitle[0] ="Xtitle of XY plot"
-print "Title of the left axis            ...", aXYPlot.AxisTitle[0]
-print "Default title of the bottom axis  ...", aXYPlot.AxisTitle[1]
-aXYPlot.AxisTitle[1] = '    '
-aXYPlot.AxisTitle[1] = "Ytitle of XY plot"
-print "Title of the bottom axis          ...", aXYPlot.AxisTitle[1]
+print "Default title of the left axis    ...", aXYPlot.LeftAxisTitle
+aXYPlot.LeftAxisTitle = "Ytitle of XY plot"
+print "New title of the left axis        ...", aXYPlot.LeftAxisTitle
+print "Default title of the bottom axis  ...", aXYPlot.BottomAxisTitle
+aXYPlot.BottomAxisTitle = "Xtitle of XY plot"
+print "New title of the bottom axis      ...", aXYPlot.BottomAxisTitle
 
 # 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..."
diff --git a/test/VisuPrs/2D_viewer/A1.py b/test/VisuPrs/2D_viewer/A1.py
index 1dd0c38f..7c845fa4 100755
--- a/test/VisuPrs/2D_viewer/A1.py
+++ b/test/VisuPrs/2D_viewer/A1.py
@@ -19,50 +19,49 @@
 
 # This case corresponds to: /visu/2D_viewer/A1 case
 
-from paravistest import test_values
-from pvsimple import CreateXYPlotView
+from paravistest import *
+from presentations import *
+from pvsimple import *
 
 # Create view
 aXYPlot = CreateXYPlotView()
+Render(aXYPlot)
 
 error = 0
 
-aXYPlot.AxisUseCustomRange = [1, 1, 0, 0]
+# Apply custom axes range
+Etvalue = (1, 1, 1, 1)
+aXYPlot.LeftAxisUseCustomRange, aXYPlot.BottomAxisUseCustomRange, aXYPlot.RightAxisUseCustomRange, aXYPlot.TopAxisUseCustomRange = 1, 1, 1, 1
+Ranges = aXYPlot.LeftAxisUseCustomRange, aXYPlot.BottomAxisUseCustomRange, aXYPlot.RightAxisUseCustomRange, aXYPlot.TopAxisUseCustomRange
+error = error + test_values(Ranges, Etvalue)
+
+# Set custom axes range
+aXYPlot.LeftAxisUseCustomRange = 1
+aXYPlot.BottomAxisUseCustomRange = 1
+
 # Left axis range
-axisRange = aXYPlot.LeftAxisRange
-axisRange[0:2] = [200., 800.]
-Ranges = aXYPlot.LeftAxisRange
-Etvalue = [200, 800]
+Etvalue = (200., 800.)
+aXYPlot.LeftAxisRangeMinimum, aXYPlot.LeftAxisRangeMaximum = Etvalue
+Ranges = aXYPlot.LeftAxisRangeMinimum, aXYPlot.LeftAxisRangeMaximum
 error = error + test_values(Ranges, Etvalue)
+
 # Bottom axis range
-axisRange = aXYPlot.BottomAxisRange
-axisRange[0:2] = [350.,750.]
-Ranges = aXYPlot.BottomAxisRange
-Etvalue = [350, 750]
+Etvalue = (350., 750.)
+aXYPlot.BottomAxisRangeMinimum, aXYPlot.BottomAxisRangeMaximum = Etvalue
+Ranges = aXYPlot.BottomAxisRangeMinimum, aXYPlot.BottomAxisRangeMaximum
+error = error + test_values(Ranges, Etvalue)
+
+# Right axis range
+Etvalue = (0., 300.)
+aXYPlot.RightAxisRangeMinimum, aXYPlot.RightAxisRangeMaximum = Etvalue
+Ranges = aXYPlot.RightAxisRangeMinimum, aXYPlot.RightAxisRangeMaximum
+error = error + test_values(Ranges, Etvalue)
+
+# Top axis range
+Etvalue = (100., 450.)
+aXYPlot.TopAxisRangeMinimum, aXYPlot.TopAxisRangeMaximum = Etvalue
+Ranges = aXYPlot.TopAxisRangeMinimum, aXYPlot.TopAxisRangeMaximum
 error = error + test_values(Ranges, Etvalue)
-# Left and bottom axis range
-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])
-aXYPlot.AxisUseCustomRange = [1, 1, 1, 1]
-# Left, bottom, right and top axis range
-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]
-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..."