Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Local Adjustments GUI improvements #5743

Merged
merged 6 commits into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions rtdata/languages/default
Original file line number Diff line number Diff line change
Expand Up @@ -1160,6 +1160,8 @@ HISTORY_MSG_919;Local - Residual wavelet highlights threshold
HISTORY_MSG_920;Local - Wavelet sigma LC
HISTORY_MSG_921;Local - Wavelet Graduated sigma LC2
HISTORY_MSG_922;Local - changes In Black and White
HISTORY_MSG_923;Local - Tool complexity mode
HISTORY_MSG_924;Local - Tool complexity mode
HISTORY_MSG_CAT02PRESET;Cat02 automatic preset
HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
Expand Down Expand Up @@ -1551,9 +1553,8 @@ PREFERENCES_CLUTSCACHE;HaldCLUT Cache
PREFERENCES_CLUTSCACHE_LABEL;Maximum number of cached CLUTs
PREFERENCES_CLUTSDIR;HaldCLUT directory
PREFERENCES_CMMBPC;Black point compensation
PREFERENCES_COMPLEXITYLOC;Complexity Local Adjustements
PREFERENCES_COMPLEXITYLOC;Default complexity for Local Adjustements
PREFERENCES_COMPLEXITY_EXP;Expert
PREFERENCES_COMPLEXITY_CONF;Confirmed
PREFERENCES_COMPLEXITY_NORM;Normal
PREFERENCES_CROP;Crop Editing
PREFERENCES_CROP_AUTO_FIT;Automatically zoom to fit the crop
Expand Down Expand Up @@ -1671,7 +1672,7 @@ PREFERENCES_SHOWBASICEXIF;Show basic Exif info
PREFERENCES_SHOWDATETIME;Show date and time
PREFERENCES_SHOWFILMSTRIPTOOLBAR;Show Filmstrip toolbar
PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
PREFERENCES_SHOWTOOLTIP;Show Local Adjustements Tooltips
PREFERENCES_SHOWTOOLTIP;Show Local Adjustements advice tooltips
PREFERENCES_SHTHRESHOLD;Threshold for clipped shadows
PREFERENCES_SINGLETAB;Single Editor Tab Mode
PREFERENCES_SINGLETABVERTAB;Single Editor Tab Mode, Vertical Tabs
Expand Down Expand Up @@ -2374,7 +2375,7 @@ TP_LOCALLAB_CURVNONE;Disable curves
TP_LOCALLAB_DARKRETI;Darkness
TP_LOCALLAB_DEHAFRA;Dehaze
TP_LOCALLAB_DEHAZ;Strength
TP_LOCALLAB_DEHAZ_TOOLTIP;Negative values add haze
TP_LOCALLAB_DEHAZ_TOOLTIP;Negative values adds haze
TP_LOCALLAB_DELTAD;Delta balance
TP_LOCALLAB_DELTAEC;Mask ΔE Image
TP_LOCALLAB_DENOIS;Ψ Denoise
Expand Down Expand Up @@ -2489,11 +2490,11 @@ 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
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 & Wavelet Pyramid Ψ Big defects
TP_LOCALLAB_LOC_CONTRAST;Local contrast - Wavelet
TP_LOCALLAB_LOC_CONTRASTPYR;Ψ Pyramid 1:
TP_LOCALLAB_LOC_CONTRASTPYRLAB; Graduated Filter - Edge Sharpness - Blur
TP_LOCALLAB_LOC_CONTRASTPYR2;Ψ Pyramid 2:
TP_LOCALLAB_LOC_CONTRASTPYR2LAB; Contrast by Levels- Tone Mapping- Dir. Contrast
TP_LOCALLAB_LOC_CONTRASTPYR2LAB; Contrast by Levels- Tone Mapping - Dir. Contrast
TP_LOCALLAB_LOC_RESIDPYR;Residual Image Main
TP_LOCALLAB_LOG;Encoding log
TP_LOCALLAB_LOGAUTO;Automatic
Expand Down Expand Up @@ -2552,6 +2553,8 @@ TP_LOCALLAB_MERTWO;Substract
TP_LOCALLAB_METHOD_TOOLTIP;'Enhanced + chroma denoise' significantly increases processing times.\nBut reduce artifacts.
TP_LOCALLAB_MLABEL;Restored datas Min=%1 Max=%2 (Clip - Offset)
TP_LOCALLAB_MLABEL_TOOLTIP;'Should be' near min=0 max=32768 but others values are possible.\nYou can act on Clip Restored datas and Offset to normalize.\n\nRestored image with no mixture.
TP_LOCALLAB_MODE_EXPERT;Expert
TP_LOCALLAB_MODE_NORMAL;Normal
TP_LOCALLAB_MRFIV;Background
TP_LOCALLAB_MRFOU;Previous Spot
TP_LOCALLAB_MRONE;None
Expand Down Expand Up @@ -2626,7 +2629,7 @@ TP_LOCALLAB_SENSIDEN;Scope
TP_LOCALLAB_SENSIEXCLU;Scope
TP_LOCALLAB_SENSIEXCLU_TOOLTIP;Adjust color to include in exclusion!
TP_LOCALLAB_SENSIH;Scope
TP_LOCALLAB_SENSIH_TOOLTIP; Adjust scope of action:\nSmall values limit action to colors very similar to those under the center spot.\nHigh values let the tool act upon a wider range of colors.\nValues smaller than 20 lead to a better algorithm.
TP_LOCALLAB_SENSIH_TOOLTIP;Adjust scope of action:\nSmall values limit action to colors very similar to those under the center spot.\nHigh values let the tool act upon a wider range of colors.\nValues smaller than 20 lead to a better algorithm.
TP_LOCALLAB_SENSILOG;Scope
TP_LOCALLAB_SENSIS;Scope
TP_LOCALLAB_SENSIS_TOOLTIP;Adjust scope of action:\nSmall values limit action to colors very similar to those under the center spot.\nHigh values let the tool act upon a wider range of colors.\nValues smaller than 20 lead to a better algorithm.
Expand All @@ -2636,7 +2639,7 @@ TP_LOCALLAB_SH1;Shadows Highlights
TP_LOCALLAB_SH2;Equalizer
TP_LOCALLAB_SHADEX;Shadows
TP_LOCALLAB_SHADEXCOMP;Shadows compression & tonal width
TP_LOCALLAB_SHADHIGH;Shadows Highlights-Gradient - Tone Equalizer - TRC
TP_LOCALLAB_SHADHIGH;Shadows Highlight - Tone equalizer
TP_LOCALLAB_SHADOWHIGHLIGHT_TOOLTIP;Can be used instead - or in complement - of exposure module in difficult cases.\nThe use of Denoise may be necessary : lightening the shadows.\n\nCan be used as graduated filter (increase Scope)
TP_LOCALLAB_SHAMASKCOL;Shadows mask
TP_LOCALLAB_SHAPETYPE;Shape RT-spot area
Expand All @@ -2659,7 +2662,7 @@ TP_LOCALLAB_SHOWFOURIER;Fourier ƒ(dct)
TP_LOCALLAB_SHOWLAPLACE;∆ Laplacian (first)
TP_LOCALLAB_SHOWLC;6 - Mask and modifications
TP_LOCALLAB_SHOWMASK;Show mask
TP_LOCALLAB_SHOWMASKCOL_TOOLTIP;Display modifications.\nBeware, you can only view one modification (color and light or Exposure or Shadows-Highlight or TM or CBDL or Retinex MSR or Blur).\n\nUse Mask is before algorihtm shape detection
TP_LOCALLAB_SHOWMASKCOL_TOOLTIP;Display mask modifications.\nBeware, you can only view one tool mask at the same time.\n\nNote: Use Mask is before algorihtm shape detection.
TP_LOCALLAB_SHOWMASKSOFT_TOOLTIP;Show process Fourier:\nShows the different stages of the process.\nLaplace - builds the second derivative according to the threshold (first step).\nFourier -shows the transformed Laplacian with DCT.\nPoisson - show solution of Poisson DCE.\nNormalize - show result without normalization luminance.
TP_LOCALLAB_SHOWMNONE;None
TP_LOCALLAB_SHOWMODIF;Show modifications without mask
Expand Down Expand Up @@ -2735,12 +2738,12 @@ TP_LOCALLAB_VIS_TOOLTIP;<b>Click</b> to show/hide selected Control Spot.\n<b>Ctr
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
Expand Down
2 changes: 2 additions & 0 deletions rtengine/procevents.h
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,8 @@ enum ProcEventCode {
Evlocallabsigmalc = 919,
Evlocallabsigmalc2 = 920,
Evlocallabblwh = 921,
EvlocallabcomplexityWithRefresh = 922,
EvlocallabcomplexityWithoutRefresh = 923,

NUMOFEVENTS
};
Expand Down
Loading