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

dehaze: added more user-controllable parameters

Browse Source
This commit is contained in:
Alberto Griggio
2018-10-11 13:43:45 +02:00
parent 83f5205006
commit 74ae459bf2
8 changed files with 190 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rtgui/dehaze.cc
View File

@@ -30,12 +30,30 @@ Dehaze::Dehaze(): FoldableToolPanel(this, "dehaze", M("TP_DEHAZE_LABEL"), false,
auto m = ProcEventMapper::getInstance();
EvDehazeEnabled = m->newEvent(HDR, "HISTORY_MSG_DEHAZE_ENABLED");
EvDehazeStrength = m->newEvent(HDR, "HISTORY_MSG_DEHAZE_STRENGTH");
EvDehazeShowDepthMap = m->newEvent(HDR, "HISTORY_MSG_DEHAZE_SHOW_DEPTH_MAP");
EvDehazeDepth = m->newEvent(HDR, "HISTORY_MSG_DEHAZE_DEPTH");
EvDehazeDetail = m->newEvent(HDR, "HISTORY_MSG_DEHAZE_DETAIL");
strength = Gtk::manage(new Adjuster(M("TP_DEHAZE_STRENGTH"), 0., 100., 1., 50.));
strength->setAdjusterListener(this);
strength->show();
depth = Gtk::manage(new Adjuster(M("TP_DEHAZE_DEPTH"), -100., 100., 1., 0.));
depth->setAdjusterListener(this);
depth->show();
detail = Gtk::manage(new Adjuster(M("TP_DEHAZE_DETAIL"), -100, 100, 1, 0));
detail->setAdjusterListener(this);
detail->show();
showDepthMap = Gtk::manage(new Gtk::CheckButton(M("TP_DEHAZE_SHOW_DEPTH_MAP")));
showDepthMap->signal_toggled().connect(sigc::mem_fun(*this, &Dehaze::showDepthMapChanged));
showDepthMap->show();
pack_start(*strength);
pack_start(*depth);
pack_start(*detail);
pack_start(*showDepthMap);
}
@@ -45,11 +63,17 @@ void Dehaze::read(const ProcParams *pp, const ParamsEdited *pedited)
if (pedited) {
strength->setEditedState(pedited->dehaze.strength ? Edited : UnEdited);
depth->setEditedState(pedited->dehaze.depth ? Edited : UnEdited);
detail->setEditedState(pedited->dehaze.detail ? Edited : UnEdited);
set_inconsistent(multiImage && !pedited->dehaze.enabled);
showDepthMap->set_inconsistent(!pedited->dehaze.showDepthMap);
}
setEnabled(pp->dehaze.enabled);
strength->setValue(pp->dehaze.strength);
depth->setValue(pp->dehaze.depth);
detail->setValue(pp->dehaze.detail);
showDepthMap->set_active(pp->dehaze.showDepthMap);
enableListener();
}
@@ -58,22 +82,34 @@ void Dehaze::read(const ProcParams *pp, const ParamsEdited *pedited)
void Dehaze::write(ProcParams *pp, ParamsEdited *pedited)
{
pp->dehaze.strength = strength->getValue();
pp->dehaze.depth = depth->getValue();
pp->dehaze.detail = detail->getValue();
pp->dehaze.enabled = getEnabled();
pp->dehaze.showDepthMap = showDepthMap->get_active();
if (pedited) {
pedited->dehaze.strength = strength->getEditedState();
pedited->dehaze.depth = depth->getEditedState();
pedited->dehaze.detail = detail->getEditedState();
pedited->dehaze.enabled = !get_inconsistent();
pedited->dehaze.showDepthMap = !showDepthMap->get_inconsistent();
}
}
void Dehaze::setDefaults(const ProcParams *defParams, const ParamsEdited *pedited)
{
strength->setDefault(defParams->dehaze.strength);
depth->setDefault(defParams->dehaze.depth);
detail->setDefault(defParams->dehaze.detail);
if (pedited) {
strength->setDefaultEditedState(pedited->dehaze.strength ? Edited : UnEdited);
depth->setDefaultEditedState(pedited->dehaze.depth ? Edited : UnEdited);
detail->setDefaultEditedState(pedited->dehaze.detail ? Edited : UnEdited);
} else {
strength->setDefaultEditedState(Irrelevant);
depth->setDefaultEditedState(Irrelevant);
detail->setDefaultEditedState(Irrelevant);
}
}
@@ -81,7 +117,13 @@ void Dehaze::setDefaults(const ProcParams *defParams, const ParamsEdited *pedite
void Dehaze::adjusterChanged(Adjuster* a, double newval)
{
if (listener && getEnabled()) {
listener->panelChanged(EvDehazeStrength, a->getTextValue());
if (a == strength) {
listener->panelChanged(EvDehazeStrength, a->getTextValue());
} else if (a == depth) {
listener->panelChanged(EvDehazeDepth, a->getTextValue());
} else if (a == detail) {
listener->panelChanged(EvDehazeDetail, a->getTextValue());
}
}
}
@@ -100,11 +142,21 @@ void Dehaze::enabledChanged ()
}
void Dehaze::showDepthMapChanged()
{
if (listener) {
listener->panelChanged(EvDehazeShowDepthMap, showDepthMap->get_active() ? M("GENERAL_ENABLED") : M("GENERAL_DISABLED"));
}
}
void Dehaze::setBatchMode(bool batchMode)
{
ToolPanel::setBatchMode(batchMode);
strength->showEditedCB();
depth->showEditedCB();
detail->showEditedCB();
}

