diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 8e0343663..0d513e4fb 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -1577,16 +1577,16 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, bool fnameAbsol keyFile.set_integer_list("Wavelet", "Edgcont", thresh); } if (!pedited || pedited->wavelet.level0noise) { - Glib::ArrayHandle thresh (wavelet.level0noise.value, 2, Glib::OWNERSHIP_NONE); - keyFile.set_integer_list("Wavelet", "Level0noise", thresh); + Glib::ArrayHandle thresh (wavelet.level0noise.value, 2, Glib::OWNERSHIP_NONE); + keyFile.set_double_list("Wavelet", "Level0noise", thresh); } - if (!pedited || pedited->wavelet.level0noise) { - Glib::ArrayHandle thresh (wavelet.level1noise.value, 2, Glib::OWNERSHIP_NONE); - keyFile.set_integer_list("Wavelet", "Level1noise", thresh); + if (!pedited || pedited->wavelet.level1noise) { + Glib::ArrayHandle thresh (wavelet.level1noise.value, 2, Glib::OWNERSHIP_NONE); + keyFile.set_double_list("Wavelet", "Level1noise", thresh); } if (!pedited || pedited->wavelet.level2noise) { - Glib::ArrayHandle thresh (wavelet.level0noise.value, 2, Glib::OWNERSHIP_NONE); - keyFile.set_integer_list("Wavelet", "Level2noise", thresh); + Glib::ArrayHandle thresh (wavelet.level2noise.value, 2, Glib::OWNERSHIP_NONE); + keyFile.set_double_list("Wavelet", "Level2noise", thresh); } if (!pedited || pedited->wavelet.threshold) keyFile.set_integer ("Wavelet", "ThresholdHighlight", wavelet.threshold); @@ -2447,17 +2447,17 @@ if (keyFile.has_group ("Wavelet")) { if (pedited) pedited->wavelet.edgcont = true; } if (keyFile.has_key ("Wavelet", "Level0noise")) { - Glib::ArrayHandle thresh = keyFile.get_integer_list ("Wavelet", "Level0noise"); + Glib::ArrayHandle thresh = keyFile.get_double_list ("Wavelet", "Level0noise"); wavelet.level0noise.setValues(thresh.data()[0], thresh.data()[1]); if (pedited) pedited->wavelet.level0noise = true; } if (keyFile.has_key ("Wavelet", "Level1noise")) { - Glib::ArrayHandle thresh = keyFile.get_integer_list ("Wavelet", "Level1noise"); + Glib::ArrayHandle thresh = keyFile.get_double_list ("Wavelet", "Level1noise"); wavelet.level1noise.setValues(thresh.data()[0], thresh.data()[1]); if (pedited) pedited->wavelet.level1noise = true; } if (keyFile.has_key ("Wavelet", "Level2noise")) { - Glib::ArrayHandle thresh = keyFile.get_integer_list ("Wavelet", "Level2noise"); + Glib::ArrayHandle thresh = keyFile.get_double_list ("Wavelet", "Level2noise"); wavelet.level2noise.setValues(thresh.data()[0], thresh.data()[1]); if (pedited) pedited->wavelet.level2noise = true; } diff --git a/rtengine/procparams.h b/rtengine/procparams.h index e5d273c57..b8cc80931 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -911,9 +911,9 @@ class WaveletParams { Threshold pastlev; Threshold satlev; Threshold edgcont; - Threshold level0noise; - Threshold level1noise; - Threshold level2noise; + Threshold level0noise; + Threshold level1noise; + Threshold level2noise; WaveletParams (); diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index 4f90eb5d0..1fef95641 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -1035,9 +1035,9 @@ void Wavelet::read (const ProcParams* pp, const ParamsEdited* pedited) { pastlev->setValue(pp->wavelet.pastlev); satlev->setValue(pp->wavelet.satlev); edgcont->setValue(pp->wavelet.edgcont); - level0noise->setValue(pp->wavelet.level0noise); - level1noise->setValue(pp->wavelet.level1noise); - level2noise->setValue(pp->wavelet.level2noise); + level0noise->setValue(pp->wavelet.level0noise); + level1noise->setValue(pp->wavelet.level1noise); + level2noise->setValue(pp->wavelet.level2noise); strength->setValue(pp->wavelet.strength); for (int i = 0; i < 9; i++) { correction[i]->setValue(pp->wavelet.c[i]); @@ -1126,9 +1126,9 @@ void Wavelet::write (ProcParams* pp, ParamsEdited* pedited) { pp->wavelet.hllev = hllev->getValue (); pp->wavelet.bllev = bllev->getValue (); pp->wavelet.edgcont = edgcont->getValue (); - pp->wavelet.level0noise = level0noise->getValue (); - pp->wavelet.level1noise = level1noise->getValue (); - pp->wavelet.level2noise = level2noise->getValue (); + pp->wavelet.level0noise = level0noise->getValue (); + pp->wavelet.level1noise = level1noise->getValue (); + pp->wavelet.level2noise = level2noise->getValue (); pp->wavelet.ccwcurve = ccshape->getCurve (); pp->wavelet.opacityCurveRG = opacityShapeRG->getCurve (); pp->wavelet.opacityCurveBY = opacityShapeBY->getCurve (); @@ -1338,9 +1338,9 @@ void Wavelet::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi pastlev->setDefault (defParams->wavelet.pastlev); satlev->setDefault (defParams->wavelet.satlev); edgcont->setDefault (defParams->wavelet.edgcont); - level0noise->setDefault (defParams->wavelet.level0noise); - level1noise->setDefault (defParams->wavelet.level1noise); - level2noise->setDefault (defParams->wavelet.level2noise); + level0noise->setDefault (defParams->wavelet.level0noise); + level1noise->setDefault (defParams->wavelet.level1noise); + level2noise->setDefault (defParams->wavelet.level2noise); if (pedited) { rescon->setDefault (defParams->wavelet.rescon);