Added button to reset all show modifications
This commit is contained in:
parent
93afc0ac07
commit
986af6e5ed
@ -2500,6 +2500,7 @@ TP_LOCALLAB_RECURS_TOOLTIP;Recalculate references for hue, luma, chroma after ea
|
|||||||
TP_LOCALLAB_REFLABEL;Ref. (0..1) Chroma=%1 Luma=%2 Hue=%3
|
TP_LOCALLAB_REFLABEL;Ref. (0..1) Chroma=%1 Luma=%2 Hue=%3
|
||||||
TP_LOCALLAB_REN_DIALOG_LAB;Enter the new Control Spot name
|
TP_LOCALLAB_REN_DIALOG_LAB;Enter the new Control Spot name
|
||||||
TP_LOCALLAB_REN_DIALOG_NAME;Renaming Control Spot
|
TP_LOCALLAB_REN_DIALOG_NAME;Renaming Control Spot
|
||||||
|
TP_LOCALLAB_RESETSHOW;Reset All Show Modifications
|
||||||
TP_LOCALLAB_RESID;Residual Image
|
TP_LOCALLAB_RESID;Residual Image
|
||||||
TP_LOCALLAB_RESIDBLUR;Blur Residual Image
|
TP_LOCALLAB_RESIDBLUR;Blur Residual Image
|
||||||
TP_LOCALLAB_RESIDCHRO;Residual image Chroma
|
TP_LOCALLAB_RESIDCHRO;Residual image Chroma
|
||||||
|
@ -921,6 +921,7 @@ enum ProcEventCode {
|
|||||||
Evlocallabanglog = 892,
|
Evlocallabanglog = 892,
|
||||||
EvLocallabSpotcolorde = 893,
|
EvLocallabSpotcolorde = 893,
|
||||||
EvlocallabshowmasksharMethod = 894,
|
EvlocallabshowmasksharMethod = 894,
|
||||||
|
Evlocallabshowreset = 895,
|
||||||
NUMOFEVENTS
|
NUMOFEVENTS
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -924,7 +924,8 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
|
|||||||
LUMINANCECURVE, //Evlocallabstrlog
|
LUMINANCECURVE, //Evlocallabstrlog
|
||||||
LUMINANCECURVE, //Evlocallabanglog
|
LUMINANCECURVE, //Evlocallabanglog
|
||||||
LUMINANCECURVE, //EvLocallabSpotcolorde
|
LUMINANCECURVE, //EvLocallabSpotcolorde
|
||||||
LUMINANCECURVE // EvlocallabshowmasksharMethod
|
LUMINANCECURVE, // EvlocallabshowmasksharMethod
|
||||||
|
LUMINANCECURVE // Evlocallabshowreset
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -766,6 +766,8 @@ labqualcurv(Gtk::manage(new Gtk::Label(M("TP_LOCALLAB_QUALCURV_METHOD") + ":")))
|
|||||||
lumacontrastMinusButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS")))),
|
lumacontrastMinusButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMACONTRAST_MINUS")))),
|
||||||
lumaneutralButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMANEUTRAL")))),
|
lumaneutralButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMANEUTRAL")))),
|
||||||
lumacontrastPlusButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS")))),
|
lumacontrastPlusButton(Gtk::manage(new Gtk::Button(M("TP_DIRPYREQUALIZER_LUMACONTRAST_PLUS")))),
|
||||||
|
resetshowButton(Gtk::manage(new Gtk::Button(M("TP_LOCALLAB_RESETSHOW")))),
|
||||||
|
|
||||||
gridFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABGRID")))),
|
gridFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABGRID")))),
|
||||||
struFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABSTRUM")))),
|
struFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABSTRUM")))),
|
||||||
blurFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABBLURM")))),
|
blurFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_LABBLURM")))),
|
||||||
@ -3879,6 +3881,9 @@ pe(nullptr)
|
|||||||
|
|
||||||
|
|
||||||
panel->pack_start(*explog, false, false);
|
panel->pack_start(*explog, false, false);
|
||||||
|
|
||||||
|
panel->pack_start(*resetshowButton);
|
||||||
|
resetshowButtonConn = resetshowButton->signal_pressed().connect(sigc::mem_fun(*this, &Locallab::resetshowPressed));
|
||||||
|
|
||||||
pack_start(*panel);
|
pack_start(*panel);
|
||||||
|
|
||||||
@ -7188,6 +7193,46 @@ void Locallab::mergecolMethodChanged()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Locallab::resetshowPressed()
|
||||||
|
{
|
||||||
|
disableListener();
|
||||||
|
showmaskcolMethod->set_active(0);
|
||||||
|
showmaskcolMethodinv->set_active(0);
|
||||||
|
showmaskexpMethod->set_active(0);
|
||||||
|
showmaskexpMethodinv->set_active(0);
|
||||||
|
showmaskSHMethod->set_active(0);
|
||||||
|
showmaskSHMethodinv->set_active(0);
|
||||||
|
showmaskvibMethod->set_active(0);
|
||||||
|
showmaskretiMethod->set_active(0);
|
||||||
|
showmasksoftMethod->set_active(0);
|
||||||
|
showmasktmMethod->set_active(0);
|
||||||
|
showmaskblMethod->set_active(0);
|
||||||
|
showmasklcMethod->set_active(0);
|
||||||
|
showmaskcbMethod->set_active(0);
|
||||||
|
showmasksharMethod->set_active(0);
|
||||||
|
|
||||||
|
enableListener();
|
||||||
|
showmaskcolMethodChanged();
|
||||||
|
showmasksharMethodChanged();
|
||||||
|
showmaskcolMethodChangedinv();
|
||||||
|
showmaskexpMethodChangedinv();
|
||||||
|
showmaskexpMethodChanged();
|
||||||
|
showmaskSHMethodChanged();
|
||||||
|
showmaskvibMethodChanged();
|
||||||
|
showmaskSHMethodChangedinv();
|
||||||
|
showmasklcMethodChanged();
|
||||||
|
showmaskcbMethodChanged();
|
||||||
|
showmaskblMethodChanged();
|
||||||
|
showmasktmMethodChanged();
|
||||||
|
showmaskretiMethodChanged();
|
||||||
|
showmasksoftMethodChanged();
|
||||||
|
|
||||||
|
if (listener) {
|
||||||
|
listener->panelChanged(Evlocallabshowreset, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
void Locallab::showmaskcolMethodChanged()
|
void Locallab::showmaskcolMethodChanged()
|
||||||
{
|
{
|
||||||
// printf("showmaskcolMethodChanged\n");
|
// printf("showmaskcolMethodChanged\n");
|
||||||
@ -11734,7 +11779,7 @@ void Locallab::enableListener()
|
|||||||
enablelogConn.block(false);
|
enablelogConn.block(false);
|
||||||
AutograyConn.block(false);
|
AutograyConn.block(false);
|
||||||
fullimageConn.block(false);
|
fullimageConn.block(false);
|
||||||
|
resetshowButtonConn.block(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Locallab::disableListener()
|
void Locallab::disableListener()
|
||||||
@ -11839,7 +11884,7 @@ void Locallab::disableListener()
|
|||||||
enablelogConn.block(true);
|
enablelogConn.block(true);
|
||||||
AutograyConn.block(true);
|
AutograyConn.block(true);
|
||||||
fullimageConn.block(true);
|
fullimageConn.block(true);
|
||||||
|
resetshowButtonConn.block(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited, int index)
|
void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited, int index)
|
||||||
|
@ -607,7 +607,9 @@ private:
|
|||||||
Gtk::Button* const lumacontrastMinusButton;
|
Gtk::Button* const lumacontrastMinusButton;
|
||||||
Gtk::Button* const lumaneutralButton;
|
Gtk::Button* const lumaneutralButton;
|
||||||
Gtk::Button* const lumacontrastPlusButton;
|
Gtk::Button* const lumacontrastPlusButton;
|
||||||
sigc::connection lumacontrastMinusPressedConn, lumaneutralPressedConn, lumacontrastPlusPressedConn;
|
Gtk::Button* const resetshowButton;
|
||||||
|
|
||||||
|
sigc::connection lumacontrastMinusPressedConn, lumaneutralPressedConn, lumacontrastPlusPressedConn, resetshowButtonConn;
|
||||||
Gtk::Frame* const gridFrame;
|
Gtk::Frame* const gridFrame;
|
||||||
Gtk::Frame* const struFrame;
|
Gtk::Frame* const struFrame;
|
||||||
Gtk::Frame* const blurFrame;
|
Gtk::Frame* const blurFrame;
|
||||||
@ -781,6 +783,7 @@ private:
|
|||||||
void lumacontrastMinusPressed();
|
void lumacontrastMinusPressed();
|
||||||
void lumaneutralPressed();
|
void lumaneutralPressed();
|
||||||
void lumacontrastPlusPressed();
|
void lumacontrastPlusPressed();
|
||||||
|
void resetshowPressed();
|
||||||
|
|
||||||
// Locallab GUI management function
|
// Locallab GUI management function
|
||||||
void updateLocallabGUI(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited, int index);
|
void updateLocallabGUI(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited, int index);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user