diff --git a/src/iop/agx.c b/src/iop/agx.c index 1c1229b7011b..864c2cb248c0 100644 --- a/src/iop/agx.c +++ b/src/iop/agx.c @@ -115,17 +115,17 @@ typedef struct dt_iop_agx_params_t // Corresponds to p_y, but not directly -- needs application of gamma float curve_pivot_y_linear_output; // $MIN: 0.f $MAX: 1.f $DEFAULT: 0.18f $DESCRIPTION: "pivot target output" // P_slope - float curve_contrast_around_pivot; // $MIN: 0.1f $MAX: 10.f $DEFAULT: 2.4f $DESCRIPTION: "contrast" + float curve_contrast_around_pivot; // $MIN: 0.1f $MAX: 10.f $DEFAULT: 2.8f $DESCRIPTION: "contrast" // related to P_tlength; the number expresses the portion of the y range below the pivot float curve_linear_ratio_below_pivot; // $MIN: 0.f $MAX: 1.f $DEFAULT: 0.f $DESCRIPTION: "toe start" // related to P_slength; the number expresses the portion of the y range below the pivot float curve_linear_ratio_above_pivot; // $MIN: 0.f $MAX: 1.f $DEFAULT: 0.f $DESCRIPTION: "shoulder start" // t_p - float curve_toe_power; // $MIN: 0.f $MAX: 10.f $DEFAULT: 1.5f $DESCRIPTION: "toe power" + float curve_toe_power; // $MIN: 0.f $MAX: 10.f $DEFAULT: 1.55f $DESCRIPTION: "toe power" // s_p - float curve_shoulder_power; // $MIN: 0.f $MAX: 10.f $DEFAULT: 1.5f $DESCRIPTION: "shoulder power" + float curve_shoulder_power; // $MIN: 0.f $MAX: 10.f $DEFAULT: 1.55f $DESCRIPTION: "shoulder power" float curve_gamma; // $MIN: 0.01f $MAX: 100.f $DEFAULT: 2.2f $DESCRIPTION: "curve y gamma" - gboolean auto_gamma; // $MIN: 0.f $MAX: 1.f $DEFAULT: 0.f $DESCRIPTION: "keep the pivot on the diagonal" + gboolean auto_gamma; // $DEFAULT: FALSE $DESCRIPTION: "keep the pivot on the diagonal" // t_ly float curve_target_display_black_ratio; // $MIN: 0.f $MAX: 0.15f $DEFAULT: 0.f $DESCRIPTION: "target black" // s_ly @@ -133,7 +133,7 @@ typedef struct dt_iop_agx_params_t // custom primaries; rotation limits below: +/- 0.5236 radian => +/- 30 degrees dt_iop_agx_base_primaries_t base_primaries; // $DEFAULT: DT_AGX_REC2020 $DESCRIPTION: "base primaries" - gboolean disable_primaries_adjustments; // $MIN: 0.f $MAX: 1.f $DEFAULT: 0.f $DESCRIPTION: "disable adjustments" + gboolean disable_primaries_adjustments; // $DEFAULT: FALSE $DESCRIPTION: "disable adjustments" float red_inset; // $MIN: 0.f $MAX: 0.99f $DEFAULT: 0.f $DESCRIPTION: "red attenuation" float red_rotation; // $MIN: -0.5236f $MAX: 0.5236f $DEFAULT: 0.f $DESCRIPTION: "red rotation" float green_inset; // $MIN: 0.f $MAX: 0.99f $DEFAULT: 0.f $DESCRIPTION: "green attenuation" @@ -151,7 +151,7 @@ typedef struct dt_iop_agx_params_t float blue_unrotation; // $MIN: -0.5236f $MAX: 0.5236f $DEFAULT: 0.f $DESCRIPTION: "blue reverse rotation" // v5 - gboolean completely_reverse_primaries; // $DEFAULT: 0 $DESCRIPTION: "reverse all" + gboolean completely_reverse_primaries; // $DEFAULT: FALSE $DESCRIPTION: "reverse all" } dt_iop_agx_params_t; typedef struct dt_iop_basic_curve_controls_t @@ -1298,7 +1298,7 @@ static void _create_matrices(const primaries_params_t *params, // the start of the process. Its inverse (see the next steps), when // applied to RGB values in the curve's working space (which // actually uses the base primaries), will undo the rotation and, - // depending on purity, push colours further from achromatic, + // depending on purity, push colors further from achromatic, // resaturating them. dt_colormatrix_t outset_and_unrotated_to_xyz_transposed; dt_make_transposed_matrices_from_primaries_and_whitepoint @@ -1313,7 +1313,7 @@ static void _create_matrices(const primaries_params_t *params, // 'tmp' is constructed the same way as // inbound_inset_and_rotated_to_xyz_transposed, but this matrix will - // be used to remap colours to the 'base' profile, so we need to + // be used to remap colors to the 'base' profile, so we need to // invert it. dt_colormatrix_t rendering_to_base_transposed; mat3SSEinv(rendering_to_base_transposed, tmp); @@ -1829,7 +1829,6 @@ static GtkWidget* _create_basic_curve_controls_box(dt_iop_module_t *self, dt_bauhaus_slider_set_format(slider, "%"); dt_bauhaus_slider_set_digits(slider, 2); dt_bauhaus_slider_set_factor(slider, 100.f); - dt_bauhaus_slider_set_soft_range(slider, 0.f, 1.f); gtk_widget_set_tooltip_text(slider, _("darken or brighten the pivot (linear output power)")); dt_bauhaus_widget_set_quad_tooltip(slider, _("the average luminance of the selected region will be\n" "used to set the pivot relative to mid-gray,\n" @@ -1908,7 +1907,6 @@ static void _add_look_sliders(dt_iop_module_t *section) dt_bauhaus_slider_set_format(slider, "%"); dt_bauhaus_slider_set_digits(slider, 2); dt_bauhaus_slider_set_factor(slider, 100.f); - dt_bauhaus_slider_set_soft_range(slider, 0.f, 1.f); gtk_widget_set_tooltip_text(slider, _("increase to bring hues closer to the original")); } @@ -1975,7 +1973,6 @@ static GtkWidget* _create_advanced_box(dt_iop_module_t *self, // Shoulder length slider = dt_bauhaus_slider_from_params(section, "curve_linear_ratio_above_pivot"); - dt_bauhaus_slider_set_soft_range(slider, 0.f, 1.f); dt_bauhaus_slider_set_format(slider, "%"); dt_bauhaus_slider_set_digits(slider, 2); dt_bauhaus_slider_set_factor(slider, 100.f); @@ -1993,7 +1990,6 @@ static GtkWidget* _create_advanced_box(dt_iop_module_t *self, // Toe length slider = dt_bauhaus_slider_from_params(section, "curve_linear_ratio_below_pivot"); - dt_bauhaus_slider_set_soft_range(slider, 0.f, 1.f); dt_bauhaus_slider_set_format(slider, "%"); dt_bauhaus_slider_set_digits(slider, 2); dt_bauhaus_slider_set_factor(slider, 100.f); @@ -2570,7 +2566,6 @@ void init_presets(dt_iop_module_so_t *self) self->op, self->version(), &p, sizeof(p), TRUE, DEVELOP_BLEND_CS_RGB_SCENE); - _make_punchy(&p); dt_gui_presets_add_generic(_("blender-like|punchy"), self->op, self->version(), &p, sizeof(p),