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

Clean partialpasted never used

Browse Source
This commit is contained in:
Desmis 2018-01-27 17:50:53 +01:00
parent 35148773f9
commit 4edc7d0719
2 changed files with 117 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
rtgui/partialpastedlg.cc
View File

@ -45,8 +45,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
raw ->set_name("PartialPasteHeader"); raw ->set_name("PartialPasteHeader");
advanced = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ADVANCEDGROUP"))); advanced = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_ADVANCEDGROUP")));
advanced ->set_name("PartialPasteHeader"); advanced ->set_name("PartialPasteHeader");
loc = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LOCGROUP")));
loc ->set_name ("PartialPasteHeader");
// Basic Settings: // Basic Settings:
wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE"))); wb = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_WHITEBALANCE")));
@ -133,10 +131,10 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
raw_ca_autocorrect = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWCACORR_AUTO"))); raw_ca_autocorrect = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWCACORR_AUTO")));
raw_caredblue = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWCACORR_CAREDBLUE"))); raw_caredblue = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWCACORR_CAREDBLUE")));
Gtk::VBox* vboxes[9]; Gtk::VBox* vboxes[8];
Gtk::HSeparator* hseps[9]; Gtk::HSeparator* hseps[8];
for (int i = 0; i < 9; i++) { for (int i = 0; i < 8; i++) {
vboxes[i] = Gtk::manage (new Gtk::VBox ()); vboxes[i] = Gtk::manage (new Gtk::VBox ());
vboxes[i]->set_name("PartialPasteGroupContainer"); vboxes[i]->set_name("PartialPasteGroupContainer");
hseps[i] = Gtk::manage (new Gtk::HSeparator ()); hseps[i] = Gtk::manage (new Gtk::HSeparator ());
@ -155,7 +153,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[0]->pack_start (*pcvignette, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*pcvignette, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*gradient, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*gradient, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*labcurve, Gtk::PACK_SHRINK, 2); vboxes[0]->pack_start (*labcurve, Gtk::PACK_SHRINK, 2);
// vboxes[0]->pack_start (*locallab, Gtk::PACK_SHRINK, 2);
//DETAIL //DETAIL
vboxes[1]->pack_start (*detail, Gtk::PACK_SHRINK, 2); vboxes[1]->pack_start (*detail, Gtk::PACK_SHRINK, 2);
@ -212,11 +209,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[6]->pack_start(*metadata, Gtk::PACK_SHRINK, 2); vboxes[6]->pack_start(*metadata, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*exifch, Gtk::PACK_SHRINK, 2); vboxes[6]->pack_start (*exifch, Gtk::PACK_SHRINK, 2);
vboxes[6]->pack_start (*iptc, Gtk::PACK_SHRINK, 2); vboxes[6]->pack_start (*iptc, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_pixelshift, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_ccSteps, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_dcb_iterations, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_dcb_enhance, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_lmmse_iterations, Gtk::PACK_SHRINK, 2);
//RAW //RAW
vboxes[7]->pack_start (*raw, Gtk::PACK_SHRINK, 2); vboxes[7]->pack_start (*raw, Gtk::PACK_SHRINK, 2);
@ -307,7 +299,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
metaConn = meta->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::metaToggled)); metaConn = meta->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::metaToggled));
rawConn = raw->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::rawToggled)); rawConn = raw->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::rawToggled));
advancedConn = advanced->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::advancedToggled)); advancedConn = advanced->signal_toggled().connect (sigc::mem_fun(*this, &PartialPasteDlg::advancedToggled));
// locConn = loc->signal_toggled().connect (sigc::mem_fun (*this, &PartialPasteDlg::locToggled));
// Basic Settings // Basic Settings
wbConn = wb->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true)); wbConn = wb->signal_toggled().connect (sigc::bind (sigc::mem_fun(*basic, &Gtk::CheckButton::set_inconsistent), true));
@ -413,7 +404,6 @@ void PartialPasteDlg::everythingToggled ()
ConnectionBlocker rawBlocker(rawConn); ConnectionBlocker rawBlocker(rawConn);
ConnectionBlocker advancedBlocker(advancedConn); ConnectionBlocker advancedBlocker(advancedConn);
everything->set_inconsistent (false); everything->set_inconsistent (false);
//toggle group headings //toggle group headings
@ -425,7 +415,6 @@ void PartialPasteDlg::everythingToggled ()
meta->set_active(everything->get_active()); meta->set_active(everything->get_active());
raw->set_active(everything->get_active()); raw->set_active(everything->get_active());
advanced->set_active(everything->get_active()); advanced->set_active(everything->get_active());
loc->set_active (everything->get_active());
//toggle group children //toggle group children
PartialPasteDlg::basicToggled (); PartialPasteDlg::basicToggled ();
@ -436,7 +425,6 @@ void PartialPasteDlg::everythingToggled ()
PartialPasteDlg::metaToggled (); PartialPasteDlg::metaToggled ();
PartialPasteDlg::rawToggled (); PartialPasteDlg::rawToggled ();
PartialPasteDlg::advancedToggled (); PartialPasteDlg::advancedToggled ();
// PartialPasteDlg::locToggled ();
} }
void PartialPasteDlg::rawToggled () void PartialPasteDlg::rawToggled ()
@ -496,8 +484,6 @@ void PartialPasteDlg::rawToggled ()
void PartialPasteDlg::basicToggled () void PartialPasteDlg::basicToggled ()
{ {
// locallabConn.block (true);
ConnectionBlocker wbBlocker(wbConn); ConnectionBlocker wbBlocker(wbConn);
ConnectionBlocker exposureBlocker(exposureConn); ConnectionBlocker exposureBlocker(exposureConn);
ConnectionBlocker localcontrastBlocker(localcontrastConn); ConnectionBlocker localcontrastBlocker(localcontrastConn);
@ -508,7 +494,6 @@ void PartialPasteDlg::basicToggled ()
ConnectionBlocker gradientBlocker(gradientConn); ConnectionBlocker gradientBlocker(gradientConn);
ConnectionBlocker labcurveBlocker(labcurveConn); ConnectionBlocker labcurveBlocker(labcurveConn);
basic->set_inconsistent (false); basic->set_inconsistent (false);
wb->set_active (basic->get_active ()); wb->set_active (basic->get_active ());
@ -520,21 +505,6 @@ void PartialPasteDlg::basicToggled ()
pcvignette->set_active (basic->get_active ()); pcvignette->set_active (basic->get_active ());
gradient->set_active (basic->get_active ()); gradient->set_active (basic->get_active ());
labcurve->set_active (basic->get_active ()); labcurve->set_active (basic->get_active ());
/*
locallab->set_active (basic->get_active ());
wbConn.block (false);
exposureConn.block (false);
shConn.block (false);
epdConn.block (false);
pcvignetteConn.block (false);
gradientConn.block (false);
retinexConn.block (false);
labcurveConn.block (false);
locallabConn.block (false);
colorappearanceConn.block (false);
*/
} }
void PartialPasteDlg::detailToggled () void PartialPasteDlg::detailToggled ()
@ -572,18 +542,6 @@ void PartialPasteDlg::advancedToggled ()
colorappearance->set_active (advanced->get_active ()); colorappearance->set_active (advanced->get_active ());
wavelet->set_active (advanced->get_active ()); wavelet->set_active (advanced->get_active ());
} }
/*
void PartialPasteDlg::locToggled ()
{
locallabConn.block (true);
loc->set_inconsistent (false);
locallab->set_active (loc->get_active ());
locallabConn.block (false);
}
*/
void PartialPasteDlg::colorToggled () void PartialPasteDlg::colorToggled ()
{ {
@ -716,11 +674,6 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.gradient = falsePE.gradient; filterPE.gradient = falsePE.gradient;
} }
/*
if (!locallab->get_active ()) {
filterPE.locallab = falsePE.locallab;
}
*/
if (!labcurve->get_active ()) { if (!labcurve->get_active ()) {
filterPE.labCurve = falsePE.labCurve; filterPE.labCurve = falsePE.labCurve;
} }

