diff --git a/rtdata/languages/default b/rtdata/languages/default index 950090441..0ffe73d12 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2738,12 +2738,12 @@ TP_LOCALLAB_VIS_TOOLTIP;Click to show/hide selected Control Spot.\nCtr TP_LOCALLAB_LIST_NAME;Add tool to current spot... TP_LOCALLAB_COLOR_TOOLNAME;Locallab Color&Light TP_LOCALLAB_EXP_TOOLNAME;Locallab Exposure -TP_LOCALLAB_SH_TOOLNAME;Locallab Shadows Highlight +TP_LOCALLAB_SH_TOOLNAME;Locallab Shadows Highlight & Tone Equalizer TP_LOCALLAB_VIB_TOOLNAME;Locallab Vibrance -TP_LOCALLAB_SOFT_TOOLNAME;Locallab Soft Light +TP_LOCALLAB_SOFT_TOOLNAME;Locallab Soft Light & Original Retinex TP_LOCALLAB_BLUR_TOOLNAME;Locallab Blur, Noise & Denoise TP_LOCALLAB_TONE_TOOLNAME;Locallab Tone Mapping -TP_LOCALLAB_RET_TOOLNAME;Locallab Retinex +TP_LOCALLAB_RET_TOOLNAME;Locallab Dehaze & Retinex TP_LOCALLAB_SHARP_TOOLNAME;Locallab Sharpening TP_LOCALLAB_LC_TOOLNAME;Locallab Local Constrast & Wavelet TP_LOCALLAB_CBDL_TOOLNAME;Locallab CBDL diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index f360d944f..4a95a3421 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -3491,9 +3491,9 @@ void LocallabShadow::read(const rtengine::procparams::ProcParams* pp, const Para complexity->set_active(spot.complexshadhigh); if (spot.shMethod == "std") { - shMethod->set_active(0); - } else if (spot.shMethod == "tone") { shMethod->set_active(1); + } else if (spot.shMethod == "tone") { + shMethod->set_active(0); } for (int i = 0; i < 5; i++) { @@ -3554,9 +3554,9 @@ void LocallabShadow::write(rtengine::procparams::ProcParams* pp, ParamsEdited* p spot.visishadhigh = exp->get_visible(); spot.complexshadhigh = complexity->get_active_row_number(); - if (shMethod->get_active_row_number() == 0) { + if (shMethod->get_active_row_number() == 1) { spot.shMethod = "std"; - } else if (shMethod->get_active_row_number() == 1) { + } else if (shMethod->get_active_row_number() == 0) { spot.shMethod = "tone"; } @@ -3847,9 +3847,9 @@ void LocallabShadow::convertParamToNormal() // Set hidden GUI widgets in Normal mode to default spot values if (defSpot.shMethod == "std") { - shMethod->set_active(0); - } else if (defSpot.shMethod == "tone") { shMethod->set_active(1); + } else if (defSpot.shMethod == "tone") { + shMethod->set_active(0); } blurSHde->setValue((double)defSpot.blurSHde); diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index 39e1df169..bd2c04087 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -1484,9 +1484,13 @@ void LocallabRetinex::updateGUIToMode(const modeType new_type) if (new_type == Normal) { // Advanced widgets are hidden in Normal mode retiFrame->hide(); + retitoolFrame->hide(); + expretitools->hide(); } else { // Advanced widgets are shown in Expert mode retiFrame->show(); + retitoolFrame->show(); + expretitools->show(); } }