From 1184a716a98a58a9416328089819ff35336152e0 Mon Sep 17 00:00:00 2001
From: Benjamin Bolling <benjaminbolling@ci0021286.esss.lu.se>
Date: Thu, 27 Feb 2020 15:08:37 +0100
Subject: [PATCH] Updated the BCM expert/detailed screen together with Hinko.
---
.../OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob | 575 +++---------------
1 file changed, 90 insertions(+), 485 deletions(-)
diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob
index ba4c6c6c..c104ef76 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/SubWindows/BCM.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>BCM</name>
<class></class>
- <width>2060</width>
+ <width>1540</width>
<height>870</height>
<background_color>
<color name="Button_Background" red="210" green="210" blue="210">
@@ -10,7 +10,7 @@
</background_color>
<widget type="rectangle" version="2.0.0">
<name>Rectangle Template</name>
- <width>2060</width>
+ <width>1540</width>
<height>50</height>
<line_width>0</line_width>
<line_color>
@@ -81,7 +81,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey03-title</name>
- <text>Channels Configuration</text>
+ <text>Settings</text>
<x>14</x>
<width>246</width>
<height>50</height>
@@ -120,7 +120,7 @@ $(pv_value)</tooltip>
<x>15</x>
<y>20</y>
<width>416</width>
- <height>370</height>
+ <height>686</height>
<style>3</style>
<widget type="label" version="2.0.0">
<name>LGGrey02-title</name>
@@ -146,9 +146,9 @@ $(pv_value)</tooltip>
<widget type="group" version="2.0.0">
<name>Hardware</name>
<x>10</x>
- <y>49</y>
- <width>378</width>
- <height>152</height>
+ <y>50</y>
+ <width>396</width>
+ <height>150</height>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
<name>Label_3</name>
@@ -211,550 +211,155 @@ $(pv_value)</tooltip>
<widget type="group" version="2.0.0">
<name>Pulse</name>
<x>10</x>
- <y>205</y>
- <width>378</width>
- <height>147</height>
+ <y>220</y>
+ <width>396</width>
+ <height>100</height>
<transparent>true</transparent>
<widget type="spinner" version="2.0.0">
<name>Spinner</name>
<pv_name>$(PV_name)-DRCR</pv_name>
- <x>234</x>
- <y>9</y>
+ <x>205</x>
+ <y>10</y>
+ <width>140</width>
<precision>2</precision>
</widget>
<widget type="label" version="2.0.0">
<name>Label_14</name>
<text>Droop Compensation:</text>
<x>27</x>
- <y>9</y>
+ <y>10</y>
<width>160</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_6</name>
<text>Charge per Pulse:</text>
- <y>45</y>
- <width>190</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_7</name>
- <text>Background Noise:</text>
- <y>82</y>
+ <y>40</y>
<width>190</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(PV_name)-IPCH-RBV</pv_name>
- <x>234</x>
- <y>45</y>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_2</name>
- <pv_name>$(PV_name)-BGSV-RBV</pv_name>
- <x>234</x>
- <y>82</y>
+ <x>205</x>
+ <y>40</y>
+ <width>140</width>
</widget>
</widget>
- </widget>
- <widget type="group" version="2.0.0">
- <name>LGGrey02_6</name>
- <x>15</x>
- <y>400</y>
- <width>416</width>
- <height>182</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>LGGrey02-title_6</name>
- <text>Data Acquisition</text>
- <width>416</width>
- <height>40</height>
- <font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_33</name>
- <text>AI CG State:</text>
- <x>51</x>
- <y>63</y>
- <width>91</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_34</name>
- <text>DAQ Control:</text>
- <x>41</x>
- <y>104</y>
- <width>101</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_8</name>
- <pv_name>$(PV_name)-STAT</pv_name>
- <x>159</x>
- <y>63</y>
- <width>120</width>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_3</name>
- <actions>
- <action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
- <value>START</value>
- <description>Start</description>
- </action>
- </actions>
- <pv_name>$(PV_name)-MSGS</pv_name>
- <x>159</x>
- <y>99</y>
- <width>120</width>
- <tooltip>$(actions)</tooltip>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_4</name>
- <actions>
- <action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
- <value>STOP</value>
- <description>Stop</description>
- </action>
- </actions>
- <pv_name>$(PV_name)-MSGS</pv_name>
- <x>159</x>
- <y>134</y>
- <width>120</width>
- <tooltip>$(actions)</tooltip>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button_5</name>
- <actions>
- <action type="write_pv">
- <pv_name>$(pv_name)</pv_name>
- <value>0</value>
- <description>Trigger</description>
- </action>
- </actions>
- <pv_name>$(PV_name)-TRG</pv_name>
- <x>293</x>
- <y>99</y>
- <width>66</width>
- <tooltip>$(actions)</tooltip>
- </widget>
- </widget>
- </widget>
- </widget>
- <widget type="group" version="2.0.0">
- <name>Settings</name>
- <x>1541</x>
- <y>77</y>
- <width>499</width>
- <height>793</height>
- <style>3</style>
- <background_color>
- <color name="BACKGROUND" red="220" green="225" blue="221">
- </color>
- </background_color>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-titlebar_1</name>
- <width>499</width>
- <height>793</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </background_color>
- <corner_width>10</corner_width>
- <corner_height>10</corner_height>
- </widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey03-title_1</name>
- <text>Settings</text>
- <x>14</x>
- <width>246</width>
- <height>50</height>
- <font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
- </font>
- </font>
- <foreground_color>
- <color name="TEXT-LIGHT" red="230" green="230" blue="230">
- </color>
- </foreground_color>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="group" version="2.0.0">
- <name>BGGrey03-content-group_1</name>
- <x>14</x>
- <y>50</y>
- <width>475</width>
- <height>723</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="rectangle" version="2.0.0">
- <name>BGGrey03-background_1</name>
- <width>475</width>
- <height>723</height>
- <line_width>0</line_width>
- <background_color>
- <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
- <widget type="group" version="2.0.0">
- <name>LGGrey02_3</name>
- <x>15</x>
- <y>20</y>
- <width>448</width>
- <height>443</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>LGGrey02-title_3</name>
- <text>DAQ</text>
- <width>448</width>
- <height>40</height>
- <font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
<widget type="group" version="2.0.0">
<name>Setup</name>
<x>10</x>
- <y>57</y>
- <width>428</width>
- <height>379</height>
+ <y>350</y>
+ <width>396</width>
+ <height>160</height>
<transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Label_40</name>
- <text>Clock Frequency:</text>
- <y>139</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_41</name>
- <text>Clock Source:</text>
- <y>98</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_42</name>
<text>Sample Count:</text>
- <y>58</y>
- <width>130</width>
+ <y>40</y>
+ <width>190</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_43</name>
<text>Retrigger Count:</text>
- <y>261</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_44</name>
- <text>Trigger Delay:</text>
- <y>220</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_45</name>
- <text>Clock Divider:</text>
- <y>180</y>
- <width>130</width>
+ <y>70</y>
+ <width>190</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_46</name>
<text>Trigger Source:</text>
- <y>302</y>
- <width>130</width>
+ <y>100</y>
+ <width>190</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_5</name>
- <pv_name>$(PV_name)-SMNM</pv_name>
- <x>147</x>
- <y>58</y>
- <width>120</width>
- <maximum>800000.0</maximum>
- </widget>
- <widget type="combo" version="2.0.0">
- <name>Combo Box</name>
- <pv_name>$(PV_name)-CLKS</pv_name>
- <x>147</x>
- <y>93</y>
- <width>120</width>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_6</name>
- <pv_name>$(PV_name)-CLKF</pv_name>
- <x>147</x>
- <y>139</y>
- <width>120</width>
- <format>0</format>
- <show_units>true</show_units>
- <minimum>6250000.0</minimum>
- <maximum>1.25E8</maximum>
- <increment>1000.0</increment>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_7</name>
- <pv_name>$(PV_name)-CLKD</pv_name>
- <x>147</x>
- <y>180</y>
- <width>120</width>
- <show_units>true</show_units>
- <minimum>1.0</minimum>
- <maximum>10.0</maximum>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_8</name>
- <pv_name>$(PV_name)-TRGD</pv_name>
- <x>147</x>
- <y>220</y>
- <width>120</width>
- <show_units>true</show_units>
- <minimum>-1024.0</minimum>
- <maximum>1024.0</maximum>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_9</name>
- <pv_name>$(PV_name)-TRGR</pv_name>
- <x>147</x>
- <y>261</y>
- <width>120</width>
- <show_units>true</show_units>
- </widget>
- <widget type="combo" version="2.0.0">
- <name>Combo Box_1</name>
- <pv_name>$(PV_name)-TRGC</pv_name>
- <x>147</x>
- <y>297</y>
- <width>120</width>
- <items>
- <item>frontpanel0</item>
- <item>frontpanel1</item>
- <item>frontpanel2</item>
- <item>backplane0</item>
- <item>backplane1</item>
- <item>backplane2</item>
- <item>backplane3</item>
- <item>backplane4</item>
- <item>backplane5</item>
- <item>backplane6</item>
- </items>
- <items_from_pv>false</items_from_pv>
- </widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
<pv_name>$(PV_name)-SMNM-RBV</pv_name>
- <x>281</x>
- <y>58</y>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_12</name>
- <pv_name>$(PV_name)-CLKS-RBV</pv_name>
- <x>281</x>
- <y>98</y>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_13</name>
- <pv_name>$(PV_name)-CLKF-RBV</pv_name>
- <x>281</x>
- <y>139</y>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_14</name>
- <pv_name>$(PV_name)-CLKD-RBV</pv_name>
- <x>281</x>
- <y>180</y>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_15</name>
- <pv_name>$(PV_name)-TRGD-RBV</pv_name>
- <x>281</x>
- <y>220</y>
+ <x>205</x>
+ <y>40</y>
+ <width>140</width>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_16</name>
<pv_name>$(PV_name)-TRGR-RBV</pv_name>
- <x>281</x>
- <y>261</y>
+ <x>205</x>
+ <y>70</y>
+ <width>140</width>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_17</name>
<pv_name>$(PV_name)-TRGC-RBV</pv_name>
- <x>281</x>
- <y>302</y>
+ <x>205</x>
+ <y>100</y>
+ <width>140</width>
<format>6</format>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_22</name>
<pv_name>$(PV_name)</pv_name>
- <x>147</x>
- <y>19</y>
- <width>120</width>
+ <x>205</x>
+ <y>10</y>
+ <width>140</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_50</name>
<text>Device State:</text>
- <y>19</y>
- <width>130</width>
+ <y>10</y>
+ <width>190</width>
<horizontal_alignment>2</horizontal_alignment>
</widget>
</widget>
- </widget>
- <widget type="group" version="2.0.0">
- <name>LGGrey02_4</name>
- <x>15</x>
- <y>483</y>
- <width>448</width>
- <height>223</height>
- <style>3</style>
- <widget type="label" version="2.0.0">
- <name>LGGrey02-title_4</name>
- <text>Parameters</text>
- <width>448</width>
- <height>40</height>
- <font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
- </font>
- </font>
- <foreground_color>
- <color name="GROUP-TEXT" red="25" green="25" blue="25">
- </color>
- </foreground_color>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_51</name>
- <text>MA Filter Window:</text>
- <x>31</x>
- <y>190</y>
- <width>130</width>
- <height>21</height>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_53</name>
- <text>Conversion Offset:</text>
- <x>31</x>
- <y>92</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_54</name>
- <text>Conversion Scale:</text>
- <x>31</x>
- <y>52</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_55</name>
- <text>Decimation Factor:</text>
- <x>31</x>
- <y>132</y>
- <width>130</width>
- <horizontal_alignment>2</horizontal_alignment>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_19</name>
- <pv_name>$(PV_name):AI-AFWW</pv_name>
- <x>178</x>
- <y>190</y>
- <width>120</width>
- <show_units>true</show_units>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_29</name>
- <pv_name>$(PV_name):AI-AFWW-RBV</pv_name>
- <x>308</x>
- <y>190</y>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_18</name>
- <pv_name>$(PV_name)-LCVF</pv_name>
- <x>178</x>
- <y>52</y>
- <width>120</width>
- <precision>6</precision>
- <maximum>1.0</maximum>
- <increment>0.001</increment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_27</name>
- <pv_name>$(PV_name)-LCVF-RBV</pv_name>
- <x>308</x>
- <y>52</y>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_28</name>
- <pv_name>$(PV_name)-LCVO-RBV</pv_name>
- <x>308</x>
- <y>92</y>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_21</name>
- <pv_name>$(PV_name)-LCVO</pv_name>
- <x>178</x>
- <y>92</y>
- <width>120</width>
- <precision>2</precision>
- <show_units>true</show_units>
- <minimum>-100.0</minimum>
- </widget>
- <widget type="spinner" version="2.0.0">
- <name>Spinner_20</name>
- <pv_name>$(PV_name)-DECF</pv_name>
- <x>178</x>
- <y>132</y>
- <width>120</width>
- <show_units>true</show_units>
- <minimum>1.0</minimum>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_30</name>
- <pv_name>$(PV_name)-DECF-RBV</pv_name>
- <x>308</x>
- <y>132</y>
+ <widget type="group" version="2.0.0">
+ <name>Parameters</name>
+ <x>10</x>
+ <y>530</y>
+ <width>396</width>
+ <height>130</height>
+ <transparent>true</transparent>
+ <widget type="label" version="2.0.0">
+ <name>Label_53</name>
+ <text>Conversion Offset:</text>
+ <y>40</y>
+ <width>190</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_54</name>
+ <text>Conversion Scale:</text>
+ <y>10</y>
+ <width>190</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_55</name>
+ <text>Decimation Factor:</text>
+ <y>70</y>
+ <width>190</width>
+ <horizontal_alignment>2</horizontal_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_27</name>
+ <pv_name>$(PV_name)-LCVF-RBV</pv_name>
+ <x>205</x>
+ <y>10</y>
+ <width>140</width>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_28</name>
+ <pv_name>$(PV_name)-LCVO-RBV</pv_name>
+ <x>205</x>
+ <y>40</y>
+ <width>140</width>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_30</name>
+ <pv_name>$(PV_name)-DECF-RBV</pv_name>
+ <x>205</x>
+ <y>70</y>
+ <width>140</width>
+ </widget>
</widget>
</widget>
</widget>
--
GitLab