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 22d9f02..acb0d1f 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 @@ -16943,6 +16943,525 @@ "path": "Symbol-Views/Equipment-Views/Estop" }, "type": "ia.display.view" +<<<<<<< Updated upstream +======= + }, + { + "meta": { + "name": "UL12_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 315.337, + "y": 97.9116 + }, + "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": "UL11-11_B" + }, + "position": { + "height": 20, + "width": 20, + "x": 828.01, + "y": 165.01 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Status/UL11-11_AB", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL7-10_B" + }, + "position": { + "height": 20, + "width": 20, + "x": 901, + "y": 406 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Status/UL7-10_AB", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL4-10_B" + }, + "position": { + "height": 20, + "width": 20, + "x": 905, + "y": 609 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Status/UL4-10_AB", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL1-10_B" + }, + "position": { + "height": 20, + "width": 20, + "x": 893, + "y": 798 + }, + "props": { + "params": { + "directionLeft": false, + "forceFaultStatus": null, + "forceRunningStatus": null, + "has_state": false, + "tagProps": [ + "System/MCM01/Status/UL1-10_AB", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value", + "value" + ] + }, + "path": "Symbol-Views/Equipment-Views/Status" + }, + "type": "ia.display.view" + }, + { + "meta": { + "name": "UL11_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 317, + "y": 165 + }, + "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": "UL10_2_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 356, + "y": 223 + }, + "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": "UL9_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 319, + "y": 284 + }, + "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": "UL8_2_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 363, + "y": 345 + }, + "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": "UL7_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 319, + "y": 406 + }, + "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": "UL6_2_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 369, + "y": 466 + }, + "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": "UL5_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 311, + "y": 535 + }, + "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": "UL4_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 312, + "y": 609 + }, + "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": "UL3_2_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 367, + "y": 683 + }, + "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": "UL2_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 310, + "y": 736 + }, + "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": "UL1_3_FIO1" + }, + "position": { + "height": 20, + "width": 20, + "x": 311, + "y": 798 + }, + "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" +>>>>>>> Stashed changes } ], "meta": { diff --git a/image_server/MCM01_Singulated_Inbound.svg b/image_server/MCM01_Singulated_Inbound.svg index eb76ac4..3d357bd 100644 --- a/image_server/MCM01_Singulated_Inbound.svg +++ b/image_server/MCM01_Singulated_Inbound.svg @@ -7,7 +7,7 @@ viewBox="0 0 1850 1028" version="1.1" id="svg1" - inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + inkscape:version="1.4 (86a8ad7, 2024-10-11)" sodipodi:docname="MCM01_Singulated_Inbound.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -23,14 +23,14 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:document-units="px" - inkscape:zoom="16" - inkscape:cx="686.09375" - inkscape:cy="498.59375" - inkscape:window-width="2027" - inkscape:window-height="1957" - inkscape:window-x="1433" - inkscape:window-y="79" - inkscape:window-maximized="0" + inkscape:zoom="4" + inkscape:cx="1146.25" + inkscape:cy="687" + inkscape:window-width="3840" + inkscape:window-height="2054" + inkscape:window-x="3829" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="layer1" showguides="false" /> @@ -104,7 +104,7 @@ width="77.54184" height="18.540894" x="-435.41611" - y="-1599.2018" + y="-1623.2018" ry="0" inkscape:label="PS3-9" transform="matrix(0,-1,-1,0,0,0)" /> @@ -113,7 +113,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-1-6-3" width="248.81763" height="18.583055" - x="1321.2705" + x="1345.2705" y="-352.54788" ry="0" inkscape:label="PS3-7" @@ -123,7 +123,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-1-6" width="144.67346" height="18.583797" - x="1173.715" + x="1197.715" y="-352.46008" ry="0" inkscape:label="PS3-6" @@ -133,7 +133,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-1" width="114.45422" height="18.584229" - x="1056.5084" + x="1080.5084" y="-352.46259" ry="0" inkscape:label="PS3-5" @@ -143,14 +143,14 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-8-0" width="52.223759" height="19.105164" - x="535.64288" - y="-931.09668" + x="554.36725" + y="-946.1106" ry="0" inkscape:label="PS3-3" transform="matrix(0.78016781,-0.62557029,-0.62557029,-0.78016781,0,0)" /> @@ -159,8 +159,8 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-8" width="18.987564" height="18.904602" - x="515.90137" - y="-930.64099" + x="534.63525" + y="-945.64246" ry="0" inkscape:label="PS3-2" transform="matrix(0.78058448,-0.62505029,-0.62505029,-0.78058448,0,0)" /> @@ -169,7 +169,7 @@ id="rect3-9-2-8-2-8-63-0-0-2" width="19.641779" height="18.82029" - x="902.63806" + x="924.99158" y="-425.7164" ry="0" inkscape:label="UL7-11" @@ -179,7 +179,7 @@ id="rect3-9-2-8-2-8-63-0-0-2-9" width="19.641779" height="18.82029" - x="924.56561" + x="946.91913" y="-425.73251" ry="0" inkscape:label="UL7-12" @@ -189,7 +189,7 @@ id="rect3-9-2-8-2-8-63-0-0-2-9-7" width="43.178749" height="18.815516" - x="946.33575" + x="968.51251" y="-425.68265" ry="0" inkscape:label="UL7-13" @@ -197,9 +197,9 @@ @@ -569,7 +569,7 @@ id="rect7" width="158.42107" height="18.661926" - x="1112.5919" + x="1138.5919" y="766.0238" inkscape:label="PS2-5" /> @@ -956,7 +956,7 @@ id="rect74" width="20.388828" height="18.59844" - x="907.02887" + x="933.02887" y="609.66956" inkscape:label="UL4-11" /> @@ -997,15 +997,15 @@ id="rect3-8" width="150.27055" height="18.943512" - x="1144.1945" - y="-315.31213" + x="1161.4744" + y="-334.73953" inkscape:label="PS2-3" transform="rotate(48.349319)" ry="0" rx="0" /> @@ -1019,7 +1019,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-9-6-5-6-8-2-7" width="50.911827" height="18.561308" - x="1653.7499" + x="1687.7499" y="-563.82581" ry="0" inkscape:label="PS4-14" @@ -1030,7 +1030,7 @@ width="63.188854" height="18.574894" x="-536.79138" - y="-1733.8231" + y="-1767.8231" ry="0" inkscape:label="PS4-12" transform="matrix(0,-1,-1,0,0,0)" /> @@ -1040,7 +1040,7 @@ width="84.850632" height="18.579206" x="-471.53638" - y="-1733.905" + y="-1767.905" ry="0" inkscape:label="PS4-11" transform="matrix(0,-1,-1,0,0,0)" /> @@ -1050,7 +1050,7 @@ width="136.61603" height="18.578045" x="-384.39868" - y="-1733.6864" + y="-1767.6864" ry="0" inkscape:label="PS4-10" transform="matrix(0,-1,-1,0,0,0)" /> @@ -1059,7 +1059,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-9-6-5" width="202.49959" height="18.577972" - x="1500.5731" + x="1534.5731" y="-241.08835" ry="0" inkscape:label="PS4-8" @@ -1069,7 +1069,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-9-6" width="242.50011" height="18.577576" - x="1254.9956" + x="1288.9956" y="-241.07407" ry="0" inkscape:label="PS4-7" @@ -1079,7 +1079,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2-9" width="127.19492" height="18.578186" - x="1125.4799" + x="1159.4799" y="-241.069" inkscape:label="PS4-6" transform="scale(1,-1)" @@ -1089,7 +1089,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7-2" width="107.87698" height="18.988983" - x="1015.8455" + x="1049.8455" y="-241.56894" ry="0" inkscape:label="PS4-5" @@ -1099,7 +1099,7 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-3-7" width="18.960403" height="18.9604" - x="995.16278" + x="1029.1628" y="-241.67325" ry="0" inkscape:label="PS4-4" @@ -1109,8 +1109,8 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8-9-4" width="69.569084" height="18.902496" - x="897.80194" - y="-251.88811" + x="928.01471" + y="-267.48364" ry="0" inkscape:label="PS4-2" transform="rotate(27.302589)" /> @@ -1200,8 +1200,8 @@ id="rect3-9-7-5-8-20-4-1-2-9-3-8" width="42.409935" height="18.587996" - x="871.22089" - y="165.63831" + x="900.21228" + y="165.46153" ry="0" inkscape:label="UL11-14" /> @@ -1218,15 +1218,15 @@ id="rect3-9-7-5-8-20-4-1-2-9-3" width="18.71986" height="18.5952" - x="849.91248" + x="878.90387" y="165.57574" ry="0" inkscape:label="UL11-13" />