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

Colorimeter correction workflow improvements #328

Merged
merged 9 commits into from
Mar 26, 2024
Merged

Colorimeter correction workflow improvements #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
15e182d
Add i1 Pro 3 to the list so that is it recognized as a spectrometer
ethanbrookins Mar 15, 2024
fd1a8e4
Spectrometer reading is fixed to correctly save as the reference, not…
ethanbrookins Mar 15, 2024
f48afe6
Temp fix to put the name of a virtual display into the dialog box
ethanbrookins Mar 16, 2024
defea6a
Sets a minimum size for the matrix window, otherwise it spawns as the…
ethanbrookins Mar 16, 2024
f127ef5
Adds checks so the matrix graph will still draw even if the .ccmx doe…
ethanbrookins Mar 16, 2024
a8b71cd
Fixed improper formatting in ARGYLL_COLPROF_ARGS and ARGYLL_DISPCAL_ARGS
ethanbrookins Mar 22, 2024
c5d4a98
Improvements to the correction details dialog box
ethanbrookins Mar 22, 2024
8208e0e
Remove Resolve minimum delay and a couple other tiny fixes
ethanbrookins Mar 22, 2024
602cfc5
- Addressed review comments.
eoyilmaz Mar 26, 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
5 changes: 4 additions & 1 deletion DisplayCAL/CGATS.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,10 @@ def __bytes__(self):
elif isinstance(value, (float, int, bytes)):
if key not in ("NUMBER_OF_FIELDS", "NUMBER_OF_SETS"):
if isinstance(key, int):
result.append(bytes(str(value), "utf-8"))
if isinstance(value, bytes):
result.append(value)
else:
result.append(bytes(str(value), "utf-8"))
else:
if "KEYWORDS" in self and key in list(
self["KEYWORDS"].values()
Expand Down
11 changes: 11 additions & 0 deletions DisplayCAL/argyll_instruments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,17 @@
"integration_time": [9.2, 3.9], # Using i1 Pro values
"refresh": True,
},
"i1 Pro 3": {
"usb_ids": [{"vid": 0x0765, "pid": 0x6009, "hid": False}],
"spectral": True,
"adaptive_mode": True,
"highres_mode": True,
"projector_mode": False,
"sensor_cal": True,
"skip_sensor_cal": True,
"integration_time": [9.2, 3.9], # Still just using i1 Pro values
"refresh": True,
},
"ColorHug": {
"usb_ids": [
{"vid": 0x04D8, "pid": 0xF8DA, "hid": True},
Expand Down
72 changes: 25 additions & 47 deletions DisplayCAL/display_cal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10985,7 +10985,7 @@ def just_measure_finish(self, result):
except Exception as exception:
wx.CallAfter(show_result_dialog, exception, self)
else:
if cgats.queryv1("INSTRUMENT_TYPE_SPECTRAL") == "YES":
if cgats.queryv1("INSTRUMENT_TYPE_SPECTRAL") == b"YES":
setcfg("last_reference_ti3_path", cgats.filename)
else:
setcfg("last_colorimeter_ti3_path", cgats.filename)
Expand Down Expand Up @@ -13218,12 +13218,12 @@ def correction_type_handler(event):
display = (
meta.get("EDID_model", meta.get("EDID_model_id", {}))
.get("value", "")
.encode("UTF-7")
.encode("utf-7")
)
manufacturer = (
meta.get("EDID_manufacturer", {})
.get("value", "")
.encode("UTF-7")
.encode("utf-7")
)
cgats.ARGYLL_COLPROF_ARGS.add_data(
'-M "%s" -A "%s"' % (display, manufacturer)
Expand Down Expand Up @@ -13505,26 +13505,23 @@ def correction_type_handler(event):
flag=wx.ALL | wx.ALIGN_LEFT | wx.EXPAND,
border=4,
)
use_display_txt_ctrl = not display
if use_display_txt_ctrl:
boxsizer = wx.StaticBoxSizer(
wx.StaticBox(dlg, -1, lang.getstr("display")), wx.VERTICAL
)
dlg.sizer3.Add(boxsizer, 1, flag=wx.TOP | wx.EXPAND, border=12)
if sys.platform not in ("darwin", "win32"):
boxsizer.Add((1, 8))
if not config.is_virtual_display():
display = self.worker.get_display_name(False, True, False)
dlg.display_txt_ctrl = wx.TextCtrl(dlg, -1, display, size=(400, -1))
boxsizer.Add(
dlg.display_txt_ctrl,
1,
flag=wx.ALL | wx.ALIGN_LEFT | wx.EXPAND,
border=4,
)
use_manufacturer_txt_ctrl = (
not manufacturer and not config.is_virtual_display(display)
boxsizer = wx.StaticBoxSizer(
wx.StaticBox(dlg, -1, lang.getstr("display")), wx.VERTICAL
)
dlg.sizer3.Add(boxsizer, 1, flag=wx.TOP | wx.EXPAND, border=12)
if sys.platform not in ("darwin", "win32"):
boxsizer.Add((1, 8))
if not display:
# protects from an improperly formatted display name in the ref.ti3
display = self.worker.get_display_name(False, True, False)
dlg.display_txt_ctrl = wx.TextCtrl(dlg, -1, display, size=(400, -1))
boxsizer.Add(
dlg.display_txt_ctrl,
1,
flag=wx.ALL | wx.ALIGN_LEFT | wx.EXPAND,
border=4,
)
use_manufacturer_txt_ctrl = not manufacturer
if use_manufacturer_txt_ctrl:
boxsizer = wx.StaticBoxSizer(
wx.StaticBox(dlg, -1, lang.getstr("display.manufacturer")),
Expand All @@ -13536,17 +13533,12 @@ def correction_type_handler(event):
if not pnpidcache:
# Populate pnpidcache
get_manufacturer_name("???")
# CB_SORT isn't supported by wxOSX/Cocoa!
# Why isn't this mentioned in the wxPython docs?
dlg.manufacturer_txt_ctrl = AutocompleteComboBox(
dlg.manufacturer_txt_ctrl = wx.Choice(
dlg, -1, choices=natsort(list(pnpidcache.values())), size=(400, -1)
)
if not manufacturer and display == self.worker.get_display_name(
False, True, False
):
dlg.manufacturer_txt_ctrl.SetStringSelection(
self.worker.get_display_edid().get("manufacturer", "")
)
manufacturer_selection = self.worker.get_display_edid().get("manufacturer", "")
if len(manufacturer_selection) < 1: manufacturer_selection = "Unknown"
dlg.manufacturer_txt_ctrl.SetStringSelection(manufacturer_selection)
boxsizer.Add(
dlg.manufacturer_txt_ctrl,
1,
Expand Down Expand Up @@ -13587,8 +13579,7 @@ def correction_type_handler(event):
dlg.Center()
result = dlg.ShowWindowModalBlocking()
description = safe_str(dlg.description_txt_ctrl.GetValue().strip(), "UTF-8")
if use_display_txt_ctrl:
display = dlg.display_txt_ctrl.GetValue()
display = dlg.display_txt_ctrl.GetValue()
if (
dlg.display_tech_ctrl.IsEnabled()
and dlg.display_tech_ctrl.GetStringSelection()
Expand Down Expand Up @@ -13835,7 +13826,7 @@ def correction_type_handler(event):
b'\nOBSERVER "%s"\\1' % observer.replace(b"\\", b"\\\\"),
cgats,
)
if reference_observer.encode("utf-8") and not re.search(
if reference_observer and not re.search(
rb'\nREFERENCE_OBSERVER\s+".+?"\n', cgats
):
# By default, CCMX/CCSS files don't contain observer
Expand Down Expand Up @@ -15005,26 +14996,13 @@ def display_ctrl_handler(self, event, load_lut=True, update_ccmx_items=True):
if debug:
print("[D] display_ctrl_handler -> lut_viewer_load_lut END")
self.update_use_video_lut()
# Special case: Resolve. Needs a minimum display update delay of
# atleast 600 ms for repeatable measurements. This is a Resolve
# issue. There seem to be quite a few bugs that were introduced in
# Resolve via the version 10.1.x to 11.x transition.
is_resolve = config.get_display_name() == "Resolve"
update_delay_ctrls = setcfg_cond(
is_resolve, "measure.min_display_update_delay_ms", 1000
)
setcfg_cond(is_resolve, "measure.override_min_display_update_delay_ms", 1)
# Enable 3D LUT tab for virtual displays & eeColor
enable_3dlut_tab = (
config.is_virtual_display() or config.get_display_name() == "SII REPEATER"
)
setcfg_cond(
enable_3dlut_tab, "3dlut.tab.enable", 1, True, not getcfg("3dlut.create")
)
if update_delay_ctrls:
override = bool(getcfg("measure.override_min_display_update_delay_ms"))
getattr(self, "override_min_display_update_delay_ms").SetValue(override)
self.update_display_delay_ctrl("min_display_update_delay_ms", override)
self.update_drift_compensation_ctrls()
self.show_display_delay_ctrls()
self.show_ffp_ctrls()
Expand Down
Loading
Loading