From 508a10366d816f4471ac18e3627be5dcc4aaa7a3 Mon Sep 17 00:00:00 2001 From: Nika Date: Mon, 14 Apr 2025 13:32:25 +0400 Subject: [PATCH 1/2] Review MTN6-106 MTN6-107 --- .../MCM01 Fluid Inbound Merges 1-4/view.json | 18 ++-- .../MCM02 Fluid Inbound Merges 5-7/view.json | 86 +++++++++++++++++-- 2 files changed, 87 insertions(+), 17 deletions(-) diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json index c2fa08a..d70633d 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json @@ -213,7 +213,7 @@ }, { "meta": { - "name": "UL4-10_B" + "name": "UL4-10B" }, "position": { "height": 20, @@ -1461,7 +1461,7 @@ }, { "meta": { - "name": "UL7-10_B" + "name": "UL7-10B" }, "position": { "height": 20, @@ -3139,7 +3139,7 @@ }, { "meta": { - "name": "UL1-20" + "name": "UL4-13" }, "position": { "height": 20.05, @@ -4331,7 +4331,7 @@ }, { "meta": { - "name": "UL7-10_A" + "name": "UL7-10A" }, "position": { "height": 20.05, @@ -9602,7 +9602,7 @@ }, { "meta": { - "name": "UL1-10_B" + "name": "UL1-10B" }, "position": { "height": 20, @@ -9943,7 +9943,7 @@ }, { "meta": { - "name": "UL11-11_B" + "name": "UL11-11B" }, "position": { "height": 20, @@ -11505,7 +11505,7 @@ }, { "meta": { - "name": "UL11-11_A" + "name": "UL11-11A" }, "position": { "height": 20.05, @@ -12658,7 +12658,7 @@ }, { "meta": { - "name": "UL1-10_A" + "name": "UL1-10A" }, "position": { "height": 20.05, @@ -13164,7 +13164,7 @@ }, { "meta": { - "name": "UL4-10_A" + "name": "UL4-10A" }, "position": { "height": 20.05, diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json index a74f1bc..167b45e 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json @@ -47,7 +47,7 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1250.97, + "x": 1270.97, "y": 629.02 }, "props": { @@ -864,7 +864,7 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1228.95, + "x": 1263.95, "y": 772.22 }, "props": { @@ -3411,7 +3411,7 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1310.91, + "x": 1328.91, "y": 629.02 }, "props": { @@ -3446,8 +3446,8 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1206.38, - "y": 772.22 + "x": 1232.38, + "y": 771.22 }, "props": { "params": { @@ -4336,7 +4336,7 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1261.14, + "x": 1301.14, "y": 772.12 }, "props": { @@ -8004,7 +8004,7 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1208.97, + "x": 1224.97, "y": 629.02 }, "props": { @@ -8573,7 +8573,7 @@ "position": { "height": 20.05, "width": 19.98, - "x": 1177.89, + "x": 1179.89, "y": 772.32 }, "props": { @@ -9306,6 +9306,76 @@ "path": "Detailed-Views/Good Pull Chord" }, "type": "ia.display.view" + }, + { + "meta": { + "elementPrefix": null, + "id": "path54", + "name": "UL13-9B", + "originalName": "UL13-9A" + }, + "position": { + "height": 20, + "width": 20, + "x": 1203, + "y": 772 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "System/MCM02/Status/UL13-9A", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "elementPrefix": null, + "id": "path38", + "name": "UL18-13B", + "originalName": "UL18-13A" + }, + "position": { + "height": 20, + "width": 20, + "x": 1195, + "y": 628 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "System/MCM02/Status/UL18-13A", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" } ], "meta": { From 6e18804e156b387c0ed1159342589bb8dbff48d5 Mon Sep 17 00:00:00 2001 From: Nika Date: Mon, 14 Apr 2025 14:42:59 +0400 Subject: [PATCH 2/2] Refactor: Camera Names --- .../MCM01 Fluid Inbound Merges 1-4/view.json | 50 +++++++++++++++---- .../MCM02 Fluid Inbound Merges 5-7/view.json | 14 +++--- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json index d70633d..d8a4452 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json @@ -17462,7 +17462,7 @@ }, { "meta": { - "name": "UL12-3-Camera" + "name": "Camera_1" }, "position": { "height": 20, @@ -17494,7 +17494,7 @@ }, { "meta": { - "name": "UL12-7-Camera" + "name": "Camera_19" }, "position": { "height": 20, @@ -17526,7 +17526,7 @@ }, { "meta": { - "name": "PS3-3-Camera" + "name": "Camera_30" }, "position": { "height": 20, @@ -17558,7 +17558,7 @@ }, { "meta": { - "name": "PS3-6-Camera" + "name": "Camera_25" }, "position": { "height": 20, @@ -17590,7 +17590,7 @@ }, { "meta": { - "name": "PS3-7-Camera" + "name": "Camera_26" }, "position": { "height": 20, @@ -17622,7 +17622,7 @@ }, { "meta": { - "name": "PS4-12-Camera" + "name": "Camera_29" }, "position": { "height": 20, @@ -17654,7 +17654,7 @@ }, { "meta": { - "name": "UL1-20-Camera" + "name": "Camera_23" }, "position": { "height": 20, @@ -17686,7 +17686,7 @@ }, { "meta": { - "name": "UL3-6-Camera" + "name": "Camera_24" }, "position": { "height": 20, @@ -17718,7 +17718,7 @@ }, { "meta": { - "name": "UL1-3-Camera" + "name": "Camera_3" }, "position": { "height": 20, @@ -17747,6 +17747,38 @@ "path": "Symbol-Views/Equipment-Views/THEA" }, "type": "ia.display.view" + }, + { + "meta": { + "name": "Camera_2" + }, + "position": { + "height": 20, + "width": 20, + "x": 83, + "y": 945 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "System/MCM02/THEA/THEA_2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/THEA" + }, + "type": "ia.display.view" } ], "meta": { diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json index 167b45e..8934c84 100644 --- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json +++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json @@ -1807,7 +1807,7 @@ }, { "meta": { - "name": "UL21-17-Camera" + "name": "Camera_35" }, "position": { "height": 20, @@ -2020,7 +2020,7 @@ }, { "meta": { - "name": "UL21-11-Camera" + "name": "Camera_13" }, "position": { "height": 20, @@ -3721,7 +3721,7 @@ }, { "meta": { - "name": "UL21-1-Camera" + "name": "Camera" }, "position": { "height": 20, @@ -4258,7 +4258,7 @@ }, { "meta": { - "name": "UL19-6-Camera" + "name": "Camera_18" }, "position": { "height": 20, @@ -4398,7 +4398,7 @@ }, { "meta": { - "name": "UL15-4-Camera" + "name": "Camera_1" }, "position": { "height": 20, @@ -5431,7 +5431,7 @@ }, { "meta": { - "name": "UL15-6-Camera" + "name": "Camera_19" }, "position": { "height": 20, @@ -6041,7 +6041,7 @@ }, { "meta": { - "name": "UL20-3-Camera" + "name": "Camera_0" }, "position": { "height": 20,