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

Capture sharpening: some cleanups

Browse Source
This commit is contained in:
Ingo Weyrich 2019-08-18 11:16:53 +02:00
parent 7b3c50bc31
commit ce3ca966f6
4 changed files with 113 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/rawimagesource.cc
View File

@ -4992,13 +4992,14 @@ BENCHFUN
array2D<float>& Y = red; // red will be overridden anyway => we can use its buffer to store Y array2D<float>& Y = red; // red will be overridden anyway => we can use its buffer to store Y
array2D<float>& Cb = green; // green will be overridden anyway => we can use its buffer to store Cb array2D<float>& Cb = green; // green will be overridden anyway => we can use its buffer to store Cb
array2D<float>& Cr = blue; // blue will be overridden anyway => we can use its buffer to store Cr array2D<float>& Cr = blue; // blue will be overridden anyway => we can use its buffer to store Cr
const float gamma = sharpeningParams.gamma;
StopWatch Stop1("rgb2Y"); StopWatch Stop1("rgb2Y");
#ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif
for (int i = 0; i < H; ++i) { for (int i = 0; i < H; ++i) {
Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, W); Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, W);
Color::RGB2YCbCr(red[i], green[i], blue[i], Y[i], Cb[i], Cr[i], gamma, W); Color::RGB2YCbCr(red[i], green[i], blue[i], Y[i], Cb[i], Cr[i], sharpeningParams.gamma, W);
} }
// calculate contrast based blend factors to reduce sharpening in regions with low contrast // calculate contrast based blend factors to reduce sharpening in regions with low contrast
JaggedArray<float> blend(W, H); JaggedArray<float> blend(W, H);
@ -5011,9 +5012,11 @@ BENCHFUN
ImProcFunctions ipf(&dummy); ImProcFunctions ipf(&dummy);
ipf.deconvsharpening(Y, tmp, blend, W, H, sharpeningParams, 1.0); ipf.deconvsharpening(Y, tmp, blend, W, H, sharpeningParams, 1.0);
StopWatch Stop2("Y2RGB"); StopWatch Stop2("Y2RGB");
#ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif
for (int i = 0; i < H; ++i) { for (int i = 0; i < H; ++i) {
Color::YCbCr2RGB(Y[i], Cb[i], Cr[i], red[i], green[i], blue[i], gamma, W); Color::YCbCr2RGB(Y[i], Cb[i], Cr[i], red[i], green[i], blue[i], sharpeningParams.gamma, W);
} }
Stop2.stop(); Stop2.stop();
} }

1
rtgui/batchtoolpanelcoord.cc
View File

@ -152,6 +152,7 @@ void BatchToolPanelCoordinator::initSession ()
cacorrection->setAdjusterBehavior (false); cacorrection->setAdjusterBehavior (false);
sharpening->setAdjusterBehavior (false, false, false, false, false, false, false); sharpening->setAdjusterBehavior (false, false, false, false, false, false, false);
prsharpening->setAdjusterBehavior (false, false, false, false, false, false, false); prsharpening->setAdjusterBehavior (false, false, false, false, false, false, false);
pdSharpening->setAdjusterBehavior (false, false, false, false);
sharpenEdge->setAdjusterBehavior (false, false); sharpenEdge->setAdjusterBehavior (false, false);
sharpenMicro->setAdjusterBehavior (false, false, false); sharpenMicro->setAdjusterBehavior (false, false, false);
epd->setAdjusterBehavior (false, false, false, false, false); epd->setAdjusterBehavior (false, false, false, false, false);

