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

Merge with 'Beep6581/dev'

Browse Source
This commit is contained in:
Pandagrapher
2023-04-29 11:24:55 +02:00
parent 23be310029 3d67ca450f
commit f7c25b18af
53 changed files with 1487 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/whitebalance.h
View File

@@ -21,6 +21,7 @@
#include <gtkmm.h>
#include "adjuster.h"
#include "checkbox.h"
#include "guiutils.h"
#include "toolpanel.h"
#include "wbprovider.h"
@@ -35,7 +36,7 @@ public:
virtual void spotWBRequested(int size) = 0;
};
class WhiteBalance final : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public rtengine::AutoWBListener
class WhiteBalance final : public ToolParamBlock, public AdjusterListener, public CheckBoxListener, public FoldableToolPanel, public rtengine::AutoWBListener
{
enum WB_LabelType {
@@ -45,6 +46,7 @@ class WhiteBalance final : public ToolParamBlock, public AdjusterListener, publi
private:
Gtk::Label* StudLabel;
Gtk::Label* mulLabel;
protected:
class MethodColumns : public Gtk::TreeModel::ColumnRecord
@@ -60,6 +62,8 @@ protected:
add(colId);
}
};
rtengine::ProcEvent EvWBObserver10;
Glib::ustring wbIcons[rtengine::toUnderlying(rtengine::procparams::WBEntry::Type::CUSTOM) + 1];
Glib::RefPtr<Gtk::TreeStore> refTreeModel;
@@ -71,6 +75,7 @@ protected:
Adjuster* green;
Adjuster* equal;
Adjuster* tempBias;
CheckBox* observer10;
Gtk::Button* spotbutton;
int opt;
@@ -112,6 +117,7 @@ public:
void spotPressed ();
void spotSizeChanged ();
void adjusterChanged(Adjuster* a, double newval) override;
void checkBoxToggled(CheckBox* c, CheckValue newval) override;
int getSize ();
void setWBProvider (WBProvider* p)
{
@@ -123,7 +129,7 @@ public:
}
void setWB (int temp, double green);
void resetWB ();
void WBChanged (double temp, double green, float studgood) override;
void WBChanged (double temp, double green, double rw, double gw, double bw, float studgood) override;
void setAdjusterBehavior (bool tempadd, bool greenadd, bool equaladd, bool tempbiasadd);
void trimValues (rtengine::procparams::ProcParams* pp) override;