From 12491036d78df6afea24b323be25fed2b6d2cb3e Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 25 May 2020 08:51:01 +0200 Subject: [PATCH] Various small chnages to GUI and tooltips color and light - exposure --- rtdata/languages/default | 5 +++- rtgui/locallabtools.cc | 65 +++++++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/rtdata/languages/default b/rtdata/languages/default index 89350cfe6..a6d2b5d16 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -2429,7 +2429,7 @@ TP_LOCALLAB_EXPLAP_TOOLTIP;The more you act on this threshold slider, the greate TP_LOCALLAB_EXPLAPBAL_TOOLTIP;Balances the action between the original image and the Laplace transform. TP_LOCALLAB_EXPLAPLIN_TOOLTIP;Add linear exposure component before application Laplace transform TP_LOCALLAB_EXPLAPGAMM_TOOLTIP;Apply a gamma before and after Laplace transform -TP_LOCALLAB_EXPMERGEFILE_TOOLTIP;Allows various possibilities to blend image (as layers in Photosshop) : difference, multiply, soft light, overlay...with opacity... +TP_LOCALLAB_EXPMERGEFILE_TOOLTIP;Allows various possibilities to blend image (as layers in Photosshop) : difference, multiply, soft light, overlay...with opacity...\nOriginal Image : merge current RT-spot with Original.\nPrevious spot : merge current Rt-spot with previous - if there is only one spot previous = original.\nBackground : merge current RT-spot with a color and luminance background (less possibilties) TP_LOCALLAB_EXPNOISEMETHOD_TOOLTIP;Apply a median before Laplace transform to prevent artifacts (noise).\nYou can also use "Denoise" tool. TP_LOCALLAB_EXPMETHOD_TOOLTIP;Standard : use an algorithm similar as main Exposure but in L*a*b* and taking account of deltaE.\n\nLaplacian & PDE : use another algorithm also with deltaE and with Poisson equation to solve Laplacian in Fourier space.\nPDE IPOL, PDE Fattal and Standard can be combined.\nFFTW Fourier Transform is optimized in size to reduce processing time.\nPDE reduce artifacts and noise. TP_LOCALLAB_EXPOSE;Exposure - Dynamic Range Compression @@ -2503,6 +2503,7 @@ TP_LOCALLAB_LEVELBLUR;Maximum Blur levels TP_LOCALLAB_LEVELWAV;Ψ Wavelets Levels TP_LOCALLAB_LEVELWAV_TOOLTIP;The Level is automatically adapted to the size of the spot and the preview.\nFrom level 9 size max 512 to level 1 size max = 4 TP_LOCALLAB_LIGHTNESS;Lightness +TP_LOCALLAB_LIGHTN_TOOLTIP;In inverse mode: selection = -100 force luminance to zero TP_LOCALLAB_LIGHTRETI;Lightness TP_LOCALLAB_LINEAR;Linearity TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Give priority to action on midtones and high lights and by choosing the concerned wavelet levels @@ -2558,6 +2559,7 @@ TP_LOCALLAB_MERGETHR;Original(Mask 7) + Mask LCH TP_LOCALLAB_MERGETWO;Original(Mask 7) TP_LOCALLAB_MERGETYPE;Merge image and mask TP_LOCALLAB_MERGETYPE_TOOLTIP;None, use all mask in LCH mode.\nShort curves 'L' mask, use a short circuit for mask 2, 3, 4, 6, 7.\nOriginal mask 8, blend current image with original +"TP_LOCALLAB_MERGEMER_TOOLTIP;Take into account ΔE to merge files (equivalent of scope for this use) TP_LOCALLAB_MERHEI;Overlay TP_LOCALLAB_MERHUE;Hue TP_LOCALLAB_MERLUCOL;Luminance @@ -2728,6 +2730,7 @@ TP_LOCALLAB_STRGRID;Strength TP_LOCALLAB_STRRETI_TOOLTIP;if Strength Retinex < 0.2 only Dehaze is enabled.\nif Strength Retinex >= 0.1 Dehaze is in luminance mode. TP_LOCALLAB_STRUC;Structure TP_LOCALLAB_STRUCCOL1;Structure Spot +TP_LOCALLAB_STRUCT_TOOLTIP;Use Sobel algorithm to take into account structure in shape detection.\nyou can have a preview by activating "mask and modifications - Show structure spot" TP_LOCALLAB_STRUCCOL;Structure TP_LOCALLAB_STRUMASKCOL;Structure mask strength TP_LOCALLAB_STYPE;Shape method diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 48fac4c15..5df31feec 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -589,7 +589,7 @@ LocallabColor::LocallabColor(): setExpandAlignProperties(expmaskcol1, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); merMethod->append(M("TP_LOCALLAB_MRONE")); - merMethod->append(M("TP_LOCALLAB_MRTWO")); +// merMethod->append(M("TP_LOCALLAB_MRTWO")); merMethod->append(M("TP_LOCALLAB_MRTHR")); merMethod->append(M("TP_LOCALLAB_MRFOU")); merMethod->append(M("TP_LOCALLAB_MRFIV")); @@ -870,10 +870,13 @@ void LocallabColor::getMaskView(int &colorMask, int &colorMaskinv, int &expMask, void LocallabColor::updateAdviceTooltips(const bool showTooltips) { if (showTooltips) { - lightness->set_tooltip_text(M("TP_LOCALLAB_EXPCOLOR_TOOLTIP")); + exp->set_tooltip_text(M("TP_LOCALLAB_EXPCOLOR_TOOLTIP")); + lightness->set_tooltip_text(M("TP_LOCALLAB_LIGHTN_TOOLTIP")); + structcol->set_tooltip_text(M("TP_LOCALLAB_STRUCT_TOOLTIP")); sensi->set_tooltip_text(M("TP_LOCALLAB_SENSI_TOOLTIP")); strcol->set_tooltip_text(M("TP_LOCALLAB_GRADGEN_TOOLTIP")); qualitycurveMethod->set_tooltip_markup(M("TP_LOCALLAB_CURVEMETHOD_TOOLTIP")); + mercol->set_tooltip_text(M("TP_LOCALLAB_MERGEMER_TOOLTIP")); opacol->set_tooltip_text(M("TP_LOCALLAB_MERGEOPA_TOOLTIP")); conthrcol->set_tooltip_text(M("TP_LOCALLAB_MERGEOPA_TOOLTIP")); gridmerFrame->set_tooltip_text(M("TP_LOCALLAB_GRIDFRAME_TOOLTIP")); @@ -887,10 +890,13 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips) LLmaskcolshapewav->setTooltip(M("TP_LOCALLAB_LMASK_LEVEL_TOOLTIP")); expmaskcol1->set_tooltip_text(M("TP_LOCALLAB_EXPMERGEFILE_TOOLTIP")); } else { + exp->set_tooltip_text(""); lightness->set_tooltip_text(""); + structcol->set_tooltip_text(""); sensi->set_tooltip_text(""); strcol->set_tooltip_text(""); qualitycurveMethod->set_tooltip_text(""); + mercol->set_tooltip_text(""); opacol->set_tooltip_text(""); conthrcol->set_tooltip_text(""); gridmerFrame->set_tooltip_text(""); @@ -1024,14 +1030,14 @@ void LocallabColor::read(const rtengine::procparams::ProcParams* pp, const Param if (spot.merMethod == "mone") { merMethod->set_active(0); - } else if (spot.merMethod == "mtwo") { - merMethod->set_active(1); +// } else if (spot.merMethod == "mtwo") { +// merMethod->set_active(1); } else if (spot.merMethod == "mthr") { - merMethod->set_active(2); + merMethod->set_active(1); } else if (spot.merMethod == "mfou") { - merMethod->set_active(3); + merMethod->set_active(2); } else if (spot.merMethod == "mfiv") { - merMethod->set_active(4); + merMethod->set_active(3); } if (spot.mergecolMethod == "one") { @@ -1195,13 +1201,13 @@ void LocallabColor::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pe if (merMethod->get_active_row_number() == 0) { spot.merMethod = "mone"; +// } else if (merMethod->get_active_row_number() == 1) { +// spot.merMethod = "mtwo"; } else if (merMethod->get_active_row_number() == 1) { - spot.merMethod = "mtwo"; - } else if (merMethod->get_active_row_number() == 2) { spot.merMethod = "mthr"; - } else if (merMethod->get_active_row_number() == 3) { + } else if (merMethod->get_active_row_number() == 2) { spot.merMethod = "mfou"; - } else if (merMethod->get_active_row_number() == 4) { + } else if (merMethod->get_active_row_number() == 3) { spot.merMethod = "mfiv"; } @@ -1676,14 +1682,14 @@ void LocallabColor::convertParamToNormal() if (defSpot.merMethod == "mone") { merMethod->set_active(0); - } else if (defSpot.merMethod == "mtwo") { - merMethod->set_active(1); +// } else if (defSpot.merMethod == "mtwo") { +// merMethod->set_active(1); } else if (defSpot.merMethod == "mthr") { - merMethod->set_active(2); + merMethod->set_active(1); } else if (defSpot.merMethod == "mfou") { - merMethod->set_active(3); + merMethod->set_active(2); } else if (defSpot.merMethod == "mfiv") { - merMethod->set_active(4); + merMethod->set_active(3); } if (defSpot.mergecolMethod == "one") { @@ -2085,7 +2091,7 @@ void LocallabColor::updateColorGUI2() conthrcol->hide(); gridmerFrame->hide(); break; - +/* case 1: invers->set_sensitive(false); H2CurveEditorG->set_sensitive(true); @@ -2095,6 +2101,16 @@ void LocallabColor::updateColorGUI2() conthrcol->hide(); gridmerFrame->hide(); break; +*/ + case 1: + invers->set_sensitive(false); + H2CurveEditorG->set_sensitive(true); + rgbCurveEditorG->set_sensitive(false); + special->set_sensitive(false); + mask7->show(); + conthrcol->show(); + gridmerFrame->hide(); + break; case 2: invers->set_sensitive(false); @@ -2107,16 +2123,6 @@ void LocallabColor::updateColorGUI2() break; case 3: - invers->set_sensitive(false); - H2CurveEditorG->set_sensitive(true); - rgbCurveEditorG->set_sensitive(false); - special->set_sensitive(false); - mask7->show(); - conthrcol->show(); - gridmerFrame->hide(); - break; - - case 4: invers->set_sensitive(false); H2CurveEditorG->set_sensitive(true); rgbCurveEditorG->set_sensitive(false); @@ -2439,6 +2445,7 @@ void LocallabExposure::updateAdviceTooltips(const bool showTooltips) if (showTooltips) { exp->set_tooltip_text(M("TP_LOCALLAB_EXPOSURE_TOOLTIP")); expMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP")); + structexp->set_tooltip_text(M("TP_LOCALLAB_STRUCT_TOOLTIP")); pdeFrame->set_tooltip_text(M("TP_LOCALLAB_PDEFRAME_TOOLTIP")); laplacexp->set_tooltip_text(M("TP_LOCALLAB_EXPLAP_TOOLTIP")); balanexp->set_tooltip_text(M("TP_LOCALLAB_EXPLAPBAL_TOOLTIP")); @@ -2460,6 +2467,7 @@ void LocallabExposure::updateAdviceTooltips(const bool showTooltips) } else { exp->set_tooltip_text(""); expMethod->set_tooltip_text(""); + structexp->set_tooltip_text(""); pdeFrame->set_tooltip_text(""); exnoiseMethod->set_tooltip_text(""); laplacexp->set_tooltip_text(M("")); @@ -2989,6 +2997,7 @@ void LocallabExposure::convertParamToNormal() disableListener(); // Set hidden GUI widgets in Normal mode to default spot values + blurexpde->setValue((double)defSpot.blurexpde); lapmaskexp->setValue(defSpot.lapmaskexp); gammaskexp->setValue(defSpot.gammaskexp); slomaskexp->setValue(defSpot.slomaskexp); @@ -3007,12 +3016,14 @@ void LocallabExposure::updateGUIToMode(const modeType new_type) gammaskexp->hide(); slomaskexp->hide(); gradFramemask->hide(); + blurexpde->hide(); } else { // Advanced widgets are shown in Expert mode lapmaskexp->show(); gammaskexp->show(); slomaskexp->show(); gradFramemask->show(); + blurexpde->show(); } }