diff --git a/.resources/8689e9d315127358c84a1c9faee52f224ff54e132cb1f28af9025f570252dedf b/.resources/0c05775244abb9df77850171f3ef4a5ebcdc863343c35affba2825ef1e5c1bf8 similarity index 99% rename from .resources/8689e9d315127358c84a1c9faee52f224ff54e132cb1f28af9025f570252dedf rename to .resources/0c05775244abb9df77850171f3ef4a5ebcdc863343c35affba2825ef1e5c1bf8 index 8010bf36..6ceee5fc 100644 --- a/.resources/8689e9d315127358c84a1c9faee52f224ff54e132cb1f28af9025f570252dedf +++ b/.resources/0c05775244abb9df77850171f3ef4a5ebcdc863343c35affba2825ef1e5c1bf8 @@ -453,7 +453,7 @@ ] }, "title": "", - "viewPath": "autStand/Detailed_Views/ZOOM-MCM01" + "viewPath": "autStand/Detailed_Views/MCM01-FLUID INBOUND" }, "/autStand/MCM02": { "docks": { @@ -551,7 +551,7 @@ ] }, "title": "", - "viewPath": "autStand/Detailed_Views/ZOOM-MCM02" + "viewPath": "autStand/Detailed_Views/MCM02-NC SORTER" }, "/autStand/Statistics": { "docks": { diff --git a/.resources/0fc4a3a1c444b66425507f6054668b470f9dce1f81d49ef936236d01af5784a1 b/.resources/0fc4a3a1c444b66425507f6054668b470f9dce1f81d49ef936236d01af5784a1 new file mode 100644 index 00000000..32da1029 Binary files /dev/null and b/.resources/0fc4a3a1c444b66425507f6054668b470f9dce1f81d49ef936236d01af5784a1 differ diff --git a/.resources/349454fcea00eb345ffbeafeadb61f8a72b200b402a9317e5820bc93d09a466b b/.resources/349454fcea00eb345ffbeafeadb61f8a72b200b402a9317e5820bc93d09a466b deleted file mode 100644 index 71d4eb7d..00000000 Binary files a/.resources/349454fcea00eb345ffbeafeadb61f8a72b200b402a9317e5820bc93d09a466b and /dev/null differ diff --git a/.resources/3c3aa49c502f8c830e6b4c063bd9ada78fef42c849b52416016714369d6b6671 b/.resources/3c3aa49c502f8c830e6b4c063bd9ada78fef42c849b52416016714369d6b6671 deleted file mode 100644 index 3d739e8b..00000000 Binary files a/.resources/3c3aa49c502f8c830e6b4c063bd9ada78fef42c849b52416016714369d6b6671 and /dev/null differ diff --git a/.resources/5e38599c3ec2467d8d2b1808c6cb61af179eb8e010eb7a6f8d045bf6ebd82f1e b/.resources/5e38599c3ec2467d8d2b1808c6cb61af179eb8e010eb7a6f8d045bf6ebd82f1e deleted file mode 100644 index bb3e159a..00000000 Binary files a/.resources/5e38599c3ec2467d8d2b1808c6cb61af179eb8e010eb7a6f8d045bf6ebd82f1e and /dev/null differ diff --git a/.resources/8e7800ccc53668b2b08fdbdbb6126ebf87b2845319b919c1998104a7ca4f3230 b/.resources/8e7800ccc53668b2b08fdbdbb6126ebf87b2845319b919c1998104a7ca4f3230 new file mode 100644 index 00000000..a9a46494 Binary files /dev/null and b/.resources/8e7800ccc53668b2b08fdbdbb6126ebf87b2845319b919c1998104a7ca4f3230 differ diff --git a/.resources/b693627f43ce7cba05d42f48a56a3641a05c131d1200fa4da10e86ebc2f53557 b/.resources/a153d78225b6ef809cf4512e4dbec8812cc6b13a4e56b39a926d4a38e892c5e3 similarity index 99% rename from .resources/b693627f43ce7cba05d42f48a56a3641a05c131d1200fa4da10e86ebc2f53557 rename to .resources/a153d78225b6ef809cf4512e4dbec8812cc6b13a4e56b39a926d4a38e892c5e3 index 27b6d2b5..cc0d9bc6 100644 --- a/.resources/b693627f43ce7cba05d42f48a56a3641a05c131d1200fa4da10e86ebc2f53557 +++ b/.resources/a153d78225b6ef809cf4512e4dbec8812cc6b13a4e56b39a926d4a38e892c5e3 @@ -1,7 +1,7 @@ { "custom": { "params": { - "highlightTagPath": "MCM01", + "highlightTagPath": "value", "panZoomScale": 1 }, "scale": 1, @@ -19,7 +19,7 @@ }, "panning": true, "viewParams": { - "highlightTagPath": "MCM01" + "highlightTagPath": "value" }, "viewPath": "autStand/Detailed_Views/MCM-Views/MCM01" }, diff --git a/.resources/c46ab77c9fa6f36c968e66e01c7208b12e3df6e8a83bd6ede0c5f5bb5f86c5e6 b/.resources/c46ab77c9fa6f36c968e66e01c7208b12e3df6e8a83bd6ede0c5f5bb5f86c5e6 new file mode 100644 index 00000000..7bfeb0ff Binary files /dev/null and b/.resources/c46ab77c9fa6f36c968e66e01c7208b12e3df6e8a83bd6ede0c5f5bb5f86c5e6 differ diff --git a/.resources/c4d1c704767264ea4e92a4c2d401cca9cc9be8e168199ad01534057f6d3041f7 b/.resources/c4d1c704767264ea4e92a4c2d401cca9cc9be8e168199ad01534057f6d3041f7 deleted file mode 100644 index 705aa232..00000000 Binary files a/.resources/c4d1c704767264ea4e92a4c2d401cca9cc9be8e168199ad01534057f6d3041f7 and /dev/null differ diff --git a/.resources/c8f9a0195ee27e7409ec68d9656cb322ee6a8fb5c0a8747fcf33c3c0a32cac7e b/.resources/c8f9a0195ee27e7409ec68d9656cb322ee6a8fb5c0a8747fcf33c3c0a32cac7e new file mode 100644 index 00000000..7ed8882d Binary files /dev/null and b/.resources/c8f9a0195ee27e7409ec68d9656cb322ee6a8fb5c0a8747fcf33c3c0a32cac7e differ diff --git a/.resources/1e47163e9f546b25c8408c5687f3196f2d1730f8e2bac2107dc52ae834dc0a88 b/.resources/d26380ed8a71f34321c8c37c8b29c25fb8460ab2bdfcc3ebb6def1e1733c8e4f similarity index 83% rename from .resources/1e47163e9f546b25c8408c5687f3196f2d1730f8e2bac2107dc52ae834dc0a88 rename to .resources/d26380ed8a71f34321c8c37c8b29c25fb8460ab2bdfcc3ebb6def1e1733c8e4f index a966f223..af47700e 100644 --- a/.resources/1e47163e9f546b25c8408c5687f3196f2d1730f8e2bac2107dc52ae834dc0a88 +++ b/.resources/d26380ed8a71f34321c8c37c8b29c25fb8460ab2bdfcc3ebb6def1e1733c8e4f @@ -24,12 +24,14 @@ def deviceType(self, path, props): import traceback msg = "Error in deviceType: {}\n{}".format(str(e), traceback.format_exc()) system.perspective.print(msg) - # optionally: system.gui.errorBox(msg) # if running in Vision, not Perspective return None def handleTagHighlight(view, currentValue): tag_priority = currentValue.value + + if not "||" in tag_priority: + return # --- CASE 1: Remove all highlights by applying CLEAR class --- if not tag_priority or str(tag_priority).upper() == "CLEAR": @@ -41,7 +43,10 @@ def handleTagHighlight(view, currentValue): return False parts = str(tag_priority).split("||") + tag = parts[0] + + system.perspective.print(tag) splitedTag = tag.split("/") deviceName = splitedTag[-1] @@ -49,6 +54,8 @@ def handleTagHighlight(view, currentValue): priority = parts[1] + system.perspective.print(priority) + foundMatch = False # clear all highlights and apply new one when found @@ -63,18 +70,12 @@ def handleTagHighlight(view, currentValue): child.props.style.classes = "" tagPath = tagsList[0] -# system.perspective.print(tagPath) if tag == tagPath: child.props.style["classes"] = "Highlight/Pulse-" + priority path = child.props.get("path") -# docked_view = deviceType(child) docked_view = deviceType(view, path, tagProps) -# system.perspective.print(docked_view) - system.perspective.openDock(docked_view[0], params = {'tagProps':tagProps, 'tags': docked_view[1], 'devices':docked_view[2]}) -# tags = autStand.devices.getAllTags(view, tagProps[0]) -# system.perspective.openDock(docked_view, params={'tagProps': tagProps, 'tags': tags}) - + system.perspective.openDock(docked_view[0], params = {'tagProps':tagProps, 'tags': docked_view[1], 'devices':docked_view[2]}) foundMatch = True return foundMatch diff --git a/BNA8/com.inductiveautomation.perspective/page-config/config.json b/BNA8/com.inductiveautomation.perspective/page-config/config.json index 8010bf36..6ceee5fc 100644 --- a/BNA8/com.inductiveautomation.perspective/page-config/config.json +++ b/BNA8/com.inductiveautomation.perspective/page-config/config.json @@ -453,7 +453,7 @@ ] }, "title": "", - "viewPath": "autStand/Detailed_Views/ZOOM-MCM01" + "viewPath": "autStand/Detailed_Views/MCM01-FLUID INBOUND" }, "/autStand/MCM02": { "docks": { @@ -551,7 +551,7 @@ ] }, "title": "", - "viewPath": "autStand/Detailed_Views/ZOOM-MCM02" + "viewPath": "autStand/Detailed_Views/MCM02-NC SORTER" }, "/autStand/Statistics": { "docks": { diff --git a/BNA8/com.inductiveautomation.perspective/page-config/resource.json b/BNA8/com.inductiveautomation.perspective/page-config/resource.json index c6dac3fa..6edf9f28 100644 --- a/BNA8/com.inductiveautomation.perspective/page-config/resource.json +++ b/BNA8/com.inductiveautomation.perspective/page-config/resource.json @@ -9,8 +9,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T12:11:49Z" + "timestamp": "2025-09-25T12:59:05Z" }, - "lastModificationSignature": "3bb50af6be5d582438da031187b8478db69b1a8d52c8f82837434745555c63e4" + "lastModificationSignature": "ee633206b7d3e030e9d6a7c6c3d5321255e47052c66459ead9932c359be5bd1e" } } \ No newline at end of file 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 c1cbb3c1..db9f5616 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-09-25T12:10:33Z" + "timestamp": "2025-09-25T13:05:15Z" }, - "lastModificationSignature": "63678f7b5e29f8326cc640289d8d86f6a1c502799815b37f8114890548b2e37b" + "lastModificationSignature": "024812809d61dbea933da4f3915034c918bfc629f7b76120c2f2791baca76c3b" } } \ 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 705aa232..a9a46494 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 27b6d2b5..cc0d9bc6 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 @@ -1,7 +1,7 @@ { "custom": { "params": { - "highlightTagPath": "MCM01", + "highlightTagPath": "value", "panZoomScale": 1 }, "scale": 1, @@ -19,7 +19,7 @@ }, "panning": true, "viewParams": { - "highlightTagPath": "MCM01" + "highlightTagPath": "value" }, "viewPath": "autStand/Detailed_Views/MCM-Views/MCM01" }, 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 0d5dc4f5..5c29d1c5 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-09-25T12:13:21Z" + "timestamp": "2025-09-25T13:03:44Z" }, - "lastModificationSignature": "c6f1d1008217c44b2199c30dfaa21820e0e761d53741e1a2a8112cb0def9a241" + "lastModificationSignature": "4fea7c6436c5ace3a35194ac3a3676fc07d98b10c7e6b445963e213949906102" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png index bb3e159a..7bfeb0ff 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM01/thumbnail.png differ 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 5428a252..a4c8fa77 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 @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T12:15:10Z" + "timestamp": "2025-09-25T13:06:17Z" }, - "lastModificationSignature": "66af6c348905f6bacaf450bceed2bf9f9c2bbd61100ce80d385350b4cd6b598d" + "lastModificationSignature": "747930a51b93273b478547810cc9d0b48ed718f56b921feba1986592d556f8c8" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/thumbnail.png index 71d4eb7d..32da1029 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM-Views/MCM02/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json index 92ad18e8..6c4a86e5 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-25T12:16:54Z" + "timestamp": "2025-09-25T13:06:04Z" }, - "lastModificationSignature": "344bdc6faeeb97842c2ababbf23e8d37e128070f816b7f634fe855bddc853d4e" + "lastModificationSignature": "c56233ec5df022965cef384c729c1102ffabdd5f0d936c849edb9b07db3963bc" } } \ No newline at end of file diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png index 3d739e8b..7ed8882d 100644 Binary files a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png and b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/thumbnail.png differ diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/EPC/resource.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/EPC/resource.json index 9b382211..e8bb324e 100644 --- a/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/EPC/resource.json +++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Equipment/EPC/resource.json @@ -10,8 +10,8 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-15T12:07:03Z" + "timestamp": "2025-09-25T12:49:48Z" }, - "lastModificationSignature": "518c87ee2027cea44f3edb5f788df944ed6182525fbd8d19b01c4373e7821771" + "lastModificationSignature": "0ed16456d9c6a8f3dd8d7477bef5377f724a1f2692241e0b2bbdb03fded91f72" } } \ No newline at end of file diff --git a/BNA8/ignition/script-python/autStand/Utils/code.py b/BNA8/ignition/script-python/autStand/Utils/code.py index a966f223..af47700e 100644 --- a/BNA8/ignition/script-python/autStand/Utils/code.py +++ b/BNA8/ignition/script-python/autStand/Utils/code.py @@ -24,12 +24,14 @@ def deviceType(self, path, props): import traceback msg = "Error in deviceType: {}\n{}".format(str(e), traceback.format_exc()) system.perspective.print(msg) - # optionally: system.gui.errorBox(msg) # if running in Vision, not Perspective return None def handleTagHighlight(view, currentValue): tag_priority = currentValue.value + + if not "||" in tag_priority: + return # --- CASE 1: Remove all highlights by applying CLEAR class --- if not tag_priority or str(tag_priority).upper() == "CLEAR": @@ -41,7 +43,10 @@ def handleTagHighlight(view, currentValue): return False parts = str(tag_priority).split("||") + tag = parts[0] + + system.perspective.print(tag) splitedTag = tag.split("/") deviceName = splitedTag[-1] @@ -49,6 +54,8 @@ def handleTagHighlight(view, currentValue): priority = parts[1] + system.perspective.print(priority) + foundMatch = False # clear all highlights and apply new one when found @@ -63,18 +70,12 @@ def handleTagHighlight(view, currentValue): child.props.style.classes = "" tagPath = tagsList[0] -# system.perspective.print(tagPath) if tag == tagPath: child.props.style["classes"] = "Highlight/Pulse-" + priority path = child.props.get("path") -# docked_view = deviceType(child) docked_view = deviceType(view, path, tagProps) -# system.perspective.print(docked_view) - system.perspective.openDock(docked_view[0], params = {'tagProps':tagProps, 'tags': docked_view[1], 'devices':docked_view[2]}) -# tags = autStand.devices.getAllTags(view, tagProps[0]) -# system.perspective.openDock(docked_view, params={'tagProps': tagProps, 'tags': tags}) - + system.perspective.openDock(docked_view[0], params = {'tagProps':tagProps, 'tags': docked_view[1], 'devices':docked_view[2]}) foundMatch = True return foundMatch diff --git a/BNA8/ignition/script-python/autStand/Utils/resource.json b/BNA8/ignition/script-python/autStand/Utils/resource.json index 3e17fd50..9d8f22f7 100644 --- a/BNA8/ignition/script-python/autStand/Utils/resource.json +++ b/BNA8/ignition/script-python/autStand/Utils/resource.json @@ -9,9 +9,9 @@ "attributes": { "lastModification": { "actor": "admin", - "timestamp": "2025-09-19T14:43:02Z" + "timestamp": "2025-09-25T13:05:53Z" }, "hintScope": 2, - "lastModificationSignature": "9d58c365d8aba15c6e322fa153e168c440f81681d7ecc1e0e3405f21b64be363" + "lastModificationSignature": "db71169d0b0acd29c4e789322d8721171c733a24db2a19994da3a55ba662489e" } } \ No newline at end of file