Skip to content
Snippets Groups Projects
Commit 4697bb6d authored by Rafael Montano's avatar Rafael Montano
Browse files

Changes to the main screen, included the new error bit for Filament and new... 

Changes to the main screen, included the new error bit for Filament and new Filament simulation screen was added
parent b8dc884f
No related branches found
No related tags found
1 merge request!29Master
Hide whitespace changes
Inline Side-by-side
NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png
+ 0
− 0
View replaced file @ b8dc884f View file @ 4697bb6d
NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png

39.2 KiB | W: | H:

NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png

7.16 KiB | W: | H:

NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png
NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png
NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png
NON-APPROVED/ts2-010rfc-rflps/support/images/filament_psu.png
  • 2-up
  • Swipe
  • Onion skin
NON-APPROVED/ts2-010rfc-rflps/support/overview.bob
+ 39
− 0
View file @ 4697bb6d
...@@ -2169,4 +2169,43 @@ widget.setPropertyValue('tooltip', pvs[0].getName() + ...@@ -2169,4 +2169,43 @@ widget.setPropertyValue('tooltip', pvs[0].getName() +
<width>295</width> <width>295</width>
<horizontal_alignment>1</horizontal_alignment> <horizontal_alignment>1</horizontal_alignment>
</widget> </widget>
<widget type="symbol" version="2.0.0">
<name>Symbol</name>
<pv_name>$(PREFIX):RFS-Kly-110:GreenLight-INT-RB</pv_name>
<symbols>
<symbol>images/SG-TL70-W-2.png</symbol>
<symbol>images/SG-TL70-G-2.png</symbol>
</symbols>
<x>520</x>
<y>226</y>
<width>30</width>
<height>30</height>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="symbol" version="2.0.0">
<name>Symbol_1</name>
<pv_name>$(PREFIX):RFS-Kly-110:YellowLight-INT-RB</pv_name>
<symbols>
<symbol>images/SG-TL70-W-2.png</symbol>
<symbol>images/SG-TL70-Y-2.png</symbol>
</symbols>
<x>520</x>
<y>203</y>
<width>30</width>
<height>30</height>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="symbol" version="2.0.0">
<name>Symbol_2</name>
<pv_name>$(PREFIX):RFS-Kly-110:RedLight-INT-RB</pv_name>
<symbols>
<symbol>images/SG-TL70-W-2.png</symbol>
<symbol>images/SG-TL70-R-2.png</symbol>
</symbols>
<x>520</x>
<y>180</y>
<width>30</width>
<height>30</height>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
</display> </display>
NON-APPROVED/ts2-010rfc-rflps/support/rflpsDiagnostics.bob
+ 9
− 2
View file @ 4697bb6d
...@@ -1095,7 +1095,7 @@ ...@@ -1095,7 +1095,7 @@
<height>100</height> <height>100</height>
<style>1</style> <style>1</style>
<font> <font>
<font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0"> <font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="18.0">
</font> </font>
</font> </font>
<foreground_color> <foreground_color>
...@@ -1132,7 +1132,7 @@ ...@@ -1132,7 +1132,7 @@
<height>100</height> <height>100</height>
<style>1</style> <style>1</style>
<font> <font>
<font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0"> <font name="SUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="18.0">
</font> </font>
</font> </font>
<foreground_color> <foreground_color>
...@@ -1172,6 +1172,13 @@ ...@@ -1172,6 +1172,13 @@
</widget> </widget>
<widget type="action_button" version="3.0.0"> <widget type="action_button" version="3.0.0">
<name>Action Button_2</name> <name>Action Button_2</name>
<actions>
<action type="open_display">
<file>simulationDisplay.bob</file>
<target>window</target>
<description>Open Filament simulation module</description>
</action>
</actions>
<text>Run self-test</text> <text>Run self-test</text>
<x>520</x> <x>520</x>
<y>62</y> <y>62</y>
......
NON-APPROVED/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
+ 3
− 1
View file @ 4697bb6d
...@@ -344,6 +344,7 @@ widget.setValue(data)]]></text> ...@@ -344,6 +344,7 @@ widget.setValue(data)]]></text>
<pv_name>$(PREFIX):$(SGNL)-WRN-RB</pv_name> <pv_name>$(PREFIX):$(SGNL)-WRN-RB</pv_name>
<pv_name>$(PREFIX):$(SGNL)-ERRDISTOL-RB</pv_name> <pv_name>$(PREFIX):$(SGNL)-ERRDISTOL-RB</pv_name>
<pv_name>$(PREFIX):$(SGNL)-ERRTIME-RB</pv_name> <pv_name>$(PREFIX):$(SGNL)-ERRTIME-RB</pv_name>
<pv_name>$(PREFIX):$(SGNL)-ERRONSTAT-RB</pv_name>
</script> </script>
</scripts> </scripts>
<editable>false</editable> <editable>false</editable>
...@@ -434,6 +435,7 @@ widget.setPropertyValue("x_axis.maximum", maximum) ...@@ -434,6 +435,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<x_axis> <x_axis>
<title>Time (min)</title> <title>Time (min)</title>
<autoscale>false</autoscale> <autoscale>false</autoscale>
<log_scale>false</log_scale>
<minimum>0.0</minimum> <minimum>0.0</minimum>
<maximum>100.0</maximum> <maximum>100.0</maximum>
<show_grid>true</show_grid> <show_grid>true</show_grid>
...@@ -1884,7 +1886,7 @@ Reset all non-active interlocks</tooltip> ...@@ -1884,7 +1886,7 @@ Reset all non-active interlocks</tooltip>
<y>869</y> <y>869</y>
<width>690</width> <width>690</width>
<font> <font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="16.0"> <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font> </font>
</font> </font>
<foreground_color> <foreground_color>
......
NON-APPROVED/ts2-010rfc-rflps/support/simulationDisplay.bob 0 → 100644
+ 352
− 0
View file @ 4697bb6d
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>Filament Simulation Module</name>
<width>920</width>
<widget type="picture" version="2.0.0">
<name>Picture_1</name>
<file>images/filament_psu.png</file>
<x>20</x>
<y>190</y>
<width>880</width>
<height>260</height>
</widget>
<widget type="label" version="2.0.0">
<name>Label_5</name>
<text>FILAMENT Simulation Module</text>
<width>920</width>
<height>82</height>
<font>
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
<color name="PRIMARY" red="0" green="148" blue="202">
</color>
</background_color>
<transparent>false</transparent>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle_4</name>
<x>74</x>
<y>230</y>
<width>506</width>
<height>90</height>
<line_width>1</line_width>
<line_color>
<color name="BLACK" red="0" green="0" blue="0">
</color>
</line_color>
<background_color>
<color red="242" green="242" blue="242">
</color>
</background_color>
<corner_width>4</corner_width>
<corner_height>4</corner_height>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Rectangle_3</name>
<x>74</x>
<y>341</y>
<width>506</width>
<height>80</height>
<line_width>1</line_width>
<line_color>
<color name="BLACK" red="0" green="0" blue="0">
</color>
</line_color>
<background_color>
<color red="242" green="242" blue="242">
</color>
</background_color>
<corner_width>4</corner_width>
<corner_height>4</corner_height>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
<pv_name>LAB-011RFC:CONNECTION-STAT</pv_name>
<x>791</x>
<y>30</y>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<rules>
<rule name="colorRule" prop_id="background_color" out_exp="false">
<exp bool_exp="pv0 == 1">
<value>
<color name="GREEN" red="61" green="216" blue="61">
</color>
</value>
</exp>
<exp bool_exp="pv0 == 0">
<value>
<color name="DISCONNECTED" red="135" green="29" blue="100">
</color>
</value>
</exp>
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
</widget>
<widget type="label" version="2.0.0">
<name>Label_2</name>
<class>COMMENT</class>
<text>Connection status</text>
<x>641</x>
<y>30</y>
<width>140</width>
<font>
<font name="Comment" family="Source Sans Pro" style="ITALIC" size="16.0">
</font>
</font>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
<pv_name>LAB-011RFC:FIL-ISetIn-RB</pv_name>
<x>649</x>
<y>275</y>
<horizontal_alignment>1</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_4</name>
<text>Set close loop mode</text>
<x>685</x>
<y>120</y>
<width>176</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_2</name>
<pv_name>LAB-011RFC:FIL-CloseLoop</pv_name>
<x>695</x>
<y>150</y>
<width>166</width>
<labels_from_pv>true</labels_from_pv>
</widget>
<widget type="label" version="2.0.0">
<name>Label_10</name>
<text>I-SET from LPS</text>
<x>639</x>
<y>241</y>
<width>121</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="polyline" version="2.0.0">
<name>Polyline_4</name>
<x>571</x>
<y>250</y>
<width>70</width>
<height>70</height>
<visible>false</visible>
<line_color>
<color name="PRIMARY" red="0" green="148" blue="202">
</color>
</line_color>
<arrows>1</arrows>
<arrow_length>10</arrow_length>
<points>
<point x="0.0" y="35.0">
</point>
<point x="70.0" y="35.0">
</point>
</points>
<rules>
<rule name="showNarrow" prop_id="visible" out_exp="false">
<exp bool_exp="pv0==1">
<value>true</value>
</exp>
<pv_name>LAB-011RFC:FIL-CloseLoop-RB</pv_name>
</rule>
</rules>
</widget>
<widget type="bool_button" version="2.0.0">
<name>RESET_BUTTON_2</name>
<pv_name>LAB-011RFC:CPU-RST</pv_name>
<x>60</x>
<y>150</y>
<width>93</width>
<off_label>CPU Reset</off_label>
<off_color>
<color red="0" green="100" blue="0">
</color>
</off_color>
<on_label>Reseting...</on_label>
<on_color>
<color red="0" green="255" blue="0">
</color>
</on_color>
<show_led>false</show_led>
<foreground_color>
<color red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<actions>
</actions>
<tooltip>$(pv_name)
$(pv_value)
Reset all non-active interlocks</tooltip>
<confirm_message>This will reset all non-active interlocks</confirm_message>
</widget>
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>LAB-011RFC:FIL-LocRemOut-RB</pv_name>
<x>234</x>
<y>372</y>
<off_color>
<color name="ON" red="22" green="222" blue="33">
</color>
</off_color>
<on_color>
<color name="OFF" red="169" green="169" blue="169">
</color>
</on_color>
<tooltip>$(pv_name)
$(pv_value)
Local/Remote Status</tooltip>
</widget>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_4</name>
<pv_name>LAB-011RFC:FIL-LocRemOut</pv_name>
<x>268</x>
<y>366</y>
<width>110</width>
<show_led>false</show_led>
<labels_from_pv>true</labels_from_pv>
</widget>
<widget type="led" version="2.0.0">
<name>LED_5</name>
<pv_name>LAB-011RFC:FIL-OnStatOut-RB</pv_name>
<x>90</x>
<y>372</y>
<tooltip>$(pv_name)
$(pv_value)
ON/OFF Status</tooltip>
</widget>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_5</name>
<pv_name>LAB-011RFC:FIL-OnStatOut</pv_name>
<x>119</x>
<y>366</y>
<show_led>false</show_led>
<labels_from_pv>true</labels_from_pv>
</widget>
<widget type="led" version="2.0.0">
<name>LED_6</name>
<pv_name>LAB-011RFC:FIL-FaultStatOut-RB</pv_name>
<x>394</x>
<y>372</y>
<off_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
</off_color>
<on_color>
<color name="OK" red="61" green="216" blue="61">
</color>
</on_color>
<tooltip>$(pv_name)
$(pv_value)
Fault status</tooltip>
</widget>
<widget type="bool_button" version="2.0.0">
<name>Boolean Button_6</name>
<pv_name>LAB-011RFC:FIL-FaultStatOut</pv_name>
<x>429</x>
<y>366</y>
<off_color>
<color name="OK" red="61" green="216" blue="61">
</color>
</off_color>
<on_color>
<color name="MAJOR" red="252" green="13" blue="27">
</color>
</on_color>
<show_led>false</show_led>
<labels_from_pv>true</labels_from_pv>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
<pv_name>LAB-011RFC:FIL-WMonOut-RB</pv_name>
<x>215</x>
<y>275</y>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Entry_3</name>
<pv_name>LAB-011RFC:FIL-WMonOut</pv_name>
<x>90</x>
<y>275</y>
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Entry_4</name>
<pv_name>LAB-011RFC:FIL-IMonOut</pv_name>
<x>340</x>
<y>275</y>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_5</name>
<pv_name>LAB-011RFC:FIL-IMonOut-RB</pv_name>
<x>461</x>
<y>275</y>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_11</name>
<text>W-MON</text>
<x>135</x>
<y>241</y>
<width>136</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_12</name>
<text>I-MON</text>
<x>383</x>
<y>241</y>
<width>136</width>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
<name>LED_7</name>
<pv_name>LAB-011RFC:FIL-RstCmdIn-RB</pv_name>
<x>641</x>
<y>341</y>
<tooltip>$(pv_name)
$(pv_value)
ON/OFF Status</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_13</name>
<text>Reset CMD</text>
<x>685</x>
<y>341</y>
<width>85</width>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="led" version="2.0.0">
<name>LED_8</name>
<pv_name>LAB-011RFC:FIL-OnCmdIn-RB</pv_name>
<x>641</x>
<y>372</y>
<tooltip>$(pv_name)
$(pv_value)
ON/OFF Status</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_14</name>
<text>ON CMD</text>
<x>685</x>
<y>372</y>
<width>85</width>
<vertical_alignment>1</vertical_alignment>
</widget>
</display>
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