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

Batch edit is broken, fixes #4886

Browse Source
This commit is contained in:
heckflosse
2018-10-23 15:36:07 +02:00
parent f832d479e9
commit 2696037cb8
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/batchtoolpanelcoord.cc
View File

@@ -383,9 +383,8 @@ void BatchToolPanelCoordinator::initSession ()
} }
} }
void BatchToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr) void BatchToolPanelCoordinator::panelChanged(const rtengine::ProcEvent& event, const Glib::ustring& descr)
{ {
if (selected.empty()) { if (selected.empty()) {
return; return;
} }
@@ -611,9 +610,14 @@ void BatchToolPanelCoordinator::endBatchPParamsChange()
* Using a Profile panel in the batch tool panel editor is actually * Using a Profile panel in the batch tool panel editor is actually
* not supported by BatchToolPanelCoordinator::profileChange! * not supported by BatchToolPanelCoordinator::profileChange!
*/ */
void BatchToolPanelCoordinator::profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited) void BatchToolPanelCoordinator::profileChange(
const PartialProfile* nparams,
const rtengine::ProcEvent& event,
const Glib::ustring& descr,
const ParamsEdited* paramsEdited,
bool fromLastSave
)
{ {
if (event == rtengine::EvProfileChanged) { if (event == rtengine::EvProfileChanged) {
// a profile has been selected in a hypothetical Profile panel // a profile has been selected in a hypothetical Profile panel
// -> ACTUALLY NOT SUPPORTED // -> ACTUALLY NOT SUPPORTED

28
rtgui/batchtoolpanelcoord.h
View File

@@ -51,30 +51,36 @@ public:
explicit BatchToolPanelCoordinator (FilePanel* parent); explicit BatchToolPanelCoordinator (FilePanel* parent);
// FileSelectionChangeListener interface // FileSelectionChangeListener interface
void selectionChanged (const std::vector<Thumbnail*>& selected); void selectionChanged (const std::vector<Thumbnail*>& selected) override;
// toolpanellistener interface // toolpanellistener interface
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr); void panelChanged(const rtengine::ProcEvent& event, const Glib::ustring& descr) override;
// profilechangelistener interface // profilechangelistener interface
void profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited = nullptr); void profileChange(
const rtengine::procparams::PartialProfile* nparams,
const rtengine::ProcEvent& event,
const Glib::ustring& descr,
const ParamsEdited* paramsEdited = nullptr,
bool fromLastSave = false
) override;
// wbprovider interface // wbprovider interface
void getAutoWB (double& temp, double& green, double equal, double tempBias); void getAutoWB (double& temp, double& green, double equal, double tempBias) override;
void getCamWB (double& temp, double& green); void getCamWB (double& temp, double& green);
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt); void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;
// batchpparamschangelistener interface // batchpparamschangelistener interface
void beginBatchPParamsChange(int numberOfEntries); void beginBatchPParamsChange(int numberOfEntries) override;
void endBatchPParamsChange(); void endBatchPParamsChange() override;
// imageareatoollistener interface // imageareatoollistener interface
void spotWBselected (int x, int y, Thumbnail* thm = nullptr); void spotWBselected (int x, int y, Thumbnail* thm = nullptr) override;
void cropSelectionReady (); void cropSelectionReady () override;
void rotateSelectionReady (double rotate_deg, Thumbnail* thm = nullptr); void rotateSelectionReady (double rotate_deg, Thumbnail* thm = nullptr) override;
CropGUIListener* startCropEditing (Thumbnail* thm = nullptr); CropGUIListener* startCropEditing (Thumbnail* thm = nullptr) override;
void optionsChanged (); void optionsChanged ();
}; };