Bugfix for Directional Pyramid Denoising. Adding a Directional Pyramid Equalizer tool. This one serves the same function as the existing Wavelet Equalizer, but has much less artifacting; though it is a little slower to execute and has not yet been adapted for OpenMP implementation. There are also fewer levels on which the tool operates, though of course if there was a demand that could be altered. The controls are similar, though have been given separate luma and chroma controls. Each slider adjusts the factor by which a given detail band is amplified; factors larger than one increase contrast, while values smaller than one decrease contrast. The luma control alters contrast on various scales, each successive one twice as large as the previous one. The chroma control is similar, but does less since there is typically less chroma contrast on fine scales. One might use this to restore some of the color contrast lost in NR, or to remove color fringing by making the fine scale enhancement factor much less than one.

2010-09-22 15:39:00 -05:00
parent b649b7cd8f
commit 539c39a92b
26 changed files with 1137 additions and 137 deletions
--- a/rtgui/dirpyrequalizer.h
+++ b/rtgui/dirpyrequalizer.h
@@ -0,0 +1,65 @@
+/*
+ *  This file is part of RawTherapee.
+ *
+ *  RawTherapee is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  RawTherapee is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  © 2010 Emil Martinec <ejmartin@uchicago.edu>
+ */
+ 
+#ifndef DIRPYREQUALIZER_H_INCLUDED
+#define DIRPYREQUALIZER_H_INCLUDED
+
+#include <gtkmm.h>
+#include <adjuster.h>
+#include <toolpanel.h>
+
+class DirPyrEqualizer : public Gtk::VBox, public AdjusterListener, public ToolPanel 
+{
+
+protected:
+
+    Gtk::CheckButton * enabled;
+    Adjuster* multiplier[8]; 
+
+    sigc::connection enaConn;
+    sigc::connection lumaneutralPressedConn;
+    sigc::connection lumacontrastPlusPressedConn;
+    sigc::connection lumacontrastMinusPressedConn;
+	sigc::connection chromaneutralPressedConn;
+    sigc::connection chromacontrastPlusPressedConn;
+    sigc::connection chromacontrastMinusPressedConn;
+	
+    bool lastEnabled;
+
+public:
+
+    DirPyrEqualizer ();
+    virtual ~DirPyrEqualizer ();
+
+    void read           (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL); 
+    void write          (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
+    void setDefaults    (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
+    void setBatchMode   (bool batchMode);
+   
+    void adjusterChanged (Adjuster* a, double newval);
+    void enabledToggled ();
+    void lumaneutralPressed ();
+    void lumacontrastPlusPressed ();
+    void lumacontrastMinusPressed ();
+	void chromaneutralPressed ();
+    void chromacontrastPlusPressed ();
+    void chromacontrastMinusPressed ();
+};
+
+#endif