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

Jump to bottom

Filmic auto picker #1818

Closed
wants to merge 3 commits into from
Closed

Filmic auto picker #1818

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c96ca1
filmic: turn auto button into a picker
moy Nov 10, 2018
19a033e
filmic: use color-pickers continuously when active
moy Nov 10, 2018
aa8c438
filmic: disable color picker when moving black/white/middle sliders
moy Nov 11, 2018
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
140 changes: 57 additions & 83 deletions src/iop/filmic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ typedef enum dt_iop_filmic_pickcolor_type_t
DT_PICKPROFLOG_NONE = 0,
DT_PICKPROFLOG_GREY_POINT = 1,
DT_PICKPROFLOG_BLACK_POINT = 2,
DT_PICKPROFLOG_WHITE_POINT = 3
DT_PICKPROFLOG_WHITE_POINT = 3,
DT_PICKPROFLOG_AUTOTUNE = 4
} dt_iop_filmic_pickcolor_type_t;

typedef struct dt_iop_filmic_params_t
Expand All @@ -99,7 +100,6 @@ typedef struct dt_iop_filmic_params_t

typedef struct dt_iop_filmic_gui_data_t
{
int apply_picked_color;
int which_colorpicker;
GtkWidget *white_point_source;
GtkWidget *grey_point_source;
Expand Down Expand Up @@ -498,6 +498,7 @@ static void set_colorpick_state(dt_iop_filmic_gui_data_t *g, const int which_col
dt_bauhaus_widget_set_quad_active(g->grey_point_source, which_colorpicker == DT_PICKPROFLOG_GREY_POINT);
dt_bauhaus_widget_set_quad_active(g->black_point_source, which_colorpicker == DT_PICKPROFLOG_BLACK_POINT);
dt_bauhaus_widget_set_quad_active(g->white_point_source, which_colorpicker == DT_PICKPROFLOG_WHITE_POINT);
dt_bauhaus_widget_set_quad_active(g->auto_button, which_colorpicker == DT_PICKPROFLOG_AUTOTUNE);
}

static void security_threshold_callback(GtkWidget *slider, gpointer user_data)
Expand Down Expand Up @@ -530,28 +531,11 @@ static void security_threshold_callback(GtkWidget *slider, gpointer user_data)
dt_dev_add_history_item(darktable.develop, self, TRUE);
}

static void optimize_button_pressed_callback(GtkWidget *button, gpointer user_data)
static void apply_autotune(dt_iop_module_t *self)
{
dt_iop_module_t *self = (dt_iop_module_t *)user_data;
dt_iop_filmic_gui_data_t *g = (dt_iop_filmic_gui_data_t *)self->gui_data;
if(self->dt->gui->reset) return;
if(self->off) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->off), 1);

disable_colorpick(self);
set_colorpick_state(g, g->which_colorpicker);

dt_iop_request_focus(self);
dt_lib_colorpicker_set_area(darktable.lib, 0.99);
dt_control_queue_redraw();
self->request_color_pick = DT_REQUEST_COLORPICK_MODULE;
dt_dev_reprocess_all(self->dev);

if(self->request_color_pick != DT_REQUEST_COLORPICK_MODULE || self->picked_color_max[0] < 0.0f)
{
dt_control_log(_("wait for the preview to be updated."));
return;
}

dt_iop_filmic_gui_data_t *g = (dt_iop_filmic_gui_data_t *)self->gui_data;
dt_iop_filmic_params_t *p = (dt_iop_filmic_params_t *)self->params;

float noise = powf(2.0f, -16.0f);
Expand Down Expand Up @@ -585,8 +569,6 @@ static void optimize_button_pressed_callback(GtkWidget *button, gpointer user_da

sanitize_latitude(p, g);

self->request_color_pick = DT_REQUEST_COLORPICK_OFF;

dt_dev_add_history_item(darktable.develop, self, TRUE);
}

