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

merge with dev

Browse Source
This commit is contained in:
Alberto Griggio
2018-10-27 16:11:17 +02:00
parent 59339644de eee6837385
commit b50b8dea9f
211 changed files with 2968 additions and 1991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
rtgui/toolpanelcoord.h
View File

@@ -85,7 +85,8 @@
class ImageEditorCoordinator;
class ToolPanelCoordinator : public ToolPanelListener,
class ToolPanelCoordinator :
public ToolPanelListener,
public ToolBarListener,
public ProfileChangeListener,
public WBProvider,
@@ -98,9 +99,7 @@ class ToolPanelCoordinator : public ToolPanelListener,
public ImageAreaToolListener,
public rtengine::ImageTypeListener
{
protected:
WhiteBalance* whitebalance;
Vignetting* vignetting;
Gradient* gradient;
@@ -194,11 +193,9 @@ protected:
void updateVScrollbars (bool hide);
private:
EditDataProvider *editDataProvider;
public:
CoarsePanel* coarse;
Gtk::Notebook* toolPanelNotebook;
@@ -209,7 +206,18 @@ public:
{
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)
@@ -219,12 +227,20 @@ public:
}
// toolpanellistener interface
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr);
void panelChanged(const rtengine::ProcEvent& event, const Glib::ustring& descr);
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans, bool isMono = false);
// void autoContrastChanged (double autoContrast);
// profilechangelistener interface
void profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited = nullptr, bool fromLastSave = false);
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
);
void setDefaults(const rtengine::procparams::ProcParams* defparams);
// DirSelectionListener interface
void dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile);
@@ -279,22 +295,16 @@ public:
void cropSelectRequested ();
// icmpanellistener interface
void saveInputICCReference (Glib::ustring fname, bool apply_wb);
void saveInputICCReference(const Glib::ustring& fname, bool apply_wb);
// imageareatoollistener interface
void spotWBselected (int x, int y, Thumbnail* thm = nullptr);
void sharpMaskSelected (bool sharpMask);
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);
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 updateTPVScrollbar (bool hide);
bool handleShortcutKey (GdkEventKey* event);