diff --git a/script/tests/templates/testTemplate.py b/script/tests/templates/testTemplate.py index 0c216aa..34d343e 100644 --- a/script/tests/templates/testTemplate.py +++ b/script/tests/templates/testTemplate.py @@ -35,7 +35,7 @@ def startTest(testName, DEVICE, params): test.getPath() string, path of this test file test.getName() string, name of this test test.getDeviceName() string, device for which the test must run (typically it is the beginning of a process variable name) - test.getPlotName() string, name to be given to the plot when using setPlotName(). Example: scan.setPlotName(test.getPlotName()) + test.getPlotName() string, name to be given to the plot when using setPlotTitle(). Example: scan.setPlotTitle(test.getPlotName()) ----------------------------------- GETTING TEST PARAMETERS: ----------------------------------- @@ -84,7 +84,7 @@ def startTest(testName, DEVICE, params): # initialise plot tab with 2 plots: pass here the axis names: scan = ManualScan(['sample'], ['Status (MSTA)', 'Position (VAL)']) # set plot name(tab title): - scan.setPlotName(test.getPlotName()) + scan.setPlotTitle(test.getPlotName()) # start plots. See further below how to add points to the plots (scan): scan.start() diff --git a/script/tests/tests.properties b/script/tests/tests.properties index a7b5fe4..ea9e037 100644 --- a/script/tests/tests.properties +++ b/script/tests/tests.properties @@ -1,5 +1,5 @@ #TestingList for pshell: configuration properties -#Fri May 12 17:36:14 CEST 2017 +#Fri May 12 17:55:12 CEST 2017 customPanel= showEnabledTestsOnly=true listFilter=LabTests diff --git a/script/tests/tests/Collimator Tests/Initialise/Initialise.py b/script/tests/tests/Collimator Tests/Initialise/Initialise.py index 0ab0272..b5dfa0b 100644 --- a/script/tests/tests/Collimator Tests/Initialise/Initialise.py +++ b/script/tests/tests/Collimator Tests/Initialise/Initialise.py @@ -29,7 +29,7 @@ def startTest(testName, DEVICE, params): #by default, failed ret = 'Test failed' success = False - #plot name to be given to the scan. Use: scan.setPlotName(plotName) + #plot name to be given to the scan. Use: scan.setPlotTitle(plotName) plotName = DEVICE + ' - ' + testName ###### WRITE YOUR CODE HERE BELOW ####### @@ -57,7 +57,7 @@ def startTest(testName, DEVICE, params): return scan = ManualScan(['idX'], ['idMotorPosition', 'idEncoderPosition', 'idError'] ) - scan.setPlotName(plotName) + scan.setPlotTitle(plotName) scan.start() #Creating channels: dimension 1 try: diff --git a/script/tests/tests/PS Tests/playground-pw84/playground-pw84.py b/script/tests/tests/PS Tests/playground-pw84/playground-pw84.py index 1b7a196..1105544 100644 --- a/script/tests/tests/PS Tests/playground-pw84/playground-pw84.py +++ b/script/tests/tests/PS Tests/playground-pw84/playground-pw84.py @@ -30,7 +30,7 @@ def startTest(testName, DEVICE, params): test.log( 'device: ' + DEVICE ) #scan = ManualScan(['time'], ['SetV', 'ActualV', 'ActualI'] , [0.0], [30.0], [20]) scan = ManualScan(['time'], ['SetV', 'ActualV', 'ActualI']) - scan.setPlotName(plotName) + scan.setPlotTitle(plotName) scan.start() try: @@ -115,6 +115,7 @@ def startTest(testName, DEVICE, params): test.sendFeedback(ret, success) except: # generic error handler + import traceback ret = traceback.format_exc() success = False test.sendFeedback(ret, success) diff --git a/script/tests/tests/PS Tests/test without ioc/test without ioc.py b/script/tests/tests/PS Tests/test without ioc/test without ioc.py index 412d8bc..0a02508 100644 --- a/script/tests/tests/PS Tests/test without ioc/test without ioc.py +++ b/script/tests/tests/PS Tests/test without ioc/test without ioc.py @@ -86,7 +86,7 @@ def startTest(testName, DEVICE, params): scan.start() #in this example we initialise also a plot type to show how to add several curves on the same plot - p1 = plot(None,name="motor_msta", context = plotName + " Multi curves")[0] + p1 = plot(None,name="motor_msta", title = plotName + " Multi curves")[0] #opionally set plot ranges #p1.getAxis(p1.AxisId.X).setRange(0.0,80.0) #p1.getAxis(p1.AxisId.Y).setRange(0.0,70.0)