Expand All @@ -596,7 +578,12 @@ static void grey_point_source_callback(GtkWidget *slider, gpointer user_data)
dt_iop_module_t *self = (dt_iop_module_t *)user_data;
if(self->dt->gui->reset) return;
dt_iop_filmic_params_t *p = (dt_iop_filmic_params_t *)self->params;
dt_iop_filmic_gui_data_t *g = (dt_iop_filmic_gui_data_t *)self->gui_data;
p->grey_point_source = dt_bauhaus_slider_get(slider);

disable_colorpick(self);
set_colorpick_state(g, g->which_colorpicker);

dt_dev_add_history_item(darktable.develop, self, TRUE);
}

Expand All @@ -610,6 +597,9 @@ static void white_point_source_callback(GtkWidget *slider, gpointer user_data)

sanitize_latitude(p, g);

disable_colorpick(self);
set_colorpick_state(g, g->which_colorpicker);

dt_dev_add_history_item(darktable.develop, self, TRUE);
}

Expand All @@ -623,6 +613,9 @@ static void black_point_source_callback(GtkWidget *slider, gpointer user_data)

sanitize_latitude(p, g);

disable_colorpick(self);
set_colorpick_state(g, g->which_colorpicker);

dt_dev_add_history_item(darktable.develop, self, TRUE);
}

Expand Down Expand Up @@ -729,13 +722,33 @@ static int call_apply_picked_color(struct dt_iop_module_t *self, dt_iop_filmic_g
case DT_PICKPROFLOG_WHITE_POINT:
apply_auto_white_point_source(self);
break;
case DT_PICKPROFLOG_AUTOTUNE:
apply_autotune(self);
break;
default:
handled = 0;
break;
}
return handled;
}

static gboolean draw(GtkWidget *widget, cairo_t *cr, dt_iop_module_t *self)
{
if(darktable.gui->reset) return FALSE;
dt_iop_filmic_gui_data_t *g = (dt_iop_filmic_gui_data_t *)self->gui_data;

/* No color picked, or picked color already applied */
if(self->picked_color_max[0] < 0.0f) return FALSE;

call_apply_picked_color(self, g);
/* Make sure next call won't re-apply autotune.
Needed to avoid infinite loops draw -> autotune -> set_sliders
-> draw. */
self->picked_color_max[0] = -INFINITY;

return FALSE;
}

static int get_colorpick_from_button(GtkWidget *button, dt_iop_filmic_gui_data_t *g)
{
int which_colorpicker = DT_PICKPROFLOG_NONE;
Expand All @@ -746,6 +759,8 @@ static int get_colorpick_from_button(GtkWidget *button, dt_iop_filmic_gui_data_t
which_colorpicker = DT_PICKPROFLOG_BLACK_POINT;
else if(button == g->white_point_source)
which_colorpicker = DT_PICKPROFLOG_WHITE_POINT;
else if(button == g->auto_button)
which_colorpicker = DT_PICKPROFLOG_AUTOTUNE;

return which_colorpicker;
}
Expand All @@ -757,55 +772,23 @@ static void color_picker_callback(GtkWidget *button, dt_iop_module_t *self)

if(self->off) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self->off), 1);

if(self->request_color_pick == DT_REQUEST_COLORPICK_OFF)
int clicked_colorpick = get_colorpick_from_button(button, g);
if(self->request_color_pick == DT_REQUEST_COLORPICK_OFF || g->which_colorpicker != clicked_colorpick)
{
g->which_colorpicker = get_colorpick_from_button(button, g);

if(g->which_colorpicker != DT_PICKPROFLOG_NONE)
{
dt_iop_request_focus(self);
self->request_color_pick = DT_REQUEST_COLORPICK_MODULE;
dt_lib_colorpicker_set_area(darktable.lib, 0.99);
g->which_colorpicker = clicked_colorpick;

g->apply_picked_color = 1;
dt_iop_request_focus(self);
self->request_color_pick = DT_REQUEST_COLORPICK_MODULE;
dt_lib_colorpicker_set_area(darktable.lib, 0.99);

dt_dev_reprocess_all(self->dev);
}
dt_dev_reprocess_all(self->dev);
}
else
{
if(self->request_color_pick != DT_REQUEST_COLORPICK_MODULE || self->picked_color_max[0] < 0.0f)
{
dt_control_log(_("wait for the preview to be updated."));
return;
}
self->request_color_pick = DT_REQUEST_COLORPICK_OFF;

if(g->apply_picked_color)
{
call_apply_picked_color(self, g);
g->apply_picked_color = 0;
}

const int which_colorpicker = get_colorpick_from_button(button, g);
if(which_colorpicker != g->which_colorpicker && which_colorpicker != DT_PICKPROFLOG_NONE)
{
g->which_colorpicker = which_colorpicker;

self->request_color_pick = DT_REQUEST_COLORPICK_MODULE;
dt_lib_colorpicker_set_area(darktable.lib, 0.99);

g->apply_picked_color = 1;

dt_dev_reprocess_all(self->dev);
}
else
{
g->which_colorpicker = DT_PICKPROFLOG_NONE;
}
disable_colorpick(self);
}

