diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js index 0312baab68793eda072dceadb013aac2c7176079..3703d4a1d78d9f5d8259c8f45d5b472c004c2f92 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js @@ -4,6 +4,14 @@ var valid = pvs[0]; var type = pvs[1]; var chan = pvs[2]; -widget.setPropertyValue("text", PVUtil.getString(type) + " @ " + PVUtil.getString(chan)); +if (PVUtil.getLong(valid)) +{ + widget.setPropertyValue("text", PVUtil.getString(chan)); + widget.setPropertyValue("transparent", "true"); +} +else +{ + widget.setPropertyValue("text", PVUtil.getString(type) + " @ " + PVUtil.getString(chan)); + widget.setPropertyValue("transparent", "false"); +} widget.setPropertyValue("tooltip", "Gauge " + PVUtil.getString(type) + " @ channel " + PVUtil.getString(chan)); -widget.setPropertyValue("transparent", PVUtil.getLong(valid) ? "true" : "false"); diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob index 94eb3b3c94d0658a1b0a3ff492a08e718bb3d52c..97f65f0dd4b6d0f707a6fc05e484623668ec8bb8 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob @@ -41,6 +41,10 @@ <x>3</x> <y>38</y> <height>25</height> + <background_color> + <color name="Write_Background" red="224" green="217" blue="202"> + </color> + </background_color> <format>6</format> <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> @@ -54,6 +58,17 @@ <format>6</format> <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> + <rules> + <rule name="Validity check" prop_id="background_color" out_exp="false"> + <exp bool_exp="pvInt0 == 0"> + <value> + <color name="ERROR" red="252" green="13" blue="27"> + </color> + </value> + </exp> + <pv_name>$(DEVICENAME):Rly$(RELAY):ValidR</pv_name> + </rule> + </rules> </widget> <widget type="textentry" version="3.0.0"> <name>HighSPS</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob index e917a7a638dab3351386536e0e431d1ca4765489..d009f49ff2cc7502144e0423106faf53c8854022 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob @@ -56,6 +56,17 @@ <show_units>false</show_units> <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> + <rules> + <rule name="Validity Check" prop_id="background_color" out_exp="false"> + <exp bool_exp="pvInt0 == 0"> + <value> + <color name="ERROR" red="252" green="13" blue="27"> + </color> + </value> + </exp> + <pv_name>$(DEVICENAME):Rly$(RELAY):ValidR</pv_name> + </rule> + </rules> </widget> <widget type="led" version="2.0.0"> <name>Relay State</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py new file mode 100644 index 0000000000000000000000000000000000000000..a2a7c074ccd5f4b83f3fc21afd057efc5a7b4dfc --- /dev/null +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py @@ -0,0 +1,13 @@ +from org.csstudio.display.builder.runtime.script import PVUtil +from org.csstudio.display.builder.model.properties import NamedWidgetColor +from org.csstudio.display.builder.model.persist import WidgetColorService + +try: + if PVUtil.getSeverityString(pvs[0]) != "INVALID" and PVUtil.getLong(pvs[0]) == 1 and PVUtil.getLong(pvs[1]) == 1: + color = WidgetColorService.getColor("Background") + else: + raise Exception() +except: + color = WidgetColorService.getColor("INVALID") + +widget.setPropertyValue('background_color', color) diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py index 2a8651c4a09a0166991b4bcc7e544fcaefef54b9..ad9dfe000dfff533a466e9151967f77ff705932f 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py @@ -2,11 +2,12 @@ from org.csstudio.display.builder.runtime.script import PVUtil from org.csstudio.display.builder.model.properties import NamedWidgetColor from org.csstudio.display.builder.model.persist import WidgetColorService -color = WidgetColorService.getColor("INVALID") try: if PVUtil.getSeverityString(pvs[0]) != "INVALID" and PVUtil.getLong(pvs[0]) == 1: color = WidgetColorService.getColor("Background") + else: + raise Exception() except: - pass + color = WidgetColorService.getColor("INVALID") widget.setPropertyValue('background_color', color) diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py index bd3446b939ccb53986f71821fdd891d51098870c..32ceda78fb646be5ac43b2d3d01a68b1d2ad94c8 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/open_gauge_brief_screen.py @@ -24,11 +24,11 @@ controller = macros.getValue("CONTROLLER") controller_type = macros.getValue("CONTROLLER_TYPE") devicename = macros.getValue("vacPREFIX") try: - pumpPV = PVFactory.getPV("{}:iUITypeR".format(controller)) - pump = pumpPV.read() - PVFactory.releasePV(pumpPV) - pump = pump.value - path = bob_path(pump) + gaugePV = PVFactory.getPV("{}:iUITypeR".format(controller)) + gauge = gaugePV.read() + PVFactory.releasePV(gaugePV) + gauge = gauge.value + path = bob_path(gauge) except Exception as e: ScriptUtil.getLogger().severe(str(e)) if controller_type: diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py new file mode 100644 index 0000000000000000000000000000000000000000..829e6a2f11f57c8f18dceffc4109a7e6e6980da6 --- /dev/null +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/open_tpg_screen.py @@ -0,0 +1,49 @@ +from org.csstudio.display.builder.runtime.script import PVUtil +from org.csstudio.display.builder.runtime.script import ScriptUtil +from org.csstudio.display.builder.runtime.pv import PVFactory + +macros = widget.getEffectiveMacros() +macros.expandValues(macros) + +tpg300 = macros.getValue("FACEPLATE_300") +tpg500 = macros.getValue("FACEPLATE_500") + +def bob_path(typ): + typ = typ.lower() + if "tpg" not in typ: + return None + + if "500" in typ: + path = tpg500 + elif "300" in typ: + path = tpg300 + else: + path = tpg300 + ScriptUtil.getLogger().severe("Cannot determine controller type: '{}', Falling back to TPG-300 faceplate".format(typ)) + + return path + + +controller = macros.getValue("CONTROLLER") +controller_type = macros.getValue("CONTROLLER_TYPE") +try: + gaugePV = PVFactory.getPV("{}:iUITypeR".format(controller)) + gauge = gaugePV.read() + PVFactory.releasePV(gaugePV) + gauge = gauge.value + path = bob_path(gauge) +except Exception as e: + ScriptUtil.getLogger().severe(str(e)) + if controller_type: + path = bob_path(controller_type) + else: + path = tpg300 + ScriptUtil.getLogger().severe("Falling back to TPG-300 faceplate") + + +macros.add("DEVICENAME", controller) +dmacros = dict() +for k in macros.getNames(): + dmacros[k] = macros.getValue(k) + +ScriptUtil.openDisplay(widget, path, "STANDALONE", dmacros) diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob index 33bd21621922f0a9b3b6618eb0c650f7667bb0b7..3cfad5f0c6733e47783ec8cd45c3ac013ca2aaa6 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_comb_chan.bob @@ -18,7 +18,7 @@ </background_color> <widget type="label" version="2.0.0"> <name>Configuration</name> - <text>COMBINATION CHANNEL CONFIGURATION</text> + <text>Combination Channel Configuration</text> <width>804</width> <height>35</height> <font> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob index 846fe244c973c78bf62b0cffda0dd72440181a36..554505de88ba9630b5d00a8142fa9910d98e872c 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_controller.bob @@ -186,7 +186,6 @@ <height>25</height> <actions> </actions> - <tooltip>$(pv_name)$(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Panel LockR</name> @@ -340,7 +339,6 @@ <height>25</height> <actions> </actions> - <tooltip>$(pv_name)$(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Parameter SettingR</name> @@ -370,7 +368,6 @@ <y>133</y> <width>120</width> <height>25</height> - <tooltip>$(pv_name)$(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>Force PascalR</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob index 249f1efaf88f7638264cadcfef9abe4bffa4cf61..3dd4540b907b65bc09666913011c36cd886e18d1 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob @@ -18,7 +18,7 @@ </background_color> <widget type="label" version="2.0.0"> <name>Configuration</name> - <text>MODULE CONFIGURATION</text> + <text>Module Configuration</text> <width>804</width> <height>35</height> <font> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob index c6f27cccf30612113aedb8093b1d9c172bd1b156..55ff97efe660e7be909fd380dc1a171ca12cab62 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg300_controller.bob @@ -158,7 +158,6 @@ <height>25</height> <actions> </actions> - <tooltip>$(pv_name)$(pv_value)</tooltip> </widget> <widget type="textupdate" version="2.0.0"> <name>SaveParams-RB</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob new file mode 100644 index 0000000000000000000000000000000000000000..54a88d1e3e69b21bd122d351508e52e5e0411a31 --- /dev/null +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_controller.bob @@ -0,0 +1,364 @@ +<?xml version="1.0" encoding="UTF-8"?> +<display version="2.0.0"> + <name>$(DEVICENAME)</name> + <width>610</width> + <height>669</height> + <widget type="group" version="2.0.0"> + <name>TPG-500</name> + <width>610</width> + <height>669</height> + <style>2</style> + <foreground_color> + <color name="GROUP-BORDER" red="150" green="155" blue="151"> + </color> + </foreground_color> + <background_color> + <color name="GROUP-BACKGROUND" red="200" green="205" blue="201"> + </color> + </background_color> + <widget type="label" version="2.0.0"> + <name>Configuration</name> + <text>$(DEVICENAME)</text> + <width>610</width> + <height>35</height> + <font> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> + </font> + </font> + <foreground_color> + <color name="GRAY-TEXT" red="255" green="255" blue="255"> + </color> + </foreground_color> + <background_color> + <color name="GROUP-BORDER" red="150" green="155" blue="151"> + </color> + </background_color> + <transparent>false</transparent> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>CommsStatR</name> + <pv_name>$(DEVICENAME):CommsStatR</pv_name> + <x>450</x> + <y>5</y> + <width>150</width> + <height>25</height> + <font> + <font name="SMALL-SERIF-BOLD" family="Source Serif Pro" style="BOLD" size="14.0"> + </font> + </font> + <foreground_color> + <color name="WHITE" red="255" green="255" blue="255"> + </color> + </foreground_color> + <transparent>true</transparent> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="embedded" version="2.0.0"> + <name>Module Configuration</name> + <file>vac_ctrl_tpg500_module.bob</file> + <x>10</x> + <y>50</y> + <width>590</width> + <height>244</height> + <resize>2</resize> + <transparent>true</transparent> + </widget> + <widget type="group" version="2.0.0"> + <name>System Settings</name> + <x>10</x> + <y>314</y> + <width>590</width> + <height>215</height> + <style>2</style> + <foreground_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </foreground_color> + <background_color> + <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209"> + </color> + </background_color> + <widget type="label" version="2.0.0"> + <name>System Settings</name> + <text>System Settings</text> + <width>590</width> + <height>30</height> + <font> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> + </font> + </font> + <foreground_color> + <color name="GRAY-TEXT" red="255" green="255" blue="255"> + </color> + </foreground_color> + <background_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Pressure Unit</name> + <text>Pressure Unit:</text> + <y>40</y> + <width>150</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="combo" version="2.0.0"> + <name>Pressure UnitS</name> + <pv_name>${DEVICENAME}:UnitS</pv_name> + <x>160</x> + <y>40</y> + <width>220</width> + <height>25</height> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>Pressure UnitR</name> + <pv_name>$(DEVICENAME):Unit-RB</pv_name> + <x>386</x> + <y>40</y> + <width>194</width> + <height>25</height> + <format>6</format> + <show_units>false</show_units> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Underrange Control</name> + <text>Underrange Control:</text> + <y>75</y> + <width>150</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="combo" version="2.0.0"> + <name>UnderRngCtrlS</name> + <pv_name>${DEVICENAME}:UnderRngCtrlS</pv_name> + <x>160</x> + <y>75</y> + <width>220</width> + <height>25</height> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>UnderRngCtrl-RB</name> + <pv_name>$(DEVICENAME):UnderRngCtrl-RB</pv_name> + <x>386</x> + <y>75</y> + <width>194</width> + <height>25</height> + <format>6</format> + <show_units>false</show_units> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Parameter Storage</name> + <text>Parameter Storage:</text> + <y>110</y> + <width>150</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="combo" version="2.0.0"> + <name>SaveParamsS</name> + <pv_name>$(DEVICENAME):SaveParamsS</pv_name> + <x>160</x> + <y>110</y> + <width>220</width> + <height>25</height> + <actions> + </actions> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>SaveParams-RB</name> + <pv_name>$(DEVICENAME):SaveParams-RB</pv_name> + <x>386</x> + <y>110</y> + <width>194</width> + <height>25</height> + <format>6</format> + <show_units>false</show_units> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Analog Output</name> + <text>Analog Output Mode:</text> + <y>145</y> + <width>150</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="combo" version="2.0.0"> + <name>AOModeS</name> + <pv_name>$(DEVICENAME):AOModeS</pv_name> + <x>160</x> + <y>145</y> + <width>220</width> + <height>25</height> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>AOMode-RB</name> + <pv_name>$(DEVICENAME):AOMode-RB</pv_name> + <x>386</x> + <y>145</y> + <width>194</width> + <height>25</height> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Error Relay</name> + <text>Error Relay Function:</text> + <y>180</y> + <width>150</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <tooltip>Error Relay Assignment</tooltip> + </widget> + <widget type="combo" version="2.0.0"> + <name>RlyErr:ModeS</name> + <pv_name>$(DEVICENAME):RlyErr:ModeS</pv_name> + <x>160</x> + <y>180</y> + <width>220</width> + <height>25</height> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>RlyErr:Mode-RB</name> + <pv_name>$(DEVICENAME):RlyErr:Mode-RB</pv_name> + <x>386</x> + <y>180</y> + <width>194</width> + <height>25</height> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + </widget> + <widget type="group" version="2.0.0"> + <name>Operation Data</name> + <x>10</x> + <y>549</y> + <width>590</width> + <height>110</height> + <style>2</style> + <foreground_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </foreground_color> + <background_color> + <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209"> + </color> + </background_color> + <widget type="label" version="2.0.0"> + <name>Operation data</name> + <text>Operation Data</text> + <width>590</width> + <height>30</height> + <font> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> + </font> + </font> + <foreground_color> + <color name="GRAY-TEXT" red="255" green="255" blue="255"> + </color> + </foreground_color> + <background_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Inner Temperature</name> + <text>Inner Temperature:</text> + <y>40</y> + <width>160</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <tooltip>Inner Temperature of the TPG</tooltip> + </widget> + <widget type="label" version="2.0.0"> + <name>Battery Voltage</name> + <text>Battery Voltage:</text> + <y>75</y> + <width>160</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>CtrlTempR</name> + <pv_name>$(DEVICENAME):CtrlTempR</pv_name> + <x>170</x> + <y>40</y> + <height>25</height> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>BatVoltR</name> + <pv_name>$(DEVICENAME):BatVoltR</pv_name> + <x>170</x> + <y>75</y> + <height>25</height> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Operating Time</name> + <text>Operating Time:</text> + <x>309</x> + <y>40</y> + <width>160</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <tooltip>Inner Temperature of the TPG</tooltip> + </widget> + <widget type="label" version="2.0.0"> + <name>Recalibration Date</name> + <text>Recalibration Due Date:</text> + <x>309</x> + <y>75</y> + <width>160</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <tooltip>Date of next recalibration</tooltip> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>OperTimR</name> + <pv_name>$(DEVICENAME):OperTimR</pv_name> + <x>479</x> + <y>40</y> + <height>25</height> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>RecalibDateR</name> + <pv_name>$(DEVICENAME):RecalibDateR</pv_name> + <x>479</x> + <y>75</y> + <height>25</height> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + </widget> + </widget> +</display> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob new file mode 100644 index 0000000000000000000000000000000000000000..8269385a89e0cecf6df9028b89c3d723a018a3d5 --- /dev/null +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_tpg500_module.bob @@ -0,0 +1,363 @@ +<?xml version="1.0" encoding="UTF-8"?> +<display version="2.0.0"> + <name>Module Configuration</name> + <width>590</width> + <height>244</height> + <widget type="group" version="2.0.0"> + <name>Module Configuration</name> + <width>590</width> + <height>244</height> + <style>2</style> + <foreground_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </foreground_color> + <background_color> + <color name="BLUE-GROUP-BACKGROUND" red="179" green="209" blue="209"> + </color> + </background_color> + <widget type="label" version="2.0.0"> + <name>Configuration</name> + <text>Module Configuration</text> + <width>590</width> + <height>35</height> + <font> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> + </font> + </font> + <foreground_color> + <color name="GRAY-TEXT" red="255" green="255" blue="255"> + </color> + </foreground_color> + <background_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>SlotA</name> + <text>Slot A</text> + <x>120</x> + <y>50</y> + <width>110</width> + <height>25</height> + <font> + <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0"> + </font> + </font> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>SlotB</name> + <text>Slot B</text> + <x>236</x> + <y>50</y> + <width>110</width> + <height>25</height> + <font> + <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0"> + </font> + </font> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="polyline" version="2.0.0"> + <name>Separator</name> + <x>10</x> + <y>80</y> + <width>570</width> + <height>1</height> + <line_width>1</line_width> + <line_color> + <color name="BLUE-GROUP-BORDER" red="138" green="167" blue="167"> + </color> + </line_color> + <points> + <point x="0.0" y="0.0"> + </point> + <point x="570.0" y="0.0"> + </point> + </points> + </widget> + <widget type="label" version="2.0.0"> + <name>Module Type</name> + <text>Module Type:</text> + <y>85</y> + <width>110</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Sensor Types</name> + <text>Sensor Types:</text> + <y>116</y> + <width>110</width> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModTypeA</name> + <pv_name>${DEVICENAME}:ModA:TypeR</pv_name> + <x>120</x> + <y>85</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModTypeB</name> + <pv_name>${DEVICENAME}:ModB:TypeR</pv_name> + <x>236</x> + <y>85</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>SensorTypeA1</name> + <pv_name>${DEVICENAME}:A1:SensorTypeR</pv_name> + <x>120</x> + <y>116</y> + <width>50</width> + <height>25</height> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + <actions> + </actions> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>SensorTypeA2</name> + <pv_name>${DEVICENAME}:A2:SensorTypeR</pv_name> + <x>180</x> + <y>116</y> + <width>50</width> + <height>25</height> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>SensorTypeB1</name> + <pv_name>${DEVICENAME}:B1:SensorTypeR</pv_name> + <x>236</x> + <y>116</y> + <width>50</width> + <height>25</height> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>SensorTypeB2</name> + <pv_name>${DEVICENAME}:B2:SensorTypeR</pv_name> + <x>296</x> + <y>116</y> + <width>50</width> + <height>25</height> + <background_color> + <color name="BLUE-BACKGROUND" red="195" green="226" blue="225"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Comm</name> + <text>Comm</text> + <x>352</x> + <y>50</y> + <width>110</width> + <height>25</height> + <font> + <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0"> + </font> + </font> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModTypeComm</name> + <pv_name>${DEVICENAME}:ModComm:TypeR</pv_name> + <x>352</x> + <y>85</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Main</name> + <text>Main</text> + <x>468</x> + <y>50</y> + <width>110</width> + <height>25</height> + <font> + <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0"> + </font> + </font> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <transparent>false</transparent> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModTypeMain</name> + <pv_name>${DEVICENAME}:ModMain:TypeR</pv_name> + <x>468</x> + <y>85</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>FWMain</name> + <pv_name>${DEVICENAME}:ModMain:FWVersionR</pv_name> + <x>468</x> + <y>116</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <precision>2</precision> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Firmware Version</name> + <text>Firmware:</text> + <x>359</x> + <y>116</y> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Part Number</name> + <text>Part Number:</text> + <x>359</x> + <y>147</y> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModMain:PartNumR</name> + <pv_name>${DEVICENAME}:ModMain:PartNumR</pv_name> + <x>468</x> + <y>147</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <precision>2</precision> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Serial Number</name> + <text>Serial Number:</text> + <x>359</x> + <y>178</y> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModMain:SerNumR</name> + <pv_name>${DEVICENAME}:ModMain:SerNumR</pv_name> + <x>468</x> + <y>178</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <precision>2</precision> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>HW Version</name> + <text>HW Version:</text> + <x>359</x> + <y>209</y> + <height>25</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>ModMain:HWVerR</name> + <pv_name>${DEVICENAME}:ModMain:HWVerR</pv_name> + <x>468</x> + <y>209</y> + <width>110</width> + <height>25</height> + <background_color> + <color name="PRIMARY-LIGHT" red="151" green="188" blue="202"> + </color> + </background_color> + <precision>2</precision> + <horizontal_alignment>1</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + </widget> +</display> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob index 5d802b9ce67b3c0f3eacefdabc6d1b83bb276a73..ed7bfa95d35b14e8284d32e30cc48e04807beead 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob @@ -37,15 +37,18 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> - <widget type="textupdate" version="2.0.0"> - <name>Channel</name> - <pv_name>$(DEVICENAME):ChanR</pv_name> - <x>371</x> + <widget type="label" version="2.0.0"> + <name>Status</name> + <text>XX @ Yy</text> + <x>326</x> <y>5</y> - <width>25</width> + <width>70</width> + <font> + <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0"> + </font> + </font> <foreground_color> <color name="WHITE" red="255" green="255" blue="255"> </color> @@ -54,16 +57,17 @@ <color name="ERROR" red="252" green="13" blue="27"> </color> </background_color> - <horizontal_alignment>1</horizontal_alignment> + <transparent>false</transparent> + <horizontal_alignment>2</horizontal_alignment> <vertical_alignment>1</vertical_alignment> - <rules> - <rule name="Validity" prop_id="transparent" out_exp="true"> - <exp bool_exp="true"> - <expression>pvInt0</expression> - </exp> + <scripts> + <script file="../../COMMON/Faceplate/gauge_status.js"> <pv_name>$(DEVICENAME):ValidR</pv_name> - </rule> - </rules> + <pv_name>$(DEVICENAME):SensorTypeR</pv_name> + <pv_name>$(DEVICENAME):ChanR</pv_name> + </script> + </scripts> + <tooltip>NA</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Pressure</name> @@ -117,14 +121,14 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 1</name> - <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <macros> <RELAY>1</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <x>10</x> <y>85</y> - <width>92</width> - <height>58</height> + <width>90</width> + <height>56</height> <resize>2</resize> <transparent>true</transparent> </widget> @@ -148,14 +152,14 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 2</name> - <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <macros> <RELAY>2</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <x>108</x> <y>85</y> - <width>92</width> - <height>58</height> + <width>90</width> + <height>56</height> <resize>2</resize> <transparent>true</transparent> </widget> @@ -179,14 +183,14 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 3</name> - <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <macros> <RELAY>3</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <x>206</x> <y>85</y> - <width>92</width> - <height>58</height> + <width>90</width> + <height>56</height> <resize>2</resize> <transparent>true</transparent> </widget> @@ -210,14 +214,14 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 4</name> - <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <macros> <RELAY>4</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <x>304</x> <y>85</y> - <width>92</width> - <height>58</height> + <width>90</width> + <height>56</height> <resize>2</resize> <transparent>true</transparent> </widget> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob index f1b32d50421962b46f28a260531c14ee48f22a82..9d880f4edd9b20344366229965512cdc927db713 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob @@ -34,7 +34,6 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob index 02de8c1e50316d6a4ec1be68b1473deee3e378bf..5d132fe645d3c008cae3c8966a3552c9e5361fe0 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob @@ -1,10 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <display version="2.0.0"> <name>$(DEVICENAME) Brief</name> + <macros> + <FACEPLATE_300>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</FACEPLATE_300> + <FACEPLATE_500>../../veg/Faceplate/vac_ctrl_tpg500_controller.bob</FACEPLATE_500> + </macros> <width>375</width> <height>298</height> - <actions> - </actions> + <rules> + <rule name="Fake rule to have iUITypeR always connected" prop_id="name" out_exp="false"> + <pv_name trigger="false">${CONTROLLER}:iUITypeR</pv_name> + </rule> + </rules> <widget type="rectangle" version="2.0.0"> <name>Background</name> <width>375</width> @@ -37,15 +44,18 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> - <widget type="textupdate" version="2.0.0"> - <name>Channel</name> - <pv_name>$(DEVICENAME):ChanR</pv_name> - <x>340</x> + <widget type="label" version="2.0.0"> + <name>Status</name> + <text>XX @ Yy</text> + <x>295</x> <y>5</y> - <width>25</width> + <width>70</width> + <font> + <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0"> + </font> + </font> <foreground_color> <color name="WHITE" red="255" green="255" blue="255"> </color> @@ -54,16 +64,17 @@ <color name="ERROR" red="252" green="13" blue="27"> </color> </background_color> - <horizontal_alignment>1</horizontal_alignment> + <transparent>false</transparent> + <horizontal_alignment>2</horizontal_alignment> <vertical_alignment>1</vertical_alignment> - <rules> - <rule name="Validity" prop_id="transparent" out_exp="true"> - <exp bool_exp="true"> - <expression>pvInt0</expression> - </exp> + <scripts> + <script file="../../COMMON/Faceplate/gauge_status.js"> <pv_name>$(DEVICENAME):ValidR</pv_name> - </rule> - </rules> + <pv_name>$(DEVICENAME):SensorTypeR</pv_name> + <pv_name>$(DEVICENAME):ChanR</pv_name> + </script> + </scripts> + <tooltip>NA</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Pressure</name> @@ -117,10 +128,10 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 1</name> - <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file> <macros> <RELAY>1</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file> <x>105</x> <y>82</y> <width>96</width> @@ -148,10 +159,10 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 2</name> - <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file> <macros> <RELAY>2</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-status.bob</file> <x>209</x> <y>82</y> <width>96</width> @@ -184,7 +195,7 @@ <y>170</y> <width>125</width> <height>25</height> - <horizontal_alignment>2</horizontal_alignment> + <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -220,12 +231,9 @@ <widget type="action_button" version="3.0.0"> <name>Controller Detailed</name> <actions> - <action type="open_display"> - <file>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</file> - <macros> - <DEVICENAME>$(CONTROLLER)</DEVICENAME> - </macros> - <target>standalone</target> + <action type="execute"> + <script file="../../veg/Faceplate/open_tpg_screen.py"> + </script> <description>Open Controller Screen</description> </action> </actions> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob index 8d3e923454b2529062e809f8cadd61713c45b543..bc259e01c632309ebc9110461e365af10bace591 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob @@ -1,8 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <display version="2.0.0"> <name>$(DEVICENAME)</name> + <macros> + <FACEPLATE_300>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</FACEPLATE_300> + <FACEPLATE_500>../../veg/Faceplate/vac_ctrl_tpg500_controller.bob</FACEPLATE_500> + </macros> <width>558</width> <height>641</height> + <rules> + <rule name="Fake rule to have iUITypeR always connected" prop_id="name" out_exp="false"> + <pv_name trigger="false">${CONTROLLER}:iUITypeR</pv_name> + </rule> + </rules> <widget type="rectangle" version="2.0.0"> <name>Gauge Background</name> <width>558</width> @@ -34,7 +43,6 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -57,7 +65,7 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> + <horizontal_alignment>2</horizontal_alignment> <vertical_alignment>1</vertical_alignment> <scripts> <script file="../../COMMON/Faceplate/gauge_status.js"> @@ -120,10 +128,10 @@ </widget> <widget type="embedded" version="2.0.0"> <name>TPG Gauge Relay Control 1</name> - <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file> <macros> <RELAY>1</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file> <x>90</x> <y>40</y> <width>212</width> @@ -151,10 +159,10 @@ </widget> <widget type="embedded" version="2.0.0"> <name>TPG Gauge Relay Control 2</name> - <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file> <macros> <RELAY>2</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file> <x>314</x> <y>40</y> <width>212</width> @@ -361,12 +369,9 @@ <widget type="action_button" version="3.0.0"> <name>Controller Detailed</name> <actions> - <action type="open_display"> - <file>../../veg/Faceplate/vac_ctrl_tpg300_controller.bob</file> - <macros> - <DEVICENAME>$(CONTROLLER)</DEVICENAME> - </macros> - <target>standalone</target> + <action type="execute"> + <script file="../../veg/Faceplate/open_tpg_screen.py"> + </script> <description>Open Controller Screen</description> </action> </actions> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob index 0b43dae0378b308addc913e28dd256594068066c..9b5a71b5809731fff6105bd7c86efede957faaa5 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob @@ -16,8 +16,9 @@ </rule> </rules> <scripts> - <script file="../COMMON/isvalid.py" check_connections="false"> + <script file="../COMMON/gauge_isvalid.py" check_connections="false"> <pv_name>$(vacPREFIX):ValidR</pv_name> + <pv_name>$(vacPREFIX):RlyValidR</pv_name> </script> </scripts> <widget type="polyline" version="2.0.0"> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob index 7a17a7f08d41f74d6228493c1913a25ebe4a0f9a..b8b050f30bc5f74f97e7575dd66744b89f84212b 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob @@ -37,15 +37,18 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> - <widget type="textupdate" version="2.0.0"> - <name>Channel</name> - <pv_name>$(DEVICENAME):ChanR</pv_name> - <x>340</x> + <widget type="label" version="2.0.0"> + <name>Status</name> + <text>XX @ Yy</text> + <x>295</x> <y>5</y> - <width>25</width> + <width>70</width> + <font> + <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0"> + </font> + </font> <foreground_color> <color name="WHITE" red="255" green="255" blue="255"> </color> @@ -54,16 +57,17 @@ <color name="ERROR" red="252" green="13" blue="27"> </color> </background_color> - <horizontal_alignment>1</horizontal_alignment> + <transparent>false</transparent> + <horizontal_alignment>2</horizontal_alignment> <vertical_alignment>1</vertical_alignment> - <rules> - <rule name="Validity" prop_id="transparent" out_exp="true"> - <exp bool_exp="true"> - <expression>pvInt0</expression> - </exp> + <scripts> + <script file="../../COMMON/Faceplate/gauge_status.js"> <pv_name>$(DEVICENAME):ValidR</pv_name> - </rule> - </rules> + <pv_name>$(DEVICENAME):SensorTypeR</pv_name> + <pv_name>$(DEVICENAME):ChanR</pv_name> + </script> + </scripts> + <tooltip>NA</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Pressure</name> @@ -117,14 +121,14 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 1</name> - <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <macros> <RELAY>1</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <x>108</x> <y>85</y> - <width>92</width> - <height>58</height> + <width>90</width> + <height>56</height> <resize>2</resize> <transparent>true</transparent> </widget> @@ -148,14 +152,14 @@ </widget> <widget type="embedded" version="2.0.0"> <name>Relay 2</name> - <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <macros> <RELAY>2</RELAY> </macros> + <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file> <x>206</x> <y>85</y> - <width>92</width> - <height>58</height> + <width>90</width> + <height>56</height> <resize>2</resize> <transparent>true</transparent> </widget> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob index f4c7747d1a6f6b68ce34bfd24006cfe8f90769c8..a9d0319794cef336ca96a0abc9dac09b6c0acb97 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob @@ -34,7 +34,6 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob index 6916008c13c65c8dff5ea5a24d2140eb66bb374d..071c89ff9690981b7190888009aa5b74bb51d810 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob @@ -16,8 +16,9 @@ </rule> </rules> <scripts> - <script file="../COMMON/isvalid.py" check_connections="false"> + <script file="../COMMON/gauge_isvalid.py" check_connections="false"> <pv_name>$(vacPREFIX):ValidR</pv_name> + <pv_name>$(vacPREFIX):RlyValidR</pv_name> </script> </scripts> <widget type="polyline" version="2.0.0"> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob index a80a8aa47d69644b6ae909db5ed9fc1d8d0cfc29..a9b1b99bb95510261c22ac5ba57a7aab2d8b5f43 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob @@ -37,15 +37,18 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> - <widget type="textupdate" version="2.0.0"> - <name>Channel</name> - <pv_name>$(DEVICENAME):ChanR</pv_name> - <x>340</x> + <widget type="label" version="2.0.0"> + <name>Status</name> + <text>XX @ Yy</text> + <x>295</x> <y>5</y> - <width>25</width> + <width>70</width> + <font> + <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0"> + </font> + </font> <foreground_color> <color name="WHITE" red="255" green="255" blue="255"> </color> @@ -54,16 +57,17 @@ <color name="ERROR" red="252" green="13" blue="27"> </color> </background_color> - <horizontal_alignment>1</horizontal_alignment> + <transparent>false</transparent> + <horizontal_alignment>2</horizontal_alignment> <vertical_alignment>1</vertical_alignment> - <rules> - <rule name="Validity" prop_id="transparent" out_exp="true"> - <exp bool_exp="true"> - <expression>pvInt0</expression> - </exp> + <scripts> + <script file="../../COMMON/Faceplate/gauge_status.js"> <pv_name>$(DEVICENAME):ValidR</pv_name> - </rule> - </rules> + <pv_name>$(DEVICENAME):SensorTypeR</pv_name> + <pv_name>$(DEVICENAME):ChanR</pv_name> + </script> + </scripts> + <tooltip>NA</tooltip> </widget> <widget type="label" version="2.0.0"> <name>Pressure</name> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob index 14c7d88bd11a5e4d0124a19ebadda50bd4237cf1..2318c4a52506a74d6dec61afc004c4357c87a006 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob @@ -34,7 +34,6 @@ </color> </background_color> <transparent>false</transparent> - <horizontal_alignment>1</horizontal_alignment> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob index c43ad64fdc626520571e6b81ec7b1ca04ae020c2..2c7727d5792c1c42039f652851fdd2e3d2a64546 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob @@ -16,8 +16,9 @@ </rule> </rules> <scripts> - <script file="../COMMON/isvalid.py" check_connections="false"> + <script file="../COMMON/gauge_isvalid.py" check_connections="false"> <pv_name>$(vacPREFIX):ValidR</pv_name> + <pv_name>$(vacPREFIX):RlyValidR</pv_name> </script> </scripts> <widget type="polyline" version="2.0.0"> diff --git a/NON-APPROVED/rfq-010_vac/RFQ.bob b/NON-APPROVED/rfq-010_vac/RFQ.bob index 5d1b1f803c9e4d20080b04c7b7e9b3e1907a66ec..6a0ca8e7c23acb316fb7072895383be105af2c32 100644 --- a/NON-APPROVED/rfq-010_vac/RFQ.bob +++ b/NON-APPROVED/rfq-010_vac/RFQ.bob @@ -39,7 +39,7 @@ <name>Open VGC Trends Action</name> <actions> <action type="open_display"> - <file>Trending MEBT VGC.bob</file> + <file>Trending RFQ-010 VGC.bob</file> <target>tab</target> <description>Open Display</description> </action> @@ -202,13 +202,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER> <DEV>VGC</DEV> <IDX>10000</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <x>237</x> <y>90</y> <width>133</width> @@ -217,13 +217,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER> <DEV>VGP</DEV> <IDX>10000</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file> <x>53</x> <y>90</y> <width>133</width> @@ -249,7 +249,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -257,6 +256,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>35</x> <y>357</y> <width>133</width> @@ -265,13 +265,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>01100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>35</x> <y>270</y> <width>133</width> @@ -297,13 +297,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>02100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>215</x> <y>270</y> <width>133</width> @@ -312,7 +312,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -320,6 +319,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>215</x> <y>357</y> <width>133</width> @@ -345,7 +345,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -353,6 +352,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>475</x> <y>357</y> <width>133</width> @@ -361,13 +361,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>03100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>475</x> <y>270</y> <width>133</width> @@ -393,13 +393,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>04100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>655</x> <y>270</y> <width>133</width> @@ -408,7 +408,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -416,6 +415,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>655</x> <y>357</y> <width>133</width> @@ -424,13 +424,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-01100</CONTROLLER> <DEV>VGP</DEV> <IDX>05100</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file> <x>260</x> <y>499</y> <width>133</width> @@ -456,7 +456,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file> <macros> <DEV>VVA</DEV> <IDX>00031</IDX> @@ -464,6 +463,7 @@ Legend</text> <PIPE_RIGHT>true</PIPE_RIGHT> <ROTATION>0</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file> <x>100</x> <y>590</y> <width>133</width> @@ -472,12 +472,12 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file> <macros> <DEV>VPDP</DEV> <IDX>00031</IDX> <PIPE_ABOVE>true</PIPE_ABOVE> </macros> + <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file> <x>100</x> <y>700</y> <width>133</width> @@ -548,7 +548,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -556,6 +555,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>60</x> <y>357</y> <width>133</width> @@ -564,13 +564,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>05100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>60</x> <y>270</y> <width>133</width> @@ -596,13 +596,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>06100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>255</x> <y>270</y> <width>133</width> @@ -611,7 +611,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -619,6 +618,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>255</x> <y>357</y> <width>133</width> @@ -684,13 +684,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10002</CONTROLLER> <DEV>VGC</DEV> <IDX>20000</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <x>15</x> <y>90</y> <width>133</width> @@ -712,13 +712,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10002</CONTROLLER> <DEV>VGC</DEV> <IDX>30000</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <x>158</x> <y>90</y> <width>133</width> @@ -789,7 +789,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -797,6 +796,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>40</x> <y>357</y> <width>133</width> @@ -805,13 +805,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>07100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>40</x> <y>270</y> <width>133</width> @@ -837,13 +837,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>08100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>220</x> <y>270</y> <width>133</width> @@ -852,7 +852,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -860,6 +859,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>220</x> <y>357</y> <width>133</width> @@ -913,13 +913,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-10001</CONTROLLER> <DEV>VGC</DEV> <IDX>40000</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgc/vac_vgc.bob</file> <x>150</x> <y>90</y> <width>133</width> @@ -945,7 +945,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -953,6 +952,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>40</x> <y>357</y> <width>133</width> @@ -961,13 +961,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>09100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>40</x> <y>270</y> <width>133</width> @@ -993,13 +993,13 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <macros> <DEV>VVG</DEV> <IDX>0A100</IDX> <PIPE_VERTICAL>true</PIPE_VERTICAL> <ROTATION>270</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvg/vac_vvg.bob</file> <x>220</x> <y>270</y> <width>133</width> @@ -1008,7 +1008,6 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEPT-$(IDX)</CONTROLLER> <DEV>VPT</DEV> @@ -1016,6 +1015,7 @@ Legend</text> <PIPE_ABOVE>true</PIPE_ABOVE> <PIPE_LEFT>true</PIPE_LEFT> </macros> + <file>$(WIDGET_ROOT)/vpt/vac_vpt.bob</file> <x>220</x> <y>357</y> <width>133</width> @@ -1024,11 +1024,11 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vbd/vac_vbd.bob</file> <macros> <DEV>VBD</DEV> <IDX>40000</IDX> </macros> + <file>$(WIDGET_ROOT)/vbd/vac_vbd.bob</file> <x>254</x> <y>90</y> <width>133</width> @@ -1037,12 +1037,12 @@ Legend</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgr/vac_vgr.bob</file> <macros> <DEV>VGR</DEV> <IDX>40000</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgr/vac_vgr.bob</file> <x>15</x> <y>90</y> <width>133</width> @@ -1080,11 +1080,11 @@ Legend</text> <transparent>true</transparent> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file> <macros> <PIPE_LEFT>true</PIPE_LEFT> <ROTATION>90</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file> <width>133</width> <height>70</height> <resize>2</resize> @@ -1096,7 +1096,7 @@ Leak Testing</text> <x>27</x> <y>50</y> <width>87</width> - <height>32</height> + <height>34</height> <font> <font name="TINY-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="12.0"> </font> @@ -1108,11 +1108,11 @@ Leak Testing</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvs/vac_vvs.bob</file> <macros> <DEV>VVS</DEV> <IDX>10000</IDX> </macros> + <file>$(WIDGET_ROOT)/vvs/vac_vvs.bob</file> <x>455</x> <y>225</y> <width>133</width> @@ -1133,11 +1133,11 @@ Leak Testing</text> <transparent>true</transparent> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file> <macros> <PIPE_LEFT>true</PIPE_LEFT> <ROTATION>90</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vvm/vac_angle-vvm.bob</file> <width>133</width> <height>70</height> <resize>2</resize> @@ -1149,7 +1149,7 @@ Leak Testing</text> <x>22</x> <y>50</y> <width>87</width> - <height>32</height> + <height>34</height> <font> <font name="TINY-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="12.0"> </font> @@ -1178,7 +1178,6 @@ Leak Testing</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file> <macros> <DEV>VVA</DEV> <IDX>00041</IDX> @@ -1186,6 +1185,7 @@ Leak Testing</text> <PIPE_RIGHT>true</PIPE_RIGHT> <ROTATION>0</ROTATION> </macros> + <file>$(WIDGET_ROOT)/vva/vac_angle-vva.bob</file> <x>150</x> <y>590</y> <width>133</width> @@ -1194,12 +1194,12 @@ Leak Testing</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file> <macros> <DEV>VPDP</DEV> <IDX>00041</IDX> <PIPE_ABOVE>true</PIPE_ABOVE> </macros> + <file>$(WIDGET_ROOT)/vpp-vpdp/vac_vpp-vpdp.bob</file> <x>150</x> <y>700</y> <width>133</width> @@ -1208,13 +1208,13 @@ Leak Testing</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file> <macros> <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEG-01100</CONTROLLER> <DEV>VGP</DEV> <IDX>06100</IDX> <PIPE_BELOW>true</PIPE_BELOW> </macros> + <file>$(WIDGET_ROOT)/vgp/vac_vgp.bob</file> <x>270</x> <y>499</y> <width>133</width> @@ -1224,11 +1224,11 @@ Leak Testing</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file> <macros> <DEV>VPG</DEV> <IDX>10001</IDX> </macros> + <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file> <x>620</x> <y>800</y> <width>320</width> @@ -1236,11 +1236,11 @@ Leak Testing</text> </widget> <widget type="embedded" version="2.0.0"> <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name> - <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file> <macros> <DEV>VPG</DEV> <IDX>20001</IDX> </macros> + <file>$(WIDGET_ROOT)/vpg/vac-vpg.bob</file> <x>1520</x> <y>800</y> <width>320</width> diff --git a/NON-APPROVED/rfq-010_vac/Trending RFQ-010 VGC.bob b/NON-APPROVED/rfq-010_vac/Trending RFQ-010 VGC.bob new file mode 100644 index 0000000000000000000000000000000000000000..c7c04d6165ac0e68f6fd525aa49f09ea74e94785 --- /dev/null +++ b/NON-APPROVED/rfq-010_vac/Trending RFQ-010 VGC.bob @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<display version="2.0.0"> + <name>RFQ-010 VGC Trends</name> + <width>2200</width> + <height>1200</height> + <widget type="databrowser" version="2.0.0"> + <name>Data Browser</name> + <file>Trending RFQ-010 VGC.plt</file> + <y>100</y> + <width>2200</width> + <height>1100</height> + </widget> + <widget type="label" version="2.0.0"> + <name>Title</name> + <text> RFQ-010 VGC Trends</text> + <width>2200</width> + <height>80</height> + <font> + <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0"> + </font> + </font> + <foreground_color> + <color name="White" red="255" green="255" blue="255"> + </color> + </foreground_color> + <background_color> + <color name="Primary Blue" red="0" green="148" blue="202"> + </color> + </background_color> + <transparent>false</transparent> + <vertical_alignment>1</vertical_alignment> + <wrap_words>false</wrap_words> + </widget> +</display> diff --git a/NON-APPROVED/rfq-010_vac/Trending RFQ-010 VGC.plt b/NON-APPROVED/rfq-010_vac/Trending RFQ-010 VGC.plt new file mode 100644 index 0000000000000000000000000000000000000000..4140fe53633617c8be35a906175eadd9a24dd090 --- /dev/null +++ b/NON-APPROVED/rfq-010_vac/Trending RFQ-010 VGC.plt @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<databrowser> + <title></title> + <save_changes>true</save_changes> + <show_legend>true</show_legend> + <show_toolbar>true</show_toolbar> + <grid>false</grid> + <scroll>true</scroll> + <update_period>3.0</update_period> + <scroll_step>5</scroll_step> + <start>-1 minutes 0.0 seconds</start> + <end>now</end> + <archive_rescale>NONE</archive_rescale> + <foreground> + <red>0</red> + <green>0</green> + <blue>0</blue> + </foreground> + <background> + <red>255</red> + <green>255</green> + <blue>255</blue> + </background> + <title_font>Liberation Sans|20|1</title_font> + <label_font>Liberation Sans|14|1</label_font> + <scale_font>Liberation Sans|12|0</scale_font> + <legend_font>Liberation Sans|14|0</legend_font> + <axes> + <axis> + <visible>true</visible> + <name>Pressure</name> + <use_axis_name>true</use_axis_name> + <use_trace_names>false</use_trace_names> + <right>false</right> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <min>1.0E-8</min> + <max>5.0E-4</max> + <grid>false</grid> + <autoscale>false</autoscale> + <log_scale>true</log_scale> + </axis> + <axis> + <visible>true</visible> + <name>Charge</name> + <use_axis_name>true</use_axis_name> + <use_trace_names>false</use_trace_names> + <right>true</right> + <color> + <red>0</red> + <green>0</green> + <blue>0</blue> + </color> + <min>-100.89384714982549</min> + <max>595.2496644658951</max> + <grid>false</grid> + <autoscale>false</autoscale> + <log_scale>false</log_scale> + </axis> + </axes> + <annotations> + </annotations> + <pvlist> + <pv> + <display_name>VGC-10000</display_name> + <visible>true</visible> + <name>RFQ-010:Vac-VGC-10000:PrsR</name> + <axis>0</axis> + <color> + <red>255</red> + <green>0</green> + <blue>0</blue> + </color> + <trace_type>LINES</trace_type> + <linewidth>1</linewidth> + <point_type>NONE</point_type> + <point_size>2</point_size> + <waveform_index>0</waveform_index> + <period>0.0</period> + <ring_size>5000</ring_size> + <request>RAW</request> + <archive> + <name>ESS Archiver</name> + <url>pbraw://archiver-01.tn.esss.lu.se:17668/retrieval</url> + <key>1</key> + </archive> + </pv> + <pv> + <display_name>VGC-20000</display_name> + <visible>true</visible> + <name>RFQ-010:Vac-VGC-20000:PrsR</name> + <axis>0</axis> + <color> + <red>0</red> + <green>255</green> + <blue>0</blue> + </color> + <trace_type>LINES</trace_type> + <linewidth>1</linewidth> + <point_type>NONE</point_type> + <point_size>2</point_size> + <waveform_index>0</waveform_index> + <period>0.0</period> + <ring_size>5000</ring_size> + <request>RAW</request> + <archive> + <name>ESS Archiver</name> + <url>pbraw://archiver-01.tn.esss.lu.se:17668/retrieval</url> + <key>1</key> + </archive> + </pv> + <pv> + <display_name>VGC-30000</display_name> + <visible>true</visible> + <name>RFQ-010:Vac-VGC-30000:PrsR</name> + <axis>0</axis> + <color> + <red>0</red> + <green>0</green> + <blue>255</blue> + </color> + <trace_type>LINES</trace_type> + <linewidth>1</linewidth> + <point_type>NONE</point_type> + <point_size>2</point_size> + <waveform_index>0</waveform_index> + <period>0.0</period> + <ring_size>5000</ring_size> + <request>RAW</request> + <archive> + <name>ESS Archiver</name> + <url>pbraw://archiver-01.tn.esss.lu.se:17668/retrieval</url> + <key>1</key> + </archive> + </pv> + <pv> + <display_name>VGC-40000</display_name> + <visible>true</visible> + <name>RFQ-010:Vac-VGC-40000:PrsR</name> + <axis>0</axis> + <color> + <red>255</red> + <green>0</green> + <blue>255</blue> + </color> + <trace_type>LINES</trace_type> + <linewidth>1</linewidth> + <point_type>NONE</point_type> + <point_size>2</point_size> + <waveform_index>0</waveform_index> + <period>0.0</period> + <ring_size>5000</ring_size> + <request>RAW</request> + <archive> + <name>ESS Archiver</name> + <url>pbraw://archiver-01.tn.esss.lu.se:17668/retrieval</url> + <key>1</key> + </archive> + </pv> + </pvlist> +</databrowser>