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

merge with dev - I hope no error

Browse Source
This commit is contained in:
Desmis
2018-11-24 14:18:37 +01:00
parent bdc888423b d1571658f8
commit 86c03e61d4
208 changed files with 2982 additions and 2150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
rtgui/toolpanelcoord.h
View File

@@ -208,7 +208,7 @@ public:
Gtk::Notebook* toolPanelNotebook;
ToolPanelCoordinator(bool batch = false);
virtual ~ToolPanelCoordinator();
~ToolPanelCoordinator () override;
bool getChangedState()
{
@@ -235,9 +235,9 @@ public:
}
// toolpanellistener interface
void panelChanged(const 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, bool isMono = false);
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans, bool isMono = false) override;
// void autoContrastChanged (double autoContrast);
// profilechangelistener interface
@@ -247,8 +247,8 @@ public:
const Glib::ustring& descr,
const ParamsEdited* paramsEdited = nullptr,
bool fromLastSave = false
);
void setDefaults(const rtengine::procparams::ProcParams* defparams);
) override;
void setDefaults(const rtengine::procparams::ProcParams* defparams) override;
// DirSelectionListener interface
void dirSelected(const Glib::ustring& dirname, const Glib::ustring& openfile);
@@ -271,13 +271,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);
@@ -285,41 +285,41 @@ 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(const 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 sharpMaskSelected(bool sharpMask);
int getSpotWBRectSize() const;
void cropSelectionReady();
void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr);
ToolBar* getToolBar() const;
CropGUIListener* startCropEditing(Thumbnail* thm = nullptr);
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);
bool handleShortcutKey(GdkEventKey* event);
// ToolBarListener interface
void toolSelected(ToolMode tool);
void editModeSwitchedOff();
void toolSelected (ToolMode tool) override;
void editModeSwitchedOff () override;
void setEditProvider(EditDataProvider *provider);