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

"Reset to default" values synchronized with the "Default" profile

Browse Source
This commit is contained in:
DrSlony
2012-06-26 21:08:12 +01:00
parent 340cb55dc9
commit 17d60e12b0
11 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/dirpyrdenoise.cc
View File

@@ -36,9 +36,9 @@ DirPyrDenoise::DirPyrDenoise () : Gtk::VBox(), FoldableToolPanel(this) {
enaConn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &DirPyrDenoise::enabledChanged) ); enaConn = enabled->signal_toggled().connect( sigc::mem_fun(*this, &DirPyrDenoise::enabledChanged) );
luma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LUMA"), 0, 100, 1, 10)); luma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_LUMA"), 0, 100, 1, 5));
chroma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMA"), 0, 100, 1, 10)); chroma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_CHROMA"), 0, 100, 1, 5));
gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 0.10)); gamma = Gtk::manage (new Adjuster (M("TP_DIRPYRDENOISE_GAMMA"), 1.0, 3.0, 0.01, 2.0));
luma->setAdjusterListener (this); luma->setAdjusterListener (this);
chroma->setAdjusterListener (this); chroma->setAdjusterListener (this);
@@ -97,7 +97,7 @@ void DirPyrDenoise::setDefaults (const ProcParams* defParams, const ParamsEdited
luma->setDefault (defParams->dirpyrDenoise.luma); luma->setDefault (defParams->dirpyrDenoise.luma);
chroma->setDefault (defParams->dirpyrDenoise.chroma); chroma->setDefault (defParams->dirpyrDenoise.chroma);
gamma->setDefault (defParams->dirpyrDenoise.chroma); gamma->setDefault (defParams->dirpyrDenoise.gamma);
if (pedited) { if (pedited) {
luma->setDefaultEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited); luma->setDefaultEditedState (pedited->dirpyrDenoise.luma ? Edited : UnEdited);

13
rtgui/dirpyrequalizer.cc
View File

@@ -56,11 +56,14 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) {
{ {
Glib::ustring ss; Glib::ustring ss;
ss = Glib::ustring::format(i); ss = Glib::ustring::format(i);
if(i == 0) if(i == 0) {
ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMAFINEST")); ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMAFINEST"));
if(i == 3) multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 3.0) );
ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMACOARSEST")); } else {
multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 1.0) ); if(i == 3)
ss += Glib::ustring::compose(" (%1)", M("TP_DIRPYREQUALIZER_LUMACOARSEST"));
multiplier[i] = Gtk::manage ( new Adjuster (ss, 0, 4, 0.01, 1.0) );
}
multiplier[i]->setAdjusterListener(this); multiplier[i]->setAdjusterListener(this);
pack_start(*multiplier[i]); pack_start(*multiplier[i]);
} }
@@ -68,7 +71,7 @@ DirPyrEqualizer::DirPyrEqualizer () : Gtk::VBox(), FoldableToolPanel(this) {
Gtk::HSeparator *separator3 = Gtk::manage (new Gtk::HSeparator()); Gtk::HSeparator *separator3 = Gtk::manage (new Gtk::HSeparator());
pack_start(*separator3, Gtk::PACK_SHRINK, 2); pack_start(*separator3, Gtk::PACK_SHRINK, 2);
multiplier[4] = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.0) ); multiplier[4] = Gtk::manage ( new Adjuster (M("TP_DIRPYREQUALIZER_THRESHOLD"), 0, 1, 0.01, 0.2) );
multiplier[4]->setAdjusterListener(this); multiplier[4]->setAdjusterListener(this);
pack_start(*multiplier[4]); pack_start(*multiplier[4]);

2
rtgui/impulsedenoise.cc
View File

