From f005db1fea9848b2372958cccf7b0082fad58129 Mon Sep 17 00:00:00 2001
From: Rafael Montano <rafaelmontano@gmail.com>
Date: Thu, 20 Aug 2020 14:58:32 +0200
Subject: [PATCH] Changes to the FIL CPU buttons
---
.../support/rflpsFILsignalv2.bob | 186 ++++++++++--------
1 file changed, 104 insertions(+), 82 deletions(-)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
index 8a7447a6..afb17d56 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/rflpsFILsignalv2.bob
@@ -14,7 +14,7 @@
<height>295</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -23,10 +23,12 @@
<widget type="rectangle" version="2.0.0">
<name>Rectangle_8</name>
<class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
<width>1130</width>
- <height>50</height>
- <line_width>0</line_width>
- <background_color>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
<color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
</color>
</background_color>
@@ -35,16 +37,16 @@
<name>Label_1</name>
<class>TITLE</class>
<text> PV name: $(PREFIX):$(SGNL)</text>
- <x use_class="true">0</x>
+ <x use_class="true">20</x>
<y use_class="true">0</y>
<width>820</width>
- <height>50</height>
+ <height use_class="true">50</height>
<font use_class="true">
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<foreground_color use_class="true">
- <color name="Text" red="0" green="0" blue="0">
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
@@ -52,8 +54,9 @@
</color>
</background_color>
<transparent use_class="true">true</transparent>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
+ <horizontal_alignment use_class="true">0</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
</widget>
<widget type="group" version="2.0.0">
<name>BGGrey03_1</name>
@@ -99,8 +102,8 @@
<x>10</x>
<width>1090</width>
<height>40</height>
- <font>
- <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+ <font use_class="true">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
<foreground_color>
@@ -128,7 +131,7 @@
<height>190</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -141,15 +144,10 @@
<x>40</x>
<y>50</y>
<width>110</width>
- <font use_class="true">
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
- <foreground_color use_class="true">
- <color name="Text" red="0" green="0" blue="0">
- </color>
- </foreground_color>
- <transparent use_class="true">true</transparent>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<actions>
@@ -179,10 +177,14 @@
<text>Status</text>
<width>340</width>
<height>40</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -194,11 +196,11 @@
<width>100</width>
<height>25</height>
<off_color>
- <color name="MINOR" red="255" green="128" blue="0">
+ <color name="MINOR" red="252" green="242" blue="17">
</color>
</off_color>
<on_color>
- <color name="OK" red="0" green="255" blue="0">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</on_color>
<square>true</square>
@@ -212,7 +214,7 @@
<width>100</width>
<height>25</height>
<on_color>
- <color name="OK" red="0" green="255" blue="0">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</on_color>
<square>true</square>
@@ -231,7 +233,7 @@
<value>10</value>
<label>ERROR</label>
<color>
- <color name="MAJOR" red="255" green="0" blue="0">
+ <color name="MAJOR" red="252" green="13" blue="27">
</color>
</color>
</state>
@@ -239,7 +241,7 @@
<value>0</value>
<label>STOPPED</label>
<color>
- <color name="Off" red="60" green="100" blue="60">
+ <color name="Off" red="90" green="110" blue="90">
</color>
</color>
</state>
@@ -247,7 +249,7 @@
<value>2</value>
<label>RAMPING</label>
<color>
- <color name="MINOR" red="255" green="128" blue="0">
+ <color name="MINOR" red="252" green="242" blue="17">
</color>
</color>
</state>
@@ -255,7 +257,7 @@
<value>3</value>
<label>HEATING</label>
<color>
- <color name="MINOR" red="255" green="128" blue="0">
+ <color name="MINOR" red="252" green="242" blue="17">
</color>
</color>
</state>
@@ -263,7 +265,7 @@
<value>4</value>
<label>READY</label>
<color>
- <color name="OK" red="0" green="255" blue="0">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</color>
</state>
@@ -284,7 +286,7 @@
<height>490</height>
<line_width>0</line_width>
<background_color>
- <color name="Read_Background" red="240" green="240" blue="240">
+ <color name="Read_Background" red="230" green="235" blue="232">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -297,11 +299,11 @@
<width>630</width>
<height>320</height>
<background_color>
- <color name="Read_Background" red="240" green="240" blue="240">
+ <color name="Read_Background" red="230" green="235" blue="232">
</color>
</background_color>
<title_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</title_font>
<show_legend>false</show_legend>
@@ -370,11 +372,11 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -388,11 +390,11 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<maximum>30.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -424,7 +426,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<axis>0</axis>
<trace_type>1</trace_type>
<color>
- <color name="OK" red="0" green="255" blue="0">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</color>
<line_width>0</line_width>
@@ -458,7 +460,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<axis>0</axis>
<trace_type>1</trace_type>
<color>
- <color name="MAJOR" red="255" green="0" blue="0">
+ <color name="MAJOR" red="252" green="13" blue="27">
</color>
</color>
<line_width>3</line_width>
@@ -492,7 +494,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<axis>0</axis>
<trace_type>1</trace_type>
<color>
- <color name="MAJOR" red="255" green="0" blue="0">
+ <color name="MAJOR" red="252" green="13" blue="27">
</color>
</color>
<line_width>3</line_width>
@@ -505,7 +507,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<marker>
<marker>
<color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</color>
<pv_name>$(PREFIX):$(SGNL)-TRAMP-RB</pv_name>
@@ -519,10 +521,14 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<text>Ramp/Step current display</text>
<width>680</width>
<height>30</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<actions>
@@ -546,7 +552,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<height>70</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -558,7 +564,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<height>70</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -581,7 +587,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<y>20</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<format>1</format>
@@ -599,7 +605,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<y>80</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<format>1</format>
@@ -670,7 +676,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<y>50</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<format>1</format>
@@ -766,7 +772,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<height>180</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -791,7 +797,7 @@ widget.setPropertyValue("x_axis.maximum", maximum)
<height>25</height>
<off_label>RAMP</off_label>
<off_color>
- <color name="Button_Background" red="210" green="210" blue="210">
+ <color name="Button_Background" red="236" green="236" blue="236">
</color>
</off_color>
<on_label>STEP</on_label>
@@ -886,22 +892,26 @@ MANUAL: Set-points manual operation</tooltip>
<text>Operation Mode</text>
<width>340</width>
<height>40</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
</widget>
<widget type="bool_button" version="2.0.0">
<name>RESET_BUTTON_2</name>
- <pv_name>$(PREFIX):CPU-RST</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
<x>30</x>
<y>520</y>
<off_label>CPU Reset</off_label>
<off_color>
- <color name="Button_Background" red="210" green="210" blue="210">
+ <color name="Button_Background" red="236" green="236" blue="236">
</color>
</off_color>
<on_label>Reseting...</on_label>
@@ -930,7 +940,7 @@ Reset all non-active interlocks</tooltip>
<description>Set Filament ON</description>
</action>
</actions>
- <pv_name>$(PREFIX):CPU-FIL</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-FIL</pv_name>
<text>FIL</text>
<x>270</x>
<y>520</y>
@@ -938,11 +948,11 @@ Reset all non-active interlocks</tooltip>
</widget>
<widget type="bool_button" version="2.0.0">
<name>Action Button_11</name>
- <pv_name>$(PREFIX):CPU-OFF</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-OFF</pv_name>
<x>150</x>
<y>520</y>
<off_color>
- <color name="MAJOR" red="255" green="0" blue="0">
+ <color name="MAJOR" red="252" green="13" blue="27">
</color>
</off_color>
<actions execute_as_one="true">
@@ -1001,8 +1011,8 @@ Reset all non-active interlocks</tooltip>
<x>10</x>
<width>1080</width>
<height>40</height>
- <font>
- <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+ <font use_class="true">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
<foreground_color>
@@ -1026,7 +1036,7 @@ Reset all non-active interlocks</tooltip>
<height>290</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -1038,10 +1048,14 @@ Reset all non-active interlocks</tooltip>
<text>Interlock Thresholds</text>
<width>670</width>
<height>30</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<actions>
@@ -1178,7 +1192,7 @@ Reset all non-active interlocks</tooltip>
<y>182</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<precision>2</precision>
@@ -1238,7 +1252,7 @@ Reset all non-active interlocks</tooltip>
<y>132</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<precision>2</precision>
@@ -1255,7 +1269,7 @@ Reset all non-active interlocks</tooltip>
<y>102</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<precision>2</precision>
@@ -1272,7 +1286,7 @@ Reset all non-active interlocks</tooltip>
<y>52</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<precision>2</precision>
@@ -1445,7 +1459,7 @@ Reset all non-active interlocks</tooltip>
<y>52</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<foreground_color>
@@ -1466,7 +1480,7 @@ Reset all non-active interlocks</tooltip>
<y>102</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<foreground_color>
@@ -1487,7 +1501,7 @@ Reset all non-active interlocks</tooltip>
<y>132</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<foreground_color>
@@ -1551,7 +1565,7 @@ Reset all non-active interlocks</tooltip>
<y>182</y>
<width>70</width>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<foreground_color>
@@ -1611,7 +1625,7 @@ Reset all non-active interlocks</tooltip>
<width>670</width>
<height>160</height>
<background_color>
- <color name="Read_Background" red="240" green="240" blue="240">
+ <color name="Read_Background" red="230" green="235" blue="232">
</color>
</background_color>
<columns>
@@ -1689,7 +1703,7 @@ widget.setValue(data)]]></text>
<height>290</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -1701,10 +1715,14 @@ widget.setValue(data)]]></text>
<text> Monitoring 1</text>
<width>340</width>
<height>30</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1783,7 +1801,7 @@ widget.setValue(data)]]></text>
<y>60</y>
<width>90</width>
<background_color>
- <color name="Read_Background" red="240" green="240" blue="240">
+ <color name="Read_Background" red="230" green="235" blue="232">
</color>
</background_color>
<transparent>false</transparent>
@@ -1819,7 +1837,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<y>90</y>
<width>90</width>
<background_color>
- <color name="Read_Background" red="240" green="240" blue="240">
+ <color name="Read_Background" red="230" green="235" blue="232">
</color>
</background_color>
<transparent>false</transparent>
@@ -1892,7 +1910,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<height>160</height>
<line_width>0</line_width>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
<corner_width>5</corner_width>
@@ -1904,10 +1922,14 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<text>Operation Mode 1</text>
<width>340</width>
<height>40</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ <font use_class="true">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
+ </color>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1972,11 +1994,11 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<height>30</height>
<off_label>WARN</off_label>
<off_color>
- <color name="OK" red="0" green="255" blue="0">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</off_color>
<on_color>
- <color name="MINOR" red="255" green="128" blue="0">
+ <color name="MINOR" red="252" green="242" blue="17">
</color>
</on_color>
<square>true</square>
@@ -1994,7 +2016,7 @@ widget.setPropertyValue('text', "%d:%02d:%02d" % (h, m, s))]]></text>
<height>30</height>
<off_label>ITLCK</off_label>
<off_color>
- <color name="OK" red="0" green="255" blue="0">
+ <color name="OK" red="61" green="216" blue="61">
</color>
</off_color>
<on_color>
--
GitLab