liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SE sharpening - avoid amount = 0 and show slider in all cases - hide slider gamma in inverse (#7385)

Browse Source 
* Selective editing sharpening - avoid amount 0 and show slider in all cases

* SE Hide gamma slider in inverse sharpening
This commit is contained in:
Desmis 2025-05-09 08:15:02 +02:00 committed by GitHub
parent 4a914c5d70
commit c398dfcf8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/locallabtools2.cc
View File

@ -2117,7 +2117,7 @@ LocallabSharp::LocallabSharp():
sharcontrast(Gtk::manage(new Adjuster(M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 20))), sharcontrast(Gtk::manage(new Adjuster(M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 20))),
sharblur(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARBLUR"), 0.2, 2.0, 0.05, 0.2))), sharblur(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARBLUR"), 0.2, 2.0, 0.05, 0.2))),
shargam(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMC"), 0.5, 3.0, 0.05, 1.))), shargam(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMC"), 0.5, 3.0, 0.05, 1.))),
sharamount(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARAMOUNT"), 0, 100, 1, 100))), sharamount(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARAMOUNT"), 1, 100, 1, 100))),
shardamping(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARDAMPING"), 0, 100, 1, 0))), shardamping(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARDAMPING"), 0, 100, 1, 0))),
shariter(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARITER"), 5, 100, 1, 30))), shariter(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARITER"), 5, 100, 1, 30))),
sharradius(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARRADIUS"), 0.4, 2.5, 0.01, 0.75))), sharradius(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SHARRADIUS"), 0.4, 2.5, 0.01, 0.75))),
@ -2413,7 +2413,7 @@ void LocallabSharp::convertParamToNormal()
// Set hidden GUI widgets in Normal mode to default spot values // Set hidden GUI widgets in Normal mode to default spot values
sharcontrast->setValue((double)defSpot.sharcontrast); sharcontrast->setValue((double)defSpot.sharcontrast);
sharblur->setValue(defSpot.sharblur); sharblur->setValue(defSpot.sharblur);
sharamount->setValue(defSpot.sharamount); // sharamount->setValue(defSpot.sharamount);
shardamping->setValue((double)defSpot.shardamping); shardamping->setValue((double)defSpot.shardamping);
shariter->setValue((double)defSpot.shariter); shariter->setValue((double)defSpot.shariter);
shargam->setValue(defSpot.shargam); shargam->setValue(defSpot.shargam);
@ -2440,12 +2440,14 @@ void LocallabSharp::convertParamToSimple()
void LocallabSharp::updateGUIToMode(const modeType new_type) void LocallabSharp::updateGUIToMode(const modeType new_type)
{ {
const LocallabParams::LocallabSpot defSpot;
switch (new_type) { switch (new_type) {
case Simple: case Simple:
// Expert and Normal mode widgets are hidden in Simple mode // Expert and Normal mode widgets are hidden in Simple mode
sharcontrast->hide(); sharcontrast->hide();
sharblur->hide(); sharblur->hide();
sharamount->hide(); sharamount->show();
shardamping->hide(); shardamping->hide();
shariter->hide(); shariter->hide();
sharFrame->hide(); sharFrame->hide();
@ -2458,7 +2460,7 @@ void LocallabSharp::updateGUIToMode(const modeType new_type)
sharcontrast->hide(); sharcontrast->hide();
sharblur->hide(); sharblur->hide();
shargam->hide(); shargam->hide();
sharamount->hide(); sharamount->show();
shardamping->hide(); shardamping->hide();
shariter->hide(); shariter->hide();
// Specific Simple mode widgets are shown in Normal mode // Specific Simple mode widgets are shown in Normal mode
@ -2475,11 +2477,25 @@ void LocallabSharp::updateGUIToMode(const modeType new_type)
shardamping->show(); shardamping->show();
shariter->show(); shariter->show();
sharFrame->show(); sharFrame->show();
if (inverssha->get_active()) {
shargam->hide();
shargam->setValue(defSpot.shargam);
}
} }
} }
void LocallabSharp::inversshaChanged() void LocallabSharp::inversshaChanged()
{ {
const LocallabParams::LocallabSpot defSpot;
const int mode = complexity->get_active_row_number();
if (inverssha->get_active()) {
shargam->hide();
shargam->setValue(defSpot.shargam);
} else {
if(mode == Expert) {
shargam->show();
}
}
if (isLocActivated && exp->getEnabled()) { if (isLocActivated && exp->getEnabled()) {
if (listener) { if (listener) {
if (inverssha->get_active()) { if (inverssha->get_active()) {