@@ -29,7 +29,7 @@ ImpulseDenoise::ImpulseDenoise () : Gtk::VBox(), FoldableToolPanel(this) {
enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED"))); enabled = Gtk::manage (new Gtk::CheckButton (M("GENERAL_ENABLED")));
enabled->set_active (false); enabled->set_active (false);
thresh = Gtk::manage (new Adjuster (M("TP_IMPULSEDENOISE_THRESH"), 0, 100, 1, 10)); thresh = Gtk::manage (new Adjuster (M("TP_IMPULSEDENOISE_THRESH"), 0, 100, 1, 50));
pack_start (*enabled); pack_start (*enabled);
pack_start (*Gtk::manage (new Gtk::HSeparator())); pack_start (*Gtk::manage (new Gtk::HSeparator()));

4
rtgui/labcurve.cc
View File

@@ -26,7 +26,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this) {
brightness = Gtk::manage (new Adjuster (M("TP_LABCURVE_BRIGHTNESS"), -100, 100, 1, 0)); brightness = Gtk::manage (new Adjuster (M("TP_LABCURVE_BRIGHTNESS"), -100, 100, 1, 0));
contrast = Gtk::manage (new Adjuster (M("TP_LABCURVE_CONTRAST"), -100, 100, 1, 0)); contrast = Gtk::manage (new Adjuster (M("TP_LABCURVE_CONTRAST"), -100, 100, 1, 0));
saturation = Gtk::manage (new Adjuster (M("TP_LABCURVE_SATURATION"), -100, 100, 1, 0)); saturation = Gtk::manage (new Adjuster (M("TP_LABCURVE_SATURATION"), -100, 100, 1, 5));
pack_start (*brightness); pack_start (*brightness);
brightness->show (); brightness->show ();
@@ -56,7 +56,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this) {
enablelimiter = Gtk::manage (new Gtk::CheckButton (M("TP_LABCURVE_ENABLESATLIMITER"))); enablelimiter = Gtk::manage (new Gtk::CheckButton (M("TP_LABCURVE_ENABLESATLIMITER")));
pack_start (*enablelimiter); pack_start (*enablelimiter);
saturationlimiter = Gtk::manage ( new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 1.0, 40) ); saturationlimiter = Gtk::manage ( new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 1.0, 50) );
pack_start (*saturationlimiter); pack_start (*saturationlimiter);
saturationlimiter->show (); saturationlimiter->show ();
saturationlimiter->reference (); saturationlimiter->reference ();

2
rtgui/rawprocess.cc
View File

@@ -49,7 +49,7 @@ RawProcess::RawProcess () : Gtk::VBox(), FoldableToolPanel(this)
ccOptions = Gtk::manage (new Gtk::VBox ()); ccOptions = Gtk::manage (new Gtk::VBox ());
ccOptions->set_border_width(4); ccOptions->set_border_width(4);
ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,2 )); ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"),0,5,1,0 ));
ccSteps->setAdjusterListener (this); ccSteps->setAdjusterListener (this);
if (ccSteps->delay < 1000) ccSteps->delay = 1000; if (ccSteps->delay < 1000) ccSteps->delay = 1000;
ccSteps->show(); ccSteps->show();

4
rtgui/shadowshighlights.cc
View File

@@ -36,14 +36,14 @@ ShadowsHighlights::ShadowsHighlights () : Gtk::VBox(), FoldableToolPanel(this) {
hqConn = hq->signal_toggled().connect( sigc::mem_fun(*this, &ShadowsHighlights::hqChanged) ); hqConn = hq->signal_toggled().connect( sigc::mem_fun(*this, &ShadowsHighlights::hqChanged) );
pack_start (*Gtk::manage (new Gtk::HSeparator())); pack_start (*Gtk::manage (new Gtk::HSeparator()));
highlights = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 0)); highlights = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HIGHLIGHTS"), 0, 100, 1, 10));
h_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HLTONALW"), 10, 100, 1, 80)); h_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_HLTONALW"), 10, 100, 1, 80));
pack_start (*highlights); pack_start (*highlights);
pack_start (*h_tonalwidth); pack_start (*h_tonalwidth);
pack_start (*Gtk::manage (new Gtk::HSeparator())); pack_start (*Gtk::manage (new Gtk::HSeparator()));
shadows = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHADOWS"), 0, 100, 1, 0)); shadows = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHADOWS"), 0, 100, 1, 10));
s_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHTONALW"), 10, 100, 1, 80)); s_tonalwidth = Gtk::manage (new Adjuster (M("TP_SHADOWSHLIGHTS_SHTONALW"), 10, 100, 1, 80));
pack_start (*shadows); pack_start (*shadows);
pack_start (*s_tonalwidth); pack_start (*s_tonalwidth);

4
rtgui/sharpenedge.cc
View File

@@ -32,10 +32,10 @@ SharpenEdge::SharpenEdge () : Gtk::VBox(), FoldableToolPanel(this) {
enabled->set_active (true); enabled->set_active (true);
pack_start(*enabled, Gtk::PACK_SHRINK, 0); pack_start(*enabled, Gtk::PACK_SHRINK, 0);
passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"),1,4,1,1)); passes = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_PASSES"),1,4,1,2));
passes->setAdjusterListener (this); passes->setAdjusterListener (this);
if (passes->delay < 1000) passes->delay = 1000; if (passes->delay < 1000) passes->delay = 1000;
amount = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_AMOUNT"),0,100,1,40)); amount = Gtk::manage(new Adjuster (M("TP_SHARPENEDGE_AMOUNT"),0,100,1,50));
amount->setAdjusterListener (this); amount->setAdjusterListener (this);
if (amount->delay < 1000) amount->delay = 1000; if (amount->delay < 1000) amount->delay = 1000;

