diff --git a/rtdata/languages/default b/rtdata/languages/default index 35afada51..2b63be060 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1083,51 +1083,8 @@ HISTORY_MSG_838;Local - Vib gradient strength H HISTORY_MSG_839;Local - Software complexity HISTORY_MSG_840;Local - CL Curve HISTORY_MSG_841;Local - LC curve -HISTORY_MSG_842;Local - Contrast Threshold Mask blur -HISTORY_MSG_843;Local - Radius Mask blur -HISTORY_MSG_844;Local - Color Mask fftw -HISTORY_MSG_845;Local - log encoding -HISTORY_MSG_846;Local - Encoding auto -HISTORY_MSG_847;Local - Source Gray -HISTORY_MSG_848;Local - Source Gray auto -HISTORY_MSG_849;Local - Auto Grayon -HISTORY_MSG_850;Local - Black Ev -HISTORY_MSG_851;Local - White Ev -HISTORY_MSG_852;Local - Target Gray -HISTORY_MSG_853;Local - Local contrast -HISTORY_MSG_854;Local - Scope encoding log -HISTORY_MSG_855;Local - Entire image -HISTORY_MSG_856;Local - Base log -HISTORY_MSG_857;Local - Contrast Blur Residual -HISTORY_MSG_858;Local - Contrast Luminance only -HISTORY_MSG_859;Local - Contrast Maximum Blur levels -HISTORY_MSG_860;Local - Contrast Curve Blur levels -HISTORY_MSG_861;Local - Contrast Curve Contrast levels -HISTORY_MSG_862;Local - Contrast Sigma luminance -HISTORY_MSG_863;Local - Contrast Merge Original -HISTORY_MSG_864;Local - Directional sigma -HISTORY_MSG_865;Local - Directional delta -HISTORY_MSG_866;Local - Contrast Curve Compression -HISTORY_MSG_867;Local - Contrast Amount residual -HISTORY_MSG_868;Local - balance ΔE C-H -HISTORY_MSG_869;Local - denoise curve luminance -HISTORY_MSG_870;Local - LC mask curve LC(H) -HISTORY_MSG_871;Local - LC mask curve C(C) -HISTORY_MSG_872;Local - LC mask curve L(L) -HISTORY_MSG_873;Local - LC mask enable -HISTORY_MSG_875;Local - LC mask blend -HISTORY_MSG_876;Local - LC mask radius -HISTORY_MSG_877;Local - LC mask chroma -HISTORY_MSG_878;Local - LC mask curve contrast -HISTORY_MSG_879;Local - LC Chroma levels -HISTORY_MSG_880;Local - LC Chroma blur levels -HISTORY_MSG_881;Local - Contrast Offset Luminance -HISTORY_MSG_882;Local - Contrast Blur -HISTORY_MSG_883;Local - Contrast By Levels -HISTORY_MSG_884;Local - Contrast Dynamic Range Laplacian -HISTORY_MSG_885;Local - Contrast Dynamic Range Wavelet -HISTORY_MSG_886;Local - Contrast Wavelet Curve Compression -HISTORY_MSG_887;Local - Contrast Wavelet Compression Residual +HISTORY_MSG_842;Local - Contrast Threshold +HISTORY_MSG_843;Local - Radius HISTORY_MSG_888;Local - Contrast Wavelet Balance Threshold HISTORY_MSG_889;Local - Contrast Wavelet Graduated Strength HISTORY_MSG_890;Local - Contrast Wavelet Graduated angle @@ -1165,7 +1122,7 @@ HISTORY_MSG_923;Local - Tool complexity mode HISTORY_MSG_924;Local - Tool complexity mode HISTORY_MSG_925;Local - Scope color tools HISTORY_MSG_926;Local - Show mask type -HISTORY_MSG_927;Local - Shadow mask +HISTORY_MSG_927;Local - Shadow HISTORY_MSG_928;Local - Common color mask HISTORY_MSG_929;Local - Mask common scope HISTORY_MSG_930;Local - Mask Common blend luma @@ -2353,24 +2310,24 @@ TP_LOCALCONTRAST_LIGHTNESS;Lightness level TP_LOCALCONTRAST_RADIUS;Radius TP_LOCALLAB_ACTIV;Luminance only TP_LOCALLAB_ACTIVSPOT;Enable Spot -TP_LOCALLAB_ADJ;Equalizer Blue-yellow Red-green +TP_LOCALLAB_ADJ;Equalizer Blue-Yellow/Red-Green TP_LOCALLAB_ALL;All rubrics TP_LOCALLAB_AMOUNT;Amount TP_LOCALLAB_ARTIF;Shape detection -TP_LOCALLAB_ARTIF_TOOLTIP;Threshold deltaE-scope increase the range of scope-deltaE - high values are for very wide gamut images.\nIncrease deltaE decay improve shape detection, but can reduce the scope of detection. +TP_LOCALLAB_ARTIF_TOOLTIP;ΔE scope threshold increases the range of deltaE scope. High values are for very wide gamut images.\nIncreasing deltaE decay can improve shape detection, but can also reduce the scope. TP_LOCALLAB_AUTOGRAY;Automatic TP_LOCALLAB_AVOID;Avoid color shift -TP_LOCALLAB_BALAN;Balance ΔE ab-L +TP_LOCALLAB_BALAN;ab-L balance (ΔE) TP_LOCALLAB_BALANEXP;Laplacian balance -TP_LOCALLAB_BALANH;Balance ΔE C-H -TP_LOCALLAB_BALAN_TOOLTIP;Change algorithm ΔE parameter.\nMore or less ab-L, more or less C - H.\nNot for Denoise +TP_LOCALLAB_BALANH;C-H balance (ΔE) +TP_LOCALLAB_BALAN_TOOLTIP;Changes the ΔE algorithm parameters.\nTakes into account more or less ab-L, or more or less C - H.\nNot for Denoise TP_LOCALLAB_BASELOG;Logarithm base TP_LOCALLAB_BILATERAL;Bilateral filter TP_LOCALLAB_BLACK_EV;Black Ev TP_LOCALLAB_BLCO;Chrominance only TP_LOCALLAB_BLENDMASKCOL;Blend -TP_LOCALLAB_BLENDMASKMASK;Add/substract luminance mask -TP_LOCALLAB_BLENDMASKMASKAB;Add/substract chrominance mask +TP_LOCALLAB_BLENDMASKMASK;Add/subtract luminance mask +TP_LOCALLAB_BLENDMASKMASKAB;Add/subtract chrominance mask TP_LOCALLAB_BLENDMASK_TOOLTIP;If blend = 0 only shape detection is improved.\nIf blend > 0 the mask is added to the image. If blend < 0 the mask is subtracted from the image TP_LOCALLAB_BLENDMASKMASK_TOOLTIP;If this slider = 0 no action.\nAdd or subtract the mask from the original image TP_LOCALLAB_BLGUID;Guided Filter @@ -2387,14 +2344,14 @@ TP_LOCALLAB_BLUMETHOD_TOOLTIP;To blur the background and isolate the foreground: TP_LOCALLAB_BLUR;Gaussian Blur - Noise - Grain TP_LOCALLAB_BLURCBDL;Blur levels 0-1-2-3-4 TP_LOCALLAB_BLURCOL;Radius -TP_LOCALLAB_BLURDE;Blur Shape detection +TP_LOCALLAB_BLURDE;Blur shape detection TP_LOCALLAB_BLURLC;Luminance Only TP_LOCALLAB_BLURLEVELFRA;Blur Levels TP_LOCALLAB_BLURMASK_TOOLTIP;Generate a blur mask, take into account the structure with the contrast threshold Mask Blur slider. TP_LOCALLAB_BLURRESIDFRA;Blur Residual TP_LOCALLAB_BLUR_TOOLNAME;Blur/Grain & Denoise - 1 TP_LOCALLAB_BLWH;All changes forced in Black-and-White -TP_LOCALLAB_BLWH_TOOLTIP;Force color change composante "a" and "b" to zero.\nUsefull when the user chooses black and white processes, or film. +TP_LOCALLAB_BLWH_TOOLTIP;Force color components "a" and "b" to zero.\nUseful for black and white processing, or film simulation. TP_LOCALLAB_BUTTON_ADD;Add TP_LOCALLAB_BUTTON_DEL;Delete TP_LOCALLAB_BUTTON_DUPL;Duplicate @@ -2421,26 +2378,26 @@ TP_LOCALLAB_CIRCRADIUS;Spot size TP_LOCALLAB_CIRCRAD_TOOLTIP;Contains the references of RT-spot, useful for shape detection (hue, luma, chroma, Sobel).\nLow values may be useful for treating foliage.\nHigh values may be useful for treating skin TP_LOCALLAB_CLARICRES;Merge chroma TP_LOCALLAB_CLARIFRA;Clarity & Sharp mask - Blend & Soft images -TP_LOCALLAB_CLARILRES;Merge Luma +TP_LOCALLAB_CLARILRES;Merge luma TP_LOCALLAB_CLARISOFT;Soft radius TP_LOCALLAB_CLARISOFT_TOOLTIP;Enabled for Clarity and Sharp mask if Merge Luma different from zero.\n\nEnabled for all wavelets pyramid modules.\nDisabled if Soft radius = 0 TP_LOCALLAB_CLARITYML;Clarity TP_LOCALLAB_CLARI_TOOLTIP;Under or equal level wavelet 4, 'Sharp mask' is enabled.\nAbove level wavelet 5 'Clarity' is enabled.\nUsefull if you use 'Level dynamic Range Compression' -TP_LOCALLAB_CLIPTM;Clip restored datas (gain) +TP_LOCALLAB_CLIPTM;Clip restored data (gain) TP_LOCALLAB_COFR;Color & Light -TP_LOCALLAB_COLORDE;Color preview selection ΔE - Intensity -TP_LOCALLAB_COLORDEPREV_TOOLTIP;Button Preview ΔE needs that only one tool is enabled (expander).\nTo be able to have an Preview ΔE with several enable tools use Mask and modifications - Preview ΔE -TP_LOCALLAB_COLORDE_TOOLTIP;Show preview selection ΔE in blue if negative and in green if positive.\n\nMask and modifications (show modifications without mask): show real modifications if positive, show enhanced modifications (only luminance) with blue and yellow if negative. +TP_LOCALLAB_COLORDE;ΔE preview color - intensity +TP_LOCALLAB_COLORDE_TOOLTIP;Show a blue color-preview for ΔE selection if negative and green if positive.\n\nMask and modifications (show modifications without mask): show actual modifications if positive, show enhanced modifications (luminance only) with blue and yellow if negative. +TP_LOCALLAB_COLORDEPREV_TOOLTIP;Preview ΔE button will only work if you have activated one (and only one) of the tools in "Add tool to current spot" menu\nTo be able to preview ΔE with several tools enabled, use Mask and modifications - Preview ΔE TP_LOCALLAB_COLORSCOPE;Scope (color tools) -TP_LOCALLAB_COLORSCOPE_TOOLTIP;Use a common Scope for Color and light, Shadows highlight, Vibrance.\nOthers tools have their specific scope. +TP_LOCALLAB_COLORSCOPE_TOOLTIP;Common Scope slider for Color and Light, Shadows/Highlights, Vibrance.\nOther tools have their own scope controls. TP_LOCALLAB_COLOR_TOOLNAME;Color & Light - 11 TP_LOCALLAB_COL_NAME;Name TP_LOCALLAB_COL_VIS;Status -TP_LOCALLAB_COMPFRA;Levels Directional Contrast +TP_LOCALLAB_COMPFRA;Directional Contrast TP_LOCALLAB_COMPFRAME_TOOLTIP;Allows special effects. You can reduce artifacts with 'Clarity & Sharp mask - Blend & Soft Images".\nUses a lot of resources TP_LOCALLAB_COMPLEX_METHOD;Software Complexity TP_LOCALLAB_COMPLEX_TOOLTIP; Allow user to select Local adjustments rubrics. -TP_LOCALLAB_COMPREFRA;Levels Dynamic Wavelet Range (un)Compression +TP_LOCALLAB_COMPREFRA;Wavelet level tone-mapping TP_LOCALLAB_COMPRESS_TOOLTIP;Use if necessary the module 'Clarity & Sharp mask and Blend & Soft Images' by adjusting 'Soft radius' to reduce artifacts. TP_LOCALLAB_CONTCOL;Contrast threshold TP_LOCALLAB_CONTFRA;Contrast by Level @@ -2455,7 +2412,7 @@ TP_LOCALLAB_CURV;Lightness - Contrast - Chrominance "Super" TP_LOCALLAB_CURVCURR;Normal TP_LOCALLAB_CURVEEDITOR_CC_TOOLTIP;If curves at the top, mask is completely black no transformation is made by the mask on the image.\nAs you go down the curve, the mask gradually more colorful and brilliant, the image is changing more and more.\n\nIt is recommended (not required) to position the top of the curves on the gray transition line which represents the references (chroma, luma, hue). TP_LOCALLAB_CURVEEDITORM_CC_TOOLTIP;If curves at the top, mask is completely black no transformation is made by the mask on the image.\nAs you go down the curve, the mask gradually more colorful and brilliant, the image is changing more and more.\n\nThe gray transition line which represents the references (chroma, luma, hue).\nYou can choose or not to position the top of the curves on this transition. -TP_LOCALLAB_CURVEEDITOR_LL_TOOLTIP;To be active, you must enable combobox 'Curves type' +TP_LOCALLAB_CURVEEDITOR_LL_TOOLTIP;To be active, you must enable combobox 'Curve type' TP_LOCALLAB_CURVEEDITOR_TONES_LABEL;Tone curve TP_LOCALLAB_CURVEEDITOR_TONES_TOOLTIP;L=f(L), can be used with L(H) in Color and Light TP_LOCALLAB_CURVEMETHOD_TOOLTIP;'Normal', the curve L=f(L) has the same algorithm than slider lightness.\n'Super' the curve L=f(L) has an new improved algorithm, which can leeds in some cases to artifacts. @@ -2476,11 +2433,11 @@ TP_LOCALLAB_DENOI_TOOLTIP;This module can be used alone (at the end of process), TP_LOCALLAB_DEPTH;Depth TP_LOCALLAB_DETAIL;Local contrast TP_LOCALLAB_DETAILSH;Details -TP_LOCALLAB_DETAILTHR;Detail threshold Luminance Chroma (DCT ƒ) +TP_LOCALLAB_DETAILTHR;Luminance & Chroma detail threshold (DCT ƒ) TP_LOCALLAB_DUPLSPOTNAME;Copy TP_LOCALLAB_EDGFRA;Edge Sharpness TP_LOCALLAB_EDGSHOW;Show all tolls -TP_LOCALLAB_ELI;Elipse +TP_LOCALLAB_ELI;Ellipse TP_LOCALLAB_ENABLE_AFTER_MASK;Use Tone Mapping TP_LOCALLAB_ENABLE_MASK;Enable mask TP_LOCALLAB_ENABLE_MASKAFT;Use all algorithms Exposure @@ -2499,7 +2456,7 @@ TP_LOCALLAB_EV_VIS_ALL;Show all TP_LOCALLAB_EXCLUF;Excluding TP_LOCALLAB_EXCLUF_TOOLTIP;Can be used to exclude this part of datas - move Scope to extend color.\n You can apply all settings to this RT-spot. TP_LOCALLAB_EXCLUTYPE;Spot method -TP_LOCALLAB_EXCLUTYPE_TOOLTIP;Normal spot use recursive data.\n\nExcluding spot reinitialize data to origin.\nCan be used to totally or partially cancel a previous action or to perform a inverse mode +TP_LOCALLAB_EXCLUTYPE_TOOLTIP;Normal spot uses recursive data.\n\nExcluding spot reinitializes all local adjustment data.\nCan be used to totally or partially cancel a previous action or to carry out operations in inverted mode TP_LOCALLAB_EXECLU;Excluding spot TP_LOCALLAB_EXNORM;Normal spot //TP_LOCALLAB_EXPCBDL_TOOLTIP;In the case of contaminated sensor (type "grease"), and when the area is important or for a series of small defects.\n\na) Put the selection spot on a pronounced default (adapting its size if necessary), use a large spot enough to allow wavelet; b) choose a wide selection area to cover most of the area affected by the defects; c) Select a transition value (low) and transition decay (high value); d) act on levels 2, 3, 4 or 5 or lower by reducing the contrast (values below 100) and by acting on the chroma slider if necessary. e)possibly act on "scope" to reduce the extent of the action.\n\nYou can also complete with Blur levels and Gaussian blur (Smooth Blur and noise) @@ -2527,7 +2484,7 @@ TP_LOCALLAB_EXPOSE;Dynamic Range & Exposure TP_LOCALLAB_EXPOSURE_TOOLTIP;Modify exposure in L*a*b space using Laplacian PDE algorithms to take into account dE and minimize artifacts. TP_LOCALLAB_EXPRETITOOLS;Advanced Retinex Tools TP_LOCALLAB_EXPSHARP_TOOLTIP;RT-Spot minimum 39*39.\nUse low transition values and high decay transition values and scope to simulate small RT-spot. -TP_LOCALLAB_EXPTOOL;Tools exposure +TP_LOCALLAB_EXPTOOL;Exposure tools TP_LOCALLAB_EXPTRC;Tone Response Curve - TRC TP_LOCALLAB_EXP_TOOLNAME;Dynamic Range & Exposure - 10 TP_LOCALLAB_FATAMOUNT;Amount @@ -2539,7 +2496,7 @@ TP_LOCALLAB_FATFRAME_TOOLTIP;PDE Fattal - use Fattal Tone mapping algorithm. TP_LOCALLAB_FATLEVEL;Sigma TP_LOCALLAB_FATRES;Amount Residual Image TP_LOCALLAB_FATSHFRA;Dynamic Range Compression Mask ƒ -TP_LOCALLAB_FEATH_TOOLTIP;Gradient width in percent of the Spot diagonal\nUsed by all Graduated filter in all tools.\nNo action if Graduated Filter are not used. +TP_LOCALLAB_FEATH_TOOLTIP;Gradient width in percent of the Spot diagonal\nUsed by all graduated filters in all tools.\nNo action if a graduated filter hasn’t been activated. TP_LOCALLAB_FEATVALUE;Feather gradient (Graduated Filters) TP_LOCALLAB_FFTCOL_MASK;FFTW ƒ TP_LOCALLAB_FFTW;ƒ - Use Fast Fourier Transform @@ -2555,7 +2512,7 @@ TP_LOCALLAB_GRADANG;Gradient angle TP_LOCALLAB_GRADANG_TOOLTIP;Rotation angle in degrees : -180 0 +180 TP_LOCALLAB_GRADFRA;Graduated Filter Mask TP_LOCALLAB_GRADGEN_TOOLTIP;Graduated filter is supplied with Color and Light & merge file, Exposure & mask, Shadows Highlight, Vibrance, Log Encoding.\n\nVibrance, Color and Light & merge file, are provided with GF luminance, chrominance, Hue.\nFeather is located in settings. -TP_LOCALLAB_GRADLOGFRA;Luminance graduated Filter +TP_LOCALLAB_GRADLOGFRA;Graduated Filter Luminance TP_LOCALLAB_GRADSTR;Gradient strength TP_LOCALLAB_GRADSTRAB_TOOLTIP;Filter chroma strength TP_LOCALLAB_GRADSTRCHRO;Chrominance gradient strength @@ -2594,7 +2551,7 @@ TP_LOCALLAB_LAPRAD_TOOLTIP;Avoid using Radius and Laplace Threshold (advanced) s TP_LOCALLAB_LAP_MASK_TOOLTIP;Solve PDE for all Laplacian masks.\nIf enabled Laplacian threshold mask reduce artifacts and smooth result.\nIf disabled linear response. TP_LOCALLAB_LC_FFTW_TOOLTIP;FFT improve quality and allow big radius, but increases the treatment time.\nThe treatment time depends on the surface to be treated.\nTo be used preferably for large radius.\n\nDimensions can be reduced by a few pixels to optimize FFTW.\nThis optimization can reduce the treatment time by a factor of 1.5 to 10.\n TP_LOCALLAB_LC_TOOLNAME;Local Contrast & Wavelets - 7 -TP_LOCALLAB_LEVELBLUR;Maximum Blur levels +TP_LOCALLAB_LEVELBLUR;Maximum blur levels TP_LOCALLAB_LEVELLOCCONTRAST_TOOLTIP;On the abscissa local contrast (near concept luminance). On the ordinate, amplification or reduction local contrast. 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 @@ -2608,7 +2565,7 @@ TP_LOCALLAB_LIST_TOOLTIP;You can select 3 levels of complexity for each tool: Ba TP_LOCALLAB_LMASK_LEVEL_TOOLTIP;Give priority to action on midtones and high lights and by choosing the concerned wavelet levels TP_LOCALLAB_LMASK_LL_TOOLTIP;Give priority to action on midtones and high lights TP_LOCALLAB_LOCCONT;Unsharp Mask -TP_LOCALLAB_LOC_CONTRAST;Local contrast & Wavelets +TP_LOCALLAB_LOC_CONTRAST;Local Contrast & Wavelets TP_LOCALLAB_LOC_CONTRASTPYR;Ψ Pyramid 1: TP_LOCALLAB_LOC_CONTRASTPYR2;Ψ Pyramid 2: TP_LOCALLAB_LOC_CONTRASTPYR2LAB;Contrast by Level- Tone Mapping - Dir.Contrast @@ -2630,7 +2587,7 @@ TP_LOCALLAB_LOG_TOOLNAME;Log Encoding - 0 TP_LOCALLAB_LUM;Curves LL - CC TP_LOCALLAB_LUMADARKEST;Darkest TP_LOCALLAB_LUMASK;Background color for luminance and color masks -TP_LOCALLAB_LUMASK_TOOLTIP;Adjust the gray of the mask background in Show Mask (Mask and modifications) +TP_LOCALLAB_LUMASK_TOOLTIP;Adjusts the shade of gray or color of the mask background in Show Mask (Mask and modifications) TP_LOCALLAB_LUMAWHITESEST;Whiteest TP_LOCALLAB_LUMFRA;L*a*b* standard TP_LOCALLAB_LUMONLY;Luminance only @@ -2638,7 +2595,7 @@ TP_LOCALLAB_MASKCOM;Common Color Mask TP_LOCALLAB_MASKCOM_TOOLTIP;A tool in its own right.\nCan be used to adjust the image appearance (chrominance, luminance, contrast) and texture as a function of Scope. //These masks works as all tools, they take into account scope color.\nThey are different from others masks which complete a tool (Color and Light, Exposure...) TP_LOCALLAB_MASFRAME;Mask and Merge -TP_LOCALLAB_MASFRAME_TOOLTIP;For all masks.\nTake into account deltaE image to avoid retouching the selection area when sliders gamma mask, slope mask, chroma mask and curves contrast , levels contrasts, and mask blur, structure(if enabled tool) are used.\nDisabled in Inverse +TP_LOCALLAB_MASFRAME_TOOLTIP;For all masks.\nTakes into account the deltaE image to avoid modifying the selection area when the following sliders are used: gamma mask, slope mask, chroma mask and curve contrast , level contrasts, and mask blur, structure (if tool enabled ) .\nDisabled when Inverse mode is used TP_LOCALLAB_MASK;Mask TP_LOCALLAB_MASK2;Contrast curve TP_LOCALLAB_MASKCOL;Mask Curves @@ -2681,7 +2638,7 @@ TP_LOCALLAB_MERTEN;Darken only TP_LOCALLAB_MERTHI;Color Burn TP_LOCALLAB_MERTHR;Difference TP_LOCALLAB_MERTWE;Exclusion -TP_LOCALLAB_MERTWO;Substract +TP_LOCALLAB_MERTWO;Subtract TP_LOCALLAB_METHOD_TOOLTIP;'Enhanced + chroma denoise' significantly increases processing times.\nBut reduce artifacts. TP_LOCALLAB_MLABEL;Restored data Min=%1 Max=%2 (Clip - Offset) TP_LOCALLAB_MLABEL_TOOLTIP;'Should be' near min=0 max=32768 (log mode) but others values are possible.\nYou can act on Clip Restored datas and Offset to normalize.\n\nRestored image with no mixture. @@ -2695,10 +2652,10 @@ TP_LOCALLAB_MRTHR;Original Image TP_LOCALLAB_MRTWO;Short Curves 'L' Mask TP_LOCALLAB_MULTIPL_TOOLTIP;Allows the retouching of tones over a very wide range : -18EV +4EV. The first slider acts on very dark tones between -18EV and -6EV. The last slider acts light tones up to 4EV TP_LOCALLAB_NEIGH;Radius -TP_LOCALLAB_NOISECHROCOARSE;Chroma coarse (Wav) +TP_LOCALLAB_NOISECHROCOARSE;Coarse chroma (Wav) TP_LOCALLAB_NOISECHROC_TOOLTIP;If superior to zero, high quality algorithm is enabled.\nCoarse is for slider >=0.02 TP_LOCALLAB_NOISECHRODETAIL;Chroma detail recovery (DCT ƒ) -TP_LOCALLAB_NOISECHROFINE;Chroma fine (Wav) +TP_LOCALLAB_NOISECHROFINE;Fine chroma(Wav) TP_LOCALLAB_NOISEDETAIL_TOOLTIP;Disabled if slider = 100 TP_LOCALLAB_NOISELEQUAL;Equalizer white-black TP_LOCALLAB_NOISELUMCOARSE;Luminance coarse (Wav) @@ -2722,7 +2679,7 @@ TP_LOCALLAB_PREVIEW;Preview ΔE TP_LOCALLAB_PREVHIDE;Hide additional settings TP_LOCALLAB_PREVSHOW;Show additional settings TP_LOCALLAB_PROXI;ΔE decay -TP_LOCALLAB_QUALCURV_METHOD;Curves type +TP_LOCALLAB_QUALCURV_METHOD;Curve type TP_LOCALLAB_QUAL_METHOD;Global quality TP_LOCALLAB_RADIUS;Radius TP_LOCALLAB_RADIUS_TOOLTIP;Above Radius 30 Use Fast Fourier Transform @@ -2735,7 +2692,7 @@ TP_LOCALLAB_REN_DIALOG_LAB;Enter the new Control Spot name TP_LOCALLAB_REN_DIALOG_NAME;Renaming Control Spot TP_LOCALLAB_RESETSHOW;Reset All Show Modifications TP_LOCALLAB_RESID;Residual Image -TP_LOCALLAB_RESIDBLUR;Blur Residual Image +TP_LOCALLAB_RESIDBLUR;Blur residual image TP_LOCALLAB_RESIDCHRO;Residual image Chroma TP_LOCALLAB_RESIDCOMP;Compress residual image TP_LOCALLAB_RESIDCONT;Residual image Contrast @@ -2743,7 +2700,7 @@ TP_LOCALLAB_RESIDHI;Highlights TP_LOCALLAB_RESIDHITHR;Highlights threshold TP_LOCALLAB_RESIDSHA;Shadows TP_LOCALLAB_RESIDSHATHR;Shadows threshold -TP_LOCALLAB_RETI;Dehaze - Retinex +TP_LOCALLAB_RETI;Dehaze & Retinex TP_LOCALLAB_RETIFRA;Retinex TP_LOCALLAB_RETIM;Original Retinex TP_LOCALLAB_RETITOOLFRA;Retinex Tools @@ -2764,7 +2721,7 @@ TP_LOCALLAB_SCALEGR;Scale TP_LOCALLAB_SCALERETI;Scale TP_LOCALLAB_SCALTM;Scale TP_LOCALLAB_SCOPEMASK;Scope (ΔE image mask) -TP_LOCALLAB_SCOPEMASK_TOOLTIP;Enabled if Mask DeltaE Image is enabled.\nLow values avoid retouching selected area +TP_LOCALLAB_SCOPEMASK_TOOLTIP;Enabled if DeltaE Image Mask is enabled.\nLow values avoid retouching selected area TP_LOCALLAB_SENSI;Scope TP_LOCALLAB_SENSIBN;Scope TP_LOCALLAB_SENSICB;Scope @@ -2802,7 +2759,7 @@ TP_LOCALLAB_SHORTCMASK_TOOLTIP;Short circuit the 2 curves L(L) and L(H).\nAllows TP_LOCALLAB_SHOWC;Mask and modifications TP_LOCALLAB_SHOWC1;Merge file TP_LOCALLAB_SHOWCB;Mask and modifications -TP_LOCALLAB_SHOWDCT;Show process Fourier ƒ +TP_LOCALLAB_SHOWDCT;Show Fourier (ƒ) process TP_LOCALLAB_SHOWE;Mask and modifications TP_LOCALLAB_SHOWFOURIER;Fourier ƒ(dct) TP_LOCALLAB_SHOWLAPLACE;∆ Laplacian (first) @@ -2818,7 +2775,7 @@ TP_LOCALLAB_SHOWMNONE;Show modified image TP_LOCALLAB_SHOWMODIF;Show modifications without mask TP_LOCALLAB_SHOWMODIFMASK;Show modifications with mask TP_LOCALLAB_SHOWNORMAL;Normalize luminance (no) -TP_LOCALLAB_SHOWPLUS;Mask and modifications - Smooth-Blur & Denoise +TP_LOCALLAB_SHOWPLUS;Mask and modifications (Blur & Denoise) TP_LOCALLAB_SHOWPOISSON;Poisson (pde ƒ) TP_LOCALLAB_SHOWR;Mask and modifications TP_LOCALLAB_SHOWREF;Preview ΔE @@ -2834,12 +2791,12 @@ TP_LOCALLAB_SIGMAWAV;Attenuation response TP_LOCALLAB_SIM;Simple TP_LOCALLAB_SLOMASKCOL;Slope TP_LOCALLAB_SLOSH;Slope -TP_LOCALLAB_SOFT;Soft Light - Original Retinex +TP_LOCALLAB_SOFT;Soft Light & Original Retinex TP_LOCALLAB_SOFTM;Soft Light //TP_LOCALLAB_SOFTMETHOD_TOOLTIP;Original Retinex is very different from others Retinex method.\nIts acts on grey and balance luminance.\nIt is an emulation of "Dodge" and "Burn" TP_LOCALLAB_SOFTMETHOD_TOOLTIP;Apply a Soft-light blend (identical to the global adjustment). Carry out dodge and burn using the original Retinex algorithm. TP_LOCALLAB_SOFTRADIUSCOL;Soft radius -TP_LOCALLAB_SOFTRETI;Reduce ΔE artifact +TP_LOCALLAB_SOFTRETI;Reduce ΔE artifacts TP_LOCALLAB_SOFTRETI_TOOLTIP;Take into account deltaE to improve Transmission map TP_LOCALLAB_SOFT_TOOLNAME;Soft Light & Original Retinex - 6 TP_LOCALLAB_SOURCE_GRAY;Value @@ -2868,13 +2825,13 @@ TP_LOCALLAB_SYM;Symmetrical (mouse) TP_LOCALLAB_SYMSL;Symmetrical (mouse + sliders) TP_LOCALLAB_TARGET_GRAY;Target gray point TP_LOCALLAB_THRES;Threshold structure -TP_LOCALLAB_THRESDELTAE;Threshold ΔE-scope +TP_LOCALLAB_THRESDELTAE;ΔE scope threshold TP_LOCALLAB_THRESRETI;Threshold TP_LOCALLAB_THRESWAV;Balance threshold -TP_LOCALLAB_TLABEL;TM Datas Min=%1 Max=%2 Mean=%3 Sigma=%4 (Threshold) +TP_LOCALLAB_TLABEL;TM Data Min=%1 Max=%2 Mean=%3 Sigma=%4 (Threshold) TP_LOCALLAB_TLABEL2;TM Effective Tm=%1 TM=%2 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 - Texture +TP_LOCALLAB_TM;Tone Mapping TP_LOCALLAB_TM_MASK;Use transmission map TP_LOCALLAB_TONEMAPESTOP_TOOLTIP;This parameter affects sensitivity to edges.\n The greater it is the more likely an illumination change is to be considered an "edge".\n If set to zero tone mapping will have an effect similar to unsharp masking. TP_LOCALLAB_TONEMAPGAM_TOOLTIP;Gamma moves the action of tone-mapping to shadows or highlights. @@ -2884,22 +2841,22 @@ TP_LOCALLAB_TONEMAP_TOOLTIP;Same as the tone mapping tool in the main menu.\nThe TP_LOCALLAB_TONEMASCALE_TOOLTIP;This control gives meaning to the difference between "local" and "global" contrast.\nThe greater it is the larger a detail needs to be in order to be boosted TP_LOCALLAB_TONE_TOOLNAME;Tone Mapping - 4 TP_LOCALLAB_TOOLCOL;Structure mask as tool -TP_LOCALLAB_TOOLMASK;Tools +TP_LOCALLAB_TOOLMASK;Mask Tools TP_LOCALLAB_TRANSIT;Transition Gradient TP_LOCALLAB_TRANSITGRAD;Transition differentiation XY TP_LOCALLAB_TRANSITGRAD_TOOLTIP;Changes the transition of the abscissa to that of the ordinate TP_LOCALLAB_TRANSITVALUE;Transition value TP_LOCALLAB_TRANSITWEAK;Transition decay (linear-log) -TP_LOCALLAB_TRANSITWEAK_TOOLTIP;Adjust transition decay : change smoothness process - 1 linear - 2 parabolic - 3 cubic - ^25.\nCan be used in conjunction with very low transition values to reduce defects (CBDL, Wavelet, Color & Light) +TP_LOCALLAB_TRANSITWEAK_TOOLTIP;Adjust transition decay function: 1 linear , 2 parabolic, 3 cubic up to ^25.\nCan be used in conjunction with very low transition values to reduce defects (CBDL, Wavelets, Color & Light) TP_LOCALLAB_TRANSIT_TOOLTIP;Adjust smoothness of transition between affected and unaffected areas, as a percentage of the "radius" TP_LOCALLAB_TRANSMISSIONGAIN;Transmission gain TP_LOCALLAB_TRANSMISSIONMAP;Transmission map TP_LOCALLAB_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction.\nYou can act on this curve to change Transmission and reduce the artifacts TP_LOCALLAB_USEMASK;Use mask TP_LOCALLAB_VART;Variance (contrast) -TP_LOCALLAB_VIBRANCE;Vibrance - Warm/Cool +TP_LOCALLAB_VIBRANCE;Vibrance & Warm/Cool TP_LOCALLAB_VIBRA_TOOLTIP;Adjust vibrance (essentially the same as the global adjustment).\nCarry out the equivalent of a white-balance adjustment using a CIECAM algorithm. -TP_LOCALLAB_VIB_TOOLNAME;Vibrance - Warm/Cool - 3 +TP_LOCALLAB_VIB_TOOLNAME;Vibrance & Warm/Cool - 3 TP_LOCALLAB_SOFT_TOOLNAME;Soft Light & Original Retinex - 6 TP_LOCALLAB_BLUR_TOOLNAME;Blur/Grain & Denoise - 1 TP_LOCALLAB_TONE_TOOLNAME;Tone Mapping - 4 @@ -2914,7 +2871,7 @@ TP_LOCALLAB_WAMASKCOL;Ψ Mask Wavelet level TP_LOCALLAB_WARM;Warm/Cool & Color artifacts TP_LOCALLAB_WARM_TOOLTIP;This slider use Ciecam algorithm and acts as White Balance, it can warm or cool the area selected.\nIt can also in some cases reduce color artifacts. TP_LOCALLAB_WASDEN_TOOLTIP;Denoise luminance for the 3 first levels (fine).\nThe right limit of the curve correspond to coarse : level 3 and beyond -TP_LOCALLAB_WAV;Levels local contrast +TP_LOCALLAB_WAV;Local contrast by level TP_LOCALLAB_WAVBLUR_TOOLTIP;Performs a blur for each level of decomposition, as well as the residual image. TP_LOCALLAB_WAVCOMP;Compression by Level TP_LOCALLAB_WAVCOMPRE;(un)Compression by Level @@ -3241,7 +3198,7 @@ TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE3;Red/Yellow TP_VIBRANCE_CURVEEDITOR_SKINTONES_RANGE4;Yellow TP_VIBRANCE_CURVEEDITOR_SKINTONES_TOOLTIP;Hue according to hue H=f(H) TP_VIBRANCE_LABEL;Vibrance -TP_VIBRANCE_PASTELS;Pastel Tones +TP_VIBRANCE_PASTELS;Pastel tones TP_VIBRANCE_PASTSATTOG;Link pastel and saturated tones TP_VIBRANCE_PROTECTSKINS;Protect skin-tones TP_VIBRANCE_PSTHRESHOLD;Pastel/saturated tones threshold @@ -3276,7 +3233,7 @@ TP_WAVELET_BALANCE;Contrast balance d/v-h TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the wavelet directions: vertical-horizontal and diagonal.\nIf contrast, chroma or residual tone mapping are activated, the effect due to balance is amplified. TP_WAVELET_BALANCE_TOOLTIP;Alters the balance between the vertical, horizontal and diagonal wavelet directions: .\nActivating contrast, chroma or residual tone mapping amplifies the effect due to balance TP_WAVELET_BALCHRO_TOOLTIP;If enabled, the 'Contrast balance' curve or slider also modifies chroma balance. -TP_WAVELET_BALCHROM;Denoise equalizer Blue-Yellow Red-Green +TP_WAVELET_BALCHROM;Denoise equalizer Blue-Yellow/Red-Green TP_WAVELET_BALLUM;Denoise equalizer White-Black TP_WAVELET_BANONE;None TP_WAVELET_BASLI;Slider @@ -3437,7 +3394,7 @@ TP_WAVELET_MEDI;Reduce artifacts in blue sky TP_WAVELET_MEDILEV;Edge detection TP_WAVELET_MEDILEV_TOOLTIP;When you enable Edge Detection, it is recommanded:\n- to disabled low contrast levels to avoid artifacts,\n- to use high values of gradient sensitivity.\n\nYou can modulate the strength with 'refine' from Denoise and Refine. TP_WAVELET_MERGEC;Merge chroma -TP_WAVELET_MERGEL;Merge Luma +TP_WAVELET_MERGEL;Merge luma TP_WAVELET_NEUTRAL;Neutral TP_WAVELET_MIXCONTRAST;Reference local contrast TP_WAVELET_MIXDENOISE;Denoise diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index b70ddee6e..67d754dbb 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -709,12 +709,14 @@ static void calcLocalParams(int sp, int oW, int oH, const LocallabParams& locall } else if (locallab.spots.at(sp).gridMethod == "two") { lp.gridmet = 1; } - +/* if (locallab.spots.at(sp).expMethod == "std") { lp.expmet = 0; } else if (locallab.spots.at(sp).expMethod == "pde") { lp.expmet = 1; } +*/ + lp.expmet = 1; if (locallab.spots.at(sp).localcontMethod == "loc") { lp.locmet = 0; @@ -3401,6 +3403,13 @@ void ImProcFunctions::deltaEforMask(float **rdE, int bfw, int bfh, LabImage* buf static void showmask(int lumask, const local_params& lp, int xstart, int ystart, int cx, int cy, int bfw, int bfh, LabImage* bufexporig, LabImage* transformed, LabImage* bufmaskorigSH, int inv) { + float lum = fabs(lumask * 400.f); + float colo = 0.f; + if(lumask < 0.f) { + lum *= 1.4f; + colo = 30000.f + 12.f * lum; + } + #ifdef _OPENMP #pragma omp parallel for schedule(dynamic,16) #endif @@ -3421,17 +3430,18 @@ static void showmask(int lumask, const local_params& lp, int xstart, int ystart, if (inv == 0) { if (zone > 0) {//normal - transformed->L[y + ystart][x + xstart] = (lumask * 400.f) + clipLoc(bufmaskorigSH->L[y][x]); + transformed->L[y + ystart][x + xstart] = (lum) + clipLoc(bufmaskorigSH->L[y][x]); transformed->a[y + ystart][x + xstart] = bufexporig->a[y][x] * bufmaskorigSH->a[y][x]; - transformed->b[y + ystart][x + xstart] = bufexporig->b[y][x] * bufmaskorigSH->b[y][x]; + transformed->b[y + ystart][x + xstart] = (colo) + bufexporig->b[y][x] * bufmaskorigSH->b[y][x]; } } else if (inv == 1) { //inverse if (zone == 0) { - transformed->L[y + ystart][x + xstart] = (lumask * 400.f) + clipLoc(bufmaskorigSH->L[y][x]); + transformed->L[y + ystart][x + xstart] = (lum) + clipLoc(bufmaskorigSH->L[y][x]); transformed->a[y + ystart][x + xstart] = bufexporig->a[y][x] * bufmaskorigSH->a[y][x]; - transformed->b[y + ystart][x + xstart] = bufexporig->b[y][x] * bufmaskorigSH->b[y][x]; + transformed->b[y + ystart][x + xstart] = (colo) + bufexporig->b[y][x] * bufmaskorigSH->b[y][x]; } } + } } } diff --git a/rtengine/procevents.h b/rtengine/procevents.h index b64748d22..730689192 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -979,6 +979,7 @@ enum ProcEventCode { EvLocallabSpotprevMethod = 953, Evlocallabactiv = 954, EvlocallabCHshape = 955, + Evlocallabhishow = 956, NUMOFEVENTS }; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 235a20e9b..5ebd2ec48 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -2713,6 +2713,7 @@ LocallabParams::LocallabSpot::LocallabSpot() : colorscope(30.0), transitweak(1.0), transitgrad(0.0), + hishow(false), activ(true), avoid(false), blwh(false), @@ -3970,6 +3971,7 @@ bool LocallabParams::LocallabSpot::operator ==(const LocallabSpot& other) const && colorscope == other.colorscope && transitweak == other.transitweak && transitgrad == other.transitgrad + && hishow == other.hishow && activ == other.activ && avoid == other.avoid && blwh == other.blwh @@ -5496,6 +5498,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo saveToKeyfile(!pedited || spot_edited->colorscope, "Locallab", "Colorscope_" + index_str, spot.colorscope, keyFile); saveToKeyfile(!pedited || spot_edited->transitweak, "Locallab", "Transitweak_" + index_str, spot.transitweak, keyFile); saveToKeyfile(!pedited || spot_edited->transitgrad, "Locallab", "Transitgrad_" + index_str, spot.transitgrad, keyFile); + saveToKeyfile(!pedited || spot_edited->hishow, "Locallab", "Hishow_" + index_str, spot.hishow, keyFile); saveToKeyfile(!pedited || spot_edited->activ, "Locallab", "Activ_" + index_str, spot.activ, keyFile); saveToKeyfile(!pedited || spot_edited->avoid, "Locallab", "Avoid_" + index_str, spot.avoid, keyFile); saveToKeyfile(!pedited || spot_edited->blwh, "Locallab", "Blwh_" + index_str, spot.blwh, keyFile); @@ -7182,6 +7185,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited) assignFromKeyfile(keyFile, "Locallab", "Colorscope_" + index_str, pedited, spot.colorscope, spotEdited.colorscope); assignFromKeyfile(keyFile, "Locallab", "Transitweak_" + index_str, pedited, spot.transitweak, spotEdited.transitweak); assignFromKeyfile(keyFile, "Locallab", "Transitgrad_" + index_str, pedited, spot.transitgrad, spotEdited.transitgrad); + assignFromKeyfile(keyFile, "Locallab", "Hishow_" + index_str, pedited, spot.hishow, spotEdited.hishow); assignFromKeyfile(keyFile, "Locallab", "Activ_" + index_str, pedited, spot.activ, spotEdited.activ); assignFromKeyfile(keyFile, "Locallab", "Avoid_" + index_str, pedited, spot.avoid, spotEdited.avoid); assignFromKeyfile(keyFile, "Locallab", "Blwh_" + index_str, pedited, spot.blwh, spotEdited.blwh); diff --git a/rtengine/procparams.h b/rtengine/procparams.h index c435e317a..44747bbab 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -1002,6 +1002,7 @@ struct LocallabParams { double colorscope; double transitweak; double transitgrad; + bool hishow; bool activ; bool avoid; bool blwh; diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index 1be81a7de..0b0f6fb3c 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -983,6 +983,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = { LUMINANCECURVE, // EvLocallabSpotprevMethod LUMINANCECURVE, // Evlocallabactiv LUMINANCECURVE, // EvlocallabCHshape + LUMINANCECURVE //Evlocallabhishow }; diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 0b66eb986..9ed4c95ee 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -77,8 +77,9 @@ ControlSpotPanel::ControlSpotPanel(): colorde_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORDE"), -15, 15, 2, 5, Gtk::manage(new RTImage("circle-blue-yellow-small.png")), Gtk::manage(new RTImage("circle-gray-green-small.png"))))), colorscope_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_COLORSCOPE"), 0., 100.0, 1., 30.))), scopemask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SCOPEMASK"), 0, 100, 1, 60))), - lumask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LUMASK"), 0, 30, 1, 10))), + lumask_(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LUMASK"), -50, 30, 1, 10, Gtk::manage(new RTImage("circle-yellow-small.png")), Gtk::manage(new RTImage("circle-gray-small.png")) ))), + hishow_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_PREVSHOW")))), activ_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_ACTIVSPOT")))), avoid_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_AVOID")))), blwh_(Gtk::manage(new Gtk::CheckButton(M("TP_LOCALLAB_BLWH")))), @@ -108,6 +109,7 @@ ControlSpotPanel::ControlSpotPanel(): maskPrevActive(false) { const bool showtooltip = options.showtooltip; + pack_start(*hishow_); Gtk::HBox* const ctboxprevmethod = Gtk::manage(new Gtk::HBox()); prevMethod_->append(M("TP_LOCALLAB_PREVHIDE")); @@ -117,7 +119,7 @@ ControlSpotPanel::ControlSpotPanel(): sigc::mem_fun( *this, &ControlSpotPanel::prevMethodChanged)); - ctboxprevmethod->pack_start(*prevMethod_); +// ctboxprevmethod->pack_start(*prevMethod_); pack_start(*ctboxprevmethod); @@ -380,6 +382,9 @@ ControlSpotPanel::ControlSpotPanel(): pack_start(*artifBox2); ToolParamBlock* const specCaseBox = Gtk::manage(new ToolParamBlock()); + hishowconn_ = hishow_->signal_toggled().connect( + sigc::mem_fun(*this, &ControlSpotPanel::hishowChanged)); + activConn_ = activ_->signal_toggled().connect( sigc::mem_fun(*this, &ControlSpotPanel::activChanged)); @@ -819,6 +824,7 @@ void ControlSpotPanel::load_ControlSpot_param() balanh_->setValue((double)row[spots_.balanh]); colorde_->setValue((double)row[spots_.colorde]); colorscope_->setValue((double)row[spots_.colorscope]); + hishow_->set_active(row[spots_.hishow]); activ_->set_active(row[spots_.activ]); avoid_->set_active(row[spots_.avoid]); blwh_->set_active(row[spots_.blwh]); @@ -899,7 +905,7 @@ void ControlSpotPanel::prevMethodChanged() Gtk::TreeModel::Row row = *iter; row[spots_.prevMethod] = prevMethod_->get_active_row_number(); - +/* // Update Control Spot GUI according to spotMethod_ combobox state (to be compliant with updateParamVisibility function) if (multiImage && prevMethod_->get_active_text() == M("GENERAL_UNCHANGED")) { expTransGrad_->show(); @@ -925,10 +931,10 @@ void ControlSpotPanel::prevMethodChanged() circrad_->show(); ctboxshape->show(); } - +*/ // Raise event if (listener) { - listener->panelChanged(EvLocallabSpotprevMethod, prevMethod_->get_active_text()); +// listener->panelChanged(EvLocallabSpotprevMethod, prevMethod_->get_active_text()); } } @@ -1179,7 +1185,7 @@ void ControlSpotPanel::updateParamVisibility() excluFrame->show(); } - +/* if (multiImage && prevMethod_->get_active_text() == M("GENERAL_UNCHANGED")) { expTransGrad_->show(); expShapeDetect_->show(); @@ -1188,6 +1194,8 @@ void ControlSpotPanel::updateParamVisibility() circrad_->show(); ctboxshape->show(); } else if (prevMethod_->get_active_row_number() == 0) { // Normal case + */ + if (!hishow_->get_active()) { // Normal case expTransGrad_->hide(); expShapeDetect_->hide(); expSpecCases_->hide(); @@ -1432,6 +1440,50 @@ void ControlSpotPanel::adjusterChanged(Adjuster* a, double newval) } } +void ControlSpotPanel::hishowChanged() +{ + // printf("avoidChanged\n"); + + // Get selected control spot + const auto s = treeview_->get_selection(); + + if (!s->count_selected_rows()) { + return; + } + + const auto iter = s->get_selected(); + Gtk::TreeModel::Row row = *iter; + row[spots_.hishow] = hishow_->get_active(); + + + + if (!hishow_->get_active()) { // Normal case + expTransGrad_->hide(); + expShapeDetect_->hide(); + expSpecCases_->hide(); + expMaskMerge_->hide(); + circrad_->hide(); + ctboxshape->hide(); + shapeMethod_->set_active(0); + + } else { // Excluding case + expTransGrad_->show(); + expShapeDetect_->show(); + expSpecCases_->show(); + expMaskMerge_->show(); + circrad_->show(); + ctboxshape->show(); + } + + // Raise event + if (listener) { + if (hishow_->get_active()) { + listener->panelChanged(Evlocallabhishow, M("GENERAL_ENABLED")); + } else { + listener->panelChanged(Evlocallabhishow, M("GENERAL_DISABLED")); + } + } +} @@ -1677,6 +1729,7 @@ void ControlSpotPanel::disableParamlistener(bool cond) balanh_->block(cond); colorde_->block(cond); colorscope_->block(cond); + hishowconn_.block(cond); activConn_.block(cond); avoidConn_.block(cond); blwhConn_.block(cond); @@ -1720,6 +1773,7 @@ void ControlSpotPanel::setParamEditable(bool cond) balanh_->set_sensitive(cond); colorde_->set_sensitive(cond); colorscope_->set_sensitive(cond); + hishow_->set_sensitive(cond); activ_->set_sensitive(cond); avoid_->set_sensitive(cond); blwh_->set_sensitive(cond); @@ -2401,6 +2455,7 @@ ControlSpotPanel::SpotRow* ControlSpotPanel::getSpot(const int index) r->transitgrad = row[spots_.transitgrad]; r->scopemask = row[spots_.scopemask]; r->lumask = row[spots_.lumask]; + r->hishow = row[spots_.hishow]; r->activ = row[spots_.activ]; r->avoid = row[spots_.avoid]; r->blwh = row[spots_.blwh]; @@ -2531,6 +2586,7 @@ void ControlSpotPanel::addControlSpot(SpotRow* newSpot) row[spots_.balanh] = newSpot->balanh; row[spots_.colorde] = newSpot->colorde; row[spots_.colorscope] = newSpot->colorscope; + row[spots_.hishow] = newSpot->hishow; row[spots_.activ] = newSpot->activ; row[spots_.avoid] = newSpot->avoid; row[spots_.blwh] = newSpot->blwh; @@ -2645,6 +2701,7 @@ ControlSpotPanel::ControlSpots::ControlSpots() add(balanh); add(colorde); add(colorscope); + add(hishow); add(activ); add(avoid); add(blwh); diff --git a/rtgui/controlspotpanel.h b/rtgui/controlspotpanel.h index 720bdf0c1..f8ef41dc0 100644 --- a/rtgui/controlspotpanel.h +++ b/rtgui/controlspotpanel.h @@ -75,6 +75,7 @@ public: double balanh; double colorde; double colorscope; + bool hishow; bool activ; bool avoid; bool blwh; @@ -245,6 +246,7 @@ private: void adjusterChanged(Adjuster* a, double newval) override; + void hishowChanged(); void activChanged(); void avoidChanged(); void blwhChanged(); @@ -305,6 +307,7 @@ private: Gtk::TreeModelColumn balanh; Gtk::TreeModelColumn colorde; Gtk::TreeModelColumn colorscope; + Gtk::TreeModelColumn hishow; Gtk::TreeModelColumn activ; Gtk::TreeModelColumn avoid; Gtk::TreeModelColumn blwh; @@ -355,6 +358,7 @@ private: Gtk::Button* const button_visibility_; sigc::connection buttonvisibilityconn_; + MyComboBoxText* const prevMethod_; sigc::connection prevMethodconn_; MyComboBoxText* const shape_; @@ -393,6 +397,8 @@ private: Adjuster* const scopemask_; Adjuster* const lumask_; + Gtk::CheckButton* const hishow_; + sigc::connection hishowconn_; Gtk::CheckButton* const activ_; sigc::connection activConn_; Gtk::CheckButton* const avoid_; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 883ef9aa2..1710a060f 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -311,6 +311,7 @@ void Locallab::read(const rtengine::procparams::ProcParams* pp, const ParamsEdit r->balanh = pp->locallab.spots.at(i).balanh; r->colorde = pp->locallab.spots.at(i).colorde; r->colorscope = pp->locallab.spots.at(i).colorscope; + r->hishow = pp->locallab.spots.at(i).hishow; r->activ = pp->locallab.spots.at(i).activ; r->avoid = pp->locallab.spots.at(i).avoid; r->blwh = pp->locallab.spots.at(i).blwh; @@ -486,6 +487,7 @@ void Locallab::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited r->balanh = newSpot->balanh; r->colorde = newSpot->colorde; r->colorscope = newSpot->colorscope; + r->hishow = newSpot->hishow; r->activ = newSpot->activ; r->avoid = newSpot->avoid; r->blwh = newSpot->blwh; @@ -918,6 +920,7 @@ void Locallab::write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited pp->locallab.spots.at(pp->locallab.selspot).balanh = r->balanh; pp->locallab.spots.at(pp->locallab.selspot).colorde = r->colorde; pp->locallab.spots.at(pp->locallab.selspot).colorscope = r->colorscope; + pp->locallab.spots.at(pp->locallab.selspot).hishow = r->hishow; pp->locallab.spots.at(pp->locallab.selspot).activ = r->activ; pp->locallab.spots.at(pp->locallab.selspot).avoid = r->avoid; pp->locallab.spots.at(pp->locallab.selspot).blwh = r->blwh; diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index 42574d15c..1a64d2722 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -951,14 +951,14 @@ void LocallabColor::updateAdviceTooltips(const bool showTooltips) structcol->set_tooltip_text(""); strcol->set_tooltip_text(""); angcol->set_tooltip_text(""); - qualitycurveMethod->set_tooltip_text(""); + qualitycurveMethod->set_tooltip_markup(""); special->set_tooltip_text(""); expmaskcol1->set_tooltip_text(""); mercol->set_tooltip_text(""); opacol->set_tooltip_text(""); conthrcol->set_tooltip_text(""); gridmerFrame->set_tooltip_text(""); - expmaskcol->set_tooltip_text(""); + expmaskcol->set_tooltip_markup(""); CCmaskshape->setTooltip(""); LLmaskshape->setTooltip(""); HHmaskshape->setTooltip(""); @@ -2311,13 +2311,15 @@ LocallabExposure::LocallabExposure(): // Exposure specific widgets expMethod(Gtk::manage(new MyComboBoxText())), - pdeFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_PDEFRA")))), +// pdeFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_PDEFRA")))), + exppde(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_PDEFRA")))), laplacexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LAPLACEXP"), 0.0, 100.0, 0.1, 0.))), linear(Gtk::manage(new Adjuster(M("TP_LOCALLAB_LINEAR"), 0., 1., 0.01, 0.05))), balanexp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_BALANEXP"), 0.5, 1.5, 0.01, 1.0))), gamm(Gtk::manage(new Adjuster(M("TP_LOCALLAB_GAMM"), 0.2, 1.3, 0.01, 0.4))), exnoiseMethod(Gtk::manage(new MyComboBoxText())), - fatFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_FATFRA")))), +// fatFrame(Gtk::manage(new Gtk::Frame(M("TP_LOCALLAB_FATFRA")))), + expfat(Gtk::manage(new MyExpander(false, M("TP_LOCALLAB_FATFRA")))), fatamount(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATAMOUNT"), 1., 100., 1., 1.))), fatdetail(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATDETAIL"), -100., 300., 1., 0.))), fatlevel(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATLEVEL"), 0.25, 2.5, 0.05, 1.))), @@ -2369,7 +2371,9 @@ LocallabExposure::LocallabExposure(): expMethod->set_active(0); expMethodConn = expMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabExposure::expMethodChanged)); - pdeFrame->set_label_align(0.025, 0.5); +// pdeFrame->set_label_align(0.025, 0.5); + setExpandAlignProperties(exppde, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); + setExpandAlignProperties(expfat, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); laplacexp->setAdjusterListener(this); @@ -2385,7 +2389,7 @@ LocallabExposure::LocallabExposure(): exnoiseMethod->set_active(0); exnoiseMethodConn = exnoiseMethod->signal_changed().connect(sigc::mem_fun(*this, &LocallabExposure::exnoiseMethodChanged)); - fatFrame->set_label_align(0.025, 0.5); + // fatFrame->set_label_align(0.025, 0.5); fatamount->setAdjusterListener(this); @@ -2505,7 +2509,7 @@ LocallabExposure::LocallabExposure(): mask2expCurveEditorG->curveListComplete(); // Add Color & Light specific widgets to GUI - pack_start(*expMethod); +// pack_start(*expMethod); ToolParamBlock* const pdeBox = Gtk::manage(new ToolParamBlock()); pdeBox->pack_start(*laplacexp); pdeBox->pack_start(*linear); @@ -2516,15 +2520,19 @@ LocallabExposure::LocallabExposure(): ctboxexpmethod->pack_start(*labelexpmethod, Gtk::PACK_SHRINK, 4); ctboxexpmethod->pack_start(*exnoiseMethod); pdeBox->pack_start(*ctboxexpmethod); - pdeFrame->add(*pdeBox); - pack_start(*pdeFrame); + exppde->add(*pdeBox, false); +// pdeFrame->add(*pdeBox); +// pack_start(*pdeFrame); + pack_start(*exppde); ToolParamBlock* const fatBox = Gtk::manage(new ToolParamBlock()); fatBox->pack_start(*fatamount); fatBox->pack_start(*fatdetail); fatBox->pack_start(*fatlevel); fatBox->pack_start(*fatanchor); - fatFrame->add(*fatBox); - pack_start(*fatFrame); +// fatFrame->add(*fatBox); + expfat->add(*fatBox, false); +// pack_start(*fatFrame); + pack_start(*expfat); pack_start(*expcomp); pack_start(*sensiex); pack_start(*structexp); @@ -2602,14 +2610,16 @@ 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")); - pdeFrame->set_tooltip_text(M("TP_LOCALLAB_PDEFRAME_TOOLTIP")); +// expMethod->set_tooltip_text(M("TP_LOCALLAB_EXPMETHOD_TOOLTIP")); +// pdeFrame->set_tooltip_text(M("TP_LOCALLAB_PDEFRAME_TOOLTIP")); + exppde->set_tooltip_text(M("TP_LOCALLAB_PDEFRAME_TOOLTIP")); laplacexp->set_tooltip_text(M("TP_LOCALLAB_EXPLAP_TOOLTIP")); linear->set_tooltip_text(M("TP_LOCALLAB_EXPLAPLIN_TOOLTIP")); balanexp->set_tooltip_text(M("TP_LOCALLAB_EXPLAPBAL_TOOLTIP")); gamm->set_tooltip_text(M("TP_LOCALLAB_EXPLAPGAMM_TOOLTIP")); exnoiseMethod->set_tooltip_text(M("TP_LOCALLAB_EXPNOISEMETHOD_TOOLTIP")); - fatFrame->set_tooltip_text(M("TP_LOCALLAB_FATFRAME_TOOLTIP")); +// fatFrame->set_tooltip_text(M("TP_LOCALLAB_FATFRAME_TOOLTIP")); + expfat->set_tooltip_text(M("TP_LOCALLAB_FATFRAME_TOOLTIP")); expcomp->set_tooltip_text(M("TP_LOCALLAB_EXPCOMP_TOOLTIP")); sensiex->set_tooltip_text(M("TP_LOCALLAB_SENSI_TOOLTIP")); structexp->set_tooltip_text(M("TP_LOCALLAB_STRUCT_TOOLTIP")); @@ -2628,21 +2638,20 @@ void LocallabExposure::updateAdviceTooltips(const bool showTooltips) Lmaskexpshape->setTooltip(M("TP_LOCALLAB_LMASK_LL_TOOLTIP")); } else { exp->set_tooltip_text(""); - expMethod->set_tooltip_text(""); - pdeFrame->set_tooltip_text(""); + exppde->set_tooltip_text(""); laplacexp->set_tooltip_text(""); linear->set_tooltip_text(""); balanexp->set_tooltip_text(""); gamm->set_tooltip_text(""); exnoiseMethod->set_tooltip_text(""); - fatFrame->set_tooltip_text(""); + expfat->set_tooltip_text(""); expcomp->set_tooltip_text(""); sensiex->set_tooltip_text(""); structexp->set_tooltip_text(""); expchroma->set_tooltip_text(""); shapeexpos->setTooltip(""); strexp->set_tooltip_text(""); - expmaskexp->set_tooltip_text(""); + expmaskexp->set_tooltip_markup(""); CCmaskexpshape->setTooltip(""); LLmaskexpshape->setTooltip(""); HHmaskexpshape->setTooltip(""); @@ -2658,6 +2667,8 @@ void LocallabExposure::updateAdviceTooltips(const bool showTooltips) void LocallabExposure::setDefaultExpanderVisibility() { exptoolexp->set_expanded(false); + exppde->set_expanded(false); + expfat->set_expanded(false); expgradexp->set_expanded(false); expmaskexp->set_expanded(false); } @@ -2704,13 +2715,13 @@ void LocallabExposure::read(const rtengine::procparams::ProcParams* pp, const Pa exp->set_visible(spot.visiexpose); exp->setEnabled(spot.expexpose); complexity->set_active(spot.complexexpose); - +/* if (spot.expMethod == "std") { expMethod->set_active(0); } else if (spot.expMethod == "pde") { expMethod->set_active(1); } - +*/ laplacexp->setValue(spot.laplacexp); linear->setValue(spot.linear); balanexp->setValue(spot.balanexp); @@ -2787,13 +2798,13 @@ void LocallabExposure::write(rtengine::procparams::ProcParams* pp, ParamsEdited* spot.expexpose = exp->getEnabled(); spot.visiexpose = exp->get_visible(); spot.complexexpose = complexity->get_active_row_number(); - +/* if (expMethod->get_active_row_number() == 0) { spot.expMethod = "std"; } else if (expMethod->get_active_row_number() == 1) { spot.expMethod = "pde"; } - +*/ spot.laplacexp = laplacexp->getValue(); spot.linear = linear->getValue(); spot.balanexp = balanexp->getValue(); @@ -3395,19 +3406,24 @@ void LocallabExposure::updateExposureGUI1() } void LocallabExposure::updateExposureGUI2() -{ +{ /* // Update exposure GUI according to expMethod value if (expMethod->get_active_row_number() == 0) { - pdeFrame->hide(); - fatFrame->hide(); +// pdeFrame->hide(); +// fatFrame->hide(); + exppde->hide(); + expfat->hide(); softradiusexp->set_sensitive(true); sensiex->set_sensitive(true); } else if (expMethod->get_active_row_number() == 1) { - pdeFrame->show(); - fatFrame->show(); + // pdeFrame->show(); + // fatFrame->show(); + exppde->show(); + expfat->show(); softradiusexp->set_sensitive(false); sensiex->set_sensitive(true); } + */ } void LocallabExposure::updateExposureGUI3() @@ -3723,11 +3739,10 @@ void LocallabShadow::updateAdviceTooltips(const bool showTooltips) for (const auto multiplier : multipliersh) { multiplier->set_tooltip_text(""); } - gamSH->set_tooltip_text(""); sloSH->set_tooltip_text(""); strSH->set_tooltip_text(""); - expmasksh->set_tooltip_text(""); + expmasksh->set_tooltip_markup(""); CCmaskSHshape->setTooltip(""); LLmaskSHshape->setTooltip(""); HHmaskSHshape->setTooltip(""); @@ -3736,6 +3751,7 @@ void LocallabShadow::updateAdviceTooltips(const bool showTooltips) lapmaskSH->set_tooltip_text(""); mask2SHCurveEditorG->set_tooltip_text(""); LmaskSHshape->setTooltip(""); + } } @@ -4613,7 +4629,7 @@ void LocallabVibrance::updateAdviceTooltips(const bool showTooltips) exp->set_tooltip_text(""); warm->set_tooltip_text(""); strvib->set_tooltip_text(""); - expmaskvib->set_tooltip_text(""); + expmaskvib->set_tooltip_markup(""); CCmaskvibshape->setTooltip(""); LLmaskvibshape->setTooltip(""); HHmaskvibshape->setTooltip(""); @@ -5280,7 +5296,7 @@ void LocallabSoft::updateAdviceTooltips(const bool showTooltips) laplace->set_tooltip_text(M("TP_LOCALLAB_ORRETILAP_TOOLTIP")); } else { exp->set_tooltip_text(""); - showmasksoftMethod->set_tooltip_text(""); + showmasksoftMethod->set_tooltip_markup(""); streng->set_tooltip_text(""); laplace->set_tooltip_text(""); } @@ -5942,15 +5958,15 @@ void LocallabBlur::updateAdviceTooltips(const bool showTooltips) Lmaskblshape->setTooltip(M("TP_LOCALLAB_LMASK_LL_TOOLTIP")); LLmaskblshapewav->setTooltip(M("TP_LOCALLAB_LMASK_LEVEL_TOOLTIP")); } else { - expblnoise->set_tooltip_text(""); + expblnoise->set_tooltip_markup(""); radius->set_tooltip_text(""); sensibn->set_tooltip_text(""); - blurMethod->set_tooltip_text(""); - expdenoise->set_tooltip_text(""); + blurMethod->set_tooltip_markup(""); + expdenoise->set_tooltip_markup(""); wavshapeden->setTooltip(""); noiselumc->set_tooltip_text(""); - expmaskbl->set_tooltip_text(""); - showmaskblMethodtyp->set_tooltip_text(""); + expmaskbl->set_tooltip_markup(""); + showmaskblMethodtyp->set_tooltip_markup(""); CCmaskblshape->setTooltip(""); LLmaskblshape->setTooltip(""); HHmaskblshape->setTooltip(""); diff --git a/rtgui/locallabtools.h b/rtgui/locallabtools.h index 8b5152968..9d0e21779 100644 --- a/rtgui/locallabtools.h +++ b/rtgui/locallabtools.h @@ -317,13 +317,15 @@ class LocallabExposure: private: // Exposure specific widgets MyComboBoxText* const expMethod; - Gtk::Frame* const pdeFrame; +// Gtk::Frame* const pdeFrame; + MyExpander* const exppde; Adjuster* const laplacexp; Adjuster* const linear; Adjuster* const balanexp; Adjuster* const gamm; MyComboBoxText* const exnoiseMethod; - Gtk::Frame* const fatFrame; +// Gtk::Frame* const fatFrame; + MyExpander* const expfat; Adjuster* const fatamount; Adjuster* const fatdetail; Adjuster* const fatlevel; @@ -409,6 +411,7 @@ private: void updateExposureGUI3(); }; + /* ==== LocallabShadow ==== */ class LocallabShadow: public Gtk::VBox, diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index fd67f181f..015b5b183 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -297,7 +297,7 @@ void LocallabTone::updateAdviceTooltips(const bool showTooltips) scaltm->set_tooltip_text(""); rewei->set_tooltip_text(""); sensitm->set_tooltip_text(""); - expmasktm->set_tooltip_text(""); + expmasktm->set_tooltip_markup(""); CCmasktmshape->setTooltip(""); LLmasktmshape->setTooltip(""); HHmasktmshape->setTooltip(""); @@ -1006,11 +1006,11 @@ void LocallabRetinex::updateAdviceTooltips(const bool showTooltips) cliptm->set_tooltip_text(""); softradiusret->set_tooltip_text(""); cTtransshape->setTooltip(""); - mMLabels->set_tooltip_text(""); - transLabels->set_tooltip_text(""); + mMLabels->set_tooltip_markup(""); + transLabels->set_tooltip_markup(""); cTgainshape->setTooltip(""); - expmaskreti->set_tooltip_text(""); - enaretiMasktmap->set_tooltip_text(""); + expmaskreti->set_tooltip_markup(""); + enaretiMasktmap->set_tooltip_markup(""); CCmaskretishape->setTooltip(""); LLmaskretishape->setTooltip(""); HHmaskretishape->setTooltip(""); @@ -2626,10 +2626,10 @@ void LocallabContrast::updateAdviceTooltips(const bool showTooltips) Lmasklcshape->setTooltip(M("TP_LOCALLAB_LMASK_LL_TOOLTIP")); } else { contFrame->set_tooltip_text(""); - LocalcurveEditorwav->set_tooltip_text(""); - levelwav->set_tooltip_text(""); - clariFrame->set_tooltip_text(""); - clarisoft->set_tooltip_text(""); + LocalcurveEditorwav->set_tooltip_markup(""); + levelwav->set_tooltip_markup(""); + clariFrame->set_tooltip_markup(""); + clarisoft->set_tooltip_markup(""); expcontrastpyr->set_tooltip_text(""); wavgradl->set_tooltip_text(""); wavedg->set_tooltip_text(""); @@ -2641,7 +2641,7 @@ void LocallabContrast::updateAdviceTooltips(const bool showTooltips) wavcompre->set_tooltip_text(""); wavcomp->set_tooltip_text(""); fftwlc->set_tooltip_text(""); - expmasklc->set_tooltip_text(""); + expmasklc->set_tooltip_markup(""); CCmasklcshape->setTooltip(""); LLmasklcshape->setTooltip(""); HHmasklcshape->setTooltip(""); @@ -4076,7 +4076,7 @@ void LocallabCBDL::updateAdviceTooltips(const bool showTooltips) threshold->set_tooltip_text(""); clarityml->set_tooltip_text(""); sensicb->set_tooltip_text(""); - expmaskcb->set_tooltip_text(""); + expmaskcb->set_tooltip_markup(""); CCmaskcbshape->setTooltip(""); LLmaskcbshape->setTooltip(""); HHmaskcbshape->setTooltip(""); diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 5b8188f80..162146681 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -1068,6 +1068,7 @@ void ParamsEdited::initFrom(const std::vector& locallab.spots.at(j).colorscope = locallab.spots.at(j).colorscope && pSpot.colorscope == otherSpot.colorscope; locallab.spots.at(j).transitweak = locallab.spots.at(j).transitweak && pSpot.transitweak == otherSpot.transitweak; locallab.spots.at(j).transitgrad = locallab.spots.at(j).transitgrad && pSpot.transitgrad == otherSpot.transitgrad; + locallab.spots.at(j).hishow = locallab.spots.at(j).hishow && pSpot.hishow == otherSpot.hishow; locallab.spots.at(j).activ = locallab.spots.at(j).activ && pSpot.activ == otherSpot.activ; locallab.spots.at(j).avoid = locallab.spots.at(j).avoid && pSpot.avoid == otherSpot.avoid; locallab.spots.at(j).blwh = locallab.spots.at(j).blwh && pSpot.blwh == otherSpot.blwh; @@ -3202,6 +3203,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng toEdit.locallab.spots.at(i).transitgrad = mods.locallab.spots.at(i).transitgrad; } + if (locallab.spots.at(i).hishow) { + toEdit.locallab.spots.at(i).hishow = mods.locallab.spots.at(i).hishow; + } + if (locallab.spots.at(i).activ) { toEdit.locallab.spots.at(i).activ = mods.locallab.spots.at(i).activ; } @@ -6196,6 +6201,7 @@ LocallabParamsEdited::LocallabSpotEdited::LocallabSpotEdited(bool v) : colorscope(v), transitweak(v), transitgrad(v), + hishow(v), activ(v), avoid(v), blwh(v), @@ -6680,6 +6686,7 @@ void LocallabParamsEdited::LocallabSpotEdited::set(bool v) colorscope = v; transitweak = v; transitgrad = v; + hishow = v; activ = v; avoid = v; blwh = v; diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h index f0ef04b1c..bd32e7f81 100644 --- a/rtgui/paramsedited.h +++ b/rtgui/paramsedited.h @@ -415,6 +415,7 @@ public: bool colorscope; bool transitweak; bool transitgrad; + bool hishow; bool activ; bool avoid; bool blwh;