Skip to content

colorharmonizer: reset histogram validity and auto-detect on image switch #22214

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

Merged
TurboGit merged 2 commits into from
Sep 9, 2026
Merged

colorharmonizer: reset histogram validity and auto-detect on image switch #22214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b8a19f
colorharmonizer: reset histogram validity and auto-detect on image sw…
masterpiga Sep 9, 2026
74242bc
RELEASE_NOTES.md: color harmonizer auto-detect fix
masterpiga Sep 9, 2026
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
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@ changes (where available).

## Bug Fixes

- Fixed color harmonizer's auto-detect harmony applying the hue
histogram of the previously viewed image after switching images in the
darkroom.

- Entering the darkroom no longer expands one instance of a module while
a different instance of it holds the focus. The instance that gets the
focus is now the one that is expanded.
Expand Down
155 changes: 121 additions & 34 deletions src/iop/colorharmonizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ typedef struct dt_iop_colorharmonizer_gui_data_t
dt_gui_collapsible_section_t sat_section; // collapsible "Saturation" section
float hue_histogram[COLORHARMONIZER_HUE_BINS];
gboolean histogram_valid;
GMutex histogram_lock;
gboolean auto_detect_pending;
} dt_iop_colorharmonizer_gui_data_t;

typedef struct dt_iop_colorharmonizer_global_data_t
Expand All @@ -118,6 +118,7 @@ static float _ucs_to_ryb_fast(const float ucs);
static float _ryb_to_ucs_fast(const float yrb);
static void _sync_custom_sliders(const dt_iop_colorharmonizer_params_t *p,
dt_iop_colorharmonizer_gui_data_t *g);
static void _set_auto_detect_button_state(dt_iop_module_t *self, const gboolean sensitive);
static gboolean _auto_detect_button_enable_idle(gpointer user_data);

const char *name()
Expand Down Expand Up @@ -294,16 +295,16 @@ static void _update_histogram(dt_iop_module_t *self,
}
}

dt_iop_gui_enter_critical_section(self);
const gboolean was_invalid = !g->histogram_valid;
g_mutex_lock(&g->histogram_lock);
memcpy(g->hue_histogram, local_histo, sizeof(local_histo));
g->histogram_valid = TRUE;
g_mutex_unlock(&g->histogram_lock);
const gboolean pending = g->auto_detect_pending;
dt_iop_gui_leave_critical_section(self);

if(was_invalid)
if(was_invalid || pending)
{
g_object_ref(g->auto_detect);
gdk_threads_add_idle(_auto_detect_button_enable_idle, g->auto_detect);
g_idle_add(_auto_detect_button_enable_idle, self);
}
}

Expand Down Expand Up @@ -1164,6 +1165,12 @@ void gui_update(dt_iop_module_t *self)
dt_gui_update_collapsible_section(&g->sat_section);
gui_changed(self, NULL, NULL);
dt_iop_color_picker_reset(self, TRUE);

dt_iop_gui_enter_critical_section(self);
const gboolean pending = g->auto_detect_pending;
dt_iop_gui_leave_critical_section(self);

_set_auto_detect_button_state(self, !pending);
}

// Convert a picked pixel color (pipeline RGB) to a normalized darktable UCS hue [0, 1).
Expand Down Expand Up @@ -1329,34 +1336,11 @@ static void _auto_detect_harmony(const float *histo,
}
}

static gboolean _auto_detect_button_enable_idle(gpointer user_data)
{
GtkWidget *btn = GTK_WIDGET(user_data);
gtk_widget_set_sensitive(btn, TRUE);
gtk_widget_set_tooltip_text(btn,
_("analyze the image's hue distribution and automatically suggest the harmony rule\n"
"and anchor hue that best match its existing color palette.\n"
"\n"
"the detection scores every rule and anchor combination against a chroma-weighted\n"
"histogram of the preview image, then selects the combination that already covers\n"
"the most chromatic energy — i.e. requires the least correction.\n"
"\n"
"the result replaces the current rule and anchor hue. use pull strength to control\n"
"how strongly the remaining off-palette colors are pulled toward the detected palette."));
g_object_unref(btn);
return G_SOURCE_REMOVE;
}

static void _auto_detect_callback(GtkButton *button, dt_iop_module_t *self)
static void _apply_auto_detect_harmony(dt_iop_module_t *self, const float *histo)
{
dt_iop_colorharmonizer_gui_data_t *g = self->gui_data;
dt_iop_colorharmonizer_params_t *p = self->params;

float histo[COLORHARMONIZER_HUE_BINS];
g_mutex_lock(&g->histogram_lock);
memcpy(histo, g->hue_histogram, sizeof(histo));
g_mutex_unlock(&g->histogram_lock);

dt_iop_colorharmonizer_rule_t best_rule;
float best_anchor;
_auto_detect_harmony(histo, COLORHARMONIZER_HUE_BINS, &best_rule, &best_anchor);
Expand All @@ -1377,6 +1361,91 @@ static void _auto_detect_callback(GtkButton *button, dt_iop_module_t *self)
_push_to_vectorscope(self);
}

