diff --git a/10-Top/ISrc.bob b/10-Top/ISrc.bob index 860f347c4c9fc0ff54855def41b0cc5548af60c0..d9ce9bdbee2a14d1a7f30df2526696e5cd47136d 100644 --- a/10-Top/ISrc.bob +++ b/10-Top/ISrc.bob @@ -55,7 +55,7 @@ $(pv_value)</tooltip> <x use_class="true">20</x> <y use_class="true">0</y> <width>164</width> - <height use_class="true">54</height> + <height use_class="true">52</height> <font use_class="true"> <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0"> </font> @@ -84,7 +84,7 @@ $(pv_value)</tooltip> <name>Action Button Interlock</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-LPS/ISrc-LPS:Main.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-LPS/Main.bob</file> <target>tab</target> <description>Interlock</description> </action> @@ -255,15 +255,6 @@ $(pv_value)</tooltip> <actions> </actions> <rules> - <rule name="RB Match" prop_id="background_color" out_exp="false"> - <exp bool_exp="abs(pv0-pv1) >10"> - <value> - <color name="BACKGROUND" red="220" green="225" blue="221"> - </color> - </value> - </exp> - <pv_name>${Isec}-${sub_CS}:${magtr}:ForwdPwr-R</pv_name> - </rule> <rule name="Enable" prop_id="enabled" out_exp="false"> <exp bool_exp="pv0==0"> <value>true</value> @@ -493,7 +484,7 @@ $(pv_value)</tooltip> <x>60</x> <y>52</y> <width>56</width> - <height>25</height> + <height>23</height> <foreground_color> <color red="0" green="0" blue="0"> </color> @@ -1232,7 +1223,7 @@ $(pv_value)</tooltip> <name>Action Button_4</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:Magnetron.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/Magnetron.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -1668,7 +1659,7 @@ $(pv_value)</tooltip> <name>Action Button_3</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:ATU.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ATU.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -2365,7 +2356,7 @@ $(pv_value)</tooltip> <name>Action Button_6</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:Repellers.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/Repellers.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -3309,7 +3300,7 @@ $(pv_value)</tooltip> <name>Action Button_5</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:Coils.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/Coils.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -3379,7 +3370,7 @@ $(pv_value)</tooltip> <name>Action Button_9</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:Hydrogen_Monitor_System.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/Hydrogen_Monitor_System.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -3827,7 +3818,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_21</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-TT-012_Temp-R</pv_name> + <pv_name>${Isec}-${sub_LPS}:WtrC-TT-012:Temp-R</pv_name> <x>149</x> <y>346</y> <width>120</width> @@ -3861,7 +3852,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_25</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-PT-012_Pres-R</pv_name> + <pv_name>${Isec}-${sub_LPS}:WtrC-PT-012:Pres-R</pv_name> <x>149</x> <y>376</y> <width>120</width> @@ -3947,7 +3938,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_16</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-TT-011_Temp-R</pv_name> + <pv_name>${Isec}-${sub_LPS}:WtrC-TT-011:Temp-R</pv_name> <x>149</x> <y>231</y> <width>120</width> @@ -3999,7 +3990,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_20</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-PT-011_Pres-R</pv_name> + <pv_name>${Isec}-${sub_LPS}:WtrC-PT-011:Pres-R</pv_name> <x>149</x> <y>262</y> <width>120</width> @@ -4334,7 +4325,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_32</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-TT-002_Temp-R</pv_name> + <pv_name>${Lsec}-${sub_LPS}:WtrC-TT-002:Temp-R</pv_name> <x>149</x> <y>311</y> <width>120</width> @@ -4403,7 +4394,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_33</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-PT-002_Pres-R</pv_name> + <pv_name>${Lsec}-${sub_LPS}:WtrC-PT-002:Pres-R</pv_name> <x>149</x> <y>341</y> <width>120</width> @@ -4472,7 +4463,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_30</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-TT-001_Temp-R</pv_name> + <pv_name>${Lsec}-${sub_LPS}:WtrC-TT-001:Temp-R</pv_name> <x>149</x> <y>201</y> <width>120</width> @@ -4524,7 +4515,7 @@ $(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_31</name> - <pv_name>${Isec}-${sub_LPS}::WtrC-PT-001_Pres-R</pv_name> + <pv_name>${Lsec}-${sub_LPS}:WtrC-PT-001:Pres-R</pv_name> <x>149</x> <y>231</y> <width>120</width> @@ -4796,7 +4787,7 @@ $(pv_value)</tooltip> <name>Action Button_8</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:HVPS.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/HVPS.bob</file> <target>tab</target> <description>Expert</description> </action> diff --git a/10-Top/LEBT-Iris.bob b/10-Top/LEBT-Iris.bob index 0985f2c68f05d1fed853d2226b1b92725c3bb50f..287ac888f96a2f3969d5d5059423f69fa8383471 100644 --- a/10-Top/LEBT-Iris.bob +++ b/10-Top/LEBT-Iris.bob @@ -1340,7 +1340,7 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_1</name> - <pv_name>LEBT-LPS::ID-IRIS_WtrFlowOK</pv_name> + <pv_name>LEBT-LPS:ID-FS-004:WtrFlowOK</pv_name> <x>30</x> <y>55</y> <off_color> diff --git a/10-Top/LEBT.bob b/10-Top/LEBT.bob index ab9a91290739877825639ea9223d8f31df961006..0336bdc9f2231b9821687f8699a6f8222cecce90 100644 --- a/10-Top/LEBT.bob +++ b/10-Top/LEBT.bob @@ -95,7 +95,7 @@ </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update Template_38</name> - <pv_name>$(Isec)-$(sub_LPS)::MPS_CollTemp</pv_name> + <pv_name>$(Lsec)-$(sub_LPS):ID-TT-001:Temp-R</pv_name> <x>306</x> <y>13</y> <width>67</width> @@ -122,7 +122,7 @@ </widget> <widget type="led" version="2.0.0"> <name>LED_Water Flow</name> - <pv_name>$(Lsec)-$(sub_LPS)::ID-Coll_WtrFlowOK</pv_name> + <pv_name>$(Lsec)-$(sub_LPS):ID-FS-002:WtrFlowOK</pv_name> <x>58</x> <y>17</y> <off_color> @@ -330,7 +330,7 @@ $(pv_value) </widget> <widget type="led" version="2.0.0"> <name>LED_Water Flow</name> - <pv_name>$(Lsec)-$(sub_LPS)::ID-IRIS_WtrFlowOK</pv_name> + <pv_name>$(Lsec)-$(sub_LPS):ID-FS-004:WtrFlowOK</pv_name> <x>20</x> <y>75</y> <off_color> @@ -1165,7 +1165,7 @@ $(pv_value)</tooltip> <name>Action Button Expert</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/ISrc-CS:Repellers.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-CS/Repellers.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -1974,7 +1974,7 @@ $(pv_value) <name>Action Button Expert</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/LEBT-Chop/LEBT-Chop:Chopper.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/LEBT-Chop/Chopper.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -2846,7 +2846,7 @@ $(pv_value) <name>Action Button Expert</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/LEBT-CS/LEBT-CS:Solenoids.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/LEBT-CS/Solenoids.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -3945,7 +3945,7 @@ $(pv_value) <name>Action Button Expert</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/LEBT-CS/LEBT-CS:Steerers.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/LEBT-CS/Steerers.bob</file> <target>tab</target> <description>Expert</description> </action> @@ -4012,7 +4012,7 @@ $(pv_value)</tooltip> <name>Action Button_Interlock</name> <actions> <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-LPS/ISrc-LPS:Main.bob</file> + <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-LPS/Main.bob</file> <target>window</target> <description>Interlock</description> </action> diff --git a/10-Top/Main.bob b/10-Top/Main.bob deleted file mode 100644 index 8bf55ab8953251cdf8b90abaafb8da85be397e1c..0000000000000000000000000000000000000000 --- a/10-Top/Main.bob +++ /dev/null @@ -1,259 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<display version="2.0.0"> - <name>Main</name> - <macros> - <atu>ISS-ATU</atu> - <chopper>BMD-Chop</chopper> - <coil1>PWRC-CoilPS-01</coil1> - <coil2>PWRC-CoilPS-02</coil2> - <coil3>PWRC-CoilPS-03</coil3> - <hvps>ISS-HVP-S</hvps> - <lebt>LNS-LEBT-010</lebt> - <lebt937b>VAC-VEG-10010</lebt937b> - <lebt946>VAC-VEVMC-10010</lebt946> - <magtr>ISS-Magtr-01</magtr> - <mks946>VAC-VEVMC-01100</mks946> - <plcsource>Vac-PLC-11111</plcsource> - <rep1>PWRC-RepPS-01</rep1> - <rep2>PWRC-RepPS-02</rep2> - <seclebt>LNS-LEBT-010</seclebt> - <secsub>LNS-ISRC-010</secsub> - <sol1>PWRC-SolPS-01</sol1> - <sol2>PWRC-SolPS-02</sol2> - <steer1h>PWRC-SteerPS-H1</steer1h> - <steer1v>PWRC-SteerPS-V1</steer1v> - <steer2h>PWRC-SteerPS-H2</steer2h> - <steer2v>PWRC-SteerPS-V2</steer2v> - </macros> - <width>240</width> - <height>520</height> - <background_color> - <color red="220" green="220" blue="220"> - </color> - </background_color> - <actions> - </actions> - <widget type="rectangle" version="2.0.0"> - <name>Rectangle Template_1</name> - <width>240</width> - <height>50</height> - <line_width>0</line_width> - <line_color> - <color name="IO Line" red="0" green="32" blue="92"> - </color> - </line_color> - <background_color> - <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202"> - </color> - </background_color> - <actions> - </actions> - <tooltip>$(pv_name) -$(pv_value)</tooltip> - </widget> - <widget type="label" version="2.0.0"> - <name>Label Template_1</name> - <text>Ion Source</text> - <x>20</x> - <width>164</width> - <height>52</height> - <font> - <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0"> - </font> - </font> - <foreground_color> - <color name="HEADER-TEXT" red="0" green="0" blue="0"> - </color> - </foreground_color> - <background_color> - <color name="IO Background" red="255" green="255" blue="205"> - </color> - </background_color> - <vertical_alignment>1</vertical_alignment> - <auto_size>true</auto_size> - <wrap_words>false</wrap_words> - <actions> - </actions> - <border_color> - <color name="IO Border" red="215" green="215" blue="215"> - </color> - </border_color> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_11</name> - <actions> - <action type="open_display"> - <file>ISrc.bob</file> - <target>tab</target> - <description>Source</description> - </action> - </actions> - <x>20</x> - <y>70</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_12</name> - <actions> - <action type="open_display"> - <file>LEBT.bob</file> - <target>tab</target> - <description>LEBT</description> - </action> - </actions> - <x>20</x> - <y>110</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_13</name> - <actions> - <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-LPS/ISrc-LPS:Main.bob</file> - <target>tab</target> - <description>Interlock</description> - </action> - </actions> - <x>20</x> - <y>150</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_15</name> - <actions> - <action type="open_display"> - <file>../lebt-pbi/bcm/BCM.bob</file> - <target>standalone</target> - <description>BCM</description> - </action> - </actions> - <x>20</x> - <y>271</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_16</name> - <actions> - <action type="open_display"> - <file>../lebt-pbi/fc/fc.bob</file> - <target>standalone</target> - <description>FaradayCup</description> - </action> - </actions> - <x>20</x> - <y>311</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_18</name> - <actions> - <action type="open_display"> - <file>../lebt-pbi/npm/npm-010.opi</file> - <target>standalone</target> - <description>LEBT-010 NPM</description> - </action> - </actions> - <x>20</x> - <y>351</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_19</name> - <actions> - <action type="open_display"> - <file>../lebt-pbi/npm/npm-020.opi</file> - <target>standalone</target> - <description>LEBT-020 NPM</description> - </action> - </actions> - <x>20</x> - <y>391</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_20</name> - <actions> - <action type="open_display"> - <file>../lebt-pbi/dpl/dsm.opi</file> - <target>standalone</target> - <description>Doppler</description> - </action> - </actions> - <x>20</x> - <y>431</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_21</name> - <actions> - <action type="open_display"> - <file>../lebt-pbi/emu/EMU_main.opi</file> - <target>standalone</target> - <description>EMU</description> - </action> - </actions> - <x>20</x> - <y>471</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_17</name> - <actions> - <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/CWL-CWS01/CWL-CWS01.bob</file> - <target>tab</target> - <description>CoolingSkid</description> - </action> - </actions> - <text>Cooling Skid</text> - <x>20</x> - <y>191</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_22</name> - <actions> - <action type="open_display"> - <file>../lebt-010_vac/LEBT.bob</file> - <target>standalone</target> - <description>Vacuum</description> - </action> - </actions> - <x>20</x> - <y>512</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - <enabled>false</enabled> - </widget> - <widget type="action_button" version="3.0.0"> - <name>Action Button_23</name> - <actions> - <action type="open_display"> - <file>../../../../20-SystemExpert/10-ACC/010-ISrc-LEBT/10-Top/ISrc-Tim/ISrc-Tim:Evr-launcher.bob</file> - <target>tab</target> - <description>Timing System</description> - </action> - </actions> - <text>Timing System</text> - <x>20</x> - <y>232</y> - <width>200</width> - <tooltip>$(actions)</tooltip> - </widget> -</display>