From a0abbb0921d52d63569e753bcb99b4ad5ed78252 Mon Sep 17 00:00:00 2001
From: gugak <107577102+Salijoghli@users.noreply.github.com>
Date: Thu, 22 May 2025 18:19:17 +0400
Subject: [PATCH] Removed extra devices from SCADA and corrected names
---
.../MCM01 Bulk Inbound/view.json | 6 +-
.../MCM02 Fluid Inbound/view.json | 37 +----------
.../view.json | 64 ++++++-------------
... Sorter Destination, chutes and Bypass.svg | 35 +++++-----
4 files changed, 40 insertions(+), 102 deletions(-)
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json
index 08fb705..c4bed6b 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Bulk Inbound/view.json
@@ -4241,7 +4241,7 @@
},
{
"meta": {
- "name": "ULC2_3_SS3"
+ "name": "ULC2_3_SS1"
},
"position": {
"height": 13,
@@ -4453,7 +4453,7 @@
},
{
"meta": {
- "name": "ULC1_3_PLC(INTRALOX)"
+ "name": "ULC1_3_PLC (INTRALOX)"
},
"position": {
"height": 20,
@@ -4485,7 +4485,7 @@
},
{
"meta": {
- "name": "ULC1_4_PLC_(INTRALOX)"
+ "name": "ULC1_4_PLC (INTRALOX)"
},
"position": {
"height": 20,
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json
index 65a0983..4c2096f 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound/view.json
@@ -1996,41 +1996,6 @@
},
"type": "ia.display.view"
},
- {
- "meta": {
- "name": "PS5_12_FIO1"
- },
- "position": {
- "height": 20,
- "rotate": {
- "angle": 0
- },
- "width": 20,
- "x": 797.737,
- "y": 323.314
- },
- "props": {
- "params": {
- "directionLeft": false,
- "forceFaultStatus": null,
- "forceRunningStatus": null,
- "tagProps": [
- "System/MCM02/PullChord_End/UL20-3_EPC2_END",
- "value",
- "value",
- "value",
- "value",
- "value",
- "value",
- "value",
- "value",
- "value"
- ]
- },
- "path": "Symbol-Views/Device-Views/DeviceStatus"
- },
- "type": "ia.display.view"
- },
{
"meta": {
"name": "PS1_8_EPC1"
@@ -4143,7 +4108,7 @@
},
{
"meta": {
- "name": "PS2_1_DPM2"
+ "name": "PS1_1_DPM2"
},
"position": {
"height": 15,
diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json
index bfbffb5..b44321c 100644
--- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json
+++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Sorter Destination and Chutes/view.json
@@ -2069,7 +2069,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1402.43,
+ "x": 1382.43,
"y": 340.33
},
"props": {
@@ -2077,30 +2077,6 @@
},
"type": "ia.display.view"
},
- {
- "meta": {
- "elementPrefix": "CON",
- "forcedPrefix": "CON",
- "groupSuffix": "u",
- "id": "rect236",
- "inheritedGroupPrefix": "CON",
- "name": "S012054",
- "originalName": "rect236"
- },
- "position": {
- "height": 20,
- "rotate": {
- "angle": "270deg"
- },
- "width": 20,
- "x": 1380.92,
- "y": 340.27
- },
- "props": {
- "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
- },
- "type": "ia.display.view"
- },
{
"meta": {
"elementPrefix": "CON",
@@ -2117,7 +2093,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1447.39,
+ "x": 1427.39,
"y": 340.22
},
"props": {
@@ -2141,7 +2117,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1425.98,
+ "x": 1405.98,
"y": 340.19
},
"props": {
@@ -2165,7 +2141,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1506.4,
+ "x": 1486.4,
"y": 340.33
},
"props": {
@@ -2189,7 +2165,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1469.9,
+ "x": 1449.9,
"y": 340.27
},
"props": {
@@ -2213,7 +2189,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1551.25,
+ "x": 1531.25,
"y": 340.45
},
"props": {
@@ -2237,7 +2213,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1529.84,
+ "x": 1509.84,
"y": 340.41
},
"props": {
@@ -2261,7 +2237,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1595.27,
+ "x": 1575.27,
"y": 340.56
},
"props": {
@@ -2285,7 +2261,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1573.76,
+ "x": 1553.76,
"y": 340.5
},
"props": {
@@ -2309,7 +2285,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1658.39,
+ "x": 1638.39,
"y": 340.45
},
"props": {
@@ -2333,7 +2309,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1620.98,
+ "x": 1600.98,
"y": 340.41
},
"props": {
@@ -2357,7 +2333,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1679.9,
+ "x": 1659.9,
"y": 340.5
},
"props": {
@@ -2381,7 +2357,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1704.25,
+ "x": 1684.25,
"y": 340.68
},
"props": {
@@ -2405,7 +2381,7 @@
"angle": "270deg"
},
"width": 20,
- "x": 1726.76,
+ "x": 1706.76,
"y": 340.73
},
"props": {
@@ -3996,7 +3972,7 @@
"position": {
"height": 20,
"width": 20,
- "x": 1470.03,
+ "x": 1487.03,
"y": 364.91
},
"props": {
@@ -4028,7 +4004,7 @@
"position": {
"height": 13,
"width": 13,
- "x": 1454.03,
+ "x": 1432.03,
"y": 300.91
},
"props": {
@@ -4060,7 +4036,7 @@
"position": {
"height": 13,
"width": 13,
- "x": 1625.03,
+ "x": 1604.03,
"y": 298.91
},
"props": {
@@ -4124,7 +4100,7 @@
"position": {
"height": 20,
"width": 20,
- "x": 1704.03,
+ "x": 1663.03,
"y": 364.91
},
"props": {
@@ -4156,7 +4132,7 @@
"position": {
"height": 13,
"width": 13,
- "x": 1730.03,
+ "x": 1710.03,
"y": 300.91
},
"props": {
@@ -4898,7 +4874,7 @@
"position": {
"height": 13,
"width": 13,
- "x": 1535.03,
+ "x": 1515.03,
"y": 298.91
},
"props": {
diff --git a/image_server/MCM05 Sorter Destination, chutes and Bypass.svg b/image_server/MCM05 Sorter Destination, chutes and Bypass.svg
index c536951..d0e0ca9 100644
--- a/image_server/MCM05 Sorter Destination, chutes and Bypass.svg
+++ b/image_server/MCM05 Sorter Destination, chutes and Bypass.svg
@@ -25,8 +25,8 @@
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
inkscape:zoom="3.1112698"
- inkscape:cx="431.33514"
- inkscape:cy="419.7643"
+ inkscape:cx="1357.3236"
+ inkscape:cy="401.44381"
inkscape:window-width="3840"
inkscape:window-height="2126"
inkscape:window-x="-11"
@@ -451,49 +451,46 @@
d="m 1339.837,383.68158 h -18.6737 v -66.99113 h 18.6737 z" />