From 6caa9984125d69e1583039ee2f219b18edd19bae Mon Sep 17 00:00:00 2001
From: benjaminbolling <benjamin.bolling@esss.se>
Date: Thu, 23 Apr 2020 15:44:08 +0200
Subject: [PATCH] Fixed some graphical issues of some embedded / linked screens
of the BPM.
---
99-Shared/adsis8300bpm/aiChannelItem.bob | 26 +++++++++----------
.../adsis8300bpm/bpmChannelAverageItem.bob | 26 +++++++++----------
99-Shared/adsis8300bpm/bpmChannelItem.bob | 26 +++++++++----------
3 files changed, 36 insertions(+), 42 deletions(-)
diff --git a/99-Shared/adsis8300bpm/aiChannelItem.bob b/99-Shared/adsis8300bpm/aiChannelItem.bob
index b5b8729..4e8f0d1 100644
--- a/99-Shared/adsis8300bpm/aiChannelItem.bob
+++ b/99-Shared/adsis8300bpm/aiChannelItem.bob
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <class></class>
+ <width>307</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,11 +12,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
- <x>174</x>
- <y>72</y>
<width>145</width>
<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>
</font>
<background_color>
@@ -33,8 +34,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ControlR</pv_name>
- <x>320</x>
- <y>74</y>
+ <x>146</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -66,12 +67,11 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>337</x>
- <y>72</y>
+ <x>163</x>
<width>43</width>
<height>20</height>
<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>
<background_color>
@@ -89,12 +89,11 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>379</x>
- <y>72</y>
+ <x>205</x>
<width>43</width>
<height>20</height>
<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>
<background_color>
@@ -111,12 +110,11 @@
</action>
</actions>
<text>More..</text>
- <x>432</x>
- <y>72</y>
+ <x>258</x>
<width>49</width>
<height>20</height>
<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>
<background_color>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
index aa39840..2972b1d 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <class></class>
+ <width>307</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,11 +12,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
- <x>240</x>
- <y>75</y>
<width>145</width>
<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>
</font>
<background_color>
@@ -33,8 +34,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
- <x>386</x>
- <y>77</y>
+ <x>146</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -66,12 +67,11 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>403</x>
- <y>75</y>
+ <x>163</x>
<width>43</width>
<height>20</height>
<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>
<background_color>
@@ -89,12 +89,11 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>445</x>
- <y>75</y>
+ <x>205</x>
<width>43</width>
<height>20</height>
<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>
<background_color>
@@ -111,12 +110,11 @@
</action>
</actions>
<text>More..</text>
- <x>498</x>
- <y>75</y>
+ <x>258</x>
<width>49</width>
<height>20</height>
<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>
<background_color>
diff --git a/99-Shared/adsis8300bpm/bpmChannelItem.bob b/99-Shared/adsis8300bpm/bpmChannelItem.bob
index 3f18689..a7e19d1 100644
--- a/99-Shared/adsis8300bpm/bpmChannelItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelItem.bob
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <class></class>
+ <width>307</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,11 +12,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
- <x>240</x>
- <y>75</y>
<width>145</width>
<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>
</font>
<background_color>
@@ -33,8 +34,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
- <x>386</x>
- <y>77</y>
+ <x>146</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -66,12 +67,11 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>403</x>
- <y>75</y>
+ <x>163</x>
<width>43</width>
<height>20</height>
<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>
<background_color>
@@ -89,12 +89,11 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>445</x>
- <y>75</y>
+ <x>205</x>
<width>43</width>
<height>20</height>
<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>
<background_color>
@@ -111,12 +110,11 @@
</action>
</actions>
<text>More..</text>
- <x>498</x>
- <y>75</y>
+ <x>258</x>
<width>49</width>
<height>20</height>
<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>
<background_color>
--
GitLab