Skip to content

Commit c24a557

Browse files
committed
- fixes an issue that could mix up custom event colors
- adds ramping to events after DROP (thanks to Terracotta-6) - deactivates down-ramping
1 parent b31f793 commit c24a557

35 files changed

+35252
-35280
lines changed

src/artisanlib/canvas.py

+69-67
Large diffs are not rendered by default.

src/artisanlib/devices.py

+255-253
Large diffs are not rendered by default.

src/artisanlib/main.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -11618,13 +11618,10 @@ def displayonlymenus(self) -> None:
1161811618
self.alarmAction.setEnabled(False)
1161911619
self.autosaveAction.setEnabled(False)
1162011620
self.batchAction.setEnabled(False)
11621-
self.readingsAction.setEnabled(False)
1162211621
self.buttonsAction.setChecked(False)
1162311622
self.buttonsAction.setEnabled(False)
1162411623
self.slidersAction.setChecked(False)
1162511624
self.slidersAction.setEnabled(False)
11626-
self.eventsEditorAction.setChecked(False)
11627-
self.eventsEditorAction.setEnabled(False)
1162811625
self.simulatorAction.setEnabled(False)
1162911626

1163011627
def update_minieventline_visibility(self) -> None:
@@ -19216,31 +19213,31 @@ def fetchCurveStyles(self) -> None:
1921619213
if isinstance(m, str):
1921719214
self.qmc.EvalueMarker[0] = m
1921819215
self.qmc.EvalueMarkerSize[0] = max(self.qmc.markersize_min, self.qmc.l_eventtype1dots.get_markersize())
19219-
self.qmc.EvalueColor[0] = self.getColor(self.qmc.l_eventtype1dots)
19216+
self.qmc.EvalueColor[0] = self.getColor(self.qmc.l_eventtype1dots)[:7] # no alpha for event colors as it is handled separately
1922019217
self.qmc.Evaluelinethickness[0] = max(self.qmc.linewidth_min, self.qmc.l_eventtype1dots.get_linewidth())
1922119218
self.qmc.etypes[0] = str(self.qmc.l_eventtype1dots.get_label())
1922219219
if self.qmc.l_eventtype2dots is not None:
1922319220
m = self.qmc.l_eventtype2dots.get_marker()
1922419221
if isinstance(m, str):
1922519222
self.qmc.EvalueMarker[1] = m
1922619223
self.qmc.EvalueMarkerSize[1] = max(self.qmc.markersize_min, self.qmc.l_eventtype2dots.get_markersize())
19227-
self.qmc.EvalueColor[1] = self.getColor(self.qmc.l_eventtype2dots)
19224+
self.qmc.EvalueColor[1] = self.getColor(self.qmc.l_eventtype2dots)[:7] # no alpha for event colors as it is handled separately
1922819225
self.qmc.Evaluelinethickness[1] = max(self.qmc.linewidth_min, self.qmc.l_eventtype2dots.get_linewidth())
1922919226
self.qmc.etypes[1] = str(self.qmc.l_eventtype2dots.get_label())
1923019227
if self.qmc.l_eventtype3dots is not None:
1923119228
m = self.qmc.l_eventtype3dots.get_marker()
1923219229
if isinstance(m, str):
1923319230
self.qmc.EvalueMarker[2] = m
1923419231
self.qmc.EvalueMarkerSize[2] = max(self.qmc.markersize_min, self.qmc.l_eventtype3dots.get_markersize())
19235-
self.qmc.EvalueColor[2] = self.getColor(self.qmc.l_eventtype3dots)
19232+
self.qmc.EvalueColor[2] = self.getColor(self.qmc.l_eventtype3dots)[:7] # no alpha for event colors as it is handled separately
1923619233
self.qmc.Evaluelinethickness[2] = max(self.qmc.linewidth_min, self.qmc.l_eventtype3dots.get_linewidth())
1923719234
self.qmc.etypes[2] = str(self.qmc.l_eventtype3dots.get_label())
1923819235
if self.qmc.l_eventtype4dots is not None:
1923919236
m = self.qmc.l_eventtype4dots.get_marker()
1924019237
if isinstance(m, str):
1924119238
self.qmc.EvalueMarker[3] = m
1924219239
self.qmc.EvalueMarkerSize[3] = max(self.qmc.markersize_min, self.qmc.l_eventtype4dots.get_markersize())
19243-
self.qmc.EvalueColor[3] = self.getColor(self.qmc.l_eventtype4dots)
19240+
self.qmc.EvalueColor[3] = self.getColor(self.qmc.l_eventtype4dots)[:7] # no alpha for event colors as it is handled separately
1924419241
self.qmc.Evaluelinethickness[3] = max(self.qmc.linewidth_min, self.qmc.l_eventtype4dots.get_linewidth())
1924519242
self.qmc.etypes[3] = str(self.qmc.l_eventtype4dots.get_label())
1924619243
except Exception as e: # pylint: disable=broad-except

src/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ setuptools==70.3.0 # py2app fails on 71.0.3 and 71.0.4; pyinstaller windows/linu
3030
wheel==0.45.1
3131
pyserial==3.5
3232
pymodbus==3.6.9; python_version < '3.9' # last Python 3.8 release
33-
pymodbus==3.9.0; python_version >= '3.9'
33+
pymodbus==3.9.1; python_version >= '3.9'
3434
python-snap7==1.3; python_version < '3.10' # last Python 3.9 release
3535
python-snap7==2.0.2; python_version >= '3.10'
3636
Phidget22==1.22.20250106
@@ -98,8 +98,8 @@ PyQt5-sip==12.15.0; (sys_platform=='darwin' and platform_release<'20.0') or (pla
9898
PyQt5==5.15.10; (sys_platform=='darwin' and platform_release<'20.0') or (platform_system=='Windows' and python_version<'3.9')
9999
PyQtWebEngine==5.15.6; (sys_platform=='darwin' and platform_release<'20.0') or (platform_system=='Windows' and python_version<'3.9')
100100
# Qt6 on macOS 11+, Windows 10/11 and Linux
101-
PyQt6==6.8.1; (sys_platform=='darwin' and platform_release>='20.0') or (platform_system=='Windows' and python_version>'3.10') or (platform_system=='Linux' and platform_machine!='aarch64')
102-
PyQt6-WebEngine==6.8.0; (sys_platform=='darwin' and platform_release>='20.0') or (platform_system=='Windows' and python_version>'3.10') or (platform_system=='Linux' and platform_machine!='aarch64')
101+
PyQt6==6.9.0; (sys_platform=='darwin' and platform_release>='20.0') or (platform_system=='Windows' and python_version>'3.10') or (platform_system=='Linux' and platform_machine!='aarch64')
102+
PyQt6-WebEngine==6.9.0; (sys_platform=='darwin' and platform_release>='20.0') or (platform_system=='Windows' and python_version>'3.10') or (platform_system=='Linux' and platform_machine!='aarch64')
103103
###
104104
pyinstaller==6.12.0; platform_system=='Linux' # on Windows pyinstaller is separately installed (see above)
105105
###

0 commit comments

Comments
 (0)