Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further improvement and bugfixes for the colorimeter correction workflow #469

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+5 −2
Open

Further improvement and bugfixes for the colorimeter correction workflow #469

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
654e7fb
Fixes the error that 'check_last_ccxx_ti3' had if only a spetrometer …
ethanbrookins Dec 15, 2024
d7fcd6f
Decodes the instrument name so that it can match and 'check_last_ccss…
ethanbrookins Dec 15, 2024
b03bd1d
The .ti3 path dropdowns now correctly show the default file, instead …
ethanbrookins Dec 15, 2024
dd29098
Decodes the white levels from the .ti3 files so the dE values in the …
ethanbrookins Dec 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions DisplayCAL/display_cal.py
View file
Original file line number Diff line number Diff line change
@@ -12668,6 +12668,7 @@ def check_last_ccxx_ti3(event):
cgats_measurement_mode += "V"
if (
instrument_features.get("highres_mode")
and cgats.queryv1("SPECTRAL_BANDS") is not None
and cgats.queryv1("SPECTRAL_BANDS") > 36
):
cgats_measurement_mode += "H"
@@ -12699,7 +12700,7 @@ def check_last_ccxx_ti3(event):
if debug or verbose >= 2:
print("cgats_observer =", cgats_observer)
if (
cgats_instrument != instrument
cgats_instrument.decode("utf-8") != instrument
or cgats_measurement_mode != measurement_mode
or cgats_observer.decode("utf-8") != observer
):
@@ -12784,6 +12785,7 @@ def check_last_ccxx_ti3(event):
)
if defaultFile:
dlg.reference_ti3.SetPath(os.path.join(defaultDir, defaultFile))
wx.CallAfter(dlg.reference_ti3.setupControl)
dlg.reference_ti3.changeCallback = check_last_ccxx_ti3
dlg.reference_ti3.SetMaxFontSize(11)
dlg.reference_ti3_droptarget = FileDrop(dlg)
@@ -12908,6 +12910,7 @@ def reference_instrument_handler(event):
)
if defaultFile:
dlg.colorimeter_ti3.SetPath(os.path.join(defaultDir, defaultFile))
wx.CallAfter(dlg.colorimeter_ti3.setupControl)
dlg.colorimeter_ti3.changeCallback = check_last_ccxx_ti3
dlg.colorimeter_ti3.SetMaxFontSize(11)
dlg.colorimeter_ti3_droptarget = FileDrop(dlg)
@@ -13754,7 +13757,7 @@ def correction_type_handler(event):
white_abs = []
for _j, meas in enumerate((reference_ti3, colorimeter_ti3)):
# Get absolute whitepoint
white = meas.queryv1("LUMINANCE_XYZ_CDM2") or meas.queryi1(
white = meas.queryv1("LUMINANCE_XYZ_CDM2").decode("utf-8") or meas.queryi1(
{"RGB_R": 100, "RGB_G": 100, "RGB_B": 100}
)
if isinstance(white, str):

Unchanged files with check annotations Beta

View file
tests/test_wx_report_frame.py
"i1 DisplayPro, ColorMunki Display",
call_count=2,
):
report_frame = ReportFrame()

Check failure on line 25 in tests/test_wx_report_frame.py

GitHub Actions / Test with Python 3.13 and wxPython 4.2.2 

test_update_estimated_measurement_time_1

TypeError: 'WindowList_iterator' object is not iterable
# this shouldn't raise any TypeErrors as reported in #37
report_frame.update_estimated_measurement_time("chart")