diff --git a/rtdata/languages/default b/rtdata/languages/default index 8ab20b81c..126d1d693 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2277,7 +2277,7 @@ TP_WAVELET_TMTYPE;Compression method TP_WAVELET_TON;Toning TP_WAVELET_USHARP;Clarity method TP_WAVELET_USH;None -TP_WAVELET_USH_TOOLTIP;If you select Sharp-mask, wavelet settings will be automatically positioned :\nBackground=black, Process=below, level=3...you can change level\nIf you select Clarity, wavelet settings will be automatically positioned :\nBackground=residual, Process=above, level=7..you can change level and wavelet levels. +TP_WAVELET_USH_TOOLTIP;If you select Sharp-mask, wavelet settings will be automatically positioned :\nBackground=black, Process=below, level=3...you can change level.\n\nIf you select Clarity, wavelet settings will be automatically positioned :\nBackground=residual, Process=above, level=7..you can change level and wavelet levels. TP_WAVELET_SHA;Sharp mask TP_WAVELET_SHOWMASK;Show wavelet 'mask' TP_WAVELET_CLA;Clarity diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index b7fb38c8a..c13831468 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -1006,7 +1006,7 @@ void Crop::update(int todo) - if (WaveParams.ushamethod != "none" && WaveParams.expclari && WaveParams.CLmethod != "all") { + if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { unshar = new LabImage(labnCrop->W, labnCrop->H); provis = params.wavelet.CLmethod; @@ -1020,7 +1020,7 @@ void Crop::update(int todo) parent->ipf.ip_wavelet(labnCrop, labnCrop, kall, WaveParams, wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY, waOpacityCurveW, waOpacityCurveWL, parent->wavclCurve, skip); - if (WaveParams.ushamethod != "none" && WaveParams.expclari && WaveParams.CLmethod != "all") { + if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { float mL = (float)(WaveParams.mergeL / 100.f); float mC = (float)(WaveParams.mergeC / 100.f); diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 61736cdfb..2790f93a2 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -870,7 +870,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange) - if (WaveParams.ushamethod != "none" && WaveParams.expclari && WaveParams.CLmethod != "all") { + if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { unshar = new LabImage(pW, pH); provis = params->wavelet.CLmethod; params->wavelet.CLmethod = "all"; @@ -884,7 +884,7 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange) ipf.ip_wavelet(nprevl, nprevl, kall, WaveParams, wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY, waOpacityCurveW, waOpacityCurveWL, wavclCurve, scale); - if (WaveParams.ushamethod != "none" && WaveParams.expclari && WaveParams.CLmethod != "all") { + if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { float mL = (float)(WaveParams.mergeL / 100.f); float mC = (float)(WaveParams.mergeC / 100.f); float mL0; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 6aa680a62..c60b8e8a0 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2178,7 +2178,7 @@ WaveletParams::WaveletParams() : daubcoeffmethod("4_"), CHmethod("without"), Medgreinf("less"), - ushamethod("none"), + ushamethod("clari"), CHSLmethod("SL"), EDmethod("CU"), NPmethod("none"), diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index fde5c8310..dcf66ca5e 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -1144,7 +1144,7 @@ private: CurveFactory::curveWavContL(wavcontlutili, params.wavelet.wavclCurve, wavclCurve,/* hist16C, dummy,*/ 1); - if (WaveParams.ushamethod != "none" && WaveParams.expclari && WaveParams.CLmethod != "all") { + if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { unshar = new LabImage(fw, fh); provis = params.wavelet.CLmethod; params.wavelet.CLmethod = "all"; @@ -1155,7 +1155,7 @@ private: ipf.ip_wavelet(labView, labView, 2, WaveParams, wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY, waOpacityCurveW, waOpacityCurveWL, wavclCurve, 1); - if (WaveParams.ushamethod != "none" && WaveParams.expclari && WaveParams.CLmethod != "all") { + if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { float mL = (float)(WaveParams.mergeL / 100.f); float mC = (float)(WaveParams.mergeC / 100.f); float mL0; diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index 4397e1662..1fc4143d0 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -117,8 +117,8 @@ Wavelet::Wavelet() : edgeampli(Gtk::manage(new Adjuster(M("TP_WAVELET_EDGEAMPLI"), 0, 100, 1, 10))), mergeL(Gtk::manage(new Adjuster(M("TP_WAVELET_MERGEL"), -50, 100, 1, 40))), mergeC(Gtk::manage(new Adjuster(M("TP_WAVELET_MERGEC"), -50, 100, 1, 20))), - softrad(Gtk::manage(new Adjuster(M("TP_WAVELET_SOFTRAD"), 0.0, 100., 0.01, 0.))), - softradend(Gtk::manage(new Adjuster(M("TP_WAVELET_SOFTRAD"), 0.0, 100., 0.01, 0.))), + softrad(Gtk::manage(new Adjuster(M("TP_WAVELET_SOFTRAD"), 0.0, 100., 0.1, 0.))), + softradend(Gtk::manage(new Adjuster(M("TP_WAVELET_SOFTRAD"), 0.0, 100., 0.1, 0.))), Lmethod(Gtk::manage(new MyComboBoxText())), CHmethod(Gtk::manage(new MyComboBoxText())), CHSLmethod(Gtk::manage(new MyComboBoxText())), @@ -483,7 +483,7 @@ Wavelet::Wavelet() : showmaskConn = showmask->signal_toggled().connect(sigc::mem_fun(*this, &Wavelet::showmaskToggled)); ToolParamBlock* const clariBox = Gtk::manage(new ToolParamBlock()); - ushamethod->append(M("TP_WAVELET_USH")); + // ushamethod->append(M("TP_WAVELET_USH")); ushamethod->append(M("TP_WAVELET_SHA")); ushamethod->append(M("TP_WAVELET_CLA")); ushamethodconn = ushamethod->signal_changed().connect(sigc::mem_fun(*this, &Wavelet::ushamethodChanged)); @@ -495,7 +495,7 @@ Wavelet::Wavelet() : clariBox->pack_start(*mergeL); clariBox->pack_start(*mergeC); clariBox->pack_start(*softrad); - clariBox->pack_start(*showmask); +// clariBox->pack_start(*showmask); // Edge Sharpness ToolParamBlock* const edgBox = Gtk::manage(new ToolParamBlock()); @@ -1038,12 +1038,13 @@ void Wavelet::read(const ProcParams* pp, const ParamsEdited* pedited) } //ushamethod - if (pp->wavelet.ushamethod == "none") { +// if (pp->wavelet.ushamethod == "none") { +// ushamethod->set_active(0); + // } else + if (pp->wavelet.ushamethod == "sharp") { ushamethod->set_active(0); - } else if (pp->wavelet.ushamethod == "sharp") { - ushamethod->set_active(1); } else if (pp->wavelet.ushamethod == "clari") { - ushamethod->set_active(2); + ushamethod->set_active(1); } //CHSLmethod->set_active (1); @@ -1721,11 +1722,12 @@ void Wavelet::write(ProcParams* pp, ParamsEdited* pedited) pp->wavelet.Medgreinf = "less"; } + // if (ushamethod->get_active_row_number() == 0) { + // pp->wavelet.ushamethod = "none"; + // } else if (ushamethod->get_active_row_number() == 0) { - pp->wavelet.ushamethod = "none"; - } else if (ushamethod->get_active_row_number() == 1) { pp->wavelet.ushamethod = "sharp"; - } else if (ushamethod->get_active_row_number() == 2) { + } else if (ushamethod->get_active_row_number() == 1) { pp->wavelet.ushamethod = "clari"; } @@ -2340,27 +2342,28 @@ void Wavelet::TilesmethodUpdateUI() { void Wavelet::ushamethodChanged() { - if (ushamethod->get_active_row_number() == 2 && expclari->getEnabled() == true) { + if (ushamethod->get_active_row_number() == 1 && expclari->getEnabled() == true) { Backmethod->set_active(2); CLmethod->set_active(2); Lmethod->set_active(6); Lmethod->set_sensitive(true); Dirmethod->set_sensitive(true); Dirmethod->set_active(3); - } else if (ushamethod->get_active_row_number() == 1 && expclari->getEnabled() == true) { + } else if (ushamethod->get_active_row_number() == 0 && expclari->getEnabled() == true) { Backmethod->set_active(0); CLmethod->set_active(1); Lmethod->set_active(2); Dirmethod->set_active(3); Lmethod->set_sensitive(true); Dirmethod->set_sensitive(true); - } else if (ushamethod->get_active_row_number() == 0 || expclari->getEnabled() == false) { + /* } else if (ushamethod->get_active_row_number() == 0 || expclari->getEnabled() == false) { Backmethod->set_active(1); CLmethod->set_active(3); Lmethod->set_active(3); Dirmethod->set_active(3); Lmethod->set_sensitive(false); Dirmethod->set_sensitive(false); + */ } else if (expclari->getEnabled() == false) { Backmethod->set_active(1); CLmethod->set_active(3); @@ -2989,7 +2992,7 @@ void Wavelet::avoidToggled() void Wavelet::showmaskToggled() { - if (ushamethod->get_active_row_number() == 2 && showmask->get_active()) { + if (ushamethod->get_active_row_number() == 1 && showmask->get_active()) { Backmethod->set_active(2); CLmethod->set_active(2); Lmethod->set_active(6); @@ -2998,7 +3001,7 @@ void Wavelet::showmaskToggled() Dirmethod->set_active(3); expclari->setEnabled(false); - } else if (ushamethod->get_active_row_number() == 1 && showmask->get_active()) { + } else if (ushamethod->get_active_row_number() == 0 && showmask->get_active()) { Backmethod->set_active(0); CLmethod->set_active(1); Lmethod->set_active(2); @@ -3009,7 +3012,7 @@ void Wavelet::showmaskToggled() } - if (ushamethod->get_active_row_number() == 2 && !showmask->get_active()) { + if (ushamethod->get_active_row_number() == 1 && !showmask->get_active()) { Backmethod->set_active(2); CLmethod->set_active(2); Lmethod->set_active(6); @@ -3018,7 +3021,7 @@ void Wavelet::showmaskToggled() Dirmethod->set_active(3); expclari->setEnabled(true); - } else if (ushamethod->get_active_row_number() == 1 && !showmask->get_active()) { + } else if (ushamethod->get_active_row_number() == 0 && !showmask->get_active()) { Backmethod->set_active(0); CLmethod->set_active(1); Lmethod->set_active(2); @@ -3241,14 +3244,14 @@ void Wavelet::enableToggled(MyExpander *expander) showmask->set_active(false); } - if (ushamethod->get_active_row_number() == 2) { + if (ushamethod->get_active_row_number() == 1) { Backmethod->set_active(2); CLmethod->set_active(2); Lmethod->set_active(6); Lmethod->set_sensitive(true); Dirmethod->set_sensitive(true); Dirmethod->set_active(3); - } else if (ushamethod->get_active_row_number() == 1) { + } else if (ushamethod->get_active_row_number() == 0) { Backmethod->set_active(0); CLmethod->set_active(1); Lmethod->set_active(2);