Skip to content
Snippets Groups Projects
Commit 83babbe6 authored by Anders Harrisson's avatar Anders Harrisson
Browse files

Merge branch 'emr' into 'master' 

Fixed path to asyn.bob

See merge request ics-software/ess-opis!279
parents eaeae8be 5777b825
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NON-APPROVED/COMMON/DEVICES/electromagnetic-resonator/xrs/amptek/Amptek.bob
+ 1
− 33
View file @ 83babbe6
......@@ -106,7 +106,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #28</name>
......@@ -146,7 +145,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #38</name>
......@@ -186,7 +184,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #48</name>
......@@ -226,7 +223,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #58</name>
......@@ -266,7 +262,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #68</name>
......@@ -518,7 +513,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #124</name>
......@@ -540,7 +534,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #128</name>
......@@ -562,7 +555,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #132</name>
......@@ -584,7 +576,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #136</name>
......@@ -606,7 +597,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="combo" version="2.0.0">
<name>menu #140</name>
......@@ -806,7 +796,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="combo" version="2.0.0">
<name>menu #184</name>
......@@ -859,7 +848,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="combo" version="2.0.0">
<name>menu #197</name>
......@@ -899,7 +887,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #207</name>
......@@ -955,7 +942,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #220</name>
......@@ -977,7 +963,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textentry" version="3.0.0">
<name>text entry #224</name>
......@@ -1242,7 +1227,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #285</name>
......@@ -1264,7 +1248,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #289</name>
......@@ -1286,7 +1269,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #293</name>
......@@ -1308,7 +1290,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #297</name>
......@@ -1330,7 +1311,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="group" version="2.0.0">
<name>composite #301</name>
......@@ -1380,7 +1360,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
</widget>
<widget type="group" version="2.0.0">
......@@ -1422,7 +1401,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textentry" version="3.0.0">
<name>text entry #324</name>
......@@ -1528,7 +1506,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #347</name>
......@@ -1575,7 +1552,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #357</name>
......@@ -1622,7 +1598,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #367</name>
......@@ -1669,7 +1644,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #377</name>
......@@ -1716,7 +1690,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="group" version="2.0.0">
<name>composite #387</name>
......@@ -1755,7 +1728,6 @@
</background_color>
<format>1</format>
<show_units>false</show_units>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="combo" version="2.0.0">
<name>menu #397</name>
......@@ -1992,7 +1964,6 @@
<format>1</format>
<show_units>false</show_units>
<horizontal_alignment>2</horizontal_alignment>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #439</name>
......@@ -2015,7 +1986,6 @@
<format>1</format>
<show_units>false</show_units>
<horizontal_alignment>2</horizontal_alignment>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>text #443</name>
......@@ -2270,7 +2240,6 @@
<format>1</format>
<show_units>false</show_units>
<horizontal_alignment>2</horizontal_alignment>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="textupdate" version="2.0.0">
<name>text update #498</name>
......@@ -2293,7 +2262,6 @@
<format>1</format>
<show_units>false</show_units>
<horizontal_alignment>2</horizontal_alignment>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="group" version="2.0.0">
<name>composite #502</name>
......@@ -2601,7 +2569,7 @@
<description>Save/restore status</description>
</action>
<action type="open_display">
<file>$(ESS_OPIS)/NON-APPROVED/COMMON/UTILITIES/asyn/asynRecord.bob</file>
<file>../../../../UTILITIES/asyn/asynRecord.bob</file>
<macros>
<R>asyn1</R>
</macros>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment