From d355d18a5110982fa9e8b18d27c88df799217267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 18 Nov 2020 17:35:56 +0100
Subject: [PATCH] Have error.svg and unconnected.svg locally
---
.../pss1-pss/PSS1_PSS_Diagnostics.bob | 18 ++++---
.../diagnostics/PLC_module_status.bob | 7 ++-
.../diagnostics/PLC_cabinet_diagnostics.bob | 9 ++--
NON-APPROVED/pss1-pss/popups/key_exchange.bob | 15 +++---
.../pss1-pss/symbols/alarms/error.svg | 25 +++++++++
.../pss1-pss/symbols/alarms/unconnected.svg | 51 +++++++++++++++++++
6 files changed, 105 insertions(+), 20 deletions(-)
create mode 100644 NON-APPROVED/pss1-pss/symbols/alarms/error.svg
create mode 100644 NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index f6cdb7d2..44a91a11 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -6,6 +6,8 @@
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
+ <SYMBOLS>symbols</SYMBOLS>
+ <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
</macros>
<width>1500</width>
<height>1006</height>
@@ -194,7 +196,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="picture" version="2.0.0">
<name>GCPU</name>
- <file>symbols/plc/GCPU.png</file>
+ <file>$(PLC_SYMBOLS)/GCPU.png</file>
<y>40</y>
<width>162</width>
<height>230</height>
@@ -238,7 +240,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="picture" version="2.0.0">
<name>CPU</name>
- <file>symbols/plc/CPU.png</file>
+ <file>$(PLC_SYMBOLS)/CPU.png</file>
<y>40</y>
<width>162</width>
<height>230</height>
@@ -298,7 +300,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="picture" version="2.0.0">
<name>Switch</name>
- <file>symbols/plc/Switch.png</file>
+ <file>$(PLC_SYMBOLS)/Switch.png</file>
<y>40</y>
<width>120</width>
<height>230</height>
@@ -307,7 +309,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>SCL_Stat</name>
<pv_name>FEB-010Row:CnPw-U-001:SCL_Stat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/error.svg</symbol>
</symbols>
<x>48</x>
<y>126</y>
@@ -331,7 +333,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>HMI</name>
- <file>symbols/plc/HMI.png</file>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
<y>40</y>
<width>210</width>
<height>230</height>
@@ -353,7 +355,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>Disconnected</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
@@ -377,7 +379,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
<widget type="picture" version="2.0.0">
<name>PAS HMI</name>
- <file>symbols/plc/HMI.png</file>
+ <file>$(PLC_SYMBOLS)/HMI.png</file>
<y>40</y>
<width>210</width>
<height>230</height>
@@ -399,7 +401,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>PASHMI_ConnStat</name>
<pv_name>$(PLC):PASHMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
index 0ae33860..3578baa2 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_module_status.bob
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <macros>
+ <SYMBOLS>../../symbols</SYMBOLS>
+ </macros>
<name>Diag</name>
<width>30</width>
<height>70</height>
@@ -7,7 +10,7 @@
<name>Disconnected</name>
<pv_name>$(DIAG_CONN_STAT)</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>3</x>
<y>3</y>
@@ -24,7 +27,7 @@
<name>Error</name>
<pv_name>$(DIAG_STAT)</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/error.svg</symbol>
</symbols>
<x>3</x>
<y>43</y>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
index 3d1f6ea7..f0a50e68 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -6,7 +6,8 @@
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<P>FEB-010Row:CnPw-U-001</P>
<PLC>FEB-090:PSS-PLC-1</PLC>
- <PLC_SYMBOLS>../../symbols/plc</PLC_SYMBOLS>
+ <SYMBOLS>../../symbols</SYMBOLS>
+ <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
</macros>
<width>1500</width>
@@ -309,7 +310,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>SCL_Stat</name>
<pv_name>FEB-010Row:CnPw-U-001:SCL_Stat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/error.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/error.svg</symbol>
</symbols>
<x>48</x>
<y>126</y>
@@ -355,7 +356,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>HMI_ConnStat</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
@@ -401,7 +402,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<name>PASHMI_ConnStat</name>
<pv_name>$(PLC):PASHMI_ConnStat</pv_name>
<symbols>
- <symbol>$(ESS_SYMBOLS=/ess-symbols)/badges/alarms/unconnected.svg</symbol>
+ <symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
</symbols>
<x>89</x>
<y>93</y>
diff --git a/NON-APPROVED/pss1-pss/popups/key_exchange.bob b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
index 35214b99..872740c9 100644
--- a/NON-APPROVED/pss1-pss/popups/key_exchange.bob
+++ b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <macros>
+ <SYMBOLS>../symbols</SYMBOLS>
+ </macros>
<name>PSS1 Key Exchange</name>
<width>980</width>
<height>835</height>
@@ -174,7 +177,7 @@
</widget>
<widget type="picture" version="2.0.0">
<name>Locked symbol</name>
- <file>../symbols/Key/lock.svg</file>
+ <file>$(SYMBOLS)/Key/lock.svg</file>
<x>10</x>
<y>130</y>
<width>80</width>
@@ -488,7 +491,7 @@
<name>MainKeyLocked</name>
<pv_name>FEB-020Row:CnPw-U-005:MainKeyLocked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>203</x>
<y>80</y>
@@ -1262,7 +1265,7 @@ PAS</on_label>
<name>EntryKey1Locked</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>55</x>
<y>70</y>
@@ -1301,7 +1304,7 @@ PAS</on_label>
<name>EntryKey2Locked</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey2Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>145</x>
<y>70</y>
@@ -1360,7 +1363,7 @@ PAS</on_label>
<name>EntryKey3Locked</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey3Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>235</x>
<y>70</y>
@@ -1379,7 +1382,7 @@ PAS</on_label>
<name>EntryKey1Locked_3</name>
<pv_name>FEB-090:PSS-PAS-1:EntryKey1Locked</pv_name>
<symbols>
- <symbol>../symbols/Key/lock.svg</symbol>
+ <symbol>$(SYMBOLS)/Key/lock.svg</symbol>
</symbols>
<x>325</x>
<y>70</y>
diff --git a/NON-APPROVED/pss1-pss/symbols/alarms/error.svg b/NON-APPROVED/pss1-pss/symbols/alarms/error.svg
new file mode 100644
index 00000000..7b800a76
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/alarms/error.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#FC0D1B;}
+ .st1{fill:#960810;}
+ .st2{fill:#FFFFFF;}
+ .st3{fill:none;}
+</style>
+<g>
+ <circle class="st0" cx="7" cy="7" r="5.5"/>
+ <path class="st1" d="M7,2c2.8,0,5,2.2,5,5s-2.2,5-5,5S2,9.8,2,7S4.2,2,7,2 M7,1C3.7,1,1,3.7,1,7s2.7,6,6,6s6-2.7,6-6S10.3,1,7,1
+ L7,1z"/>
+</g>
+<g>
+ <g>
+ <path class="st2" d="M6.1,4.6c0-0.2-0.1-0.7-0.1-0.8C6.1,3.3,6.6,3,7,3c0.4,0,0.9,0.3,0.9,0.8c0,0.1,0,0.6-0.1,0.8L7.4,8.5
+ C7.3,9,7.3,9.1,7,9.1C6.7,9.1,6.7,9,6.6,8.5L6.1,4.6z"/>
+ </g>
+ <circle class="st2" cx="7" cy="10.3" r="0.7"/>
+</g>
+<rect x="1" y="1" class="st3" width="12" height="12"/>
+<rect class="st3" width="14" height="14"/>
+</svg>
diff --git a/NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg b/NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg
new file mode 100644
index 00000000..0528f4fd
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/symbols/alarms/unconnected.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 14 14" style="enable-background:new 0 0 14 14;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#D32D9C;}
+ .st1{fill:#871D64;}
+ .st2{fill:#FFFFFF;}
+ .st3{fill:none;}
+</style>
+<g>
+ <rect x="1.5" y="1.5" class="st0" width="11" height="11"/>
+ <path class="st1" d="M12,2v10H2V2H12 M13,1H1v12h12V1L13,1z"/>
+</g>
+<g>
+ <g>
+ <path class="st2" d="M6.8,5.7L8.6,4c0,0,0.1,0,0.2,0L10,5.3c0,0,0,0.1,0,0.2L8.3,7.2L9.1,8l1.7-1.7c0.5-0.5,0.5-1.3,0-1.8L9.5,3.2
+ C9,2.7,8.2,2.7,7.7,3.2L6,4.9L6.8,5.7z"/>
+ <path class="st2" d="M7.2,8.3L5.4,10c0,0-0.1,0-0.2,0L4,8.7c0,0,0-0.1,0-0.2l1.7-1.7L4.9,6L3.2,7.7C2.7,8.2,2.7,9,3.2,9.5l1.3,1.3
+ c0.5,0.5,1.3,0.5,1.8,0L8,9.1L7.2,8.3z"/>
+ </g>
+ <g>
+ <g>
+ <path class="st2" d="M5,5.4c-0.1,0-0.2,0-0.3-0.1l-1-1c-0.1-0.1-0.1-0.4,0-0.5c0.1-0.1,0.4-0.1,0.5,0l1,1c0.1,0.1,0.1,0.4,0,0.5
+ C5.2,5.4,5.1,5.4,5,5.4z"/>
+ </g>
+ <g>
+ <path class="st2" d="M5.8,4.4C5.8,4.4,5.8,4.4,5.8,4.4C5.6,4.4,5.4,4.2,5.4,4l0-1.6c0-0.2,0.2-0.4,0.4-0.4c0,0,0,0,0,0
+ c0.2,0,0.4,0.2,0.4,0.4l0,1.6C6.2,4.2,6,4.4,5.8,4.4z"/>
+ </g>
+ <g>
+ <path class="st2" d="M2.4,6.2C2.2,6.2,2.1,6,2.1,5.8c0-0.2,0.2-0.4,0.4-0.4l1.6,0c0,0,0,0,0,0c0.2,0,0.4,0.2,0.4,0.4
+ C4.4,6,4.2,6.2,4,6.2L2.4,6.2C2.4,6.2,2.4,6.2,2.4,6.2z"/>
+ </g>
+ <g>
+ <path class="st2" d="M10,10.4c-0.1,0-0.2,0-0.3-0.1l-1-1c-0.1-0.1-0.1-0.4,0-0.5c0.1-0.1,0.4-0.1,0.5,0l1,1
+ c0.1,0.1,0.1,0.4,0,0.5C10.2,10.3,10.1,10.4,10,10.4z"/>
+ </g>
+ <g>
+ <path class="st2" d="M10,8.6c-0.2,0-0.4-0.2-0.4-0.4C9.6,8,9.8,7.8,10,7.8l1.6,0c0,0,0,0,0,0c0.2,0,0.4,0.2,0.4,0.4
+ c0,0.2-0.2,0.4-0.4,0.4L10,8.6C10,8.6,10,8.6,10,8.6z"/>
+ </g>
+ <g>
+ <path class="st2" d="M8.2,11.9C8.2,11.9,8.2,11.9,8.2,11.9c-0.2,0-0.4-0.2-0.4-0.4l0-1.6c0-0.2,0.2-0.4,0.4-0.4c0,0,0,0,0,0
+ c0.2,0,0.4,0.2,0.4,0.4l0,1.6C8.6,11.8,8.4,11.9,8.2,11.9z"/>
+ </g>
+ </g>
+</g>
+<rect x="1" y="1" class="st3" width="12" height="12"/>
+<rect class="st3" width="14" height="14"/>
+</svg>
--
GitLab