From 2da11b61b0db7cb880ea0be600f111efff3d41d7 Mon Sep 17 00:00:00 2001 From: "U-PC-BUREAU\\jacques" Date: Thu, 26 Jul 2018 20:43:23 +0200 Subject: [PATCH] Refixed the same behavior --- rtengine/dcrop.cc | 2 +- rtengine/improccoordinator.cc | 4 ++-- rtgui/icmpanel.cc | 6 +++--- rtgui/tonecurve.cc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index ebcef3ab6..0b5198c3c 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -807,7 +807,7 @@ void Crop::update(int todo) } - if (todo & M_INIT) { + if (todo & M_AUTOEXP) { if (params.icm.workingTRC == "Custom") { //exec TRC IN free Glib::ustring profile; profile = params.icm.workingProfile; diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 96fb576cc..50cab329d 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -459,7 +459,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall) readyphase++; - if (todo & M_INIT) { + if (todo & M_AUTOEXP) { if (params.toneCurve.autoexp) { LUTu aehist; int aehistcompr; @@ -497,7 +497,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall) progress("Exposure curve & CIELAB conversion...", 100 * readyphase / numofphases); - if (todo & M_INIT) { + if (todo & M_AUTOEXP) { if (params.icm.workingTRC == "Custom") { //exec TRC IN free Glib::ustring profile; profile = params.icm.workingProfile; diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 9b2b32b09..936b68fd0 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -43,9 +43,9 @@ ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iuncha EvICMpgrey = m->newEvent(GAMMA, "HISTORY_MSG_ICMPGREY"); EvICMpblux = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUX"); EvICMpbluy = m->newEvent(GAMMA, "HISTORY_MSG_ICMPBLUY"); - EvICMgamm = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_GAMMA"); - EvICMslop = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_SLOPE"); - EvICMtrcinMethod = m->newEvent(ALLNORAW, "HISTORY_MSG_ICM_WORKING_TRC_METHOD"); + EvICMgamm = m->newEvent(AUTOEXP, "HISTORY_MSG_ICM_WORKING_GAMMA"); + EvICMslop = m->newEvent(AUTOEXP, "HISTORY_MSG_ICM_WORKING_SLOPE"); + EvICMtrcinMethod = m->newEvent(AUTOEXP, "HISTORY_MSG_ICM_WORKING_TRC_METHOD"); isBatchMode = lastToneCurve = lastApplyLookTable = lastApplyBaselineExposureOffset = lastApplyHueSatMap = false; diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index fff8c88db..30c9dadee 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -30,7 +30,7 @@ using namespace rtengine::procparams; ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LABEL")) { auto m = ProcEventMapper::getInstance(); - EvHistMatching = m->newEvent(ALLNORAW, "HISTORY_MSG_HISTMATCHING"); + EvHistMatching = m->newEvent(AUTOEXP, "HISTORY_MSG_HISTMATCHING"); EvHistMatchingBatch = m->newEvent(M_VOID, "HISTORY_MSG_HISTMATCHING"); EvClampOOG = m->newEvent(DARKFRAME, "HISTORY_MSG_CLAMPOOG");