diff --git a/99-Shared/adsis8300fc/fc.bob b/99-Shared/adsis8300fc/fc.bob index d5eacee05e81e8b79b3aa37775546e891b8408bb..3b772563666492fd952772e1d018156612fe6a8d 100644 --- a/99-Shared/adsis8300fc/fc.bob +++ b/99-Shared/adsis8300fc/fc.bob @@ -17,7 +17,7 @@ <width>405</width> <height>128</height> <font> - <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> <background_color> @@ -43,7 +43,7 @@ <width>405</width> <height>128</height> <font> - <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> <background_color> @@ -69,7 +69,7 @@ <width>571</width> <height>769</height> <font> - <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> <background_color> @@ -95,7 +95,7 @@ <width>857</width> <height>770</height> <font> - <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> <background_color> @@ -121,7 +121,7 @@ <width>405</width> <height>495</height> <font> - <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> <background_color> @@ -147,7 +147,7 @@ <width>411</width> <height>180</height> <font> - <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0"> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> </font> </font> <horizontal_alignment>1</horizontal_alignment> @@ -168,7 +168,7 @@ <width>1877</width> <height>29</height> <font> - <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> <background_color> @@ -231,7 +231,7 @@ <width>163</width> <height>76</height> <font> - <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0"> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> </font> </font> <horizontal_alignment>1</horizontal_alignment> @@ -288,12 +288,6 @@ $(pv_value)</tooltip> <actions> </actions> <rules> - <rule name="trace_buffer_size" prop_id="trace_2_buffer_size" out_exp="true"> - <exp bool_exp="true"> - <expression>pv0</expression> - </exp> - <pv_name>$(P)$(R)TRC2-ArraySize0_RBV</pv_name> - </rule> <rule name="y_max" prop_id="axis_1_maximum" out_exp="true"> <exp bool_exp="true"> <expression>pv0</expression> @@ -315,31 +309,7 @@ $(pv_value)</tooltip> </exp> <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name> </rule> - <rule name="time_x_min" prop_id="axis_2_minimum" out_exp="true"> - <exp bool_exp="true"> - <expression>pv0</expression> - </exp> - <pv_name>$(P)$(R)ROI2-TickFirstUsR</pv_name> - </rule> - <rule name="time_x_max" prop_id="axis_2_maximum" out_exp="true"> - <exp bool_exp="true"> - <expression>pv0</expression> - </exp> - <pv_name>$(P)$(R)ROI2-TickLastUsR</pv_name> - </rule> </rules> - <scripts> - <script file="handleCursors.js"> - <pv_name>$(P)$(R)ROI3-MinX_RBV</pv_name> - <pv_name>$(P)$(R)ROI3-SizeX_RBV</pv_name> - <pv_name>$(P)$(R)ROI3-BinX_RBV</pv_name> - <pv_name>$(P)$(R)ROI2-MinX_RBV</pv_name> - <pv_name>$(P)$(R)ROI2-ArraySizeX_RBV</pv_name> - <pv_name>$(P)$(R)ROI2-BinX_RBV</pv_name> - <pv_name trigger="false">$(P)$(R)STAT3-MaxValue_RBV</pv_name> - <pv_name>$(P)$(R)ROI3-ArraySizeX_RBV</pv_name> - </script> - </scripts> <x_axis> <title>Samples</title> <autoscale>true</autoscale> @@ -348,11 +318,11 @@ $(pv_value)</tooltip> <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> @@ -366,11 +336,11 @@ $(pv_value)</tooltip> <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> @@ -378,14 +348,14 @@ $(pv_value)</tooltip> </y_axes> <traces> <trace> - <name>cursors</name> - <x_pv>loc://cur_x(0,0,0,0)</x_pv> - <y_pv>loc://cur_y(0,0,0,0)</y_pv> + <name>Pulse</name> + <x_pv></x_pv> + <y_pv>$(P)$(R)TRC2-ArrayData</y_pv> <err_pv></err_pv> <axis>0</axis> - <trace_type>5</trace_type> + <trace_type>1</trace_type> <color> - <color name="ORANGE" red="254" green="194" blue="81"> + <color red="0" green="0" blue="255"> </color> </color> <line_width>1</line_width> @@ -394,41 +364,25 @@ $(pv_value)</tooltip> <point_size>4</point_size> <visible>true</visible> </trace> - <trace> - <name>limits</name> - <x_pv>loc://lim_x(0,0,0,0,0,0)</x_pv> - <y_pv>loc://lim_y(0,0,0,0,0,0)</y_pv> - <err_pv></err_pv> - <axis>0</axis> - <trace_type>5</trace_type> + </traces> + <marker> + <marker> <color> - <color name="Invalid" red="255" green="0" blue="255"> + <color name="ERROR" red="252" green="13" blue="27"> </color> </color> - <line_width>1</line_width> - <line_style>0</line_style> - <point_type>3</point_type> - <point_size>4</point_size> - <visible>true</visible> - </trace> - <trace> - <name>Pulse</name> - <x_pv></x_pv> - <y_pv>$(P)$(R)TRC2-ArrayData</y_pv> - <err_pv></err_pv> - <axis>0</axis> - <trace_type>1</trace_type> + <pv_name>$(P)$(R)ROI3-MinX</pv_name> + <interactive>true</interactive> + </marker> + <marker> <color> - <color name="IO PV ON" red="0" green="0" blue="255"> + <color name="ATTENTION" red="252" green="242" blue="17"> </color> </color> - <line_width>1</line_width> - <line_style>0</line_style> - <point_type>0</point_type> - <point_size>4</point_size> - <visible>true</visible> - </trace> - </traces> + <pv_name>$(P)$(R)ROI3-EndX</pv_name> + <interactive>true</interactive> + </marker> + </marker> </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_52</name> @@ -631,12 +585,6 @@ $(pv_value)</tooltip> </exp> <pv_name>$(P)$(R)PROC1-EnableOffsetScale_RBV</pv_name> </rule> - <rule name="trace1_buffer_size" prop_id="trace_0_buffer_size" out_exp="true"> - <exp bool_exp="true"> - <expression>pv0</expression> - </exp> - <pv_name>$(P)$(R)STAT3-TSTimestamp.NELM</pv_name> - </rule> </rules> <x_axis> <title>Pulse</title> @@ -650,7 +598,7 @@ $(pv_value)</tooltip> </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> @@ -668,7 +616,7 @@ $(pv_value)</tooltip> </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> @@ -1000,12 +948,6 @@ $(pv_value)</tooltip> <actions> </actions> <rules> - <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true"> - <exp bool_exp="true"> - <expression>pv0</expression> - </exp> - <pv_name>$(P)$(R)TRC3-ArraySize0_RBV</pv_name> - </rule> <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true"> <exp bool_exp="true"> <expression>pv0</expression> @@ -1030,17 +972,17 @@ $(pv_value)</tooltip> </rules> <x_axis> <title>Samples</title> - <autoscale>false</autoscale> + <autoscale>true</autoscale> <log_scale>false</log_scale> <minimum>0.0</minimum> <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> @@ -1054,11 +996,11 @@ $(pv_value)</tooltip> <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> @@ -1067,7 +1009,7 @@ $(pv_value)</tooltip> <traces> <trace> <name>Flat top</name> - <x_pv>$(P)$(R)TRC3-ArrayTimeUs</x_pv> + <x_pv></x_pv> <y_pv>$(P)$(R)TRC3-ArrayData</y_pv> <err_pv></err_pv> <axis>0</axis> @@ -1210,26 +1152,6 @@ $(pv_value)</tooltip> </color> </border_color> </widget> - <widget type="textupdate" version="2.0.0"> - <name>Text Update_94</name> - <pv_name>$(P)$(R)ROI3-EndXR</pv_name> - <x>669</x> - <y>620</y> - <width>70</width> - <background_color> - <color red="255" green="255" blue="255"> - </color> - </background_color> - <horizontal_alignment>1</horizontal_alignment> - <vertical_alignment>1</vertical_alignment> - <wrap_words>false</wrap_words> - <actions> - </actions> - <border_color> - <color red="0" green="128" blue="255"> - </color> - </border_color> - </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_95</name> <pv_name>$(P)$(R)ROI3-TickLastUsR</pv_name> @@ -1259,7 +1181,7 @@ $(pv_value)</tooltip> <width>128</width> <height>37</height> <font> - <font family="Noto Sans" style="BOLD" size="14.851485148514852"> + <font family="Source Sans Pro" style="BOLD" size="16.0"> </font> </font> <foreground_color> @@ -1330,10 +1252,6 @@ $(pv_value)</tooltip> <x>134</x> <y>746</y> <width>128</width> - <font> - <font family="Noto Sans" style="BOLD" size="10.891089108910892"> - </font> - </font> <foreground_color> <color name="Major" red="250" green="12" blue="14"> </color> @@ -1426,7 +1344,7 @@ $(pv_value)</tooltip> <width>163</width> <height>76</height> <font> - <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0"> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> </font> </font> <horizontal_alignment>1</horizontal_alignment> @@ -1447,7 +1365,7 @@ $(pv_value)</tooltip> <width>128</width> <height>37</height> <font> - <font family="Noto Sans" style="BOLD" size="14.851485148514852"> + <font family="Source Sans Pro" style="BOLD" size="16.0"> </font> </font> <foreground_color> @@ -1477,7 +1395,7 @@ $(pv_value)</tooltip> <width>411</width> <height>180</height> <font> - <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0"> + <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0"> </font> </font> <horizontal_alignment>1</horizontal_alignment> @@ -1766,26 +1684,6 @@ $(pv_value)</tooltip> </color> </border_color> </widget> - <widget type="textupdate" version="2.0.0"> - <name>Text Update_110</name> - <pv_name>$(P)$(R)ROI2-EndXR</pv_name> - <x>1092</x> - <y>620</y> - <width>70</width> - <background_color> - <color red="255" green="255" blue="255"> - </color> - </background_color> - <horizontal_alignment>1</horizontal_alignment> - <vertical_alignment>1</vertical_alignment> - <wrap_words>false</wrap_words> - <actions> - </actions> - <border_color> - <color red="0" green="128" blue="255"> - </color> - </border_color> - </widget> <widget type="textupdate" version="2.0.0"> <name>Text Update_111</name> <pv_name>$(P)$(R)ROI2-TickLastUsR</pv_name> @@ -2424,4 +2322,40 @@ $(pv_value)</tooltip> </color> </border_color> </widget> + <widget type="spinner" version="2.0.0"> + <name>Spinner_11</name> + <pv_name>$(P)$(R)ROI3-EndX</pv_name> + <x>563</x> + <y>618</y> + <width>99</width> + <height>25</height> + <format>0</format> + <precision>3</precision> + <background_color> + <color red="255" green="255" blue="255"> + </color> + </background_color> + <actions> + </actions> + <minimum>-1.7976931348623157E308</minimum> + <maximum>1.7976931348623157E308</maximum> + </widget> + <widget type="spinner" version="2.0.0"> + <name>Spinner_12</name> + <pv_name>$(P)$(R)ROI2-EndX</pv_name> + <x>985</x> + <y>618</y> + <width>99</width> + <height>25</height> + <format>0</format> + <precision>3</precision> + <background_color> + <color red="255" green="255" blue="255"> + </color> + </background_color> + <actions> + </actions> + <minimum>-1.7976931348623157E308</minimum> + <maximum>1.7976931348623157E308</maximum> + </widget> </display>