10
rtgui/partialpastedlg.h
View File

@ -40,7 +40,6 @@ public:
Gtk::CheckButton* meta; Gtk::CheckButton* meta;
Gtk::CheckButton* raw; Gtk::CheckButton* raw;
Gtk::CheckButton* advanced; Gtk::CheckButton* advanced;
Gtk::CheckButton* loc;
// options in basic: // options in basic:
Gtk::CheckButton* wb; Gtk::CheckButton* wb;
@ -68,9 +67,6 @@ public:
// options in wavelet // options in wavelet
Gtk::CheckButton* wavelet; Gtk::CheckButton* wavelet;
// options in loc
Gtk::CheckButton* locallab;
// options in color: // options in color:
Gtk::CheckButton* icm; Gtk::CheckButton* icm;
Gtk::CheckButton* vibrance; Gtk::CheckButton* vibrance;
@ -128,9 +124,9 @@ public:
Gtk::CheckButton* ff_BlurType; Gtk::CheckButton* ff_BlurType;
Gtk::CheckButton* ff_ClipControl; Gtk::CheckButton* ff_ClipControl;
sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaConn, rawConn, advancedConn, locConn; sigc::connection everythingConn, basicConn, detailConn, colorConn, lensConn, compositionConn, metaConn, rawConn, advancedConn;
sigc::connection wbConn, exposureConn, localcontrastConn, shConn, pcvignetteConn, gradientConn, labcurveConn, colorappearanceConn, locallabConn; sigc::connection wbConn, exposureConn, localcontrastConn, shConn, pcvignetteConn, gradientConn, labcurveConn, colorappearanceConn;
sigc::connection sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, fattalConn, dirpyreqConn, waveletConn, retinexConn; sigc::connection sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, fattalConn, dirpyreqConn, waveletConn, retinexConn;
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn; sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn;
sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn; sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn;
@ -153,8 +149,6 @@ public:
void metaToggled (); void metaToggled ();
void rawToggled (); void rawToggled ();
void advancedToggled (); void advancedToggled ();
void locToggled ();
}; };
#endif #endif