From 9873d4e3d63a0490a31261ecc8b927b5773451ea Mon Sep 17 00:00:00 2001
From: benjaminbolling <benjamin.bolling@esss.se>
Date: Mon, 22 Jun 2020 12:48:19 +0200
Subject: [PATCH] Fixed some new prefix-following layout issues.
---
10-Top/bcmioc/top.bob | 2 ++
99-Shared/adsis8300bcm/acct.bob | 2 +-
99-Shared/adsis8300bcm/bcm.bob | 2 +-
99-Shared/adsis8300bcm/bcm_instance.bob | 44 ++++++++++++-------------
99-Shared/adsis8300bcm/channels.bob | 30 ++++++++---------
99-Shared/adsis8300bcm/processed.bob | 2 +-
99-Shared/adsis8300bcm/raw.bob | 2 +-
7 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index a22f622..18506d8 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -88,6 +88,7 @@
<file>instance.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-005</AMC_NAME>
+ <CG>LAB-BCM08:Ctrl-AMC-005:</CG>
<CONTROL_GROUP>LAB-BCM08</CONTROL_GROUP>
<SYSTEM1>LAB-008:PBI-BCM-001</SYSTEM1>
<SYSTEM10>LAB-008:PBI-BCM-010</SYSTEM10>
@@ -117,6 +118,7 @@
<file>instance.bob</file>
<macros>
<AMC_NAME>Ctrl-AMC-004</AMC_NAME>
+ <CG>LAB-BCM09:Ctrl-AMC-004:</CG>
<CONTROL_GROUP>LAB-BCM09</CONTROL_GROUP>
<SYSTEM1>LAB-009:PBI-BCM-001</SYSTEM1>
<SYSTEM10>LAB-009:PBI-BCM-010</SYSTEM10>
diff --git a/99-Shared/adsis8300bcm/acct.bob b/99-Shared/adsis8300bcm/acct.bob
index ee37130..d87f5ca 100644
--- a/99-Shared/adsis8300bcm/acct.bob
+++ b/99-Shared/adsis8300bcm/acct.bob
@@ -23,7 +23,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)$(R)ACCT$(ID)-</text>
+ <text>$(P)$(R)ACCT$(ID)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1720</width>
diff --git a/99-Shared/adsis8300bcm/bcm.bob b/99-Shared/adsis8300bcm/bcm.bob
index 01f5f3f..059c550 100644
--- a/99-Shared/adsis8300bcm/bcm.bob
+++ b/99-Shared/adsis8300bcm/bcm.bob
@@ -533,7 +533,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)</text>
+ <text>$(CG)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1760</width>
diff --git a/99-Shared/adsis8300bcm/bcm_instance.bob b/99-Shared/adsis8300bcm/bcm_instance.bob
index 59270d5..8dd23ee 100644
--- a/99-Shared/adsis8300bcm/bcm_instance.bob
+++ b/99-Shared/adsis8300bcm/bcm_instance.bob
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(P) top</name>
- <width>460</width>
+ <width>570</width>
<height>390</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -14,7 +14,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>460</width>
+ <width>570</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -25,10 +25,10 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)</text>
+ <text>$(P)$(R)ACCT$(ID)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>420</width>
+ <width>530</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -47,7 +47,7 @@
<name>BGGrey03-titlebar_5</name>
<x>20</x>
<y>70</y>
- <width>420</width>
+ <width>530</width>
<height>300</height>
<line_width>0</line_width>
<background_color>
@@ -62,7 +62,7 @@
<text>Panels</text>
<x>20</x>
<y>70</y>
- <width>420</width>
+ <width>530</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -80,7 +80,7 @@
<name>BGGrey03-background_11</name>
<x>40</x>
<y>121</y>
- <width>380</width>
+ <width>490</width>
<height>230</height>
<line_width>0</line_width>
<background_color>
@@ -99,7 +99,7 @@
</action>
</actions>
<text>Launch</text>
- <x>300</x>
+ <x>360</x>
<y>300</y>
<background_color>
<color red="240" green="240" blue="240">
@@ -110,9 +110,9 @@
<widget type="label" version="2.0.0">
<name>Text Update_4</name>
<text>differential channels</text>
- <x>60</x>
+ <x>70</x>
<y>300</y>
- <width>220</width>
+ <width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -139,7 +139,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<text>Launch</text>
- <x>300</x>
+ <x>360</x>
<y>260</y>
<background_color>
<color red="240" green="240" blue="240">
@@ -150,9 +150,9 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Text Update_3</name>
<text>control group</text>
- <x>60</x>
+ <x>70</x>
<y>260</y>
- <width>220</width>
+ <width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -173,9 +173,9 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
<pv_name>$(P)$(R)PROC$(ID)-Name</pv_name>
- <x>60</x>
+ <x>70</x>
<y>180</y>
- <width>220</width>
+ <width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -205,7 +205,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<text>Launch</text>
- <x>300</x>
+ <x>360</x>
<y>220</y>
<background_color>
<color red="240" green="240" blue="240">
@@ -222,7 +222,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<text>Launch</text>
- <x>300</x>
+ <x>360</x>
<y>180</y>
<background_color>
<color red="240" green="240" blue="240">
@@ -233,9 +233,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>60</x>
+ <x>70</x>
<y>220</y>
- <width>220</width>
+ <width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
@@ -265,7 +265,7 @@ $(pv_value)</tooltip>
</action>
</actions>
<text>Launch</text>
- <x>300</x>
+ <x>360</x>
<y>140</y>
<background_color>
<color red="240" green="240" blue="240">
@@ -276,9 +276,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>60</x>
+ <x>70</x>
<y>140</y>
- <width>220</width>
+ <width>270</width>
<height>30</height>
<font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
diff --git a/99-Shared/adsis8300bcm/channels.bob b/99-Shared/adsis8300bcm/channels.bob
index a117a11..587af63 100644
--- a/99-Shared/adsis8300bcm/channels.bob
+++ b/99-Shared/adsis8300bcm/channels.bob
@@ -9,7 +9,7 @@
<name>BGGrey03-titlebar_4</name>
<x>20</x>
<y>70</y>
- <width>470</width>
+ <width>490</width>
<height>500</height>
<line_width>0</line_width>
<background_color>
@@ -23,7 +23,7 @@
<name>BGGrey03-background_10</name>
<x>40</x>
<y>120</y>
- <width>430</width>
+ <width>450</width>
<height>430</height>
<line_width>0</line_width>
<background_color>
@@ -57,7 +57,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>510</width>
+ <width>530</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -68,10 +68,10 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)</text>
+ <text>$(P)$(R)DIFF</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>470</width>
+ <width>490</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -118,7 +118,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>2</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>180</y>
<width>390</width>
<height>30</height>
@@ -136,7 +136,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>3</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>220</y>
<width>390</width>
<height>30</height>
@@ -154,7 +154,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>4</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>260</y>
<width>390</width>
<height>30</height>
@@ -172,7 +172,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>5</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>300</y>
<width>390</width>
<height>30</height>
@@ -190,7 +190,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>6</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>340</y>
<width>390</width>
<height>30</height>
@@ -208,7 +208,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>7</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>380</y>
<width>390</width>
<height>30</height>
@@ -226,7 +226,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>8</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>420</y>
<width>390</width>
<height>30</height>
@@ -244,7 +244,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>9</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>460</y>
<width>390</width>
<height>30</height>
@@ -262,7 +262,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>10</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>500</y>
<width>390</width>
<height>30</height>
@@ -280,7 +280,7 @@ $(pv_value)</tooltip>
<macros>
<IDX>1</IDX>
</macros>
- <x>60</x>
+ <x>70</x>
<y>140</y>
<width>390</width>
<height>30</height>
diff --git a/99-Shared/adsis8300bcm/processed.bob b/99-Shared/adsis8300bcm/processed.bob
index 528acd9..36457a3 100644
--- a/99-Shared/adsis8300bcm/processed.bob
+++ b/99-Shared/adsis8300bcm/processed.bob
@@ -322,7 +322,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)</text>
+ <text>$(P)$(R)PROC$(ID)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1860</width>
diff --git a/99-Shared/adsis8300bcm/raw.bob b/99-Shared/adsis8300bcm/raw.bob
index e765700..6c1c045 100644
--- a/99-Shared/adsis8300bcm/raw.bob
+++ b/99-Shared/adsis8300bcm/raw.bob
@@ -126,7 +126,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>$(P)</text>
+ <text>$(P)$(R)RAW$(ID)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1620</width>
--
GitLab