set_colorpick_state(g, g->which_colorpicker);
dt_control_queue_redraw();
}

void gui_focus(struct dt_iop_module_t *self, gboolean in)
Expand All @@ -815,25 +798,10 @@ void gui_focus(struct dt_iop_module_t *self, gboolean in)
if(!in)
{
disable_colorpick(self);
g->apply_picked_color = 0;
set_colorpick_state(g, g->which_colorpicker);
}
}

int button_released(struct dt_iop_module_t *self, double x, double y, int which, uint32_t state)
{
int handled = 0;
dt_iop_filmic_gui_data_t *g = (dt_iop_filmic_gui_data_t *)self->gui_data;

if(self->request_color_pick != DT_REQUEST_COLORPICK_OFF && which == 1)
{
handled = call_apply_picked_color(self, g);
g->apply_picked_color = 0;
}

return handled;
}

void commit_params(dt_iop_module_t *self, dt_iop_params_t *p1, dt_dev_pixelpipe_t *pipe,
dt_dev_pixelpipe_iop_t *piece)
{
Expand Down Expand Up @@ -1195,7 +1163,6 @@ void gui_init(dt_iop_module_t *self)
dt_iop_filmic_params_t *p = (dt_iop_filmic_params_t *)self->params;

disable_colorpick(self);
g->apply_picked_color = 0;

self->widget = gtk_box_new(GTK_ORIENTATION_VERTICAL, DT_BAUHAUS_SPACE);
dt_gui_add_help_link(self->widget, dt_get_help_url(self->op));
Expand Down Expand Up @@ -1244,11 +1211,18 @@ void gui_init(dt_iop_module_t *self)
gtk_widget_set_tooltip_text(g->security_factor, _("enlarge or shrink the computed dynamic range"));
g_signal_connect(G_OBJECT(g->security_factor), "value-changed", G_CALLBACK(security_threshold_callback), self);

g->auto_button = gtk_button_new_with_label(_("auto tune source"));
g->auto_button = dt_bauhaus_combobox_new(self);
dt_bauhaus_widget_set_label(g->auto_button, NULL, _("auto tune levels"));
dt_bauhaus_widget_set_quad_paint(g->auto_button, dtgtk_cairo_paint_colorpicker,
CPF_STYLE_FLAT | CPF_DO_NOT_USE_BORDER, NULL);
dt_bauhaus_widget_set_quad_toggle(g->auto_button, TRUE);
g_signal_connect(G_OBJECT(g->auto_button), "quad-pressed", G_CALLBACK(color_picker_callback), self);
gtk_widget_set_tooltip_text(g->auto_button, _("make an optimization with some guessing"));
gtk_box_pack_start(GTK_BOX(self->widget), g->auto_button, TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(g->auto_button), "clicked", G_CALLBACK(optimize_button_pressed_callback), self);

/* The widget receives a draw signal right before being applied in
the pipeline. This is when we want to take into account the
picked color. */
g_signal_connect(G_OBJECT(self->widget), "draw", G_CALLBACK(draw), self);

gtk_box_pack_start(GTK_BOX(self->widget), dt_ui_section_label_new(_("filmic S curve")), FALSE, FALSE, 5);

Expand Down