From 462d8d37be6eec574809c340d330cf5420c456ba Mon Sep 17 00:00:00 2001
From: Elena Donegani <elena.donegani@ess.eu>
Date: Wed, 10 Jun 2020 18:30:15 +0200
Subject: [PATCH] Replace asynGPIBSetup.bob
---
99-Shared/asyn/asynGPIBSetup.bob | 345 ++++++++++++++++++++++---------
1 file changed, 244 insertions(+), 101 deletions(-)
diff --git a/99-Shared/asyn/asynGPIBSetup.bob b/99-Shared/asyn/asynGPIBSetup.bob
index 08dc6f1..62cb63e 100644
--- a/99-Shared/asyn/asynGPIBSetup.bob
+++ b/99-Shared/asyn/asynGPIBSetup.bob
@@ -4,207 +4,350 @@
<x>456</x>
<y>239</y>
<width>375</width>
- <height>185</height>
+ <height>220</height>
<background_color>
- <color red="187" green="187" blue="187">
+ <color red="240" green="240" blue="240">
</color>
</background_color>
- <grid_visible>false</grid_visible>
- <grid_step_x>5</grid_step_x>
+ <actions>
+ </actions>
<widget type="rectangle" version="2.0.0">
- <name>rectangle #6</name>
- <y>8</y>
+ <name>BGGrey02-background</name>
+ <y>50</y>
<width>375</width>
- <height>29</height>
+ <height>170</height>
+ <line_width>2</line_width>
<line_color>
- <color red="218" green="218" blue="218">
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
</color>
</line_color>
<background_color>
- <color red="218" green="218" blue="218">
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</background_color>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>375</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <line_color>
+ <color red="128" green="0" blue="255">
+ </color>
+ </line_color>
+ <background_color use_class="true">
+ <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
- <name>text #9</name>
+ <name>Label</name>
<text>$(P)$(R)</text>
<y>12</y>
<width>375</width>
<height>25</height>
<font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
+ <font family="Sans" style="REGULAR" size="14.851485148514852">
</font>
</font>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" 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="label" version="2.0.0">
- <name>text #12</name>
+ <name>Label</name>
<text>GPIB address:</text>
- <x>4</x>
- <y>68</y>
+ <x>61</x>
+ <y>92</y>
<width>130</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</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="textentry" version="3.0.0">
- <name>text entry #15</name>
+ <name>Text Input</name>
<pv_name>$(P)$(R).ADDR</pv_name>
- <x>139</x>
- <y>68</y>
- <width>75</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
+ <x>224</x>
+ <y>88</y>
+ <width>135</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
<format>1</format>
<show_units>false</show_units>
+ <actions>
+ </actions>
<border_alarm_sensitive>false</border_alarm_sensitive>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
</widget>
<widget type="label" version="2.0.0">
- <name>text #19</name>
+ <name>Label</name>
<text>Serial poll response:</text>
- <x>4</x>
- <y>97</y>
- <width>210</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <y>120</y>
+ <width>191</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</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 #22</name>
+ <name>Text Update</name>
<pv_name>$(P)$(R).SPR</pv_name>
- <x>224</x>
- <y>97</y>
- <width>56</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
+ <x>225</x>
+ <y>117</y>
+ <width>135</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
<format>4</format>
<show_units>false</show_units>
- <border_alarm_sensitive>false</border_alarm_sensitive>
+ <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>text #26</name>
- <text>Universal Command</text>
- <x>4</x>
- <y>126</y>
+ <name>Label</name>
+ <text>Universal Command:</text>
+ <x>23</x>
+ <y>150</y>
<width>170</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</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="combo" version="2.0.0">
- <name>menu #29</name>
+ <name>Menu Button</name>
<pv_name>$(P)$(R).UCMD</pv_name>
- <x>179</x>
- <y>126</y>
- <width>180</width>
+ <x>224</x>
+ <y>145</y>
+ <width>135</width>
<height>20</height>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
+ <actions>
+ </actions>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
- <name>text #32</name>
- <text>Addressed Command</text>
- <x>4</x>
- <y>151</y>
+ <name>Label</name>
+ <text>Addressed Command:</text>
+ <x>22</x>
+ <y>182</y>
<width>170</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</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="combo" version="2.0.0">
- <name>menu #35</name>
+ <name>Menu Button</name>
<pv_name>$(P)$(R).ACMD</pv_name>
- <x>179</x>
- <y>151</y>
- <width>180</width>
+ <x>224</x>
+ <y>175</y>
+ <width>135</width>
<height>20</height>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
+ <actions>
+ </actions>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
- <name>text #38</name>
+ <name>Label</name>
<text>Supported</text>
- <x>218</x>
- <y>42</y>
+ <x>250</x>
+ <y>60</y>
<width>90</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
<foreground_color>
<color red="51" green="153" blue="0">
</color>
</foreground_color>
- <auto_size>true</auto_size>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
<rules>
- <rule name="vis_if_not_zero" prop_id="visible" out_exp="false">
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pv0!=0">
+ <value>true</value>
+ </exp>
<exp bool_exp="!(pv0!=0)">
<value>false</value>
</exp>
<pv_name>$(P)$(R).GPIBIV</pv_name>
</rule>
</rules>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
</widget>
<widget type="label" version="2.0.0">
- <name>text #42</name>
+ <name>Label</name>
<text>Unsupported</text>
- <x>208</x>
- <y>42</y>
+ <x>240</x>
+ <y>60</y>
<width>110</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
<foreground_color>
<color red="222" green="19" blue="9">
</color>
</foreground_color>
- <auto_size>true</auto_size>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
<rules>
- <rule name="vis_if_zero" prop_id="visible" out_exp="false">
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pv0==0">
+ <value>true</value>
+ </exp>
<exp bool_exp="!(pv0==0)">
<value>false</value>
</exp>
<pv_name>$(P)$(R).GPIBIV</pv_name>
</rule>
</rules>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
</widget>
<widget type="label" version="2.0.0">
- <name>text #46</name>
+ <name>Label</name>
<text>asynGpib interface:</text>
- <x>4</x>
- <y>42</y>
+ <x>2</x>
+ <y>60</y>
<width>190</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <horizontal_alignment>2</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>
</display>
--
GitLab