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

Merge branch 'dev' into spot-removal-tool

Browse Source
This commit is contained in:
Hombre57
2017-08-20 21:06:09 +02:00
parent 3eeeb151ec 1e5382a03b
commit f75bed1bfa
566 changed files with 47792 additions and 35293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtgui/toolpanelcoord.h
View File

@@ -93,7 +93,8 @@ class ToolPanelCoordinator : public ToolPanelListener,
public SpotWBListener,
public CropPanelListener,
public ICMPanelListener,
public ImageAreaToolListener
public ImageAreaToolListener,
public rtengine::ImageTypeListener
{
protected:
@@ -171,19 +172,6 @@ protected:
TextOrIcon* toiM;
TextOrIcon* toiW;
Gtk::Label* labelE;
Gtk::Label* labelD;
Gtk::Label* labelC;
Gtk::Label* labelT;
Gtk::Label* labelR;
Gtk::Label* labelM;
Gtk::Image* imgIconE;
Gtk::Image* imgIconD;
Gtk::Image* imgIconC;
Gtk::Image* imgIconT;
Gtk::Image* imgIconR;
Gtk::Image* imgIconM;
Gtk::Image* imgPanelEnd[6];
Gtk::VBox* vbPanelEnd[6];
@@ -198,7 +186,7 @@ protected:
bool hasChanged;
void addPanel (Gtk::Box* where, FoldableToolPanel* panel);
void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
void foldThemAll (GdkEventButton* event);
void updateVScrollbars (bool hide);
void updateTabsHeader (bool useIcons);
@@ -231,6 +219,7 @@ public:
// toolpanellistener interface
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr);
void imageTypeChanged(bool isRaw, bool isBayer, bool isXtrans);
// profilechangelistener interface
void profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited = nullptr);
void setDefaults (rtengine::procparams::ProcParams* defparams);
@@ -254,10 +243,10 @@ public:
void writeOptions ();
// wbprovider interface
void getAutoWB (double& temp, double& green, double equal)
void getAutoWB (double& temp, double& green, double equal, double tempBias)
{
if (ipc) {
ipc->getAutoWB (temp, green, equal);
ipc->getAutoWB (temp, green, equal, tempBias);
}
}
void getCamWB (double& temp, double& green)