7
rtgui/dehaze.h
View File

@@ -27,9 +27,15 @@ class Dehaze: public ToolParamBlock, public AdjusterListener, public FoldableToo
{
private:
Adjuster *strength;
Adjuster *depth;
Adjuster *detail;
Gtk::CheckButton *showDepthMap;
rtengine::ProcEvent EvDehazeEnabled;
rtengine::ProcEvent EvDehazeStrength;
rtengine::ProcEvent EvDehazeDepth;
rtengine::ProcEvent EvDehazeDetail;
rtengine::ProcEvent EvDehazeShowDepthMap;
public:
@@ -42,6 +48,7 @@ public:
void adjusterChanged(Adjuster *a, double newval);
void enabledChanged();
void showDepthMapChanged();
void setAdjusterBehavior(bool strengthAdd);
};

18
rtgui/paramsedited.cc
View File

@@ -568,6 +568,9 @@ void ParamsEdited::set(bool v)
softlight.strength = v;
dehaze.enabled = v;
dehaze.strength = v;
dehaze.showDepthMap = v;
dehaze.depth = v;
dehaze.detail = v;
metadata.mode = v;
exif = v;
@@ -1123,6 +1126,9 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
softlight.strength = softlight.strength && p.softlight.strength == other.softlight.strength;
dehaze.enabled = dehaze.enabled && p.dehaze.enabled == other.dehaze.enabled;
dehaze.strength = dehaze.strength && p.dehaze.strength == other.dehaze.strength;
dehaze.showDepthMap = dehaze.showDepthMap && p.dehaze.showDepthMap == other.dehaze.showDepthMap;
dehaze.depth = dehaze.depth && p.dehaze.depth == other.dehaze.depth;
dehaze.detail = dehaze.detail && p.dehaze.detail == other.dehaze.detail;
metadata.mode = metadata.mode && p.metadata.mode == other.metadata.mode;
// How the hell can we handle that???
@@ -3125,6 +3131,18 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.dehaze.strength = dontforceSet && options.baBehav[ADDSET_DEHAZE_STRENGTH] ? toEdit.dehaze.strength + mods.dehaze.strength : mods.dehaze.strength;
}
if (dehaze.depth) {
toEdit.dehaze.depth = mods.dehaze.depth;
}
if (dehaze.detail) {
toEdit.dehaze.detail = mods.dehaze.detail;
}
if (dehaze.showDepthMap) {
toEdit.dehaze.showDepthMap = mods.dehaze.showDepthMap;
}
if (metadata.mode) {
toEdit.metadata.mode = mods.metadata.mode;
}

3
rtgui/paramsedited.h
View File

@@ -729,6 +729,9 @@ class DehazeParamsEdited
public:
bool enabled;
bool strength;
bool showDepthMap;
bool depth;
bool detail;
};