Implement partial profile for framing tool
* Update partial profile load/save GUI to include framing tool * Allows for loading/saving framing tool parameters from the clipboard
This commit is contained in:
parent
114a4680de
commit
757a0a032a
@ -1864,6 +1864,7 @@ PARTIALPASTE_FLATFIELDBLURTYPE;Flat-field blur type
|
|||||||
PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
|
PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
|
||||||
PARTIALPASTE_FLATFIELDFILE;Flat-field file
|
PARTIALPASTE_FLATFIELDFILE;Flat-field file
|
||||||
PARTIALPASTE_FLATFIELDFROMMETADATA;Flat-field from Metadata
|
PARTIALPASTE_FLATFIELDFROMMETADATA;Flat-field from Metadata
|
||||||
|
PARTIALPASTE_FRAMING;Framing
|
||||||
PARTIALPASTE_GRADIENT;Graduated filter
|
PARTIALPASTE_GRADIENT;Graduated filter
|
||||||
PARTIALPASTE_HSVEQUALIZER;HSV equalizer
|
PARTIALPASTE_HSVEQUALIZER;HSV equalizer
|
||||||
PARTIALPASTE_ICMSETTINGS;Color management settings
|
PARTIALPASTE_ICMSETTINGS;Color management settings
|
||||||
|
@ -266,6 +266,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
|
|||||||
crop = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CROP")));
|
crop = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CROP")));
|
||||||
resize = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RESIZE")));
|
resize = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RESIZE")));
|
||||||
prsharpening = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PRSHARPENING")));
|
prsharpening = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PRSHARPENING")));
|
||||||
|
framing = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_FRAMING")));
|
||||||
perspective = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PERSPECTIVE")));
|
perspective = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PERSPECTIVE")));
|
||||||
commonTrans = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMMONTRANSFORMPARAMS")));
|
commonTrans = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COMMONTRANSFORMPARAMS")));
|
||||||
|
|
||||||
@ -384,6 +385,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
|
|||||||
vboxes[4]->pack_start (*crop, Gtk::PACK_SHRINK, 2);
|
vboxes[4]->pack_start (*crop, Gtk::PACK_SHRINK, 2);
|
||||||
vboxes[4]->pack_start (*resize, Gtk::PACK_SHRINK, 2);
|
vboxes[4]->pack_start (*resize, Gtk::PACK_SHRINK, 2);
|
||||||
vboxes[4]->pack_start (*prsharpening, Gtk::PACK_SHRINK, 2);
|
vboxes[4]->pack_start (*prsharpening, Gtk::PACK_SHRINK, 2);
|
||||||
|
vboxes[4]->pack_start (*framing, Gtk::PACK_SHRINK, 2);
|
||||||
vboxes[4]->pack_start (*perspective, Gtk::PACK_SHRINK, 2);
|
vboxes[4]->pack_start (*perspective, Gtk::PACK_SHRINK, 2);
|
||||||
vboxes[4]->pack_start (*commonTrans, Gtk::PACK_SHRINK, 2);
|
vboxes[4]->pack_start (*commonTrans, Gtk::PACK_SHRINK, 2);
|
||||||
|
|
||||||
@ -547,6 +549,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
|
|||||||
cropConn = crop->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
cropConn = crop->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
||||||
resizeConn = resize->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
resizeConn = resize->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
||||||
prsharpeningConn = prsharpening->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
prsharpeningConn = prsharpening->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
||||||
|
framingConn = framing->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
||||||
perspectiveConn = perspective->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
perspectiveConn = perspective->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
||||||
commonTransConn = commonTrans->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
commonTransConn = commonTrans->signal_toggled().connect (sigc::bind (sigc::mem_fun(*composition, &Gtk::CheckButton::set_inconsistent), true));
|
||||||
|
|
||||||
@ -823,6 +826,7 @@ void PartialPasteDlg::compositionToggled ()
|
|||||||
ConnectionBlocker cropBlocker(cropConn);
|
ConnectionBlocker cropBlocker(cropConn);
|
||||||
ConnectionBlocker resizeBlocker(resizeConn);
|
ConnectionBlocker resizeBlocker(resizeConn);
|
||||||
ConnectionBlocker prsharpeningBlocker(prsharpeningConn);
|
ConnectionBlocker prsharpeningBlocker(prsharpeningConn);
|
||||||
|
ConnectionBlocker framingBlocker(framingConn);
|
||||||
ConnectionBlocker perspectiveBlocker(perspectiveConn);
|
ConnectionBlocker perspectiveBlocker(perspectiveConn);
|
||||||
ConnectionBlocker commonTransBlocker(commonTransConn);
|
ConnectionBlocker commonTransBlocker(commonTransConn);
|
||||||
|
|
||||||
@ -833,6 +837,7 @@ void PartialPasteDlg::compositionToggled ()
|
|||||||
crop->set_active (composition->get_active ());
|
crop->set_active (composition->get_active ());
|
||||||
resize->set_active (composition->get_active ());
|
resize->set_active (composition->get_active ());
|
||||||
prsharpening->set_active (composition->get_active ());
|
prsharpening->set_active (composition->get_active ());
|
||||||
|
framing->set_active (composition->get_active ());
|
||||||
perspective->set_active (composition->get_active ());
|
perspective->set_active (composition->get_active ());
|
||||||
commonTrans->set_active (composition->get_active ());
|
commonTrans->set_active (composition->get_active ());
|
||||||
}
|
}
|
||||||
@ -1043,6 +1048,10 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
|
|||||||
filterPE.prsharpening = falsePE.prsharpening;
|
filterPE.prsharpening = falsePE.prsharpening;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!framing->get_active ()) {
|
||||||
|
filterPE.framing = falsePE.framing;
|
||||||
|
}
|
||||||
|
|
||||||
if (!perspective->get_active ()) {
|
if (!perspective->get_active ()) {
|
||||||
filterPE.perspective = falsePE.perspective;
|
filterPE.perspective = falsePE.perspective;
|
||||||
}
|
}
|
||||||
|
@ -180,6 +180,7 @@ public:
|
|||||||
Gtk::CheckButton* crop;
|
Gtk::CheckButton* crop;
|
||||||
Gtk::CheckButton* resize;
|
Gtk::CheckButton* resize;
|
||||||
Gtk::CheckButton* prsharpening;
|
Gtk::CheckButton* prsharpening;
|
||||||
|
Gtk::CheckButton* framing;
|
||||||
Gtk::CheckButton* perspective;
|
Gtk::CheckButton* perspective;
|
||||||
Gtk::CheckButton* commonTrans;
|
Gtk::CheckButton* commonTrans;
|
||||||
|
|
||||||
@ -231,7 +232,7 @@ public:
|
|||||||
sigc::connection spotConn, sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, fattalConn, dirpyreqConn, waveletConn, retinexConn, dehazeConn;
|
sigc::connection spotConn, sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, fattalConn, dirpyreqConn, waveletConn, retinexConn, dehazeConn;
|
||||||
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn, softlightConn;
|
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn, softlightConn;
|
||||||
sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn;
|
sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn;
|
||||||
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, prsharpeningConn, perspectiveConn, commonTransConn;
|
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, prsharpeningConn, framingConn, perspectiveConn, commonTransConn;
|
||||||
sigc::connection metadataConn, exifchConn, iptcConn, icmConn;
|
sigc::connection metadataConn, exifchConn, iptcConn, icmConn;
|
||||||
sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_FromMetaDataConn, ff_BlurRadiusConn, ff_BlurTypeConn, ff_ClipControlConn;
|
sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_FromMetaDataConn, ff_BlurRadiusConn, ff_BlurTypeConn, ff_ClipControlConn;
|
||||||
sigc::connection raw_caredblueConn, raw_ca_autocorrectConn, raw_ca_avoid_colourshiftconn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_pdaf_lines_filterConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_borderConn, raw_imagenumConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_pixelshiftConn, raw_dcb_enhanceConn, raw_exposConn, raw_blackConn;
|
sigc::connection raw_caredblueConn, raw_ca_autocorrectConn, raw_ca_avoid_colourshiftconn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_pdaf_lines_filterConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_borderConn, raw_imagenumConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_pixelshiftConn, raw_dcb_enhanceConn, raw_exposConn, raw_blackConn;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user