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

capture sharpening: contrast threshold

Browse Source
This commit is contained in:
Ingo Weyrich
2019-08-15 20:40:32 +02:00
parent 506254ce46
commit 8421f8780a
17 changed files with 106 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/pdsharpening.cc
View File

@@ -19,6 +19,7 @@
#include <cmath>
#include "eventmapper.h"
#include "pdsharpening.h"
#include "options.h"
using namespace rtengine;
using namespace rtengine::procparams;
@@ -27,7 +28,6 @@ PdSharpening::PdSharpening () : FoldableToolPanel(this, "pdsharpening", M("TP_PD
{
auto m = ProcEventMapper::getInstance();
EvPdShrEnabled = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_ENABLED");
EvPdShrContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_CONTRAST");
EvPdSharpenGamma = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_GAMMA");
EvPdShrDRadius = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_RADIUS");
@@ -35,7 +35,7 @@ PdSharpening::PdSharpening () : FoldableToolPanel(this, "pdsharpening", M("TP_PD
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
hb->show ();
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 15));
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 10));
contrast->setAdjusterListener (this);
pack_start(*contrast);
contrast->show();
@@ -43,7 +43,7 @@ PdSharpening::PdSharpening () : FoldableToolPanel(this, "pdsharpening", M("TP_PD
pack_start (*hb);
rld = new Gtk::VBox ();
gamma = Gtk::manage (new Adjuster (M("TP_SHARPENING_GAMMA"), 0.5, 3.0, 0.05, 1.0));
gamma = Gtk::manage (new Adjuster (M("TP_SHARPENING_GAMMA"), 0.5, 3.0, 0.05, 1.35));
dradius = Gtk::manage (new Adjuster (M("TP_SHARPENING_EDRADIUS"), 0.4, 2.5, 0.01, 0.75));
diter = Gtk::manage (new Adjuster (M("TP_SHARPENING_RLD_ITERATIONS"), 5, 100, 1, 30));
rld->pack_start (*gamma);
@@ -59,6 +59,19 @@ PdSharpening::PdSharpening () : FoldableToolPanel(this, "pdsharpening", M("TP_PD
gamma->setAdjusterListener (this);
diter->setAdjusterListener (this);
if (contrast->delay < options.adjusterMaxDelay) {
contrast->delay = options.adjusterMaxDelay;
}
if (dradius->delay < options.adjusterMaxDelay) {
dradius->delay = options.adjusterMaxDelay;
}
if (gamma->delay < options.adjusterMaxDelay) {
gamma->delay = options.adjusterMaxDelay;
}
if (diter->delay < options.adjusterMaxDelay) {
diter->delay = options.adjusterMaxDelay;
}
rld->reference();
}

1
rtgui/pdsharpening.h
View File

@@ -33,7 +33,6 @@ protected:
Adjuster* diter;
Gtk::VBox* rld;
rtengine::ProcEvent EvPdShrEnabled;
rtengine::ProcEvent EvPdShrContrast;
rtengine::ProcEvent EvPdShrDRadius;
rtengine::ProcEvent EvPdSharpenGamma;

3
rtgui/toolpanelcoord.cc
View File

@@ -695,8 +695,7 @@ void ToolPanelCoordinator::sharpMaskSelected(bool sharpMask)
return;
}
ipc->beginUpdateParams ();
ipc->setSharpMask(sharpMask);
ipc->endUpdateParams (rtengine::EvShrEnabled);
ipc->endUpdateParams (ipc->setSharpMask(sharpMask));
}
int ToolPanelCoordinator::getSpotWBRectSize() const