Skip to content

Commit 938306d

Browse files
John-Holt-TessellaJohn-Holt-Tessella
authored
Merge pull request #1038 from ISISComputingGroup/master
Merge master into 6.0.0
2 parents 34ed712 + f934ed2 commit 938306d

File tree

20 files changed

+271
-83
lines changed

20 files changed

+271
-83
lines changed

‎base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-clearPersistedState
1717
</programArgs>
1818
<vmArgs>-Xms40m
19-
-Xmx512m
19+
-Xmx1024m
2020
-Dpython.console.encoding=UTF-8
2121
-Dpython.import.site=false
2222
-XX:+CreateCoredumpOnCrash
@@ -27,20 +27,17 @@
2727

2828
<windowImages i16="platform:/plugin/uk.ac.stfc.isis.ibex.e4.product/icons/IBEX-icon-web16.gif" i32="platform:/plugin/uk.ac.stfc.isis.ibex.e4.product/icons/IBEX-icon-web32.gif" i48="platform:/plugin/uk.ac.stfc.isis.ibex.e4.product/icons/IBEX-icon-web48.gif" i64="platform:/plugin/uk.ac.stfc.isis.ibex.e4.product/icons/IBEX-icon-web64.gif"/>
2929

30-
3130
<launcher name="ibex-client">
3231
<win useIco="true">
3332
<ico path="../uk.ac.stfc.isis.ibex.e4.client.product/icons/ibex.ico"/>
3433
<bmp/>
3534
</win>
3635
</launcher>
3736

38-
3937
<vm>
4038
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
4139
</vm>
4240

43-
4441
<plugins>
4542
</plugins>
4643

‎base/uk.ac.stfc.isis.ibex.e4.client/Application.e4xmi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
</children>
419419
</children>
420420
<children xsi:type="basic:PartSashContainer" xmi:id="_krh18KkREeeNfrob_9kcDA" elementId="uk.ac.stfc.isis.ibex.e4.client.partsashcontainer.14" containerData="70" horizontal="true">
421-
<children xsi:type="advanced:Placeholder" xmi:id="_234KUBH9Eeq6Ie-xR-8O0g" elementId="uk.ac.stfc.isis.ibex.e4.client.placeholder.17" ref="_yrd0QBH9Eeq6Ie-xR-8O0g"/>
421+
<children xsi:type="advanced:Placeholder" xmi:id="_234KUBH9Eeq6Ie-xR-8O0g" elementId="uk.ac.stfc.isis.ibex.e4.client.placeholder.17" containerData="50" ref="_yrd0QBH9Eeq6Ie-xR-8O0g"/>
422422
<children xsi:type="basic:PartStack" xmi:id="_WuLscIXrEeib1Ij4B5lomQ" elementId="uk.ac.stfc.isis.ibex.e4.client.partstack.32" toBeRendered="false" containerData="50">
423423
<children xsi:type="basic:Part" xmi:id="_7Zl3sIXbEeiCJ_qZ_3IIBQ" elementId="uk.ac.stfc.isis.ibex.ui.graphing.MatplotlibOpiTargetView" toBeRendered="false" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Plot" closeable="true"/>
424424
</children>

‎base/uk.ac.stfc.isis.ibex.opis/resources/danfysik_calibrated.opi‎

Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<foreground_color>
5151
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
5252
</foreground_color>
53-
<height>323</height>
53+
<height>355</height>
5454
<lock_children>false</lock_children>
5555
<macros>
5656
<include_parent_macros>true</include_parent_macros>
@@ -1297,6 +1297,99 @@ $(pv_value)</tooltip>
12971297
<x>201</x>
12981298
<y>64</y>
12991299
</widget>
1300+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
1301+
<actions hook="false" hook_all="false" />
1302+
<auto_size>false</auto_size>
1303+
<background_color>
1304+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
1305+
</background_color>
1306+
<border_color>
1307+
<color name="ISIS_Border" red="0" green="0" blue="0" />
1308+
</border_color>
1309+
<border_style>0</border_style>
1310+
<border_width>1</border_width>
1311+
<enabled>true</enabled>
1312+
<font>
1313+
<opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">ISIS_Label_NEW</opifont.name>
1314+
</font>
1315+
<foreground_color>
1316+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
1317+
</foreground_color>
1318+
<height>20</height>
1319+
<horizontal_alignment>2</horizontal_alignment>
1320+
<name>Label_3</name>
1321+
<rules />
1322+
<scale_options>
1323+
<width_scalable>true</width_scalable>
1324+
<height_scalable>true</height_scalable>
1325+
<keep_wh_ratio>false</keep_wh_ratio>
1326+
</scale_options>
1327+
<scripts />
1328+
<show_scrollbar>false</show_scrollbar>
1329+
<text>Calib. File:</text>
1330+
<tooltip></tooltip>
1331+
<transparent>false</transparent>
1332+
<vertical_alignment>1</vertical_alignment>
1333+
<visible>true</visible>
1334+
<widget_type>Label</widget_type>
1335+
<width>90</width>
1336+
<wrap_words>true</wrap_words>
1337+
<wuid>13c4dcd4:16f9b32942a:-74d0</wuid>
1338+
<x>5</x>
1339+
<y>300</y>
1340+
</widget>
1341+
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
1342+
<actions hook="false" hook_all="false" />
1343+
<alarm_pulsing>false</alarm_pulsing>
1344+
<auto_size>false</auto_size>
1345+
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
1346+
<background_color>
1347+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
1348+
</background_color>
1349+
<border_alarm_sensitive>true</border_alarm_sensitive>
1350+
<border_color>
1351+
<color name="ISIS_Border" red="0" green="0" blue="0" />
1352+
</border_color>
1353+
<border_style>0</border_style>
1354+
<border_width>1</border_width>
1355+
<enabled>true</enabled>
1356+
<font>
1357+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_Value_NEW</opifont.name>
1358+
</font>
1359+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
1360+
<foreground_color>
1361+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
1362+
</foreground_color>
1363+
<format_type>0</format_type>
1364+
<height>20</height>
1365+
<horizontal_alignment>0</horizontal_alignment>
1366+
<name>Text Update_2</name>
1367+
<precision>0</precision>
1368+
<precision_from_pv>true</precision_from_pv>
1369+
<pv_name>$(PV_ROOT)FIELD:CALIB.SPEC</pv_name>
1370+
<pv_value />
1371+
<rotation_angle>0.0</rotation_angle>
1372+
<rules />
1373+
<scale_options>
1374+
<width_scalable>true</width_scalable>
1375+
<height_scalable>true</height_scalable>
1376+
<keep_wh_ratio>false</keep_wh_ratio>
1377+
</scale_options>
1378+
<scripts />
1379+
<show_units>true</show_units>
1380+
<text>######</text>
1381+
<tooltip>$(pv_name)
1382+
$(pv_value)</tooltip>
1383+
<transparent>true</transparent>
1384+
<vertical_alignment>1</vertical_alignment>
1385+
<visible>true</visible>
1386+
<widget_type>Text Update</widget_type>
1387+
<width>182</width>
1388+
<wrap_words>false</wrap_words>
1389+
<wuid>13c4dcd4:16f9b32942a:-74c6</wuid>
1390+
<x>105</x>
1391+
<y>300</y>
1392+
</widget>
13001393
</widget>
13011394
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
13021395
<actions hook="false" hook_all="false" />

