diff --git a/.resources/2051ddd9ba6877f0bdb80fb898bd72195d8c3e6686d8bf16c9426f2e2a234c24 b/.resources/2051ddd9ba6877f0bdb80fb898bd72195d8c3e6686d8bf16c9426f2e2a234c24 deleted file mode 100644 index f51a0862..00000000 Binary files a/.resources/2051ddd9ba6877f0bdb80fb898bd72195d8c3e6686d8bf16c9426f2e2a234c24 and /dev/null differ diff --git a/.resources/b200a462160ed1a8c6925f348cfa55aae6952ed0cc01ad3642cb2a4d097a2f41 b/.resources/b200a462160ed1a8c6925f348cfa55aae6952ed0cc01ad3642cb2a4d097a2f41 deleted file mode 100644 index 9d2a411d..00000000 --- a/.resources/b200a462160ed1a8c6925f348cfa55aae6952ed0cc01ad3642cb2a4d097a2f41 +++ /dev/null @@ -1,731 +0,0 @@ -{ - "custom": {}, - "params": {}, - "props": { - "defaultSize": { - "height": 1080, - "width": 1920 - } - }, - "root": { - "children": [ - { - "meta": { - "name": "MCM01" - }, - "position": { - "height": 1080, - "width": 1920 - }, - "props": { - "elements": [ - { - "elements": [ - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path6", - "name": "path6", - "transform": "translate(-2.0833334e-5)", - "type": "path" - }, - { - "type": "group" - } - ], - "id": "clipPath6", - "name": "clipPath6", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path8", - "name": "path8", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath8", - "name": "clipPath8", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path9", - "name": "path9", - "transform": "matrix(1,0,0,-1,-2796,3847)", - "type": "path" - } - ], - "id": "clipPath9", - "name": "clipPath9", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path10", - "name": "path10", - "transform": "matrix(1,0,0,-1,-2822,3855)", - "type": "path" - } - ], - "id": "clipPath10", - "name": "clipPath10", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path12", - "name": "path12", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath12", - "name": "clipPath12", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path13", - "name": "path13", - "transform": "matrix(1,0,0,-1,-2822,3839)", - "type": "path" - } - ], - "id": "clipPath13", - "name": "clipPath13", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path14", - "name": "path14", - "transform": "matrix(1,0,0,-1,-2831,3847)", - "type": "path" - } - ], - "id": "clipPath14", - "name": "clipPath14", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path16", - "name": "path16", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath16", - "name": "clipPath16", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path18", - "name": "path18", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath18", - "name": "clipPath18", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path20", - "name": "path20", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath20", - "name": "clipPath20", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path22", - "name": "path22", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath22", - "name": "clipPath22", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path24", - "name": "path24", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath24", - "name": "clipPath24", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path26", - "name": "path26", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath26", - "name": "clipPath26", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path27", - "name": "path27", - "transform": "matrix(0,-1,-1,0,5714,1994)", - "type": "path" - } - ], - "id": "clipPath27", - "name": "clipPath27", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path29", - "name": "path29", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath29", - "name": "clipPath29", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path31", - "name": "path31", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath31", - "name": "clipPath31", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path33", - "name": "path33", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath33", - "name": "clipPath33", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path35", - "name": "path35", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath35", - "name": "clipPath35", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path37", - "name": "path37", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath37", - "name": "clipPath37", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path39", - "name": "path39", - "transform": "translate(-2.0833334e-5)", - "type": "path" - } - ], - "id": "clipPath39", - "name": "clipPath39", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path40", - "name": "path40", - "transform": "matrix(0,-1,-1,0,4932,2183)", - "type": "path" - } - ], - "id": "clipPath40", - "name": "clipPath40", - "type": "clipPath" - }, - { - "clipPathUnits": "userSpaceOnUse", - "elements": [ - { - "d": "M 1126,0 H 3737 V 5796 H 1126 V 0", - "id": "path23935", - "name": "path23935", - "transform": "matrix(0,-1,-1,0,5714,2172)", - "type": "path" - } - ], - "id": "clipPath23935", - "name": "clipPath23935", - "type": "clipPath" - } - ], - "id": "defs1", - "name": "defs1", - "type": "defs" - }, - { - "elements": [ - { - "d": "m 17.513137,116.02606 h 7.883849 v 35.33131 h -7.925563 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path25072", - "name": "path25072", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 17.578237,115.55245 0.185181,-7.76481 c 1.517289,-4.83339 4.580567,-7.799271 8.864116,-10.344944 l 3.914525,6.935164 c -2.984985,1.33473 -4.229119,3.34824 -4.999076,6.51743 l -0.08744,4.67802 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path26615", - "name": "path26615", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 72.20209,125.20076 h 7.883848 v 53.73674 h -7.925561 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path26618", - "name": "path26618", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 72.261082,115.88006 h 7.883848 v 8.72601 h -7.925561 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27070", - "name": "path27070", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 72.231586,106.67734 h 7.883848 v 8.72601 h -7.925561 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27071", - "name": "path27071", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 72.219369,106.20226 c -0.03623,-9.238512 0.460678,-12.796916 8.960808,-17.991777 l 4.047256,6.905673 c -5.529025,2.473147 -5.25942,6.010384 -5.145507,11.136454 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27072", - "name": "path27072", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 34.461924,92.956423 3.944478,6.826134 -7.555316,4.365833 -3.965348,-6.862253 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27074", - "name": "path27074", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 42.425813,88.355065 3.944478,6.826134 -7.555316,4.365833 -3.965348,-6.862253 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27080", - "name": "path27080", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 60.100764,87.570756 -13.376385,7.447713 -3.959823,-6.887292 1.504291,-0.553046 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27081", - "name": "path27081", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 99.030276,87.61753 -13.464875,7.359226 -3.952449,-7.020023 1.430551,-0.368698 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27082", - "name": "path27082", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 158.56005,79.566794 -0.016,7.760334 -120.794639,-0.04735 0.0159,-7.801393 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27083", - "name": "path27083", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.244431" - }, - "type": "path" - }, - { - "d": "m 267.35173,79.640375 -0.0142,7.780257 -107.74707,-0.04746 0.0141,-7.821422 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27084", - "name": "path27084", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.243285" - }, - "type": "path" - }, - { - "d": "m 399.37485,79.720395 -0.0173,7.737716 -131.17963,-0.0472 0.0172,-7.778656 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27085", - "name": "path27085", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.23373" - }, - "type": "path" - }, - { - "d": "m 400.0944,79.650678 c 5.03604,0.02588 7.95928,-0.266973 12.23378,1.989441 1.65503,0.966601 2.74197,2.075227 3.73794,3.206593 1.85537,2.841276 3.14745,5.859861 3.05039,10.779803 l -8.06562,0.03102 c -0.0803,-1.92185 0.0446,-3.799123 -1.54746,-5.774965 -2.38574,-2.686548 -6.13811,-2.332233 -9.40355,-2.443066 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27086", - "name": "path27086", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 411.25685,96.063667 h 7.88112 v 54.940713 h -7.92282 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27087", - "name": "path27087", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.252742" - }, - "type": "path" - }, - { - "d": "m 411.25883,151.59084 h 7.88385 v 8.72601 h -7.92556 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27088", - "name": "path27088", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 427.45236,179.63321 c -12.30206,0.13237 -16.45431,-5.69061 -16.18738,-18.7973 l 7.85705,2.9e-4 c 0.10669,7.76558 0.23673,10.73714 8.29789,10.94492 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27089", - "name": "path27089", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.25" - }, - "type": "path" - }, - { - "d": "m 448.59365,171.83373 0.13725,7.76254 -20.366,0.0641 -0.13793,-7.8036 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27090", - "name": "path27090", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.268812" - }, - "type": "path" - }, - { - "d": "m 468.70557,171.74638 0.12932,7.77032 -19.19125,0.0641 -0.12998,-7.81142 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27091", - "name": "path27091", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.261075" - }, - "type": "path" - }, - { - "d": "m 481.28798,171.66728 0.06,5.6578 -11.7815,0.0672 -0.0603,-5.68771 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27092", - "name": "path27092", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.246092" - }, - "type": "path" - }, - { - "d": "m 494.42349,171.66846 0.003,5.65425 -12.14703,0.002 -0.003,-5.68414 z", - "fill": { - "opacity": "1", - "paint": "#ffffff" - }, - "id": "path27093", - "name": "path27093", - "stroke": { - "dasharray": "none", - "opacity": "1", - "paint": "#000000", - "width": "0.249796" - }, - "type": "path" - }, - { - "type": "group" - } - ], - "id": "layer1", - "name": "layer1", - "type": "group" - } - ], - "preserveAspectRatio": "none", - "viewBox": "0 0 508 285.75" - }, - "type": "ia.shapes.svg" - } - ], - "events": { - "dom": { - "onClick": { - "config": { - "script": "\tsystem.perspective.print(event.keys())" - }, - "scope": "G", - "type": "script" - } - } - }, - "meta": { - "name": "root" - }, - "type": "ia.container.coord" - } -} \ No newline at end of file diff --git a/.resources/f001c223398723ccfd967689cc65df97529e5dddd9041813a5fba2a8f86ac973 b/.resources/f001c223398723ccfd967689cc65df97529e5dddd9041813a5fba2a8f86ac973 deleted file mode 100644 index e9b407c0..00000000 Binary files a/.resources/f001c223398723ccfd967689cc65df97529e5dddd9041813a5fba2a8f86ac973 and /dev/null differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json index 3cec76ea..5dee8455 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-03T14:51:29Z" + "timestamp": "2025-10-03T15:21:13Z" }, - "lastModificationSignature": "034c44d05a47fa3c0e6d735dd1a11aa915252db207c1e7fa23437002dc641811" + "lastModificationSignature": "fd83ce064bfa8a7db90909d888cdbf8d78b5b409e2f26fc1011285843da90fd8" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png index 14b52b7a..5c76a57e 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json index 546c9e89..c2cea1b7 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Custom_Views/View-Scaler/view.json @@ -44,6 +44,18 @@ "persistent": true }, "custom.scale": { + "binding": { + "config": { + "expression": "{page.props.dimensions.viewport.width} / 1920" + }, + "transforms": [ + { + "code": "\t#this script is to see the view in the DESIGNER!!!\n\tif value \u003d\u003d 0.0:\n\t\treturn 1\n\treturn value ", + "type": "script" + } + ], + "type": "expr" + }, "persistent": true }, "custom.x": { @@ -376,10 +388,11 @@ "color": "#555555", "cursor": "pointer", "filter": "invert(100%)", - "fontSize": "19px", + "fontSize": "1.5vmin", "mix-blend-mode": "difference", "user-select": "none" - } + }, + "textAlign": "center" }, "type": "ia.input.dropdown" }, diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json index 8f8ef5f2..8ef32f52 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-03T13:31:29Z" + "timestamp": "2025-10-03T15:17:55Z" }, - "lastModificationSignature": "d7c671480b1210b1df86330d19197e47e297c95353dd4e8c31d2d866132d352f" + "lastModificationSignature": "07b7f818ad7c61bfc3af5e23ca7eb72528616fa9b04c8f1cf22f0f25a5ca9198" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json index a84fa733..833caa07 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/view.json @@ -2887,7 +2887,7 @@ }, { "meta": { - "name": "PS3_1_ENW1" + "name": "PS3_1_ENW2" }, "position": { "height": 0.0231, @@ -5088,6 +5088,14 @@ "y": 0.2046 }, "propConfig": { + "props.style.margin": { + "binding": { + "config": { + "expression": " if ({page.props.dimensions.viewport.width} \u003e 1920, \"auto\", \"0\")" + }, + "type": "expr" + } + }, "props.style.overflow": { "binding": { "config": { @@ -5098,10 +5106,7 @@ } }, "props": { - "mode": "percent", - "style": { - "margin": "auto" - } + "mode": "percent" }, "type": "ia.container.coord" } diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/resource.json index 84a0faff..88bb2fe4 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/resource.json @@ -4,13 +4,14 @@ "restricted": false, "overridable": true, "files": [ - "view.json" + "view.json", + "thumbnail.png" ], "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-03T13:50:14Z" + "timestamp": "2025-10-03T15:18:13Z" }, - "lastModificationSignature": "2f7f43ca3dd21e2d6f9b9b948907cc26fb3788674a96f87eae37ee599f078cc1" + "lastModificationSignature": "5cca42b3a6c68c7e2c78cc193e765e445dbde1c68d4e88a7b15b9de1e8f8df11" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/view.json index 430399b2..7c206204 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/view.json @@ -10300,6 +10300,14 @@ "name": "root" }, "propConfig": { + "props.style.margin": { + "binding": { + "config": { + "expression": " if ({page.props.dimensions.viewport.width} \u003e 1920, \"auto\", \"0\")" + }, + "type": "expr" + } + }, "props.style.overflow": { "binding": { "config": { @@ -10310,10 +10318,7 @@ } }, "props": { - "mode": "percent", - "style": { - "margin": "auto" - } + "mode": "percent" }, "type": "ia.container.coord" } diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json index 5966bdfb..38df44b1 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T15:12:34Z" + "timestamp": "2025-10-03T15:21:42Z" }, - "lastModificationSignature": "26d418306c0c136c8556aa80688af7cf34030b1360327575a47f25d6df4d7262" + "lastModificationSignature": "3779600335a80eb5ee91877ed768e4652fa6abd40d8416cc2e0ffe74f5916cde" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png index e9b407c0..1ac7fb31 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Docked-West/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json index 7b2ae356..70900b7f 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-01T14:59:26Z" + "timestamp": "2025-10-03T14:56:09Z" }, - "lastModificationSignature": "2a818c2bf88be425997dd6b1152148a1dfcd42631ef1c0874be8ee49adf58e78" + "lastModificationSignature": "17f18f9d7408b712cfcbef83e1f8e8347e323fee1f1f8d480f693a7348557191" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png index 5289f1f0..efd60948 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json index 084e3223..26bdda53 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Docked_Views/Header/view.json @@ -286,6 +286,14 @@ "type": "expr" } }, + "position.display": { + "binding": { + "config": { + "expression": "{page.props.dimensions.viewport.width} \u003e 800" + }, + "type": "expr" + } + }, "props.text": { "binding": { "config": { diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json index 9bfd4624..dd131936 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-29T08:46:01Z" + "timestamp": "2025-10-03T15:47:47Z" }, - "lastModificationSignature": "96c667e1a23e3b3f2705079f60515948d124ecc177ee3d97b7b4851116c98bd5" + "lastModificationSignature": "fefa4759fc7ba9ad8d6c31e9ebb629bf3707ebf81239bee5ec82229f1c8657f1" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json index cc53d330..1ddddbde 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/Beacon/view.json @@ -505,7 +505,7 @@ "dom": { "onClick": { "config": { - "script": "\t#create tags lists for the device\n\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027,params\u003d{\u0027tagProps\u0027:props, \"tags\":tags_table_dataset})" + "script": "\tprops \u003d self.view.params.tagProps\n\ttags_table_dataset \u003d autStand.devices.getAllTags(self, props[0])\t\n\tsystem.perspective.openDock(\u0027Docked-East-Device\u0027, params\u003d{\u0027tagProps\u0027: props, \"tags\": tags_table_dataset})" }, "scope": "G", "type": "script" diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json index 17056a65..af2b66a4 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-03T14:44:49Z" + "timestamp": "2025-10-03T15:16:50Z" }, - "lastModificationSignature": "e8a35262ccb49e3a791a7c4c445320a5b1e74c748adf597407c83a6cd86b6e0d" + "lastModificationSignature": "2c985708484f068a75ebffbdd976b18b193703438c7bbced3c3018b78886a820" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png index 1cd03431..e0fb7806 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/resource.json index 7b7de6a9..56af5fec 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/resource.json @@ -4,13 +4,14 @@ "restricted": false, "overridable": true, "files": [ - "view.json" + "view.json", + "thumbnail.png" ], "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-10-03T14:44:54Z" + "timestamp": "2025-10-03T15:18:58Z" }, - "lastModificationSignature": "50e69163842167145864f15dc69eab2e8053f7ebcede443c6820ea36a30250df" + "lastModificationSignature": "5cdafec1533222edc345d93d2c3c67ee2a289fda040bd01a54f73f2f09ff23ed" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/view.json index a5671ba4..9a9226c5 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/Overview-No-Zoom/view.json @@ -6783,10 +6783,19 @@ "meta": { "name": "root" }, + "propConfig": { + "props.style.margin": { + "binding": { + "config": { + "expression": " if ({page.props.dimensions.viewport.width} \u003e 1920, \"auto\", \"0\")" + }, + "type": "expr" + } + } + }, "props": { "mode": "percent", "style": { - "margin": "auto", "overflow": "visible" } }, diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json index d410a3b6..31d70851 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T11:17:45Z" + "timestamp": "2025-10-03T15:26:21Z" }, - "lastModificationSignature": "d97e2fae8a83103b73758eb1622caac2f3163fe6498d965637c7f3e1e6e39efb" + "lastModificationSignature": "65f1846ea389915f2f6a1858850de67043bb160cc6ddfeea3d9573a100c7089a" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png index e54fd941..15bb6d34 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json index 3837aab9..c831390b 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/PopUp-Views/Detail-View-Filter/view.json @@ -246,7 +246,7 @@ { "messageType": "select-all-filters", "pageScope": false, - "script": "\tdata \u003d payload[\"data\"]\n\tself.props.selected \u003d data\n\tsystem.perspective.print(data)", + "script": "\tdata \u003d payload[\"data\"]\n\tself.props.selected \u003d data", "sessionScope": false, "viewScope": true } diff --git a/BNA8/ignition/script-python/autStand/devices/code.py b/BNA8/ignition/script-python/autStand/devices/code.py index 3e9b0e79..7bb746b8 100644 --- a/BNA8/ignition/script-python/autStand/devices/code.py +++ b/BNA8/ignition/script-python/autStand/devices/code.py @@ -84,64 +84,63 @@ def build_device_mapping(full_tag_path): def build_device_table(self): """ - Converts global_device_mapping into a dataset: - Columns: Device, Status + Converts global_device_mapping into a list of dictionaries: + Keys: Device, Status Reads each tag value, falls back to 'Unknown' if error/null. """ - headers = ["Device", "Status"] rows = [] state_mappings = { - 0: "Closed", - 1: "Actuated", - 2: "Communication Faulted", - 3: "Conveyor Running In Maintenance Mode", - 4: "Disabled", - 5: "Disconnected", - 6: "Stopped", - 7: "Enabled Not Running", - 8: "Encoder Fault", - 9: "Energy Management", - 10: "ESTOP Was Actuated", - 11: "EStopped", - 12: "EStopped Locally", - 13: "Extended Faulted", - 14: "Full", - 15: "Gaylord Start Pressed", - 16: "Jam Fault", - 17: "Jammed", - 18: "Loading Allowed", - 19: "Loading Not Allowed", - 20: "Low Air Pressure Fault Was Present", - 21: "Maintenance Mode", - 22: "Conveyor Stopped In Maintenance Mode", - 23: "Motor Faulted", - 24: "Motor Was Faulted", - 25: "Normal", - 26: "Off Inactive", - 27: "Open", - 28: "PLC Ready To Run", - 29: "Package Release Pressed", - 30: "Power Branch Was Faulted", - 31: "Pressed", - 32: "Ready To Receive", - 33: "Running", - 34: "Started", - 35: "Stopped", - 36: "System Started", - 37: "Unknown", - 38: "VFD Fault", - 39: "Conveyor Running In Power Saving Mode", - 40: "Conveyor Jogging In Maintenance Mode", - 41: "VFD Reset Required", - 42: "Jam Reset Push Button Pressed", - 43: "Start Push Button Pressed", - 44: "Stop Push Button Pressed", - 45: "No Container", - 46: "Ready To Be Enabled", - 47: "Half Full", - 48: "Enabled", - 49: "Tipper Faulted" - } + 0: "Closed", + 1: "Actuated", + 2: "Communication Faulted", + 3: "Conveyor Running In Maintenance Mode", + 4: "Disabled", + 5: "Disconnected", + 6: "Stopped", + 7: "Enabled Not Running", + 8: "Encoder Fault", + 9: "Energy Management", + 10: "ESTOP Was Actuated", + 11: "EStopped", + 12: "EStopped Locally", + 13: "Extended Faulted", + 14: "Full", + 15: "Gaylord Start Pressed", + 16: "Jam Fault", + 17: "Jammed", + 18: "Loading Allowed", + 19: "Loading Not Allowed", + 20: "Low Air Pressure Fault Was Present", + 21: "Maintenance Mode", + 22: "Conveyor Stopped In Maintenance Mode", + 23: "Motor Faulted", + 24: "Motor Was Faulted", + 25: "Normal", + 26: "Off Inactive", + 27: "Open", + 28: "PLC Ready To Run", + 29: "Package Release Pressed", + 30: "Power Branch Was Faulted", + 31: "Pressed", + 32: "Ready To Receive", + 33: "Running", + 34: "Started", + 35: "Stopped", + 36: "System Started", + 37: "Unknown", + 38: "VFD Fault", + 39: "Conveyor Running In Power Saving Mode", + 40: "Conveyor Jogging In Maintenance Mode", + 41: "VFD Reset Required", + 42: "Jam Reset Push Button Pressed", + 43: "Start Push Button Pressed", + 44: "Stop Push Button Pressed", + 45: "No Container", + 46: "Ready To Be Enabled", + 47: "Half Full", + 48: "Enabled", + 49: "Tipper Faulted" + } try: for dev_name, info in global_device_mapping.items(): @@ -149,7 +148,7 @@ def build_device_table(self): status_value = "" provider = "[" + self.session.custom.fc + "_SCADA_TAG_PROVIDER]" path = provider + tagPath + "/STATE" - + if tagPath: try: result = system.tag.readBlocking([path])[0] @@ -157,26 +156,29 @@ def build_device_table(self): except: status_value = "Unknown" - rows.append([dev_name, status_value]) + # Append as dictionary + rows.append({ + 'Device': dev_name, + 'Status': status_value + }) - return system.dataset.toDataSet(headers, rows) + return rows except Exception as e: system.perspective.print("Error building device table: %s" % e) - return system.dataset.toDataSet(headers, []) + return [] # Return empty list on error def getAllTags(self, tagPath): """ - Reads all tags under a UDT instance (recursively) and returns a dataset. + Reads all tags under a UDT instance (recursively) and returns a list of dictionaries. Args: tagPath (str): Full path to the clicked device instance (e.g., System/MCM01/Photoeyes/TPE/PS3_1_TPE1) Returns: - system.dataset: Dataset with columns ["Name", "OPC Path", "Value"] + list: List of dictionaries with keys ["Name", "OPC Path", "Value"] """ - headers = ["Name", "OPC Path", "Value"] rows = [] try: @@ -202,13 +204,20 @@ def getAllTags(self, tagPath): if result.quality.isGood(): value = str(result.value) else: - value = "Unknown" + value = "Unknown" except: value = "Unknown" + system.perspective.print("We got an error here brada") # Use prefix/folder style path if inside folder displayName = prefix + name if prefix else name - rows.append([displayName, fullPath, value]) + + # Append as dictionary instead of list + rows.append({ + 'Name': displayName, + 'OPC Path': fullPath, + 'Value': value + }) elif tagType == "Folder": # Dive deeper into folder @@ -218,7 +227,8 @@ def getAllTags(self, tagPath): # Start recursion browseRecursive(tagPath) - return system.dataset.toDataSet(headers, rows) + return rows except Exception as e: - system.perspective.print("Error in getAllTags: {}".format(e)) \ No newline at end of file + system.perspective.print("Error in getAllTags: {}".format(e)) + return [] # Return empty list on error \ No newline at end of file diff --git a/BNA8/ignition/script-python/autStand/devices/resource.json b/BNA8/ignition/script-python/autStand/devices/resource.json index fb432446..17f0b513 100644 --- a/BNA8/ignition/script-python/autStand/devices/resource.json +++ b/BNA8/ignition/script-python/autStand/devices/resource.json @@ -9,9 +9,9 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T11:56:05Z" + "timestamp": "2025-10-03T15:49:48Z" }, "hintScope": 2, - "lastModificationSignature": "31548e1f209e27d65294264992e98c0d3c85525940409432e24411b6b3e1b0cc" + "lastModificationSignature": "4249e224849bd1f36d18b42ba9f88a6ca984f8efd22394df1bf809aaa4767bb8" } } \ No newline at end of file