207
rtgui/pdsharpening.cc
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of RawTherapee. * This file is part of RawTherapee.
* *
* Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com> * Copyright (c) 2019 Ingo Weyrich (heckflosse67@gmx.de)
* *
* RawTherapee is free software: you can redistribute it and/or modify * RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -15,7 +15,8 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <cmath> #include <cmath>
#include "eventmapper.h" #include "eventmapper.h"
#include "pdsharpening.h" #include "pdsharpening.h"
@ -25,7 +26,7 @@
using namespace rtengine; using namespace rtengine;
using namespace rtengine::procparams; using namespace rtengine::procparams;
PdSharpening::PdSharpening () : FoldableToolPanel(this, "pdsharpening", M("TP_PDSHARPENING_LABEL"), false, true) PdSharpening::PdSharpening() : FoldableToolPanel(this, "pdsharpening", M("TP_PDSHARPENING_LABEL"), false, true)
{ {
auto m = ProcEventMapper::getInstance(); auto m = ProcEventMapper::getInstance();
@ -35,177 +36,164 @@ PdSharpening::PdSharpening () : FoldableToolPanel(this, "pdsharpening", M("TP_PD
EvPdShrDIterations = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_ITERATIONS"); EvPdShrDIterations = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_ITERATIONS");
EvPdShrAutoContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST"); EvPdShrAutoContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_PDSHARPEN_AUTO_CONTRAST");
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ()); Gtk::HBox* hb = Gtk::manage(new Gtk::HBox());
hb->show (); hb->show();
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 10)); contrast = Gtk::manage(new Adjuster(M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 10));
contrast->setAdjusterListener (this); contrast->setAdjusterListener(this);
contrast->addAutoButton(M("TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP")); contrast->addAutoButton(M("TP_RAW_DUALDEMOSAICAUTOCONTRAST_TOOLTIP"));
contrast->setAutoValue(true); contrast->setAutoValue(true);
pack_start(*contrast); pack_start(*contrast);
contrast->show(); contrast->show();
pack_start (*hb); pack_start(*hb);
rld = new Gtk::VBox (); Gtk::VBox* rld = Gtk::manage(new Gtk::VBox());
gamma = Gtk::manage (new Adjuster (M("TP_SHARPENING_GAMMA"), 0.5, 3.0, 0.05, 1.35)); 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)); 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)); diter = Gtk::manage(new Adjuster(M("TP_SHARPENING_RLD_ITERATIONS"), 5, 100, 1, 30));
rld->pack_start (*gamma); rld->pack_start(*gamma);
rld->pack_start (*dradius); rld->pack_start(*dradius);
rld->pack_start (*diter); rld->pack_start(*diter);
gamma->show(); gamma->show();
dradius->show (); dradius->show();
diter->show (); diter->show();
rld->show (); rld->show();
pack_start(*rld); pack_start(*rld);
dradius->setAdjusterListener (this); dradius->setAdjusterListener(this);
gamma->setAdjusterListener (this); gamma->setAdjusterListener(this);
diter->setAdjusterListener (this); diter->setAdjusterListener(this);
if (contrast->delay < options.adjusterMaxDelay) { contrast->delay = std::max(contrast->delay, options.adjusterMaxDelay);
contrast->delay = options.adjusterMaxDelay; dradius->delay = std::max(dradius->delay, options.adjusterMaxDelay);
} gamma->delay = std::max(gamma->delay, options.adjusterMaxDelay);
if (dradius->delay < options.adjusterMaxDelay) { diter->delay = std::max(diter->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();
} }
PdSharpening::~PdSharpening () PdSharpening::~PdSharpening()
{ {
idle_register.destroy(); idle_register.destroy();
delete rld;
} }
void PdSharpening::read (const ProcParams* pp, const ParamsEdited* pedited) void PdSharpening::read(const ProcParams* pp, const ParamsEdited* pedited)
{ {
disableListener (); disableListener();
if (pedited) { if (pedited) {
contrast->setEditedState (pedited->pdsharpening.contrast ? Edited : UnEdited); contrast->setEditedState(pedited->pdsharpening.contrast ? Edited : UnEdited);
contrast->setAutoInconsistent (multiImage && !pedited->pdsharpening.autoContrast); contrast->setAutoInconsistent(multiImage && !pedited->pdsharpening.autoContrast);
gamma->setEditedState (pedited->pdsharpening.gamma ? Edited : UnEdited); gamma->setEditedState(pedited->pdsharpening.gamma ? Edited : UnEdited);
dradius->setEditedState (pedited->pdsharpening.deconvradius ? Edited : UnEdited); dradius->setEditedState(pedited->pdsharpening.deconvradius ? Edited : UnEdited);
diter->setEditedState (pedited->pdsharpening.deconviter ? Edited : UnEdited); diter->setEditedState(pedited->pdsharpening.deconviter ? Edited : UnEdited);
set_inconsistent (multiImage && !pedited->pdsharpening.enabled); set_inconsistent(multiImage && !pedited->pdsharpening.enabled);
} }
setEnabled(pp->pdsharpening.enabled); setEnabled(pp->pdsharpening.enabled);
contrast->setValue (pp->pdsharpening.contrast); contrast->setValue(pp->pdsharpening.contrast);
contrast->setAutoValue (pp->pdsharpening.autoContrast); contrast->setAutoValue(pp->pdsharpening.autoContrast);
gamma->setValue (pp->pdsharpening.gamma); gamma->setValue(pp->pdsharpening.gamma);
dradius->setValue (pp->pdsharpening.deconvradius); dradius->setValue(pp->pdsharpening.deconvradius);
diter->setValue (pp->pdsharpening.deconviter); diter->setValue(pp->pdsharpening.deconviter);
lastAutoContrast = pp->pdsharpening.autoContrast; lastAutoContrast = pp->pdsharpening.autoContrast;
enableListener (); enableListener();
} }
void PdSharpening::write (ProcParams* pp, ParamsEdited* pedited) void PdSharpening::write(ProcParams* pp, ParamsEdited* pedited)
{ {
pp->pdsharpening.contrast = contrast->getValue (); pp->pdsharpening.contrast = contrast->getValue();
pp->pdsharpening.autoContrast = contrast->getAutoValue(); pp->pdsharpening.autoContrast = contrast->getAutoValue();
pp->pdsharpening.enabled = getEnabled (); pp->pdsharpening.enabled = getEnabled();
pp->pdsharpening.gamma = gamma->getValue (); pp->pdsharpening.gamma = gamma->getValue();
pp->pdsharpening.deconvradius = dradius->getValue (); pp->pdsharpening.deconvradius = dradius->getValue();
pp->pdsharpening.deconviter = (int)diter->getValue (); pp->pdsharpening.deconviter =(int)diter->getValue();
if (pedited) { if (pedited) {
pedited->pdsharpening.contrast = contrast->getEditedState (); pedited->pdsharpening.contrast = contrast->getEditedState();
pedited->pdsharpening.autoContrast = !contrast->getAutoInconsistent (); pedited->pdsharpening.autoContrast = !contrast->getAutoInconsistent();
pedited->pdsharpening.gamma = gamma->getEditedState (); pedited->pdsharpening.gamma = gamma->getEditedState();
pedited->pdsharpening.deconvradius = dradius->getEditedState (); pedited->pdsharpening.deconvradius = dradius->getEditedState();
pedited->pdsharpening.deconviter = diter->getEditedState (); pedited->pdsharpening.deconviter = diter->getEditedState();
pedited->pdsharpening.enabled = !get_inconsistent(); pedited->pdsharpening.enabled = !get_inconsistent();
} }
} }
void PdSharpening::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited) void PdSharpening::setDefaults(const ProcParams* defParams, const ParamsEdited* pedited)
{ {
contrast->setDefault (defParams->pdsharpening.contrast); contrast->setDefault(defParams->pdsharpening.contrast);
gamma->setDefault (defParams->pdsharpening.gamma); gamma->setDefault(defParams->pdsharpening.gamma);
dradius->setDefault (defParams->pdsharpening.deconvradius); dradius->setDefault(defParams->pdsharpening.deconvradius);
diter->setDefault (defParams->pdsharpening.deconviter); diter->setDefault(defParams->pdsharpening.deconviter);
if (pedited) { if (pedited) {
contrast->setDefaultEditedState (pedited->pdsharpening.contrast ? Edited : UnEdited); contrast->setDefaultEditedState(pedited->pdsharpening.contrast ? Edited : UnEdited);
gamma->setDefaultEditedState (pedited->pdsharpening.gamma ? Edited : UnEdited); gamma->setDefaultEditedState(pedited->pdsharpening.gamma ? Edited : UnEdited);
dradius->setDefaultEditedState (pedited->pdsharpening.deconvradius ? Edited : UnEdited); dradius->setDefaultEditedState(pedited->pdsharpening.deconvradius ? Edited : UnEdited);
diter->setDefaultEditedState (pedited->pdsharpening.deconviter ? Edited : UnEdited); diter->setDefaultEditedState(pedited->pdsharpening.deconviter ? Edited : UnEdited);
} else { } else {
contrast->setDefaultEditedState (Irrelevant); contrast->setDefaultEditedState(Irrelevant);
gamma->setDefaultEditedState (Irrelevant); gamma->setDefaultEditedState(Irrelevant);
dradius->setDefaultEditedState (Irrelevant); dradius->setDefaultEditedState(Irrelevant);
diter->setDefaultEditedState (Irrelevant); diter->setDefaultEditedState(Irrelevant);
} }
} }
void PdSharpening::adjusterChanged (Adjuster* a, double newval) void PdSharpening::adjusterChanged(Adjuster* a, double newval)
{ {
if (listener && (multiImage || getEnabled()) ) { if (listener && (multiImage || getEnabled())) {
Glib::ustring costr; Glib::ustring costr;
if (a == gamma || a == dradius) { if (a == gamma || a == dradius) {
costr = Glib::ustring::format (std::setw(3), std::fixed, std::setprecision(2), a->getValue()); costr = Glib::ustring::format(std::setw(3), std::fixed, std::setprecision(2), a->getValue());
} else { } else {
costr = Glib::ustring::format ((int)a->getValue()); costr = Glib::ustring::format((int)a->getValue());
} }
if (a == contrast) { if (a == contrast) {
listener->panelChanged (EvPdShrContrast, costr); listener->panelChanged(EvPdShrContrast, costr);
} else if (a == gamma) { } else if (a == gamma) {
listener->panelChanged (EvPdSharpenGamma, costr); listener->panelChanged(EvPdSharpenGamma, costr);
} else if (a == dradius) { } else if (a == dradius) {
listener->panelChanged (EvPdShrDRadius, costr); listener->panelChanged(EvPdShrDRadius, costr);
} else if (a == diter) { } else if (a == diter) {
listener->panelChanged (EvPdShrDIterations, costr); listener->panelChanged(EvPdShrDIterations, costr);
} }
} }
} }
void PdSharpening::enabledChanged () void PdSharpening::enabledChanged()
{ {
if (listener) { if (listener) {
if (get_inconsistent()) { if (get_inconsistent()) {
listener->panelChanged (EvPdShrEnabled, M("GENERAL_UNCHANGED")); listener->panelChanged(EvPdShrEnabled, M("GENERAL_UNCHANGED"));
} else if (getEnabled()) { } else if (getEnabled()) {
listener->panelChanged (EvPdShrEnabled, M("GENERAL_ENABLED")); listener->panelChanged(EvPdShrEnabled, M("GENERAL_ENABLED"));
} else { } else {
listener->panelChanged (EvPdShrEnabled, M("GENERAL_DISABLED")); listener->panelChanged(EvPdShrEnabled, M("GENERAL_DISABLED"));
} }
} }
} }
void PdSharpening::setBatchMode (bool batchMode) void PdSharpening::setBatchMode(bool batchMode)
{ {
ToolPanel::setBatchMode (batchMode); ToolPanel::setBatchMode(batchMode);
// pack_start (*rld); contrast->showEditedCB();
gamma->showEditedCB();
contrast->showEditedCB (); dradius->showEditedCB();
gamma->showEditedCB (); diter->showEditedCB();
dradius->showEditedCB ();
diter->showEditedCB ();
} }
void PdSharpening::setAdjusterBehavior (bool contrastadd, bool gammaadd, bool radiusadd, bool amountadd, bool dampingadd, bool iteradd, bool edgetoladd, bool haloctrladd) void PdSharpening::setAdjusterBehavior(bool contrastadd, bool gammaadd, bool radiusadd, bool iteradd)
{ {
contrast->setAddMode(contrastadd); contrast->setAddMode(contrastadd);
@ -214,7 +202,7 @@ void PdSharpening::setAdjusterBehavior (bool contrastadd, bool gammaadd, bool ra
diter->setAddMode(iteradd); diter->setAddMode(iteradd);
} }
void PdSharpening::trimValues (rtengine::procparams::ProcParams* pp) void PdSharpening::trimValues(rtengine::procparams::ProcParams* pp)
{ {
contrast->trimValue(pp->pdsharpening.contrast); contrast->trimValue(pp->pdsharpening.contrast);
@ -223,7 +211,7 @@ void PdSharpening::trimValues (rtengine::procparams::ProcParams* pp)
diter->trimValue(pp->pdsharpening.deconviter); diter->trimValue(pp->pdsharpening.deconviter);
} }
void PdSharpening::autoContrastChanged (double autoContrast) void PdSharpening::autoContrastChanged(double autoContrast)
{ {
idle_register.add( idle_register.add(
[this, autoContrast]() -> bool [this, autoContrast]() -> bool
@ -240,25 +228,22 @@ void PdSharpening::adjusterAutoToggled(Adjuster* a, bool newval)
{ {
if (multiImage) { if (multiImage) {
if (contrast->getAutoInconsistent()) { if (contrast->getAutoInconsistent()) {
contrast->setAutoInconsistent (false); contrast->setAutoInconsistent(false);
contrast->setAutoValue (false); contrast->setAutoValue(false);
} else if (lastAutoContrast) { } else if (lastAutoContrast) {
contrast->setAutoInconsistent (true); contrast->setAutoInconsistent(true);
} }
lastAutoContrast = contrast->getAutoValue(); lastAutoContrast = contrast->getAutoValue();
} }
if (listener) { if (listener) {
if (contrast->getAutoInconsistent()) {
if (a == contrast) { listener->panelChanged(EvPdShrAutoContrast, M("GENERAL_UNCHANGED"));
if (contrast->getAutoInconsistent()) { } else if (contrast->getAutoValue()) {
listener->panelChanged (EvPdShrAutoContrast, M ("GENERAL_UNCHANGED")); listener->panelChanged(EvPdShrAutoContrast, M("GENERAL_ENABLED"));
} else if (contrast->getAutoValue()) { } else {
listener->panelChanged (EvPdShrAutoContrast, M ("GENERAL_ENABLED")); listener->panelChanged(EvPdShrAutoContrast, M("GENERAL_DISABLED"));
} else {
listener->panelChanged (EvPdShrAutoContrast, M ("GENERAL_DISABLED"));
}
} }
} }
} }

21
rtgui/pdsharpening.h
View File

@ -15,14 +15,13 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#include <gtkmm.h>
#include "adjuster.h" #include "adjuster.h"
#include "toolpanel.h" #include "toolpanel.h"
class PdSharpening : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoContrastListener class PdSharpening final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoContrastListener
{ {
protected: protected:
@ -30,7 +29,7 @@ protected:
Adjuster* gamma; Adjuster* gamma;
Adjuster* dradius; Adjuster* dradius;
Adjuster* diter; Adjuster* diter;
Gtk::VBox* rld;
bool lastAutoContrast; bool lastAutoContrast;
rtengine::ProcEvent EvPdShrContrast; rtengine::ProcEvent EvPdShrContrast;
rtengine::ProcEvent EvPdShrDRadius; rtengine::ProcEvent EvPdShrDRadius;
@ -44,17 +43,17 @@ public:
PdSharpening (); PdSharpening ();
~PdSharpening () override; ~PdSharpening () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override; void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override; void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override; void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode) override; void setBatchMode (bool batchMode) override;
void adjusterAutoToggled (Adjuster* a, bool newval) override; void adjusterAutoToggled (Adjuster* a, bool newval) override;
void adjusterChanged (Adjuster* a, double newval) override; void adjusterChanged (Adjuster* a, double newval) override;
void enabledChanged () override; void enabledChanged () override;
void autoContrastChanged (double autoContrast) override; void autoContrastChanged (double autoContrast) override;
void setAdjusterBehavior (bool contrastadd, bool gammaadd, bool radiusadd, bool amountadd, bool dampingadd, bool iteradd, bool edgetoladd, bool haloctrladd); void setAdjusterBehavior (bool contrastadd, bool gammaadd, bool radiusadd, bool iteradds);
void trimValues (rtengine::procparams::ProcParams* pp) override; void trimValues (rtengine::procparams::ProcParams* pp) override;
}; };