From eaa156a97f17a0d0fc7a1cc8a8175ebbf7ee1d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Thu, 11 Feb 2021 17:18:29 +0100
Subject: [PATCH] Labels are more specific now
---
.../diagnostics/system_overview.bob | 67 ++++++++++---------
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob
index f7a53063..972e3149 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/system_overview.bob
@@ -126,14 +126,14 @@
<widget type="group" version="2.0.0">
<name>GCPU</name>
<width>162</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
<name>Title</name>
<text>Gateway CPU</text>
<width>162</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -145,7 +145,7 @@
<widget type="picture" version="2.0.0">
<name>GCPU</name>
<file>$(PLC_SYMBOLS)/GCPU.png</file>
- <y>40</y>
+ <y>55</y>
<width>162</width>
<height>230</height>
</widget>
@@ -154,14 +154,14 @@
<name>CPU</name>
<x>250</x>
<width>162</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
<name>Title</name>
- <text>CPU</text>
+ <text>F-CPU</text>
<width>162</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -173,7 +173,7 @@
<widget type="picture" version="2.0.0">
<name>CPU</name>
<file>$(PLC_SYMBOLS)/CPU.png</file>
- <y>40</y>
+ <y>55</y>
<width>162</width>
<height>230</height>
</widget>
@@ -185,7 +185,7 @@
</macros>
<file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
<x>67</x>
- <y>83</y>
+ <y>98</y>
<width>30</width>
<height>70</height>
<resize>2</resize>
@@ -196,14 +196,15 @@
<name>Switch</name>
<x>440</x>
<width>120</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
<widget type="label" version="2.0.0">
<name>Title</name>
- <text>Scalance</text>
+ <text>PLC Cabinet
+Scalance</text>
<width>120</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -215,7 +216,7 @@
<widget type="picture" version="2.0.0">
<name>Switch</name>
<file>$(PLC_SYMBOLS)/Switch.png</file>
- <y>40</y>
+ <y>55</y>
<width>120</width>
<height>230</height>
</widget>
@@ -227,7 +228,7 @@
</macros>
<file>$(EMBEDDED_DIAG)/PLC_module_status.bob</file>
<x>45</x>
- <y>83</y>
+ <y>98</y>
<width>30</width>
<height>70</height>
<resize>2</resize>
@@ -238,21 +239,14 @@
<name>HMI</name>
<x>590</x>
<width>210</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
- <widget type="picture" version="2.0.0">
- <name>HMI</name>
- <file>$(PLC_SYMBOLS)/HMI.png</file>
- <y>40</y>
- <width>210</width>
- <height>230</height>
- </widget>
<widget type="label" version="2.0.0">
<name>Title</name>
<text>HMI</text>
<width>210</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -261,6 +255,13 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="picture" version="2.0.0">
+ <name>HMI</name>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
+ <y>55</y>
+ <width>210</width>
+ <height>230</height>
+ </widget>
<widget type="symbol" version="2.0.0">
<name>HMI_ConnStat</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
@@ -268,7 +269,7 @@
<symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
- <y>93</y>
+ <y>108</y>
<width>24</width>
<height>24</height>
<scripts>
@@ -283,21 +284,14 @@
<name>PAS HMI</name>
<x>830</x>
<width>210</width>
- <height>270</height>
+ <height>285</height>
<style>3</style>
<transparent>true</transparent>
- <widget type="picture" version="2.0.0">
- <name>PAS HMI</name>
- <file>$(PLC_SYMBOLS)/HMI.png</file>
- <y>40</y>
- <width>210</width>
- <height>230</height>
- </widget>
<widget type="label" version="2.0.0">
<name>Title</name>
<text>PAS HMI</text>
<width>210</width>
- <height>40</height>
+ <height>55</height>
<font>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
@@ -306,6 +300,13 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="picture" version="2.0.0">
+ <name>PAS HMI</name>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
+ <y>55</y>
+ <width>210</width>
+ <height>230</height>
+ </widget>
<widget type="symbol" version="2.0.0">
<name>PASHMI_ConnStat</name>
<pv_name>$(PLC):PASHMI_ConnStat</pv_name>
@@ -313,7 +314,7 @@
<symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
- <y>93</y>
+ <y>108</y>
<width>24</width>
<height>24</height>
<scripts>
--
GitLab