Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default
This revision compiles and runs on Win7x64- but further evaluation is necessary. There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder. Additional notes: - ImProcFunctions::hsv2rgb01 -> this likely need to be added to color.h & color.cc - Use of array2D should be verified in NR code - compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
@@ -21,16 +21,16 @@
|
||||
|
||||
#include <gtkmm.h>
|
||||
#include "adjuster.h"
|
||||
//#include "guiutils.h"
|
||||
#include "thresholdadjuster.h"
|
||||
#include "toolpanel.h"
|
||||
|
||||
class Vibrance : public Gtk::VBox, public AdjusterListener, public FoldableToolPanel {
|
||||
class Vibrance : public Gtk::VBox, public AdjusterListener, public ThresholdAdjusterListener, public FoldableToolPanel {
|
||||
|
||||
protected:
|
||||
Gtk::CheckButton* enabled;
|
||||
Adjuster* pastels;
|
||||
Adjuster* saturated;
|
||||
Adjuster* psThreshold;
|
||||
ThresholdAdjuster* psThreshold;
|
||||
Gtk::CheckButton* protectSkins;
|
||||
Gtk::CheckButton* avoidColorShift;
|
||||
Gtk::CheckButton* pastSatTog;
|
||||
@@ -55,6 +55,7 @@ public:
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void setAdjusterBehavior (bool amountadd, bool passadd, bool psthreshdadd);
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterChanged (ThresholdAdjuster* a, int newBottom, int newTop);
|
||||
|
||||
void enabled_toggled ();
|
||||
void protectskins_toggled ();
|
||||
|
Reference in New Issue
Block a user