static void _set_auto_detect_button_state(dt_iop_module_t *self, const gboolean sensitive)
{
dt_iop_colorharmonizer_gui_data_t *g = self->gui_data;
if(!g || !g->auto_detect) return;
gtk_widget_set_sensitive(g->auto_detect, sensitive);
if(sensitive)
{
gtk_widget_set_tooltip_text(g->auto_detect,
_("analyze the image's hue distribution and automatically suggest the harmony rule\n"
"and anchor hue that best match its existing color palette.\n"
"\n"
"the detection scores every rule and anchor combination against a chroma-weighted\n"
"histogram of the preview image, then selects the combination that already covers\n"
"the most chromatic energy — i.e. requires the least correction.\n"
"\n"
"the result replaces the current rule and anchor hue. use pull strength to control\n"
"how strongly the remaining off-palette colors are pulled toward the detected palette."));
}
else
{
gtk_widget_set_tooltip_text(g->auto_detect,
_("analyzing the image's hue distribution..."));
}
}

static gboolean _auto_detect_button_enable_idle(gpointer user_data)
{
dt_iop_module_t *self = user_data;
dt_iop_colorharmonizer_gui_data_t *g = self->gui_data;
if(!g) return G_SOURCE_REMOVE;

float histo[COLORHARMONIZER_HUE_BINS];
gboolean run_detection = FALSE;

dt_iop_gui_enter_critical_section(self);
if(g->auto_detect_pending && g->histogram_valid)
{
g->auto_detect_pending = FALSE;
memcpy(histo, g->hue_histogram, sizeof(histo));
run_detection = TRUE;
}
dt_iop_gui_leave_critical_section(self);

if(run_detection)
{
_apply_auto_detect_harmony(self, histo);
}

_set_auto_detect_button_state(self, TRUE);

return G_SOURCE_REMOVE;
}

static void _auto_detect_callback(GtkButton *button, dt_iop_module_t *self)
{
dt_iop_colorharmonizer_gui_data_t *g = self->gui_data;
if(!g) return;

float histo[COLORHARMONIZER_HUE_BINS];
gboolean valid = FALSE;

dt_iop_gui_enter_critical_section(self);
if(g->auto_detect_pending)
{
dt_iop_gui_leave_critical_section(self);
return;
}
valid = g->histogram_valid;
if(valid)
memcpy(histo, g->hue_histogram, sizeof(histo));
else
g->auto_detect_pending = TRUE;
dt_iop_gui_leave_critical_section(self);

if(valid)
{
_apply_auto_detect_harmony(self, histo);
}
else
{
_set_auto_detect_button_state(self, FALSE);
dt_dev_add_history_item(self->dev, self, TRUE);
}
}

static void _set_from_vectorscope_callback(GtkButton *button, dt_iop_module_t *self)
{
dt_color_harmony_guide_t guide;
Expand Down Expand Up @@ -1414,11 +1483,10 @@ void gui_init(dt_iop_module_t *self)

g->auto_detect = dtgtk_button_new_full(dtgtk_cairo_paint_camera, CPF_NONE, NULL,
&(dtgtk_button_config_t){
.tooltip = _("not yet available — wait for the preview to finish processing."),
.clicked_cb = G_CALLBACK(_auto_detect_callback),
.clicked_data = self,
});
gtk_widget_set_sensitive(g->auto_detect, FALSE);
_set_auto_detect_button_state(self, TRUE);
dt_gui_box_add(rule_row, g->auto_detect);

gtk_widget_set_tooltip_text(g->rule,
Expand Down Expand Up @@ -1550,7 +1618,7 @@ void gui_init(dt_iop_module_t *self)
!dt_bauhaus_toggle_get(g->sync_to_vectorscope));

g->histogram_valid = FALSE;
g_mutex_init(&g->histogram_lock);
g->auto_detect_pending = FALSE;

g->pull_strength = dt_bauhaus_slider_from_params(self, "pull_strength");
gtk_widget_set_tooltip_text(g->pull_strength,
Expand Down Expand Up @@ -1660,13 +1728,32 @@ void gui_focus(dt_iop_module_t *self, gboolean in)
}
}

void change_image(dt_iop_module_t *self)
{
dt_iop_colorharmonizer_gui_data_t *g = self->gui_data;
if(g)
{
while(g_idle_remove_by_data(self)) ;

dt_iop_gui_enter_critical_section(self);
g->histogram_valid = FALSE;
g->auto_detect_pending = FALSE;
dt_iop_gui_leave_critical_section(self);

_set_auto_detect_button_state(self, TRUE);
}
}

void gui_cleanup(dt_iop_module_t *self)
{
while(g_idle_remove_by_data(self)) ;
dt_iop_colorharmonizer_gui_data_t *g = self->gui_data;
if(g)
{
dt_iop_gui_enter_critical_section(self);
g->auto_detect_pending = FALSE;
dt_iop_gui_leave_critical_section(self);
dt_lib_histogram_set_harmony_callback(darktable.lib, NULL, NULL);
g_mutex_clear(&g->histogram_lock);
}
dt_iop_default_cleanup(self);
}
Expand Down
Loading