diff --git a/rtdata/languages/default b/rtdata/languages/default index 5026b2a5c..15a7d9a30 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2251,7 +2251,7 @@ TP_LOCALLAB_EXPOSURE_TOOLTIP;In some cases (strong shadows ..) you can use the m TP_LOCALLAB_FATAMOUNT;Amount TP_LOCALLAB_FATANCHOR;Anchor TP_LOCALLAB_FATDETAIL;Detail -TP_LOCALLAB_FATFRA;PDE Fattal - Dynamic Range Compression +TP_LOCALLAB_FATFRA;Dynamic Range Compression TP_LOCALLAB_FATFRAME_TOOLTIP;PDE Fattal - use Fattal Tone mapping algorithm.\nAnchor allows selection according to the images over or under exposed.\nUseful to increase Luminance for a Second spot near the current and using mask TP_LOCALLAB_FATLEVEL;Detail levels TP_LOCALLAB_FATSHFRA;Dynamic Range Compression Mask @@ -2498,7 +2498,7 @@ TP_LOCALLAB_THRESRETI;Threshold TP_LOCALLAB_TLABEL2;TM Effective Tm=%1 TM=%2 TP_LOCALLAB_TLABEL;TM Datas Min=%1 Max=%2 Mean=%3 Sigma=%4 (Threshold) TP_LOCALLAB_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nTm=Min TM=Max of Transmission Map.\nYou can act on Threshold to normalize -TP_LOCALLAB_TM;Tone Mapping +TP_LOCALLAB_TM;Tone Mapping - Reinforced texture TP_LOCALLAB_TM_MASK;Use transmission map TP_LOCALLAB_TONEMAPESTOP_TOOLTIP;Increase Edge stopping - or Reweighting iterates, increase processing time - but increases the effects TP_LOCALLAB_TONEMAP_TOOLTIP;Tone Mapping - main menu must be disabled diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 7ea76f1b7..a9139ff13 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2645,8 +2645,8 @@ LocallabParams::LocallabSpot::LocallabSpot() : exptonemap(false), stren(0.5), gamma(1.0), - estop(0.5), - scaltm(4.0), + estop(1.4), + scaltm(1.0), rewei(0), satur(0.), sensitm(19), diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index cc19e8d5e..d84d500a9 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -399,8 +399,8 @@ strumaskbl(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STRUMASKCOL"), 0., 200., 0.1, // Tone Mapping stren(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STREN"), -0.5, 2.0, 0.01, 0.5))), gamma(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAM"), 0.4, 4.0, 0.11, 1.0))), -estop(Gtk::manage(new Adjuster(M("TP_LOCALLAB_ESTOP"), 0.1, 4.0, 0.01, 0.5))), -scaltm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALTM"), 0.1, 10.0, 0.01, 4.0))), +estop(Gtk::manage(new Adjuster(M("TP_LOCALLAB_ESTOP"), 0.1, 4., 0.01, 1.4))), +scaltm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCALTM"), 0.1, 10.0, 0.01, 1.0))), rewei(Gtk::manage(new Adjuster(M("TP_LOCALLAB_REWEI"), 0, 3, 1, 0))), sensitm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSI"), 0, 100, 1, 15))), softradiustm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SOFTRADIUSCOL"), 0.0, 100.0, 0.1, 0.))), @@ -1401,7 +1401,9 @@ pe(nullptr) ToolParamBlock* const fatBox = Gtk::manage(new ToolParamBlock()); fatBox->pack_start(*fatamount); fatBox->pack_start(*fatdetail); - fatBox->pack_start(*fatlevel); + if (complexsoft < 2) { + fatBox->pack_start(*fatlevel); + } fatBox->pack_start(*fatanchor); pdeFrame->add(*pdeBox); fatFrame->add(*fatBox); @@ -1427,22 +1429,25 @@ pe(nullptr) exposeBox->pack_start(*expMethod); } - if (complexsoft < 2) { + if (complexsoft < 1) { exposeBox->pack_start(*pdeFrame); } - exposeBox->pack_start(*black); - if (complexsoft < 2) { - exposeBox->pack_start(*fatFrame); + exposeBox->pack_start(*black); } +// if (complexsoft < 2) { + exposeBox->pack_start(*fatFrame); +// } exposeBox->pack_start(*expcomp); - exposeBox->pack_start(*hlcompr); - exposeBox->pack_start(*hlcomprthresh); - exposeBox->pack_start(*shadex); - exposeBox->pack_start(*shcompr); - exposeBox->pack_start(*expchroma); + if (complexsoft < 2) { + exposeBox->pack_start(*hlcompr); + exposeBox->pack_start(*hlcomprthresh); + exposeBox->pack_start(*shadex); + exposeBox->pack_start(*shcompr); + exposeBox->pack_start(*expchroma); + } exposeBox->pack_start(*warm); exposeBox->pack_start(*sensiex); @@ -2135,14 +2140,18 @@ pe(nullptr) masktmBox->pack_start(*showmasktmMethod, Gtk::PACK_SHRINK, 4); masktmBox->pack_start(*enatmMask, Gtk::PACK_SHRINK, 0); masktmBox->pack_start(*enatmMaskaft, Gtk::PACK_SHRINK, 0); - masktmBox->pack_start(*masktmCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor + masktmBox->pack_start(*masktmCurveEditorG, Gtk::PACK_SHRINK, 4); masktmBox->pack_start(*blendmasktm, Gtk::PACK_SHRINK, 0); - masktmBox->pack_start(*lapmasktm, Gtk::PACK_SHRINK, 0); + if (complexsoft < 1) { + masktmBox->pack_start(*lapmasktm, Gtk::PACK_SHRINK, 0); + } masktmBox->pack_start(*radmasktm, Gtk::PACK_SHRINK, 0); masktmBox->pack_start(*chromasktm, Gtk::PACK_SHRINK, 0); - masktmBox->pack_start(*gammasktm, Gtk::PACK_SHRINK, 0); - masktmBox->pack_start(*slomasktm, Gtk::PACK_SHRINK, 0); - masktmBox->pack_start(*mask2tmCurveEditorG, Gtk::PACK_SHRINK, 4); // Padding is mandatory to correct behavior of curve editor + if (complexsoft < 1) { + masktmBox->pack_start(*gammasktm, Gtk::PACK_SHRINK, 0); + masktmBox->pack_start(*slomasktm, Gtk::PACK_SHRINK, 0); + } + masktmBox->pack_start(*mask2tmCurveEditorG, Gtk::PACK_SHRINK, 4); expmasktm->add(*masktmBox, false); @@ -2150,11 +2159,15 @@ pe(nullptr) // tmBox->pack_start(*amount);//to use if we change transit_shapedetect parameters tmBox->pack_start(*stren); tmBox->pack_start(*equiltm); - tmBox->pack_start(*gamma); - tmBox->pack_start(*satur); + if (complexsoft < 2) { + tmBox->pack_start(*gamma); + tmBox->pack_start(*satur); + } tmBox->pack_start(*estop); tmBox->pack_start(*scaltm); - tmBox->pack_start(*rewei); + if (complexsoft < 2) { + tmBox->pack_start(*rewei); + } // tmBox->pack_start(*softradiustm);//always bad with TM ?? tmBox->pack_start(*sensitm); tmBox->pack_start(*expmasktm); @@ -2162,9 +2175,9 @@ pe(nullptr) exptonemap->add(*tmBox, false); exptonemap->setLevel(2); - if (complexsoft < 2) { +// if (complexsoft < 2) { panel->pack_start(*exptonemap, false, false); - } +// } // Retinex Gtk::HBox* const retiTitleHBox = Gtk::manage(new Gtk::HBox()); @@ -8184,6 +8197,7 @@ void Locallab::adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newT { // Not used } + void Locallab::adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) { @@ -8193,13 +8207,13 @@ void Locallab::adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTop } } - if (getEnabled() && expblur->getEnabled()) { + if (getEnabled() && expblur->getEnabled() && complexsoft < 1) { if (listener) { listener->panelChanged(EvlocallabcsThresholdblur, csThresholdblur->getHistoryString()); } } - if (getEnabled() && expcolor->getEnabled()) { + if (getEnabled() && expcolor->getEnabled() && complexsoft < 1) { if (listener) { listener->panelChanged(EvlocallabcsThresholdcol, csThresholdcol->getHistoryString()); } @@ -10231,7 +10245,7 @@ void Locallab::updateLocallabGUI(const rtengine::procparams::ProcParams* pp, con } if (complexsoft == 2) { - expMethod->set_active(0); + expMethod->set_active(1); } if (pp->locallab.spots.at(index).exnoiseMethod == "one") {