From 4387c2d491d1277001910a001a023a6f8c8681e6 Mon Sep 17 00:00:00 2001 From: gugak <107577102+Salijoghli@users.noreply.github.com> Date: Thu, 22 May 2025 17:42:06 +0400 Subject: [PATCH] Added missing devices and corrected names --- .../MCM01 Bulk Inbound/view.json | 72 +++++++- .../MCM02 Fluid Inbound/view.json | 154 ++++++++++++++++- .../MCM03 Fluid Inbound/view.json | 156 +++++++++++++++++- .../view.json | 149 ++++++++++++++++- image_server/MCM02 Fluid Inbound.svg | 60 +++++-- image_server/MCM03 Fluid Inbound.svg | 60 +++++-- ... Sorter Destination, chutes and Bypass.svg | 21 ++- 7 files changed, 614 insertions(+), 58 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 bb57bbc..08fb705 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 @@ -211,7 +211,7 @@ "groupSuffix": "u", "id": "rect5", "inheritedGroupPrefix": "CON", - "name": "ULC1_1", + "name": "ULC1_1_TIPPER", "originalName": "ULC1-1" }, "position": { @@ -354,7 +354,7 @@ "groupSuffix": "u", "id": "rect15", "inheritedGroupPrefix": "CON", - "name": "ULC2_1", + "name": "ULC2_1_TIPPER", "originalName": "ULC2-1" }, "position": { @@ -4443,13 +4443,77 @@ }, "props": { "params": { - "pageid": "DetailedView/MCM04 & MCM05 Sorter Destination,chutes and bypass", + "pageid": "DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass", "panel_id": "value", - "text": "MCM04 & MCM05 Sorter Destination,chutes and bypass" + "text": "MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass" }, "path": "Custom-Views/Area_Nav_Button" }, "type": "ia.display.view" + }, + { + "meta": { + "name": "ULC1_3_PLC(INTRALOX)" + }, + "position": { + "height": 20, + "width": 20, + "x": 1363.12, + "y": 695.94 + }, + "props": { + "params": { + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Estop/PS3_3_JR1", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Device-Views/DeviceStatus" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "ULC1_4_PLC_(INTRALOX)" + }, + "position": { + "height": 20, + "width": 20, + "x": 1533.12, + "y": 636.94 + }, + "props": { + "params": { + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Estop/PS3_3_JR1", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Device-Views/DeviceStatus" + }, + "type": "ia.display.view" } ], "meta": { 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 9ff76f7..65a0983 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 @@ -1091,7 +1091,7 @@ }, { "meta": { - "name": "UL2_2" + "name": "UL2_1" }, "position": { "height": 20, @@ -1100,7 +1100,7 @@ }, "width": 20, "x": 523.635, - "y": 989 + "y": 1009 }, "props": { "params": { @@ -1170,7 +1170,7 @@ }, "width": 20, "x": 600.216, - "y": 990.66 + "y": 950.66 }, "props": { "params": { @@ -1240,7 +1240,7 @@ }, "width": 20, "x": 752.191, - "y": 989.46 + "y": 952.46 }, "props": { "params": { @@ -1310,7 +1310,7 @@ }, "width": 20, "x": 677.04, - "y": 990.78 + "y": 950.78 }, "props": { "params": { @@ -3270,9 +3270,9 @@ }, "props": { "params": { - "pageid": "DetailedView/MCM04 & MCM05 Sorter Destination,chutes and bypass", + "pageid": "DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass", "panel_id": "value", - "text": "MCM04 & MCM05 Sorter Destination,chutes and bypass" + "text": "MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass" }, "path": "Custom-Views/Area_Nav_Button" }, @@ -4242,6 +4242,146 @@ "path": "Symbol-Views/Equipment-Views/ControlCabinet" }, "type": "ia.display.view" + }, + { + "meta": { + "name": "UL2_2" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 524.63, + "y": 949 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL2-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL3_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 600.22, + "y": 1010.66 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL3-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL4_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 677.04, + "y": 1010.78 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL4-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL5_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 752.19, + "y": 1012.46 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL5-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" } ], "meta": { diff --git a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json index 8ce2878..1d8e327 100644 --- a/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json +++ b/SAT9_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Fluid Inbound/view.json @@ -1800,7 +1800,7 @@ }, "width": 20, "x": 887.51, - "y": 835.49 + "y": 797.49 }, "props": { "params": { @@ -1939,8 +1939,8 @@ "angle": -90 }, "width": 20, - "x": 809.98, - "y": 837.65 + "x": 810.98, + "y": 802.65 }, "props": { "params": { @@ -1975,7 +1975,7 @@ }, "width": 20, "x": 734.73, - "y": 837.28 + "y": 799.28 }, "props": { "params": { @@ -2009,8 +2009,8 @@ "angle": -90 }, "width": 20, - "x": 659.594, - "y": 836.74 + "x": 660.594, + "y": 797.74 }, "props": { "params": { @@ -3719,9 +3719,9 @@ }, "props": { "params": { - "pageid": "DetailedView/MCM04 & MCM05 Sorter Destination,chutes and bypass", + "pageid": "DetailedView/MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass", "panel_id": "value", - "text": "MCM04 & MCM05 Sorter Destination,chutes and bypass" + "text": "MCM04 \u0026 MCM05 Sorter Destination,chutes and bypass" }, "path": "Custom-Views/Area_Nav_Button" }, @@ -3965,6 +3965,146 @@ "path": "Symbol-Views/Equipment-Views/ControlCabinet" }, "type": "ia.display.view" + }, + { + "meta": { + "name": "UL8_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 660.59, + "y": 857.74 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL8-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL9_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 734.73, + "y": 859.28 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL9-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL10_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 810.98, + "y": 862.65 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL10-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL11_1" + }, + "position": { + "height": 20, + "rotate": { + "angle": -90 + }, + "width": 20, + "x": 887.51, + "y": 861.49 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "UL11-2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" } ], "meta": { 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 f7bf794..bfbffb5 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 @@ -2829,9 +2829,9 @@ }, "props": { "params": { - "pageid": "DetailedView/MCM02 & MCM03 Fluid Inbound", + "pageid": "DetailedView/MCM02 \u0026 MCM03 Fluid Inbound", "panel_id": "value", - "text": "MCM02 & MCM03 Fluid Inbound" + "text": "MCM02 \u0026 MCM03 Fluid Inbound" }, "path": "Custom-Views/Area_Nav_Button" }, @@ -2844,8 +2844,8 @@ "position": { "height": 13, "width": 13, - "x": 248.9555810546875, - "y": 312.91999999999996 + "x": 251.956, + "y": 301.92 }, "props": { "params": { @@ -4567,7 +4567,7 @@ }, { "meta": { - "name": "S012022_JR1" + "name": "S012018_JR1" }, "position": { "height": 13, @@ -4922,6 +4922,145 @@ "path": "Symbol-Views/Equipment-Views/Estop" }, "type": "ia.display.view" + }, + { + "meta": { + "name": "MCM05" + }, + "position": { + "height": 15, + "rotate": { + "angle": 0 + }, + "width": 30, + "x": 953.9973754882812, + "y": 476.0807189941406 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "tagProps": [ + "System/MCM02/ControlCabinet/UL17_DPM1", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/ControlCabinet" + }, + "type": "ia.display.view" + }, + { + "meta": { + "elementPrefix": "CON", + "forcedPrefix": "CON", + "groupSuffix": "u", + "id": "rect56", + "inheritedGroupPrefix": "CON", + "name": "S013058", + "originalName": "rect56" + }, + "position": { + "height": 20, + "rotate": { + "angle": "270deg" + }, + "width": 20, + "x": 248.5, + "y": 339.97 + }, + "props": { + "path": "Symbol-Views/Equipment-Views/StatusNonPowered" + }, + "type": "ia.display.view" + }, + { + "meta": { + "elementPrefix": "CON", + "forcedPrefix": "CON", + "groupSuffix": "u", + "id": "rect56", + "inheritedGroupPrefix": "CON", + "name": "S013062", + "originalName": "rect56" + }, + "position": { + "height": 20, + "rotate": { + "angle": "270deg" + }, + "width": 20, + "x": 217.5, + "y": 339.97 + }, + "props": { + "path": "Symbol-Views/Equipment-Views/StatusNonPowered" + }, + "type": "ia.display.view" + }, + { + "meta": { + "elementPrefix": "CON", + "forcedPrefix": "CON", + "groupSuffix": "u", + "id": "rect56", + "inheritedGroupPrefix": "CON", + "name": "S013064", + "originalName": "rect56" + }, + "position": { + "height": 20, + "rotate": { + "angle": "270deg" + }, + "width": 20, + "x": 196.5, + "y": 339.97 + }, + "props": { + "path": "Symbol-Views/Equipment-Views/StatusNonPowered" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "S013003_JR1" + }, + "position": { + "height": 13, + "width": 13, + "x": 871, + "y": 482 + }, + "props": { + "params": { + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Estop/UL7_3_S2", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Estop" + }, + "type": "ia.display.view" } ], "meta": { diff --git a/image_server/MCM02 Fluid Inbound.svg b/image_server/MCM02 Fluid Inbound.svg index 0ba2c54..58faa1c 100644 --- a/image_server/MCM02 Fluid Inbound.svg +++ b/image_server/MCM02 Fluid Inbound.svg @@ -9,7 +9,7 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (86a8ad7, 2024-10-11)" - sodipodi:docname="MCM02.svg" + sodipodi:docname="MCM02 Fluid Inbound.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -24,11 +24,11 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" - inkscape:zoom="1.131351" - inkscape:cx="692.9768" - inkscape:cy="585.58308" + inkscape:zoom="2.262702" + inkscape:cx="640.82676" + inkscape:cy="775.62136" inkscape:window-width="3840" - inkscape:window-height="2054" + inkscape:window-height="2126" inkscape:window-x="-11" inkscape:window-y="-11" inkscape:window-maximized="1" @@ -255,12 +255,12 @@ y="-952.86865" transform="scale(-1)" inkscape:label="UL1-1" /> + inkscape:label="PS1-8" /> diff --git a/image_server/MCM03 Fluid Inbound.svg b/image_server/MCM03 Fluid Inbound.svg index 6908e11..a854176 100644 --- a/image_server/MCM03 Fluid Inbound.svg +++ b/image_server/MCM03 Fluid Inbound.svg @@ -9,7 +9,7 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (86a8ad7, 2024-10-11)" - sodipodi:docname="MCM-03.svg" + sodipodi:docname="MCM03 Fluid Inbound.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -24,11 +24,11 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" - inkscape:zoom="1.131351" - inkscape:cx="916.60325" - inkscape:cy="430.01686" + inkscape:zoom="2.262702" + inkscape:cx="468.90841" + inkscape:cy="699.60605" inkscape:window-width="3840" - inkscape:window-height="2054" + inkscape:window-height="2126" inkscape:window-x="-11" inkscape:window-y="-11" inkscape:window-maximized="1" @@ -406,12 +406,12 @@ y="-899.63861" transform="scale(-1)" inkscape:label="UL7-1" /> + inkscape:label="UL8-3" /> diff --git a/image_server/MCM05 Sorter Destination, chutes and Bypass.svg b/image_server/MCM05 Sorter Destination, chutes and Bypass.svg index 54c11dc..c536951 100644 --- a/image_server/MCM05 Sorter Destination, chutes and Bypass.svg +++ b/image_server/MCM05 Sorter Destination, chutes and Bypass.svg @@ -9,7 +9,7 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (86a8ad7, 2024-10-11)" - sodipodi:docname="MCM05_Sorter Destination, chutes and Bypass.svg" + sodipodi:docname="MCM05 Sorter Destination, chutes and Bypass.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -24,11 +24,11 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" - inkscape:zoom="1.1" - inkscape:cx="700.00001" - inkscape:cy="537.72728" + inkscape:zoom="3.1112698" + inkscape:cx="431.33514" + inkscape:cy="419.7643" inkscape:window-width="3840" - inkscape:window-height="2054" + inkscape:window-height="2126" inkscape:window-x="-11" inkscape:window-y="-11" inkscape:window-maximized="1" @@ -564,4 +564,13 @@ sodipodi:nodetypes="ccccccc" /> + d="m 1224.9247,479.77816 h -18.6737 v -66.99113 h 18.6737 z" />