Skip to content

Commit 9c0be7e

Browse files
kofa73TurboGit
authored andcommitted
agx: make relative exposure adjustments based on exposure params respect the dynamic range scaling; minor tooltip enhancement regarding toe/shoulder inversion
1 parent 390afff commit 9c0be7e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/iop/agx.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,8 +1408,9 @@ static void _adjust_relative_exposure_from_exposure_params(dt_iop_module_t *self
14081408

14091409
const float exposure = dt_dev_exposure_get_effective_exposure(self->dev);
14101410

1411-
p->range_black_relative_ev = -8.f + 0.5f * exposure;
1412-
p->range_white_relative_ev = 4.f + 0.8 * exposure;
1411+
p->range_black_relative_ev = CLAMPF((-8.f + 0.5f * exposure) * (1.f + p->dynamic_range_scaling), -20.f, -0.1f);
1412+
p->range_white_relative_ev = CLAMPF((4.f + 0.8 * exposure) * (1.f + p->dynamic_range_scaling), 0.1f, 20.f);
1413+
14131414
_update_pivot_x(old_black_ev, old_white_ev, self, p);
14141415
}
14151416

@@ -2200,7 +2201,8 @@ static GtkWidget* _create_basic_curve_controls_box(dt_iop_module_t *self,
22002201
"at the cost of a more sudden drop near white"));
22012202
dt_bauhaus_widget_set_quad_tooltip(slider,
22022203
_("the curve has lost its 'S' shape, shoulder power cannot be applied.\n"
2203-
"target white cannot be reached with the selected contrast and pivot position.\n"
2204+
"without inverting the shoulder (forcing it to bend upwards), it would be\n"
2205+
"impossible to reach target white with the selected contrast and pivot position.\n"
22042206
"increase contrast, move the pivot higher (increase pivot target output\n"
22052207
"or curve y gamma), or increase the distance between the pivot and the right\n"
22062208
"edge (decrease the pivot shift, move the white point farther from the pivot by\n"
@@ -2216,7 +2218,8 @@ static GtkWidget* _create_basic_curve_controls_box(dt_iop_module_t *self,
22162218
"at the cost of a more sudden drop near black"));
22172219
dt_bauhaus_widget_set_quad_tooltip(slider,
22182220
_("the curve has lost its 'S' shape, toe power cannot be applied.\n"
2219-
"target black cannot be reached with the selected contrast and pivot position.\n"
2221+
"without inverting the toe (forcing it to bend downwards), it would be\n"
2222+
"impossible to reach target black with the selected contrast and pivot position.\n"
22202223
"increase contrast, move the pivot lower (reduce the pivot target output or\n"
22212224
"curve y gamma), or increase the distance between the pivot and the left edge\n"
22222225
"(increase the pivot shift, move the black point farther from the pivot by raising\n"

0 commit comments

Comments
 (0)