Skip to content
Snippets Groups Projects
Commit 492e5873 authored by Benjamin Bolling's avatar Benjamin Bolling
Browse files

Updated BCM screens in accordance with resolving issues discussed via email

parent e5510db2
No related branches found
No related tags found
2 merge requests!5Major update on PBI OPIs,!4Merge of 6+ months of changes to upstream
Hide whitespace changes
Inline Side-by-side
99-Shared/adsis8300bcm/bcm.bob
+ 0
− 7
View file @ 492e5873
......@@ -2551,15 +2551,8 @@ $(pv_value)</tooltip>
<width>120</width>
<height>30</height>
<precision>0</precision>
<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="label" version="2.0.0">
<name>Label_366</name>
......
99-Shared/adsis8300bcm/bcm_instance.bob
+ 17
− 98
View file @ 492e5873
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(P) top</name>
<width>790</width>
<height>390</height>
<name>$(P)$(R)ACCT$(ID) Panels</name>
<height>310</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
</color>
......@@ -14,7 +13,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
<width>790</width>
<width>800</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
......@@ -45,10 +44,10 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_5</name>
<x>130</x>
<x>190</x>
<y>70</y>
<width>530</width>
<height>300</height>
<width>420</width>
<height>220</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
......@@ -60,9 +59,9 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_20</name>
<text>Panels</text>
<x>130</x>
<x>190</x>
<y>70</y>
<width>530</width>
<width>420</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
......@@ -78,10 +77,10 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_11</name>
<x>150</x>
<x>210</x>
<y>121</y>
<width>490</width>
<height>230</height>
<width>380</width>
<height>149</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
......@@ -90,92 +89,12 @@
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_12</name>
<actions>
<action type="open_display">
<file>channels.bob</file>
<target>window</target>
</action>
</actions>
<text>Launch</text>
<x>470</x>
<y>300</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Text Update_4</name>
<text>differential channels</text>
<x>180</x>
<y>300</y>
<width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<border_color>
<color red="0" green="128" blue="255">
</color>
</border_color>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_11</name>
<actions>
<action type="open_display">
<file>bcm.opi</file>
<target>window</target>
</action>
</actions>
<text>Launch</text>
<x>470</x>
<y>260</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Text Update_3</name>
<text>control group</text>
<x>180</x>
<y>260</y>
<width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<border_color>
<color red="0" green="128" blue="255">
</color>
</border_color>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
<pv_name>$(P)$(R)PROC$(ID)-Name</pv_name>
<x>180</x>
<x>240</x>
<y>180</y>
<width>270</width>
<width>220</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -233,9 +152,9 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(P)$(R)ACCT$(ID)-Name</pv_name>
<x>180</x>
<x>240</x>
<y>220</y>
<width>270</width>
<width>220</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
......@@ -276,9 +195,9 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)RAW$(ID)-Name</pv_name>
<x>180</x>
<x>240</x>
<y>140</y>
<width>270</width>
<width>220</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
......
99-Shared/adsis8300bcm/lut_dest_acct_item.bob
+ 1
− 1
View file @ 492e5873
......@@ -31,7 +31,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Menu Button</name>
<pv_name>$(P)$(R)Lut$(N)BeamExists</pv_name>
<pv_name>$(P)$(R)ACCT1-Lut$(N)BeamExists</pv_name>
<x>390</x>
<width>120</width>
<background_color>
......
99-Shared/adsis8300bcm/lut_mode_acct_item.bob
+ 3
− 3
View file @ 492e5873
......@@ -31,7 +31,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_24</name>
<pv_name>$(P)$(R)Lut$(N)UpperThreshold</pv_name>
<pv_name>$(P)$(R)ACCT1-Lut$(N)UpperThreshold</pv_name>
<x>390</x>
<width>120</width>
<height>30</height>
......@@ -46,7 +46,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_25</name>
<pv_name>$(P)$(R)Lut$(N)LowerThreshold</pv_name>
<pv_name>$(P)$(R)ACCT1-Lut$(N)LowerThreshold</pv_name>
<x>530</x>
<width>120</width>
<height>30</height>
......@@ -61,7 +61,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input_26</name>
<pv_name>$(P)$(R)Lut$(N)MaxPulseLength</pv_name>
<pv_name>$(P)$(R)ACCT1-Lut$(N)MaxPulseLength</pv_name>
<x>670</x>
<width>120</width>
<height>30</height>
......
99-Shared/adsis8300bcm/lut_mode_item.bob
+ 1
− 1
View file @ 492e5873
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<class></class>
<width>360</width>
<width>370</width>
<height>30</height>
<background_color>
<color name="Transparent" red="255" green="255" blue="255" alpha="0">
......
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