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:
Hombre
2019-03-18 22:35:11 +01:00
parent b6d2480fb5 a09e319216
commit 698492e21c
2691 changed files with 93967 additions and 238984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
rtgui/toolpanelcoord.h
View File

@@ -80,11 +80,14 @@
#include "prsharpening.h"
#include "fattaltonemap.h"
#include "localcontrast.h"
#include "softlight.h"
#include "dehaze.h"
#include "guiutils.h"
class ImageEditorCoordinator;
class ToolPanelCoordinator : public ToolPanelListener,
class ToolPanelCoordinator :
public ToolPanelListener,
public ToolBarListener,
public ProfileChangeListener,
public WBProvider,
@@ -97,9 +100,7 @@ class ToolPanelCoordinator : public ToolPanelListener,
public ImageAreaToolListener,
public rtengine::ImageTypeListener
{
protected:
WhiteBalance* whitebalance;
Vignetting* vignetting;
Gradient* gradient;
@@ -136,6 +137,8 @@ protected:
Wavelet * wavelet;
DirPyrEqualizer* dirpyrequalizer;
HSVEqualizer* hsvequalizer;
SoftLight *softlight;
Dehaze *dehaze;
FilmSimulation *filmSimulation;
SensorBayer * sensorbayer;
SensorXTrans * sensorxtrans;
@@ -157,6 +160,8 @@ protected:
rtengine::StagedImageProcessor* ipc;
std::vector<ToolPanel*> toolPanels;
std::vector<FoldableToolPanel*> favorites;
ToolVBox* favoritePanel;
ToolVBox* exposurePanel;
ToolVBox* detailsPanel;
ToolVBox* colorPanel;
@@ -165,6 +170,7 @@ protected:
ToolVBox* advancedPanel;
ToolBar* toolBar;
TextOrIcon* toiF;
TextOrIcon* toiE;
TextOrIcon* toiD;
TextOrIcon* toiC;
@@ -173,9 +179,10 @@ protected:
TextOrIcon* toiM;
TextOrIcon* toiW;
Gtk::Image* imgPanelEnd[6];
Gtk::VBox* vbPanelEnd[6];
Gtk::Image* imgPanelEnd[7];
Gtk::VBox* vbPanelEnd[7];
Gtk::ScrolledWindow* favoritePanelSW;
Gtk::ScrolledWindow* exposurePanelSW;
Gtk::ScrolledWindow* detailsPanelSW;
Gtk::ScrolledWindow* colorPanelSW;
@@ -190,25 +197,34 @@ protected:
void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
void foldThemAll (GdkEventButton* event);
void updateVScrollbars (bool hide);
void updateTabsHeader (bool useIcons);
void addfavoritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
private:
EditDataProvider *editDataProvider;
public:
CoarsePanel* coarse;
Gtk::Notebook* toolPanelNotebook;
ToolPanelCoordinator (bool batch = false);
virtual ~ToolPanelCoordinator ();
~ToolPanelCoordinator () override;
bool getChangedState ()
{
return hasChanged;
}
void updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, /*LUTu & histCLurve, LUTu & histLLCurve,*/ LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histLRETI);
void updateCurveBackgroundHistogram(
const LUTu& histToneCurve,
const LUTu& histLCurve,
const LUTu& histCCurve,
const LUTu& histLCAM,
const LUTu& histCCAM,
const LUTu& histRed,
const LUTu& histGreen,
const LUTu& histBlue,
const LUTu& histLuma,
const LUTu& histLRETI
);
void foldAllButOne (Gtk::Box* parent, FoldableToolPanel* openedSection);
// multiple listeners can be added that are notified on changes (typical: profile panel and the history)
@@ -218,12 +234,20 @@ public:
}
// toolpanellistener interface
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr);
void panelChanged(const rtengine::ProcEvent& event, const Glib::ustring& descr) override;
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans);
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans, bool isMono = false) override;
// void autoContrastChanged (double autoContrast);
// 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);
void profileChange(
const rtengine::procparams::PartialProfile* nparams,
const rtengine::ProcEvent& event,
const Glib::ustring& descr,
const ParamsEdited* paramsEdited = nullptr,
bool fromLastSave = false
) override;
void setDefaults(const rtengine::procparams::ProcParams* defparams) override;
// DirSelectionListener interface
void dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile);
@@ -246,13 +270,13 @@ public:
// wbprovider interface
void getAutoWB (double& temp, double& green, double equal, double tempBias)
void getAutoWB (double& temp, double& green, double equal, double tempBias) override
{
if (ipc) {
ipc->getAutoWB (temp, green, equal, tempBias);
}
}
void getCamWB (double& temp, double& green)
void getCamWB (double& temp, double& green) override
{
if (ipc) {
ipc->getCamWB (temp, green);
@@ -260,49 +284,46 @@ public:
}
//DFProvider interface
rtengine::RawImage* getDF();
rtengine::RawImage* getDF() override;
//FFProvider interface
rtengine::RawImage* getFF();
Glib::ustring GetCurrentImageFilePath();
rtengine::RawImage* getFF() override;
Glib::ustring GetCurrentImageFilePath() override;
// rotatelistener interface
void straightenRequested ();
void autoCropRequested ();
double autoDistorRequested ();
void straightenRequested () override;
void autoCropRequested () override;
double autoDistorRequested () override;
// spotwblistener interface
void spotWBRequested (int size);
void spotWBRequested (int size) override;
// croppanellistener interface
void cropSelectRequested ();
void cropSelectRequested () override;
// icmpanellistener interface
void saveInputICCReference (Glib::ustring fname, bool apply_wb);
void saveInputICCReference(const Glib::ustring& fname, bool apply_wb) override;
// imageareatoollistener interface
void spotWBselected (int x, int y, Thumbnail* thm = nullptr);
void cropSelectionReady ();
void rotateSelectionReady (double rotate_deg, Thumbnail* thm = nullptr);
ToolBar* getToolBar ()
{
return toolBar;
}
int getSpotWBRectSize ();
CropGUIListener* startCropEditing (Thumbnail* thm = nullptr)
{
return crop;
}
void spotWBselected(int x, int y, Thumbnail* thm = nullptr) override;
void sharpMaskSelected(bool sharpMask) override;
int getSpotWBRectSize() const override;
void cropSelectionReady() override;
void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr) override;
ToolBar* getToolBar() const override;
CropGUIListener* startCropEditing(Thumbnail* thm = nullptr) override;
void updateTPVScrollbar (bool hide);
void updateTabsUsesIcons (bool useIcons);
bool handleShortcutKey (GdkEventKey* event);
// ToolBarListener interface
void toolSelected (ToolMode tool);
void editModeSwitchedOff ();
void toolSelected (ToolMode tool) override;
void editModeSwitchedOff () override;
void setEditProvider (EditDataProvider *provider);
private:
IdleRegister idle_register;
};
#endif