‎base/uk.ac.stfc.isis.ibex.opis/resources/fermi_chopper.opi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4162,7 +4162,7 @@ $(pv_value)</tooltip>
41624162
<path/>
41634163
<scriptText>import webbrowser
41644164

4165-
webbrowser.open("https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/FZJ_Fermi_chopper")
4165+
webbrowser.open("http://shadow.nd.rl.ac.uk/ibex_user_manual/FZJ-Fermi-Chopper")
41664166
</scriptText>
41674167
<embedded>true</embedded>
41684168
<description/>

‎base/uk.ac.stfc.isis.ibex.opis/resources/kepco.opi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ $(pv_value)</tooltip>
499499
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
500500
<actions hook="true" hook_all="false">
501501
<action type="OPEN_WEBPAGE">
502-
<hyperlink>https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/Kepco</hyperlink>
502+
<hyperlink>http://shadow.nd.rl.ac.uk/ibex_user_manual/Kepco-Power-Supply</hyperlink>
503503
<description>Kepco IOC specific information</description>
504504
</action>
505505
</actions>

‎base/uk.ac.stfc.isis.ibex.opis/resources/matplotlib.opi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<path/>
7272
<scriptText>import webbrowser
7373

74-
webbrowser.open("https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Matplotlib")
74+
webbrowser.open("http://shadow.nd.rl.ac.uk/ibex_user_manual/Matplotlib")
7575
</scriptText>
7676
<embedded>true</embedded>
7777
<description/>

‎base/uk.ac.stfc.isis.ibex.opis/resources/template.opi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4049,7 +4049,7 @@ $(pv_value)</tooltip>
40494049
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
40504050
<actions hook="true" hook_all="false">
40514051
<action type="OPEN_WEBPAGE">
4052-
<hyperlink>https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/Kepco</hyperlink>
4052+
<hyperlink>http://shadow.nd.rl.ac.uk/ibex_user_manual/Kepco-Power-Supply</hyperlink>
40534053
<description>Kepco IOC specific information</description>
40544054
</action>
40554055
</actions>

‎base/uk.ac.stfc.isis.ibex.scriptgenerator/defined_actions/action_loader.py‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ def getParameters(self) -> list:
4444

4545
return ListConverter().convert(arguments, gateway._gateway_client)
4646

47+
def getHelp(self) -> str:
48+
"""
49+
Returns:
50+
A string to be displayed in the script generator UI to help a user when using a config.
51+
"""
52+
return self.action.get_help()
53+
4754
def doAction(self, action) -> Union[None, AnyStr]:
4855
"""
4956
Executes the action with the parameters provided
@@ -66,7 +73,10 @@ def parametersValid(self, action) -> Union[None, AnyStr]:
6673
Returns:
6774
None if all parameters are valid, otherwise a String containing an error message.
6875
"""
69-
return self.action.parameters_valid(**action)
76+
try:
77+
return self.action.parameters_valid(**action)
78+
except Exception as e:
79+
return str(e) # If there is an error validating return to the user
7080

7181
def equals(self, other_config) -> bool:
7282
""" Implement equals needed for py4j

‎base/uk.ac.stfc.isis.ibex.scriptgenerator/defined_actions/templates/generator_template.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# pylint: skip-file
2+
13
{% include inserted_config %}
24

3-
def do_run():
5+
def runscript():
46
config = DoRun()
57
{% for action in script_generator_actions -%}
68
config.run(**{{ action }})

‎base/uk.ac.stfc.isis.ibex.scriptgenerator/defined_actions/test_configs/valid_config.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ def parameters_valid(self, param1=0.0, param2=0.0):
1919
return reason
2020
else:
2121
return None
22+
23+
def get_help(self):
24+
return "Help"
25+

0 commit comments

Comments
 (0)