4
rtgui/sharpening.cc
View File

@@ -71,8 +71,8 @@ Sharpening::Sharpening () : Gtk::VBox(), FoldableToolPanel(this) {
Gtk::HSeparator *hsep6a = Gtk::manage (new Gtk::HSeparator()); Gtk::HSeparator *hsep6a = Gtk::manage (new Gtk::HSeparator());
amount = Gtk::manage (new Adjuster (M("TP_SHARPENING_AMOUNT"), 1, 1000, 1, 150)); amount = Gtk::manage (new Adjuster (M("TP_SHARPENING_AMOUNT"), 1, 1000, 1, 125));
radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.8)); radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.5));
threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false)); threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false));
threshold->setBgGradient(milestones); threshold->setBgGradient(milestones);
pack_start(*hsep6a, Gtk::PACK_SHRINK, 2); pack_start(*hsep6a, Gtk::PACK_SHRINK, 2);

2
rtgui/sharpenmicro.cc
View File

@@ -33,7 +33,7 @@ SharpenMicro::SharpenMicro () : Gtk::VBox(), FoldableToolPanel(this) {
pack_start(*enabled, Gtk::PACK_SHRINK, 0); pack_start(*enabled, Gtk::PACK_SHRINK, 0);
enabled->show (); enabled->show ();
amount= Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"),0,100,1,25)); amount= Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_AMOUNT"),0,100,1,20));
amount->setAdjusterListener (this); amount->setAdjusterListener (this);
if (amount->delay < 1000) amount->delay = 1000; if (amount->delay < 1000) amount->delay = 1000;
amount->show(); amount->show();

2
rtgui/thresholdselector.cc
View File

@@ -532,7 +532,7 @@ void ThresholdSelector::reset () {
positions[0] = defPos[0]; positions[0] = defPos[0];
positions[1] = defPos[1]; positions[1] = defPos[1];
positions[2] = defPos[2]; positions[2] = defPos[2];
positions[2] = defPos[3]; positions[3] = defPos[3];
updateTooltip(); updateTooltip();
queue_draw (); queue_draw ();
} }

6
rtgui/vibrance.cc
View File

@@ -28,18 +28,18 @@ Vibrance::Vibrance () : Gtk::VBox(), FoldableToolPanel(this) {
enabled->set_active (false); enabled->set_active (false);
pack_start(*enabled, Gtk::PACK_SHRINK, 0); pack_start(*enabled, Gtk::PACK_SHRINK, 0);
pastels = Gtk::manage(new Adjuster (M("TP_VIBRANCE_PASTELS"),-100,100,5,0)); pastels = Gtk::manage(new Adjuster (M("TP_VIBRANCE_PASTELS"),-100,100,5,50));
pastels->setAdjusterListener (this); pastels->setAdjusterListener (this);
//if (pastels->delay < 1000) pastels->delay = 1000; //if (pastels->delay < 1000) pastels->delay = 1000;
pack_start( *pastels, Gtk::PACK_SHRINK, 0); pack_start( *pastels, Gtk::PACK_SHRINK, 0);
saturated = Gtk::manage(new Adjuster (M("TP_VIBRANCE_SATURATED"),-100,100,5,0)); saturated = Gtk::manage(new Adjuster (M("TP_VIBRANCE_SATURATED"),-100,100,5,50));
saturated->setAdjusterListener (this); saturated->setAdjusterListener (this);
saturated->set_sensitive(false); saturated->set_sensitive(false);
//if (saturated->delay < 1000) saturated->delay = 1000; //if (saturated->delay < 1000) saturated->delay = 1000;
pack_start( *saturated, Gtk::PACK_SHRINK, 0); pack_start( *saturated, Gtk::PACK_SHRINK, 0);
psThreshold = Gtk::manage (new ThresholdAdjuster (M("TP_VIBRANCE_PSTHRESHOLD"), 0., 100., 75., 75., 0, false)); psThreshold = Gtk::manage (new ThresholdAdjuster (M("TP_VIBRANCE_PSTHRESHOLD"), 0., 100., 1., 75., 0, false));
psThreshold->setAdjusterListener (this); psThreshold->setAdjusterListener (this);
psThreshold->set_sensitive(false); psThreshold->set_sensitive(false);
//if (psThreshold->delay < 1000) psThreshold->delay = 1000; //if (psThreshold->delay < 1000) psThreshold->delay = 1000;