merge with dev
This commit is contained in:
@@ -141,6 +141,8 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
|
||||
raw_ca_avoid_colourshift = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT")));
|
||||
//...
|
||||
filmNegative = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_FILMNEGATIVE")) );
|
||||
//---
|
||||
captureSharpening = Gtk::manage (new Gtk::CheckButton (M("TP_PDSHARPENING_LABEL")) );
|
||||
Gtk::VBox* vboxes[9];
|
||||
Gtk::HSeparator* hseps[9];
|
||||
|
||||
@@ -254,7 +256,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
|
||||
vboxes[8]->pack_start (*ff_AutoSelect, Gtk::PACK_SHRINK, 2);
|
||||
vboxes[8]->pack_start (*ff_BlurType, Gtk::PACK_SHRINK, 2);
|
||||
vboxes[8]->pack_start (*ff_BlurRadius, Gtk::PACK_SHRINK, 2);
|
||||
vboxes[8]->pack_start (*ff_ClipControl, Gtk::PACK_SHRINK, 2);
|
||||
vboxes[8]->pack_start (*captureSharpening, Gtk::PACK_SHRINK, 2);
|
||||
vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0);
|
||||
vboxes[8]->pack_start (*raw_ca_autocorrect, Gtk::PACK_SHRINK, 2);
|
||||
vboxes[8]->pack_start (*raw_caredblue, Gtk::PACK_SHRINK, 2);
|
||||
@@ -411,6 +413,8 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
|
||||
raw_ca_avoid_colourshiftconn = raw_ca_avoid_colourshift->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
|
||||
//---
|
||||
filmNegativeConn = filmNegative->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
|
||||
//---
|
||||
captureSharpeningConn = captureSharpening->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
|
||||
|
||||
add_button (M("GENERAL_OK"), Gtk::RESPONSE_OK);
|
||||
add_button (M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);
|
||||
@@ -486,6 +490,7 @@ void PartialPasteDlg::rawToggled ()
|
||||
ConnectionBlocker raw_caredblueBlocker(raw_caredblueConn);
|
||||
ConnectionBlocker raw_ca_avoid_colourshiftBlocker(raw_ca_avoid_colourshiftconn);
|
||||
ConnectionBlocker filmNegativeBlocker(filmNegativeConn);
|
||||
ConnectionBlocker captureSharpeningBlocker(captureSharpeningConn);
|
||||
|
||||
raw->set_inconsistent (false);
|
||||
|
||||
@@ -515,6 +520,7 @@ void PartialPasteDlg::rawToggled ()
|
||||
raw_caredblue->set_active (raw->get_active ());
|
||||
raw_ca_avoid_colourshift->set_active (raw->get_active ());
|
||||
filmNegative->set_active (raw->get_active());
|
||||
captureSharpening->set_active (raw->get_active());
|
||||
}
|
||||
|
||||
void PartialPasteDlg::basicToggled ()
|
||||
@@ -1004,6 +1010,17 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
|
||||
filterPE.filmNegative.blueRatio = falsePE.filmNegative.blueRatio;
|
||||
}
|
||||
|
||||
if (!captureSharpening->get_active ()) {
|
||||
filterPE.pdsharpening.enabled = falsePE.pdsharpening.enabled;
|
||||
filterPE.pdsharpening.contrast = falsePE.pdsharpening.contrast;
|
||||
filterPE.pdsharpening.autoContrast = falsePE.pdsharpening.autoContrast;
|
||||
filterPE.pdsharpening.autoRadius = falsePE.pdsharpening.autoRadius;
|
||||
filterPE.pdsharpening.deconvradius = falsePE.pdsharpening.deconvradius;
|
||||
filterPE.pdsharpening.deconvradiusOffset = falsePE.pdsharpening.deconvradiusOffset;
|
||||
filterPE.pdsharpening.deconviter = falsePE.pdsharpening.deconviter;
|
||||
filterPE.pdsharpening.deconvitercheck = falsePE.pdsharpening.deconvitercheck;
|
||||
}
|
||||
|
||||
if (dstPE) {
|
||||
*dstPE = filterPE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user