This commit is contained in:
Salijoghli 2025-09-25 17:07:07 +04:00
parent a6aed583df
commit 2330d679d0
25 changed files with 40 additions and 38 deletions

View File

@ -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": {

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -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"
},

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

View File

@ -24,13 +24,15 @@ 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":
for child in view.rootContainer.getChildren()[0].getChildren():
@ -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})
foundMatch = True
return foundMatch

View File

@ -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": {

View File

@ -9,8 +9,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-25T12:11:49Z"
"timestamp": "2025-09-25T12:59:05Z"
},
"lastModificationSignature": "3bb50af6be5d582438da031187b8478db69b1a8d52c8f82837434745555c63e4"
"lastModificationSignature": "ee633206b7d3e030e9d6a7c6c3d5321255e47052c66459ead9932c359be5bd1e"
}
}

View File

@ -10,8 +10,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-25T12:10:33Z"
"timestamp": "2025-09-25T13:05:15Z"
},
"lastModificationSignature": "63678f7b5e29f8326cc640289d8d86f6a1c502799815b37f8114890548b2e37b"
"lastModificationSignature": "024812809d61dbea933da4f3915034c918bfc629f7b76120c2f2791baca76c3b"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -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"
},

View File

@ -10,8 +10,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-25T12:13:21Z"
"timestamp": "2025-09-25T13:03:44Z"
},
"lastModificationSignature": "c6f1d1008217c44b2199c30dfaa21820e0e761d53741e1a2a8112cb0def9a241"
"lastModificationSignature": "4fea7c6436c5ace3a35194ac3a3676fc07d98b10c7e6b445963e213949906102"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -10,8 +10,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-25T12:15:10Z"
"timestamp": "2025-09-25T13:06:17Z"
},
"lastModificationSignature": "66af6c348905f6bacaf450bceed2bf9f9c2bbd61100ce80d385350b4cd6b598d"
"lastModificationSignature": "747930a51b93273b478547810cc9d0b48ed718f56b921feba1986592d556f8c8"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 83 KiB

View File

@ -10,8 +10,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-25T12:16:54Z"
"timestamp": "2025-09-25T13:06:04Z"
},
"lastModificationSignature": "344bdc6faeeb97842c2ababbf23e8d37e128070f816b7f634fe855bddc853d4e"
"lastModificationSignature": "c56233ec5df022965cef384c729c1102ffabdd5f0d936c849edb9b07db3963bc"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

@ -10,8 +10,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-15T12:07:03Z"
"timestamp": "2025-09-25T12:49:48Z"
},
"lastModificationSignature": "518c87ee2027cea44f3edb5f788df944ed6182525fbd8d19b01c4373e7821771"
"lastModificationSignature": "0ed16456d9c6a8f3dd8d7477bef5377f724a1f2692241e0b2bbdb03fded91f72"
}
}

View File

@ -24,13 +24,15 @@ 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":
for child in view.rootContainer.getChildren()[0].getChildren():
@ -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})
foundMatch = True
return foundMatch

View File

@ -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"
}
}