merge with dev

This commit is contained in:
U-PC-BUREAU\jacques 2018-07-07 13:46:18 +02:00
commit e65c6786ff
92 changed files with 2399 additions and 1322 deletions

View File

@ -1,10 +1,8 @@
if(WIN32)
cmake_minimum_required(VERSION 2.8.4)
elseif(APPLE)
if(APPLE)
cmake_minimum_required(VERSION 3.3)
CMAKE_POLICY(SET CMP0025 NEW)
else()
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8.8)
endif()
# Must stay before the PROJECT() command:
@ -318,9 +316,9 @@ pkg_check_modules(LCMS REQUIRED lcms2>=2.6)
pkg_check_modules(EXPAT REQUIRED expat>=2.1)
pkg_check_modules(FFTW3F REQUIRED fftw3f)
pkg_check_modules(IPTCDATA REQUIRED libiptcdata)
pkg_check_modules(TIFF REQUIRED libtiff-4>=4.0.4)
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
find_package(TIFF REQUIRED)
find_package(ZLIB REQUIRED)
if(WITH_SYSTEM_KLT)
find_package(KLT REQUIRED)

8
rawtherapee.astylerc Normal file
View File

@ -0,0 +1,8 @@
style=1tbs
indent=spaces=4
indent-switches
break-blocks
pad-oper
convert-tabs
pad-header
unpad-paren

View File

@ -1334,7 +1334,11 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1379,6 +1383,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@ -1406,12 +1411,15 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!PARTIALPASTE_PCVIGNETTE;Vignette filter
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1894,13 +1902,16 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1949,10 +1960,12 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2039,6 +2052,8 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2111,7 +2126,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1441,7 +1441,11 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1491,6 +1495,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the <b>Focus Mask</b>.\nShortcut: <b>Shift-f</b>\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\n\nTo improve detection accuracy for noisy images evaluate at smaller zoom, about 10-30%.
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
@ -1498,6 +1503,9 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!PARTIALPASTE_ADVANCEDGROUP;Advanced Settings
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
!PREFERENCES_BEHADDALLHINT;Set all parameters to the <b>Add</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>deltas</b> to the stored values.
@ -1867,15 +1875,18 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@ -1927,10 +1938,12 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
@ -2017,6 +2030,8 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2106,7 +2121,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -996,7 +996,11 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1069,6 +1073,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1123,6 +1128,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1130,6 +1136,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1141,6 +1148,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1815,15 +1823,18 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@ -1875,10 +1886,12 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1983,6 +1996,8 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2076,7 +2091,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -2237,19 +2237,34 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: <b>-</b>
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!SAMPLEFORMAT_32;24-bit floating-point
!SAMPLEFORMAT_64;32-bit floating-point
!TP_BWMIX_MIXC;Channel Mixer
!TP_BWMIX_NEUTRAL;Reset
!TP_RAW_4PASS;4-Pass
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression

View File

@ -991,7 +991,11 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1065,6 +1069,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1120,6 +1125,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1127,6 +1133,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1138,6 +1145,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1812,15 +1820,18 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1870,10 +1881,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1981,6 +1994,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2074,7 +2089,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -36,7 +36,7 @@
#35 2017-02-18 AWB bias (TooWaBoo) RT 5.0 r1
#36 2017-02-23 Korrekturen (TooWaBoo) RT 5.0 r1
#37 2017-03-06 Dynamisches Profil (TooWaBoo) RT 5.0 r1
#38 2017-03-26 Pixel Shift (TooWaBoo) RT 5.0 r1
#38 2017-03-26 Pixel-Shift (TooWaBoo) RT 5.0 r1
#39 06.04.2017 Fast Export (TooWaBoo) RT 5.0 r1
#40 30.04.2017 Erweiterung/Korrekturen (TooWaBoo) RT 5.0 r1
#41 03.05.2017 Erweiterung/Korrekturen (TooWaBoo) RT 5.0 r1
@ -58,6 +58,14 @@
#57 17.05.2018 Erweiterung (TooWaBoo) RT 5.4
#58 19.05.2018 Erweiterung (TooWaBoo) RT 5.4
#59 29.05.2018 Erweiterung (TooWaBoo) RT 5.4
#60 14.06.2018 Erweiterung (TooWaBoo) RT 5.4
#61 14.06.2018 Korrektur (TooWaBoo) RT 5.4
#62 22.06.2018 Korrektur (TooWaBoo) RT 5.4
#63 24.06.2018 DCB/RCD+VNG4 (TooWaBoo) RT 5.4
#64 24.06.2018 Erweiterung/Korrektur (TooWaBoo) RT 5.4
#65 25.06.2018 Korrekturen (TooWaBoo) RT 5.4
#66 04.07.2018 Erweiterung (TooWaBoo) RT 5.4
#67 05.07.2018 Erweiterung (TooWaBoo) RT 5.4
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@ -601,7 +609,7 @@ HISTORY_MSG_293;(Filmsimulation)
HISTORY_MSG_294;(Filmsimulation)\nIntensität
HISTORY_MSG_295;(Filmsimulation) - Film
HISTORY_MSG_296;(Rauschreduzierung)\nLuminanzkurve
HISTORY_MSG_297;(Rauschreduzierung)\nQualität
HISTORY_MSG_297;(Rauschreduzierung)\nModus
HISTORY_MSG_298;(Vorverarbeitung)\nDead-Pixel-Filter
HISTORY_MSG_299;(Rauschreduzierung)\nChrominanzkurve
HISTORY_MSG_300;-
@ -750,20 +758,20 @@ HISTORY_MSG_442;(Retinex) - Einstellungen\nTransmission - Skalierung
HISTORY_MSG_443;(Farbmanagement)\nAusgabeprofil\nSchwarzpunkt-Kompensation
HISTORY_MSG_444;(Weißabgleich)\nAWB-Temperatur-Korrektur
HISTORY_MSG_445;(Sensor-Matrix)\nFarbinterpolation\nUnterbild
HISTORY_MSG_449;(Sensor-Matrix)\nFarbinterpolation\nISO-Anpassung
HISTORY_MSG_452;(Sensor-Matrix)\nFarbinterpolation\nBewegungsmaske\nanzeigen
HISTORY_MSG_453;(Sensor-Matrix)\nFarbinterpolation\nNur Maske anzeigen
HISTORY_MSG_457;(Sensor-Matrix)\nFarbinterpolation\nBewegung im Rot/Blau-\nKanal erkennen
HISTORY_MSG_462;(Sensor-Matrix)\nFarbinterpolation\nBewegung im Grün-\nKanal erkennen
HISTORY_MSG_464;(Sensor-Matrix)\nFarbinterpolation\nUnschärfebewegungsmaske
HISTORY_MSG_465;(Sensor-Matrix)\nFarbinterpolation\nUnschärferadius
HISTORY_MSG_468;(Sensor-Matrix)\nFarbinterpolation\nLücken in der Bewegungs-\nmaske erkennen
HISTORY_MSG_469;(Sensor-Matrix)\nFarbinterpolation\nMedian
HISTORY_MSG_471;(Sensor-Matrix)\nFarbinterpolation\nBewegungskorrektur
HISTORY_MSG_472;(Sensor-Matrix)\nFarbinterpolation\nWeicher Übergang
HISTORY_MSG_473;(Sensor-Matrix)\nFarbinterpolation\nLMMSE für Bewegungs-\nteile verwenden
HISTORY_MSG_474;(Sensor-Matrix)\nFarbinterpolation\nFrame-Helligkeit angleichen
HISTORY_MSG_475;(Sensor-Matrix)\nFarbinterpolation)\nAusgleich pro Kanal
HISTORY_MSG_449;(Sensor-Matrix)\nFarbinterpolation - PS\nISO-Anpassung
HISTORY_MSG_452;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungsmaske\nanzeigen
HISTORY_MSG_453;(Sensor-Matrix)\nFarbinterpolation - PS\nNur Maske anzeigen
HISTORY_MSG_457;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegung im Rot/Blau-\nKanal erkennen
HISTORY_MSG_462;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegung im Grün-\nKanal erkennen
HISTORY_MSG_464;(Sensor-Matrix)\nFarbinterpolation - PS\nUnschärfebewegungsmaske
HISTORY_MSG_465;(Sensor-Matrix)\nFarbinterpolation - PS\nUnschärferadius
HISTORY_MSG_468;(Sensor-Matrix)\nFarbinterpolation - PS\nLücken in der Bewegungs-\nmaske erkennen
HISTORY_MSG_469;(Sensor-Matrix)\nFarbinterpolation - PS\nMedian
HISTORY_MSG_471;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungskorrektur
HISTORY_MSG_472;(Sensor-Matrix)\nFarbinterpolation - PS\nWeicher Übergang
HISTORY_MSG_473;(Sensor-Matrix)\nFarbinterpolation - PS\nLMMSE für Bewegungs-\nteile verwenden
HISTORY_MSG_474;(Sensor-Matrix)\nFarbinterpolation - PS\nFrame-Helligkeit angleichen
HISTORY_MSG_475;(Sensor-Matrix)\nFarbinterpolation - PS\nAusgleich pro Kanal
HISTORY_MSG_476;(CIECAM02)\nBetrachtungsbed.\nFarbtemperatur
HISTORY_MSG_477;(CIECAM02)\nBetrachtungsbed.\nTönung
HISTORY_MSG_478;(CIECAM02)\nBetrachtungsbed.\nYb% (Ø Luminanz)
@ -784,6 +792,7 @@ HISTORY_MSG_492;(RGB-Kurven)
HISTORY_MSG_493;(L*a*b*)
HISTORY_MSG_CLAMPOOG;(Belichtung) - Farben\nauf Farbraum beschränken
HISTORY_MSG_COLORTONING_LABGRID_VALUE;(Farbanpassungen)\nL*a*b* - Farbkorrektur
HISTORY_MSG_DUALDEMOSAIC_CONTRAST;(Sensor-Matrix)\nFarbinterpolation\nKontrastschwelle
HISTORY_MSG_HISTMATCHING;(Belichtung)\nAuto-Tonwertkurve
HISTORY_MSG_LOCALCONTRAST_AMOUNT;(Lokaler Kontrast)\nIntensität
HISTORY_MSG_LOCALCONTRAST_DARKNESS;(Lokaler Kontrast)\nDunkle Bereiche
@ -792,10 +801,14 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;(Lokaler Kontrast)\nHelle Bereiche
HISTORY_MSG_LOCALCONTRAST_RADIUS;(Lokaler Kontrast)\nRadius
HISTORY_MSG_METADATA_MODE;(Metadaten)\nKopiermodus
HISTORY_MSG_MICROCONTRAST_CONTRAST;(Mikrokontrast)\nKontrastschwelle
HISTORY_MSG_PIXELSHIFT_DEMOSAIC;(Sensor-Matrix)\nFarbinterpolation - PS\nBewegungsmethode
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;(Sensor-Matrix)\nVorverarbeitung\nRichtung
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;(Sensor-Matrix)\nVorverarbeitung\nPDAF-Zeilenfilter
HISTORY_MSG_PRSHARPEN_CONTRAST;(Skalieren) - Schärfen\nKontrastschwelle
HISTORY_MSG_RAW_BORDER;(Sensor-Matrix)\nFarbinterpolation\nBildrand
HISTORY_MSG_SHARPENING_CONTRAST;(Schärfung)\nKontrastschwelle
HISTORY_MSG_SOFTLIGHT_ENABLED;(Weiches Licht)
HISTORY_MSG_SOFTLIGHT_STRENGTH;(Weiches Licht)\nIntensität
HISTORY_MSG_TM_FATTAL_ANCHOR;(Dynamikkompression)\nHelligkeitsverschiebung
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: <b>Alt</b> + <b>s</b>
@ -917,6 +930,7 @@ MAIN_TOOLTIP_PREVIEWFOCUSMASK;Vorschau Fokusmaske\nTaste: <b>Umschalt</b> + <b>f
MAIN_TOOLTIP_PREVIEWG;Vorschau Grün-Kanal\nTaste: <b>g</b>
MAIN_TOOLTIP_PREVIEWL;Vorschau Helligkeit\nTaste: <b>v</b>\n\n0.299·R + 0.587·G + 0.114·B
MAIN_TOOLTIP_PREVIEWR;Vorschau Rot-Kanal\nTaste: <b>r</b>
MAIN_TOOLTIP_PREVIEWSHARPMASK;Schärfungs-Kontroll-Maske ein-/ausschalten\n\nFunktioniert nur bei aktivierter Schärfung\nund Zoom >= 100%.
MAIN_TOOLTIP_QINFO;Bildinformationen ein-/ausblenden\nTaste: <b>i</b>
MAIN_TOOLTIP_SHOWHIDELP1;Linkes Bedienfeld ein-/ausblenden\nTaste: <b>l</b>
MAIN_TOOLTIP_SHOWHIDERP1;Rechtes Bedienfeld ein-/ausblenden\nTaste: <b>Alt</b> + <b>l</b>
@ -960,7 +974,7 @@ PARTIALPASTE_DIRPYRDENOISE;Rauschreduzierung
PARTIALPASTE_DIRPYREQUALIZER;Detailebenenkontrast
PARTIALPASTE_DISTORTION;Verzeichnungskorrektur
PARTIALPASTE_EPD;Tonwertkorrektur
PARTIALPASTE_EQUALIZER;Anzahl der Ebenen
PARTIALPASTE_EQUALIZER;Wavelet
PARTIALPASTE_EVERYTHING;Alle Parameter aktivieren / deaktivieren
PARTIALPASTE_EXIFCHANGES;Änderungen an Exif-Daten
PARTIALPASTE_EXPOSURE;Belichtung
@ -1000,7 +1014,7 @@ PARTIALPASTE_RAW_DMETHOD;Farbinterpolation: Methode
PARTIALPASTE_RAW_FALSECOLOR;Farbinterpolation: Falschfarbenreduzierung
PARTIALPASTE_RAW_IMAGENUM;Farbinterpolation: Unterbild
PARTIALPASTE_RAW_LMMSEITERATIONS;Farbinterpolation: LMMSE-Verbesserungsstufen
PARTIALPASTE_RAW_PIXELSHIFT;Farbinterpolation: Pixel Shift
PARTIALPASTE_RAW_PIXELSHIFT;Farbinterpolation: Pixel-Shift
PARTIALPASTE_RESIZE;Skalieren
PARTIALPASTE_RETINEX;Retinex (Bildschleier entfernen)
PARTIALPASTE_RGBCURVES;RGB-Kurven
@ -1009,6 +1023,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Schatten/Lichter
PARTIALPASTE_SHARPENEDGE;Kantenschärfung
PARTIALPASTE_SHARPENING;Schärfung
PARTIALPASTE_SHARPENMICRO;Mikrokontrast
PARTIALPASTE_SOFTLIGHT;Weiches Licht
PARTIALPASTE_TM_FATTAL;Dynamikkompression
PARTIALPASTE_VIBRANCE;Dynamik
PARTIALPASTE_VIGNETTING;Vignettierungskorrektur
@ -1278,7 +1293,7 @@ QINFO_FRAMECOUNT;%2 Frames
QINFO_HDR;HDR / %2 Frame(s)
QINFO_ISO;ISO
QINFO_NOEXIF;Keine Exif-Daten vorhanden.
QINFO_PIXELSHIFT;Pixel Shift / %2 Frame(s)
QINFO_PIXELSHIFT;Pixel-Shift / %2 Frame(s)
SAMPLEFORMAT_0;Unbekanntes Datenformat
SAMPLEFORMAT_1;8 Bit ohne Vorzeichen
SAMPLEFORMAT_2;16 Bit ohne Vorzeichen
@ -1314,7 +1329,7 @@ THRESHOLDSELECTOR_HINT;<b>Umschalt</b>-Taste halten, um individuelle\nKontrollpu
THRESHOLDSELECTOR_T;Oben
THRESHOLDSELECTOR_TL;Oben-Links
THRESHOLDSELECTOR_TR;Oben-Rechts
TOOLBAR_TOOLTIP_COLORPICKER;<b>Farbwähler</b>\n\nWenn eingeschaltet:\n- Mit der linken Maustaste können Sie einen Farbwähler setzen.\n- Zum Verschieben, linke Maustaste festhalten.\n- Umschalttaste + Rechts-Klick entfernt alle Farbwähler.\n- Rechts-Klick auf den Farbwählerbutton blendet die Farbwähler ein/aus\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
TOOLBAR_TOOLTIP_COLORPICKER;Farbwähler\n\nWenn eingeschaltet:\n- Mit der linken Maustaste können Sie einen Farbwähler setzen.\n- Zum Verschieben, linke Maustaste festhalten.\n- Umschalttaste + Rechts-Klick entfernt alle Farbwähler.\n- Rechts-Klick auf den Farbwählerbutton blendet die Farbwähler ein/aus\n- Rechts-Klick in einen freien Bereich schaltet auf das Hand-Werkzeug zurück.
TOOLBAR_TOOLTIP_CROP;Ausschnitt wählen\nTaste: <b>c</b>\n\nZum Verschieben des Ausschnitts,\nUmschalttaste festhalten.
TOOLBAR_TOOLTIP_HAND;Hand-Werkzeug\nTaste: <b>h</b>
TOOLBAR_TOOLTIP_STRAIGHTEN;Ausrichten / Drehen\nTaste: <b>s</b>\n\nRichtet das Bild entlang einer Leitlinie aus.
@ -1568,10 +1583,10 @@ TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RGB
TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP;Für RAW-Bilder kann entweder die RGB-\noder L*a*b*-Methode verwendet werden.\n\nFür andere Bilder wird unabhängig von der\nAuswahl immer die L*a*b*-Methode verwendet.
TP_DIRPYRDENOISE_MAIN_GAMMA;Gamma
TP_DIRPYRDENOISE_MAIN_GAMMA_TOOLTIP;Mit Gamma kann die Intensität der\nRauschreduzierung über den Farbbereich\nvariiert werden. Bei kleinen Werten sind\nnur dunkle Farbtöne betroffen, bei\ngrößeren Werten wird der Effekt auf\nhellere Töne ausgeweitet.
TP_DIRPYRDENOISE_MAIN_MODE;Qualität
TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Hoch
TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Standard
TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;Einstellung der Qualität der Rauschreduzierung.\nDie Einstellung “Hoch“ verbessert die Rausch-\nreduzierung auf Kosten der Verarbeitungszeit.
TP_DIRPYRDENOISE_MAIN_MODE;Modus
TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Aggressiv
TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Konservativ
TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;"Konservativ" bewahrt Tieffrequenz-Chroma-Muster,\nwährend "Aggressiv" sie entfernt.
TP_DIRPYRDENOISE_MEDIAN_METHOD;Methode
TP_DIRPYRDENOISE_MEDIAN_METHOD_CHROMINANCE;Nur Farbe
TP_DIRPYRDENOISE_MEDIAN_METHOD_LAB;L*a*b*
@ -1825,17 +1840,23 @@ TP_RAWEXPOS_LINEAR;Korrekturfaktor
TP_RAWEXPOS_PRESER;Weißpunkt: Lichter schützen
TP_RAWEXPOS_RGB;Rot, Grün, Blau
TP_RAWEXPOS_TWOGREEN;Grün-Werte automatisch angleichen
TP_RAW_1PASSMEDIUM;1-Pass (Medium)
TP_RAW_3PASSBEST;3-Pass (Beste)
TP_RAW_1PASSMEDIUM;1-Pass (Markesteijn)
TP_RAW_2PASS;1-Pass + schnell
TP_RAW_3PASSBEST;3-Pass (Markesteijn)
TP_RAW_4PASS;3-Pass + schnell
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
TP_RAW_AMAZEVNG4;AMaZE + VNG4
TP_RAW_BORDER;Bildrand
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB-Verbesserung
TP_RAW_DCBITERATIONS;Anzahl der DCB-Iterationen
TP_RAW_DCBVNG4;DCB + VNG4
TP_RAW_DMETHOD;Methode
TP_RAW_DMETHOD_PROGRESSBAR;%1 verarbeitet
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaikoptimierung
TP_RAW_DMETHOD_TOOLTIP;<b>IGV</b> und <b>LMMSE</b> sind speziel für High-ISO-Aufnahmen um die\nRauschreduzierung zu unterstützen ohne zu Maze-Mustern,\nPosterisierung oder einem ausgewaschenen Look zu führen.\n\n<b>Pixel Shift</b> ist für “Pentax Pixel Shift“-Dateien. Für "Nicht-Pixel-\nShift"-Dateien wird automatisch AMaZE verwendet.
TP_RAW_DMETHOD_TOOLTIP;<b>IGV</b> und <b>LMMSE</b> sind speziel für High-ISO-Aufnahmen um die\nRauschreduzierung zu unterstützen ohne zu Maze-Mustern,\nPosterisierung oder einem ausgewaschenen Look zu führen.\n\n<b>Pixel-Shift</b> ist für “Pentax Pixel-Shift“-Dateien. Für "Nicht-Pixel-\nShift"-Dateien wird automatisch AMaZE verwendet.
TP_RAW_DUALDEMOSAICCONTRAST;Kontrastschwelle
TP_RAW_EAHD;EAHD
TP_RAW_FALSECOLOR;Falschfarbenreduzierung
TP_RAW_FAST;Schnell
@ -1844,16 +1865,17 @@ TP_RAW_HD_TOOLTIP;Je niedriger der Wert, umso empfindlicher reagiert\ndie “Hot
TP_RAW_HPHD;HPHD
TP_RAW_IGV;IGV
TP_RAW_IMAGENUM;Unterbild
TP_RAW_IMAGENUM_TOOLTIP;Einige RAW-Formate enthalten mehrere Unterbilder (Pentax Pixel Shift,\nPentax 3-in-1 HDR, Canon Dual Pixel).\n\n> Auswahl des zu verwendenden Unterbildes (nicht bei Pixel Shift).\n\n> Legt das Unterbild für die Bewegungsbereiche bei Pixel Shift fest.
TP_RAW_IMAGENUM_TOOLTIP;Einige RAW-Formate enthalten mehrere Unterbilder (Pentax Pixel-Shift,\nPentax 3-in-1 HDR, Canon Dual Pixel).\n\n> Auswahl des zu verwendenden Unterbildes (nicht bei Pixel-Shift).\n\n> Legt das Unterbild für die Bewegungsbereiche bei Pixel-Shift fest.
TP_RAW_LABEL;Farbinterpolation
TP_RAW_LMMSE;LMMSE
TP_RAW_LMMSEITERATIONS;LMMSE-Verbesserungsstufen
TP_RAW_LMMSE_TOOLTIP;Fügt Gamma (Stufe 1), Median (Stufe 2-4)\nund Optimierung (Stufe 5-6) zur Minimierung\nvon Artefakten hinzu und verbessert das\nSignalrauschverhältnis.
TP_RAW_MONO;Mono
TP_RAW_NONE;Keine
TP_RAW_PIXELSHIFT;Pixel Shift
TP_RAW_PIXELSHIFT;Pixel-Shift
TP_RAW_PIXELSHIFTADAPTIVE;Adaptive Erkennung
TP_RAW_PIXELSHIFTBLUR;Unschärfebewegungsmaske
TP_RAW_PIXELSHIFTDMETHOD;Bewegungsmethode
TP_RAW_PIXELSHIFTEPERISO;Empfindlichkeit
TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;Der Standardwert 0 wird für die Basis-ISO empfohlen.\nHöhere Werte erhöhen die Empfindlichkeit der Bewegungserkennung.\nVerändern Sie den Wert in kleinen Schritten und beobachten Sie die\nBewegungsmaske. Erhöhen Sie die Empfindlichkeit für unterbelichtete\noder High-ISO-Bilder.
TP_RAW_PIXELSHIFTEQUALBRIGHT;Frame-Helligkeit angleichen
@ -1900,8 +1922,9 @@ TP_RAW_PIXELSHIFTSTDDEVFACTORBLUE;StdDev factor Blue
TP_RAW_PIXELSHIFTSTDDEVFACTORGREEN;StdDev factor Green
TP_RAW_PIXELSHIFTSTDDEVFACTORRED;StdDev factor Red
TP_RAW_RCD;RCD
TP_RAW_RCDVNG4;RCD + VNG4
TP_RAW_SENSOR_BAYER_LABEL;Sensor mit Bayer-Matrix
TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Mit “3-Pass“ erzielt man die besten Ergebnisse\n(empfohlen bei Bildern mit niedrigen ISO-Werten).\n\nBei hohen ISO-Werten unterscheidet sich “1-Pass“\nkaum gegenüber “3-Pass“, ist aber deutlich schneller.
TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;Mit “3-Pass“ erzielt man die besten Ergebnisse\n(empfohlen bei Bildern mit niedrigen ISO-Werten).\n\nBei hohen ISO-Werten unterscheidet sich “1-Pass“\nkaum gegenüber “3-Pass“, ist aber deutlich schneller.\n\n"+ schnell" erzeugt weniger Artefakte in kontrast-\narmen Bereichen.
TP_RAW_SENSOR_XTRANS_LABEL;Sensor mit X-Trans-Matrix
TP_RAW_VNG4;VNG4
TP_RESIZE_APPLIESTO;Anwenden auf:
@ -2042,6 +2065,8 @@ TP_SHARPENMICRO_CONTRAST;Kontrastschwelle
TP_SHARPENMICRO_LABEL;Mikrokontrast
TP_SHARPENMICRO_MATRIX;3×3-Matrix statt 5×5-Matrix
TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
TP_SOFTLIGHT_LABEL;Weiches Licht
TP_SOFTLIGHT_STRENGTH;Intensität
TP_TM_FATTAL_AMOUNT;Intensität
TP_TM_FATTAL_ANCHOR;Helligkeitsverschiebung
TP_TM_FATTAL_LABEL;Dynamikkompression
@ -2293,9 +2318,7 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
!TP_RAW_4PASS;4-Pass
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
HISTORY_MSG_RESIZE_ALLOW_UPSCALING;(Skalieren)\nHochskalieren zulassen
PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;Vorverarbeitung: PDAF-Zeilenfilter
PARTIALPASTE_RAW_BORDER;Farbinterpolation: Bildrand
TP_RESIZE_ALLOW_UPSCALING;Hochskalieren zulassen

View File

@ -827,7 +827,11 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
@ -942,6 +946,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_QINFO;Quick info on the image.\nShortcut: <b>i</b>
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
@ -1009,6 +1014,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1016,6 +1022,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1030,6 +1037,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PARTIALPASTE_VIGNETTING;Vignetting correction
@ -1775,15 +1783,18 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@ -1833,10 +1844,12 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1974,6 +1987,8 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2062,7 +2077,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -741,7 +741,11 @@
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT;Add
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
@ -861,6 +865,7 @@
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_QINFO;Quick info on the image.\nShortcut: <b>i</b>
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
@ -931,6 +936,7 @@
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -938,6 +944,7 @@
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -953,6 +960,7 @@
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PARTIALPASTE_VIGNETTING;Vignetting correction
@ -1762,15 +1770,18 @@
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD;Method
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@ -1822,10 +1833,12 @@
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1964,6 +1977,8 @@
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2060,7 +2075,7 @@
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1721,7 +1721,11 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1757,6 +1761,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@ -1775,11 +1780,14 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!PARTIALPASTE_GRADIENT;Graduated filter
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1977,13 +1985,16 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_CASTR;Strength
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -2027,7 +2038,9 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2110,6 +2123,8 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2182,7 +2197,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -992,7 +992,11 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1066,6 +1070,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1121,6 +1126,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1128,6 +1134,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1139,6 +1146,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1813,15 +1821,18 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1871,10 +1882,12 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1982,6 +1995,8 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2075,7 +2090,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -2211,8 +2211,16 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
!PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
@ -2228,15 +2236,22 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_RAW_4PASS;4-Pass
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
!TP_RAW_PIXELSHIFTEPERISO;Sensitivity
!TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;The default value of 0 should work fine for base ISO.\nHigher values increase sensitivity of motion detection.\nChange in small steps and watch the motion mask while changing.\nIncrease sensitivity for underexposed or high ISO images.
!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion.
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression

View File

@ -991,7 +991,11 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1065,6 +1069,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1120,6 +1125,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1127,6 +1133,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1138,6 +1145,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1812,15 +1820,18 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1870,10 +1881,12 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1981,6 +1994,8 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2074,7 +2089,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -992,7 +992,11 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1066,6 +1070,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1121,6 +1126,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1128,6 +1134,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1139,6 +1146,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1813,15 +1821,18 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1871,10 +1882,12 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1982,6 +1995,8 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2075,7 +2090,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1596,7 +1596,11 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1633,6 +1637,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
@ -1646,11 +1651,14 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1915,13 +1923,16 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -1965,10 +1976,12 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2051,6 +2064,8 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2123,7 +2138,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -758,6 +758,7 @@ HISTORY_MSG_492;RGBカーブ
HISTORY_MSG_493;L*a*b*調整
HISTORY_MSG_CLAMPOOG;色域外の色を切り取る
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - カラー補正
HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - コントラストのしきい値
HISTORY_MSG_HISTMATCHING;トーンカーブの自動調節
HISTORY_MSG_LOCALCONTRAST_AMOUNT;ローカルコントラスト - 量
HISTORY_MSG_LOCALCONTRAST_DARKNESS;ローカルコントラスト - 暗い部分
@ -766,6 +767,7 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;ローカルコントラスト - 明るい
HISTORY_MSG_LOCALCONTRAST_RADIUS;ローカルコントラスト - 半径
HISTORY_MSG_METADATA_MODE;メタデータ コピーモード
HISTORY_MSG_MICROCONTRAST_CONTRAST;マイクロコントラスト - コントラストのしきい値
HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - 振れに対するデモザイクの方式
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;ラインノイズフィルタの方向
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAFラインフィルタ
HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - コントラストのしきい値
@ -876,7 +878,6 @@ MAIN_TAB_RAW;raw
MAIN_TAB_RAW_TOOLTIP;ショートカット: <b>Alt-r</b>
MAIN_TAB_TRANSFORM;変形
MAIN_TAB_TRANSFORM_TOOLTIP;ショートカット: <b>Alt-t</b>
MAIN_TAB_WAVELET;ウェーブレット
MAIN_TAB_WAVELET_TOOLTIP;ショートカット: <b>Alt-w</b>
MAIN_TOOLTIP_BACKCOLOR0;プレビューの背景色を指定します: <b>テーマに基づく</b>\nショートカット: <b>9</b>
MAIN_TOOLTIP_BACKCOLOR1;プレビューの背景色を指定します: <b>黒</b>\nショートカットt: <b>9</b>
@ -986,7 +987,6 @@ PARTIALPASTE_SHARPENMICRO;マイクロコントラスト
PARTIALPASTE_TM_FATTAL;ダイナミックレンジ圧縮
PARTIALPASTE_VIBRANCE;自然な彩度
PARTIALPASTE_VIGNETTING;周辺光量補正
PARTIALPASTE_WAVELETGROUP;ウェーブレット処理
PARTIALPASTE_WHITEBALANCE;ホワイトバランス
PREFERENCES_ADD;追加
PREFERENCES_APPLNEXTSTARTUP;要再起動
@ -1011,10 +1011,6 @@ PREFERENCES_CACHECLEARTHUMBS;サムネイルのクリア
PREFERENCES_CACHEMAXENTRIES;キャッシュエントリーの最大数
PREFERENCES_CACHEOPTS;cache オプション
PREFERENCES_CACHETHUMBHEIGHT;サムネイル縦の最大値
PREFERENCES_CIEART;CIECAM02 最適化
PREFERENCES_CIEART_FRAME;CIECAM02-特定の設定
PREFERENCES_CIEART_LABEL;倍精度の代わりに単精度浮動小数点を使用
PREFERENCES_CIEART_TOOLTIP;有効にした場合、 CIECAM02は倍精度浮動小数点形式の代わりに単精度で実行されます。これは品質を少し犠牲にし、速度を少し増加させます
PREFERENCES_CLIPPINGIND;クリッピング領域の表示
PREFERENCES_CLUTSCACHE;HaldCLUT cache
PREFERENCES_CLUTSCACHE_LABEL;cacheに置けるHaldCLUTの最大数
@ -1265,7 +1261,6 @@ SAVEDLG_AUTOSUFFIX;ファイルが存在する場合、自動的に末尾に文
SAVEDLG_FILEFORMAT;ファイル形式
SAVEDLG_FORCEFORMATOPTS;強制保存オプション
SAVEDLG_JPEGQUAL;JPEG 品質
SAVEDLG_PNGCOMPR;PNG 圧縮
SAVEDLG_PUTTOQUEUE;キュー処理に追加
SAVEDLG_PUTTOQUEUEHEAD;キュー処理の最初に追加
SAVEDLG_PUTTOQUEUETAIL;キュー処理の最後に追加
@ -1507,12 +1502,6 @@ TP_DARKFRAME_LABEL;ダークフレーム
TP_DEFRINGE_LABEL;フリンジ低減
TP_DEFRINGE_RADIUS;半径
TP_DEFRINGE_THRESHOLD;しきい値
TP_DIRPYRDENOISE_3X3;3×3
TP_DIRPYRDENOISE_3X3_SOFT;3×3 ソフト
TP_DIRPYRDENOISE_5X5;5×5
TP_DIRPYRDENOISE_5X5_SOFT;5×5 ソフト
TP_DIRPYRDENOISE_7X7;7×7
TP_DIRPYRDENOISE_9X9;9×9
TP_DIRPYRDENOISE_CHROMINANCE_AMZ;自動(多分割方式)
TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL;自動(分割方式)
TP_DIRPYRDENOISE_CHROMINANCE_AUTOGLOBAL_TOOLTIP;色ノイズ低減の効果を確認して下さい\n注意設定値の計算はあくまで平均的なもので、かなり主観的でです
@ -1543,7 +1532,6 @@ TP_DIRPYRDENOISE_LUMINANCE_FRAME;輝度ノイズ
TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING;輝度
TP_DIRPYRDENOISE_MAIN_COLORSPACE;色空間
TP_DIRPYRDENOISE_MAIN_COLORSPACE_LAB;L*a*b*
TP_DIRPYRDENOISE_MAIN_COLORSPACE_LABEL;ノイズ低減
TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RGB
TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP;raw画像は、RGBまたはL*a*b*方式のいずれかを使用することができます。\n\nraw以外の画像は、選択にかかわらずL*a*b*方式が採用されます
TP_DIRPYRDENOISE_MAIN_GAMMA;ガンマ
@ -1807,8 +1795,10 @@ TP_RAWEXPOS_RGB;レッド、グリーン、ブルー
TP_RAWEXPOS_TWOGREEN;2つのグリーンを連動
TP_RAW_1PASSMEDIUM;1-パス (ミディアム)
TP_RAW_3PASSBEST;3-Pass (最良)
TP_RAW_4PASS;4-パス
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
TP_RAW_AMAZEVNG4;AMaZE+VNG4
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB 拡張処理
TP_RAW_DCBITERATIONS;DCB 反復の数
@ -1816,6 +1806,7 @@ TP_RAW_DMETHOD;方式
TP_RAW_DMETHOD_PROGRESSBAR;%1 デモザイク中...
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;デモザイク・リファイン中...
TP_RAW_DMETHOD_TOOLTIP;注: IGVとLMMSEは高ISO画像に適しています
TP_RAW_DUALDEMOSAICCONTRAST;コントラストのしきい値
TP_RAW_EAHD;EAHD
TP_RAW_FALSECOLOR;偽色抑制処理の回数
TP_RAW_FAST;Fast
@ -1833,6 +1824,7 @@ TP_RAW_MONO;Mono
TP_RAW_NONE;なし (センサーのパターンを表示)
TP_RAW_PIXELSHIFT;ピクセルシフト
TP_RAW_PIXELSHIFTBLUR;振れマスクのぼかし
TP_RAW_PIXELSHIFTDMETHOD;振れに対するデモザイクの方式
TP_RAW_PIXELSHIFTEPERISO;ISOの適合
TP_RAW_PIXELSHIFTEPERISO_TOOLTIP;通常のISOに関してはデフォルトの0で十分だと思われます。\n高いISOの場合は、振れの検知を良くするために設定値を上げます。\n少しづつ増加させ、振れのマスクの変化を見ます。
TP_RAW_PIXELSHIFTEQUALBRIGHT;構成画像の明るさを均等にする
@ -2254,9 +2246,18 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
!TP_RAW_4PASS;4-Pass
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_SOFTLIGHT;Soft light
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_BORDER;Border
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength

View File

@ -992,7 +992,11 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1066,6 +1070,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1121,6 +1126,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1128,6 +1134,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1139,6 +1146,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1813,15 +1821,18 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1871,10 +1882,12 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1982,6 +1995,8 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2075,7 +2090,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1265,7 +1265,11 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1313,6 +1317,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!MAIN_TOOLTIP_BACKCOLOR1;Background color of the preview: <b>Black</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_BACKCOLOR2;Background color of the preview: <b>White</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@ -1342,12 +1347,15 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!PARTIALPASTE_PCVIGNETTE;Vignette filter
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1887,13 +1895,16 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1942,10 +1953,12 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2032,6 +2045,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!TP_SHADOWSHLIGHTS_SHARPMASK;Sharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2114,7 +2129,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -2156,7 +2156,11 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!LENSPROFILE_CORRECTION_AUTOMATCH;Auto-matched correction parameters
!LENSPROFILE_CORRECTION_LCPFILE;LCP File
@ -2166,12 +2170,16 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
!OPTIONS_DEFRAW_MISSING;The default profile for <b>raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
!PARTIALPASTE_ADVANCEDGROUP;Advanced Settings
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
!PREFERENCES_CROP;Crop editing
@ -2238,8 +2246,11 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_RAW_4PASS;4-Pass
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax/Sony Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
@ -2249,11 +2260,15 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
!TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP;Enabled: Equalize the RGB channels individually.\nDisabled: Use same equalization factor for all channels.
!TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP;Overlays the image with a green mask showing the regions with motion.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_GAINOFFS;Gain and Offset (brightness)
!TP_RETINEX_GAINTRANSMISSION;Gain transmission
!TP_RETINEX_GAINTRANSMISSION_TOOLTIP;Amplify or reduce transmission map to achieve luminance.\nAbscissa: transmission -min from 0, mean, and values (max).\nOrdinate: gain.
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression

View File

@ -991,7 +991,11 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1065,6 +1069,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1120,6 +1125,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1127,6 +1133,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1138,6 +1145,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1812,15 +1820,18 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1870,10 +1881,12 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1981,6 +1994,8 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2074,7 +2089,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1678,7 +1678,11 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1715,6 +1719,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
@ -1723,11 +1728,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!PARTIALPASTE_EQUALIZER;Wavelet levels
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1924,13 +1932,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_CASTR;Strength
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -1974,7 +1985,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2057,6 +2070,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2129,7 +2144,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1678,7 +1678,11 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1715,6 +1719,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
@ -1723,11 +1728,14 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!PARTIALPASTE_EQUALIZER;Wavelet levels
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1924,13 +1932,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!TP_PRSHARPENING_LABEL;Post-Resize Sharpening
!TP_PRSHARPENING_TOOLTIP;Sharpens the image after resizing. Only works when the "Lanczos" resizing method is used. It is impossible to preview the effects of this tool. See RawPedia for usage instructions.
!TP_RAWCACORR_CASTR;Strength
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -1974,7 +1985,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2057,6 +2070,8 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2129,7 +2144,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

File diff suppressed because it is too large Load Diff

View File

@ -1651,7 +1651,11 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1680,6 +1684,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!IPTCPANEL_TRANSREFERENCEHINT;Enter a number or identifier needed for workflow control or tracking.
!MAIN_MSG_TOOMANYOPENEDITORS;Too many open editors.\nPlease close an editor to continue.
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
@ -1690,11 +1695,14 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1942,10 +1950,13 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_IMAGENUM;Sub-image
!TP_RAW_IMAGENUM_TOOLTIP;Some raw files consist of several sub-images (Pentax/Sony Pixel Shift, Pentax 3-in-1 HDR, Canon Dual Pixel).\n\nWhen using any demosaicing method other than Pixel Shift, this selects which sub-image is used.\n\nWhen using the Pixel Shift demosaicing method on a Pixel Shift raw, all sub-images are used, and this selects which sub-image should be used for moving parts.
@ -1978,7 +1989,9 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for base ISO.\nIncrease the value for high ISO shots, 5.0 is a good starting point.\nWatch the motion mask while changing the value.
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2057,6 +2070,8 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2129,7 +2144,7 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1572,7 +1572,11 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1608,6 +1612,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@ -1632,11 +1637,14 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!PARTIALPASTE_METAGROUP;Metadata settings
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1916,13 +1924,16 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -1966,10 +1977,12 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2052,6 +2065,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2124,7 +2139,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1572,7 +1572,11 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1608,6 +1612,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TAB_INSPECT; Inspect
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MONITOR_PROFILE_SYSTEM;System default
!NAVIGATOR_B;B:
!NAVIGATOR_G;G:
@ -1632,11 +1637,14 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!PARTIALPASTE_METAGROUP;Metadata settings
!PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_RETINEX;Retinex
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTLISLOW;Low
!PREFERENCES_AUTLISMAX;Max - Average of all tiles
@ -1916,13 +1924,16 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!TP_RAWEXPOS_BLACK_GREEN;Green
!TP_RAWEXPOS_BLACK_RED;Red
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -1966,10 +1977,12 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@ -2052,6 +2065,8 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!TP_RETINEX_VIEW_UNSHARP;Unsharp mask
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2124,7 +2139,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1054,7 +1054,11 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1122,6 +1126,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1174,6 +1179,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1181,6 +1187,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1192,6 +1199,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_AUTLISLOW;Low
@ -1827,13 +1835,16 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1883,10 +1894,12 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1991,6 +2004,8 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2084,7 +2099,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -993,7 +993,11 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1067,6 +1071,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1122,6 +1127,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1129,6 +1135,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1140,6 +1147,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1813,15 +1821,18 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1871,10 +1882,12 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1982,6 +1995,8 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2075,7 +2090,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -1958,7 +1958,11 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
!IPTCPANEL_CITYHINT;Enter the name of the city pictured in this image.
@ -1993,6 +1997,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!MAIN_TAB_ADVANCED;Advanced
!MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: <b>Alt-w</b>
!MAIN_TOOLTIP_BACKCOLOR3;Background color of the preview: <b>Middle grey</b>\nShortcut: <b>9</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!OPTIONS_BUNDLED_MISSING;The bundled profile "<b>%1</b>" could not be found!\n\nYour installation could be damaged.\n\nDefault internal values will be used instead.
!OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
!OPTIONS_DEFRAW_MISSING;The default profile for <b>raw photos</b> could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\n"<b>%1</b>" will be used instead.
@ -2001,9 +2006,12 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!PARTIALPASTE_FLATFIELDCLIPCONTROL;Flat-field clip control
!PARTIALPASTE_LOCALCONTRAST;Local contrast
!PARTIALPASTE_METADATA;Metadata mode
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_IMAGENUM;Sub-image
!PARTIALPASTE_RAW_PIXELSHIFT;Pixel Shift
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PREFERENCES_AUTOSAVE_TP_OPEN;Automatically save tools collapsed/expanded\nstate before exiting
!PREFERENCES_CMMBPC;Black point compensation
@ -2108,13 +2116,16 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!TP_PREPROCESS_LINEDENOISE_DIRECTION_VERTICAL;Vertical
!TP_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!TP_PREPROCESS_PDAFLINESFILTER_TOOLTIP;Tries to suppress stripe noise caused by on-sensor PDAF pixels, occurring with some Sony mirrorless cameras on some backlit scenes with visible flare.
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
@ -2156,7 +2167,9 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RETINEX_CONTEDIT_MAP;Mask equalizer
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_MAP_TOOLTIP;This curve can be applied alone or with a Gaussian mask or wavelet mask.\nBeware of artifacts!
@ -2182,6 +2195,8 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!TP_RETINEX_VIEW_METHOD_TOOLTIP;Standard - Normal display.\nMask - Displays the mask.\nUnsharp mask - Displays the image with a high radius unsharp mask.\nTransmission - Auto/Fixed - Displays the file transmission-map, before any action on contrast and brightness.\n\nAttention: the mask does not correspond to reality, but is amplified to make it more visible.
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2193,7 +2208,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
!TP_WAVELET_CURVEEDITOR_CC_TOOLTIP;Modifies local contrast as a function of the original local contrast (abscissa).\nLow abscissa values represent small local contrast (real values about 10..20).\n50% abscissa represents average local contrast (real value about 100..300).\n66% abscissa represents standard deviation of local contrast (real value about 300..800).\n100% abscissa represents maximum local contrast (real value about 3000..8000).
!TP_WAVELET_CURVEEDITOR_CH_TOOLTIP;Modifies each level's contrast as a function of hue.\nTake care not to overwrite changes made with the Gamut sub-tool's hue controls.\nThe curve will only have an effect when wavelet contrast level sliders are non-zero.
!TP_WAVELET_DAUB_TOOLTIP;Changes Daubechies coefficients:\nD4 = Standard,\nD14 = Often best performance, 10% more time-intensive.\n\nAffects edge detection as well as the general quality of the firsts levels. However the quality is not strictly related to this coefficient and can vary with images and uses.
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGEDETECTTHR;Threshold low (noise)
!TP_WAVELET_EDGEDETECTTHR2;Threshold high (detection)
!TP_WAVELET_EDGREINF_TOOLTIP;Reinforce or reduce the action of the first level, do the opposite to the second level, and leave the rest unchanged.

View File

@ -992,7 +992,11 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
!HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
!HISTORY_MSG_RAW_BORDER;Raw border
!HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
!HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
!HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
!HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
!IPTCPANEL_CATEGORYHINT;Identifies the subject of the image in the opinion of the provider.
@ -1066,6 +1070,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
!MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
!MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
!MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
!MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
!MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
!MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-l</b>
@ -1121,6 +1126,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
!PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
!PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
!PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
!PARTIALPASTE_PRSHARPENING;Post-resize sharpening
!PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
!PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1128,6 +1134,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
!PARTIALPASTE_RAWGROUP;Raw Settings
!PARTIALPASTE_RAW_BORDER;Raw border
!PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
!PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
!PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1139,6 +1146,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!PARTIALPASTE_RGBCURVES;RGB curves
!PARTIALPASTE_SHARPENEDGE;Edges
!PARTIALPASTE_SHARPENMICRO;Microcontrast
!PARTIALPASTE_SOFTLIGHT;Soft light
!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
!PARTIALPASTE_VIBRANCE;Vibrance
!PREFERENCES_ADD;Add
@ -1812,15 +1820,18 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RAWEXPOS_PRESER;Highlight preservation
!TP_RAWEXPOS_RGB;Red, Green, Blue
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
!TP_RAW_4PASS;4-Pass
!TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
!TP_RAW_2PASS;1-pass+fast
!TP_RAW_3PASSBEST;3-pass (Markesteijn)
!TP_RAW_4PASS;3-pass+fast
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_BORDER;Border
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!TP_RAW_DCBVNG4;DCB+VNG4
!TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
!TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
!TP_RAW_DMETHOD_TOOLTIP;Note: IGV and LMMSE are dedicated to high ISO images to aid in noise reduction without leading to maze patterns, posterization or a washed-out look.\nPixel Shift is for Pentax/Sony Pixel Shift files. It falls back to AMaZE for non-Pixel Shift files.
@ -1870,10 +1881,12 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
!TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
!TP_RAW_RCD;RCD
!TP_RAW_RCDVNG4;RCD+VNG4
!TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
!TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
!TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
!TP_RAW_VNG4;VNG4
!TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
!TP_RESIZE_APPLIESTO;Applies to:
!TP_RESIZE_CROPPEDAREA;Cropped Area
!TP_RESIZE_FITBOX;Bounding Box
@ -1981,6 +1994,8 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_SHARPENMICRO_LABEL;Microcontrast
!TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
!TP_SHARPENMICRO_UNIFORMITY;Uniformity
!TP_SOFTLIGHT_LABEL;Soft Light
!TP_SOFTLIGHT_STRENGTH;Strength
!TP_TM_FATTAL_AMOUNT;Amount
!TP_TM_FATTAL_ANCHOR;Anchor
!TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2074,7 +2089,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_WAVELET_DTWO;Horizontal
!TP_WAVELET_EDCU;Curve
!TP_WAVELET_EDGCONT;Local contrast
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
!TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
!TP_WAVELET_EDGE;Edge Sharpness
!TP_WAVELET_EDGEAMPLI;Base amplification
!TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -862,7 +862,11 @@ HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - Contrast threshold
HISTORY_MSG_RAW_BORDER;Raw border
HISTORY_MSG_RESIZE_ALLOW_UPSCALING;Resize - Allow upscaling
HISTORY_MSG_SHARPENING_CONTRAST;Sharpening - Contrast threshold
HISTORY_MSG_SOFTLIGHT_ENABLED;Soft light
HISTORY_MSG_SOFTLIGHT_STRENGTH;Soft light - Strength
HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
@ -981,10 +985,10 @@ MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <b>&lt;</b>
MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: <b>&gt;</b>
MAIN_TOOLTIP_PREVIEWB;Preview the <b>Blue channel</b>.\nShortcut: <b>b</b>
MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the <b>Focus Mask</b>.\nShortcut: <b>Shift-f</b>\n\nMore accurate on images with shallow depth of field, low noise and at higher zoom levels.\n\nTo improve detection accuracy for noisy images evaluate at smaller zoom, about 10-30%.
MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%
MAIN_TOOLTIP_PREVIEWG;Preview the <b>Green channel</b>.\nShortcut: <b>g</b>
MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
MAIN_TOOLTIP_PREVIEWSHARPMASK;Preview the <b>Sharpening Contrast Mask</b>.\nShortcut: <b>None</b>\n\nOnly works when sharpening is enabled and zoom >= 100%.
MAIN_TOOLTIP_QINFO;Quick info on the image.\nShortcut: <b>i</b>
MAIN_TOOLTIP_SHOWHIDELP1;Show/Hide the left panel.\nShortcut: <b>l</b>
MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
@ -1057,6 +1061,7 @@ PARTIALPASTE_PREPROCESS_DEADPIXFILT;Dead pixel filter
PARTIALPASTE_PREPROCESS_GREENEQUIL;Green equilibration
PARTIALPASTE_PREPROCESS_HOTPIXFILT;Hot pixel filter
PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
PARTIALPASTE_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
PARTIALPASTE_PRSHARPENING;Post-resize sharpening
PARTIALPASTE_RAWCACORR_AUTO;CA auto-correction
PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue
@ -1064,6 +1069,7 @@ PARTIALPASTE_RAWEXPOS_BLACK;Black levels
PARTIALPASTE_RAWEXPOS_LINEAR;White point correction
PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation
PARTIALPASTE_RAWGROUP;Raw Settings
PARTIALPASTE_RAW_BORDER;Raw border
PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement
PARTIALPASTE_RAW_DCBITERATIONS;DCB iterations
PARTIALPASTE_RAW_DMETHOD;Demosaic method
@ -1079,6 +1085,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Shadows/highlights
PARTIALPASTE_SHARPENEDGE;Edges
PARTIALPASTE_SHARPENING;Sharpening (USM/RL)
PARTIALPASTE_SHARPENMICRO;Microcontrast
PARTIALPASTE_SOFTLIGHT;Soft light
PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
PARTIALPASTE_VIBRANCE;Vibrance
PARTIALPASTE_VIGNETTING;Vignetting correction
@ -2020,15 +2027,18 @@ TP_RAWEXPOS_LINEAR;White-point correction
TP_RAWEXPOS_PRESER;Highlight preservation
TP_RAWEXPOS_RGB;Red, Green, Blue
TP_RAWEXPOS_TWOGREEN;Link greens
TP_RAW_1PASSMEDIUM;1-Pass (Medium)
TP_RAW_3PASSBEST;3-Pass (Best)
TP_RAW_4PASS;4-Pass
TP_RAW_1PASSMEDIUM;1-pass (Markesteijn)
TP_RAW_2PASS;1-pass+fast
TP_RAW_3PASSBEST;3-pass (Markesteijn)
TP_RAW_4PASS;3-pass+fast
TP_RAW_AHD;AHD
TP_RAW_AMAZE;AMaZE
TP_RAW_AMAZEVNG4;AMaZE+VNG4
TP_RAW_BORDER;Border
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB enhancement
TP_RAW_DCBITERATIONS;Number of DCB iterations
TP_RAW_DCBVNG4;DCB+VNG4
TP_RAW_DMETHOD;Method
TP_RAW_DMETHOD_PROGRESSBAR;%1 demosaicing...
TP_RAW_DMETHOD_PROGRESSBAR_REFINE;Demosaicing refinement...
@ -2080,10 +2090,12 @@ TP_RAW_PIXELSHIFTSIGMA_TOOLTIP;The default radius of 1.0 usually fits well for b
TP_RAW_PIXELSHIFTSMOOTH;Smooth transitions
TP_RAW_PIXELSHIFTSMOOTH_TOOLTIP;Smooth transitions between areas with motion and areas without.\nSet to 0 to disable transition smoothing.\nSet to 1 to either get the AMaZE/LMMSE result of the selected frame (depending on whether "Use LMMSE" is selected), or the median of all four frames if "Use median" is selected.
TP_RAW_RCD;RCD
TP_RAW_RCDVNG4;RCD+VNG4
TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.
TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
TP_RAW_VNG4;VNG4
TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
TP_RESIZE_APPLIESTO;Applies to:
TP_RESIZE_CROPPEDAREA;Cropped Area
TP_RESIZE_FITBOX;Bounding Box
@ -2222,6 +2234,8 @@ TP_SHARPENMICRO_CONTRAST;Contrast threshold
TP_SHARPENMICRO_LABEL;Microcontrast
TP_SHARPENMICRO_MATRIX;3×3 matrix instead of 5×5
TP_SHARPENMICRO_UNIFORMITY;Uniformity
TP_SOFTLIGHT_LABEL;Soft Light
TP_SOFTLIGHT_STRENGTH;Strength
TP_TM_FATTAL_AMOUNT;Amount
TP_TM_FATTAL_ANCHOR;Anchor
TP_TM_FATTAL_LABEL;Dynamic Range Compression
@ -2318,7 +2332,7 @@ TP_WAVELET_DTHR;Diagonal
TP_WAVELET_DTWO;Horizontal
TP_WAVELET_EDCU;Curve
TP_WAVELET_EDGCONT;Local contrast
TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, Top-Left, Top-Right, Bottom-right represent respectively local contast for low values, mean, mean+stdev, maxima
TP_WAVELET_EDGCONT_TOOLTIP;Adjusting the points to the left decreases contrast, and to the right increases it.\nBottom-left, top-left, top-right and bottom-right represent respectively local contrast for low values, mean, mean+stdev and maxima.
TP_WAVELET_EDGE;Edge Sharpness
TP_WAVELET_EDGEAMPLI;Base amplification
TP_WAVELET_EDGEDETECT;Gradient sensitivity

View File

@ -18,19 +18,24 @@
along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
/* Scrollbar stuck workaround */
scrollbar:not(.overlay-indicator):hover {
min-width: 1px;
}
/* text-shadow causes a serious performance degradation in rendering the UI,
* at least in comboboxes with many entries (i.e. Profiled Lens Correction).
*/
* {
color: #AAAAAA;
text-shadow: none;
}
*:disabled {
color: #666666;
}
/* Scrollbar stuck workaround */
scrollbar:not(.overlay-indicator):hover {
min-width: 1px;
}
.view:selected:not(check):not(radio) {
color: #262626;
background-color: #AAAAAA

View File

@ -2,7 +2,7 @@
This file is part of RawTherapee.
Copyright (c) 2016-2017 TooWaBoo
Version 2.62
Version 2.66
RawTherapee is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -164,7 +164,7 @@ filechooser frame {
}
#PlacesPaned frame {
margin: -8px 0 0;
margin: -5px 0 0;
}
frame > border {
@ -215,7 +215,7 @@ dialog frame > label {
frame > label {
margin: 0;
padding: 0.5em 0;
padding: 0.41667em 0 0.33334em 0.08334em;
color: @headline-frame;
}
frame > checkbutton label{
@ -245,19 +245,22 @@ textview:selected, treeview:selected {
}
#PlacesPaned > box:nth-child(1) treeview {
padding: 0.08334em 0 0.08334em 0.5em;
padding: 0.08334em 0 0.08334em 0.416667em;
-gtk-icon-style: symbolic;
}
#HistoryPanel {
margin-top: 0.5em;
margin-top: 0.25em;
}
#RightNotebook #HistoryPanel {
margin-top: 0.33334em;
}
#HistoryPanel > border {
margin-top: 1.75em;
}
#HistoryPanel > label {
margin: 0 0 -1.33334em 0;
padding: 0;
margin: 0 0 -1.5em 0;
padding: 0 0 0 0.08334em;
}
#Snapshots > border {
@ -284,24 +287,24 @@ textview:selected, treeview:selected {
/*Corrects the space of the snapshot view to the paned separator*/
#Snapshots {
margin-top: -0.33334em;
margin-top: 0.16667em;
}
/**/
/*** end ***************************************************************************************/
/*** Navigator *********************************************************************************/
#Navigator .drawingarea {
border-top: 0.41667em solid @bg-dark-grey;
border-bottom: 0.25em solid @bg-dark-grey;
}
#Navigator {
background-color: @bg-dark-grey;
padding-top: 0.75em;
padding-bottom: 0.25em;
background-color: @bg-dark-grey;
}
#Navigator box label {
padding: 0.16667em 0;
}
#Navigator > label:nth-child(2) {
margin-top: 0.5em;
}
/*** end ***************************************************************************************/
@ -356,9 +359,34 @@ filechooser list row:selected {
/*** Histogram *********************************************************************************/
#HistogramPanel {
min-height: 0;
margin: -2px 0;
border: none;
background-color: transparent;
}
#HistogramPanel > :nth-child(2) {
border: none;
border-left: 0.08334em solid @bg-light-grey;
background-color: @bg-dark-grey;
}
#HistogramPanel > :nth-child(1) {
border: none;
background-color: transparent;
}
#EditorLeftPaned #HistogramPanel > :nth-child(1) {
border: none;
border-right: 0.08334em solid @bg-light-grey;
background-color: @bg-dark-grey;
}
#EditorLeftPaned #HistogramPanel > :nth-child(2) {
border: none;
background-color: transparent;
}
#HistogramArea,
#HistogramRGBArea {
border: 0.08334em solid @bg-dark-grey;
@ -367,25 +395,24 @@ filechooser list row:selected {
#fullButton,
#histButton {
padding: 0.47em 0.41667em;
padding: 0;
margin: 0;
border-color: @bg-light-grey;
border-style: solid;
border-width: 0 0 0 0.08334em;
border:none;
background-color: @bg-dark-grey;
background-image: none;
box-shadow: none;
min-height: 0;
min-width: 0;
min-height: 1.58334em;
min-width: 1.5em;
border-radius: 0;
}
#fullButton {
padding: 0.47em 0.41667em 0.58334em;
#histButton:first-child {
margin-top: 1px;
}
#EditorLeftPaned #fullButton,
#EditorLeftPaned #histButton {
border-width: 0 0.08334em 0 0;
#histButton:last-child {
margin-bottom: 1px;
}
/*** end ***************************************************************************************/
/*** Separator *********************************************************************************/
@ -413,6 +440,7 @@ popover separator:not(:only-child) {
paned.horizontal > separator {
background-color: transparent;
background-image: none;
min-width: 0.41667em;
border-left: 0.25em solid @bg-light-grey;
border-right: 0.25em solid @bg-light-grey;
@ -426,9 +454,16 @@ paned.vertical > separator {
min-height: 0.5em;
border-top: 1px solid @bg-light-grey;
border-bottom: 1px solid @bg-light-grey;
margin: 0.25em 0 0;
margin: 0.25em 0 -0.5em;
padding: 0.2em 0 0;
}
/*Filmstrip*/
#EditorRightPaned > paned.horizontal > paned.vertical > separator {
margin-bottom: 0;
}
#EditorRightPaned > paned.horizontal:nth-child(1) > paned.vertical:nth-child(1) > separator {
margin-bottom: -0.5em;
}
dialog paned.horizontal > separator {
background-color: @bg-grey;
@ -451,8 +486,8 @@ menu separator {
#IopsPanel separator,
#FileBrowser separator {
background-color: shade(@bg-light-grey,.75);
margin-top: 0.33334em;
margin-bottom: 0.33334em;
margin-top: 0.16667em;
margin-bottom: 0.16667em;
}
#MyExpander separator {
@ -1388,6 +1423,9 @@ button.MiddleH {
margin-bottom: -2px;
padding-bottom: 0.41667em;
}
#ProfilePanel > label {
margin-bottom: 0.08334em;
}
#ProfilePanel combobox {
margin-left: 0.16667em;
}

View File

@ -33,7 +33,6 @@ set(RTENGINESOURCEFILES
FTblockDN.cc
PF_correct_RT.cc
amaze_demosaic_RT.cc
amaze_vng4_demosaic_RT.cc
cJSON.c
calc_distort.cc
camconst.cc
@ -53,6 +52,7 @@ set(RTENGINESOURCEFILES
dfmanager.cc
diagonalcurves.cc
dirpyr_equalizer.cc
dual_demosaic_RT.cc
dynamicprofile.cc
expo_before_b.cc
fast_demo.cc
@ -125,6 +125,7 @@ set(RTENGINESOURCEFILES
ipshadowshighlights.cc
xtrans_demosaic.cc
vng4_demosaic_RT.cc
ipsoftlight.cc
)
if(LENSFUN_HAS_LOAD_DIRECTORY)

View File

@ -1584,6 +1584,9 @@ void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, c
// clean up
free(buffer);
}
if(border < 4) {
border_interpolate2(W, H, 3, rawData, red, green, blue);
}
if(plistener) {
plistener->setProgress(1.0);

View File

@ -1,93 +0,0 @@
////////////////////////////////////////////////////////////////
//
// combined AMaZE + VNG4 demosaic algorithm
//
//
// copyright (c) 2018 Ingo Weyrich <heckflosse67@gmx.de>
//
// blends AMaZE and VNG4 output based on contrast
//
//
// amaze_vng4_demosaic_RT.cc is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
////////////////////////////////////////////////////////////////
#include "rtengine.h"
#include "rawimagesource.h"
#include "rt_math.h"
//#define BENCHMARK
#include "StopWatch.h"
#include "rt_algo.h"
using namespace std;
namespace rtengine
{
void RawImageSource::amaze_vng4_demosaic_RT(int winw, int winh, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, double contrast)
{
BENCHFUN
if (contrast == 0.0) {
// contrast == 0.0 means only AMaZE will be used
amaze_demosaic_RT(0, 0, winw, winh, rawData, red, green, blue);
return;
}
vng4_demosaic(rawData, red, green, blue);
array2D<float> redTmp(winw, winh);
array2D<float> greenTmp(winw, winh);
array2D<float> blueTmp(winw, winh);
array2D<float> L(winw, winh);
amaze_demosaic_RT(0, 0, winw, winh, rawData, redTmp, greenTmp, blueTmp);
const float xyz_rgb[3][3] = { // XYZ from RGB
{ 0.412453, 0.357580, 0.180423 },
{ 0.212671, 0.715160, 0.072169 },
{ 0.019334, 0.119193, 0.950227 }
};
#pragma omp parallel
{
#pragma omp for
for(int i = 0; i < winh; ++i) {
Color::RGB2L(redTmp[i], greenTmp[i], blueTmp[i], L[i], xyz_rgb, winw);
}
}
// calculate contrast based blend factors to use vng4 in regions with low contrast
JaggedArray<float> blend(winw, winh);
buildBlendMask(L, blend, winw, winh, contrast / 100.f);
// the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
#pragma omp parallel for
for(int i = 0; i < winh; ++i) {
for(int j = 0; j < winw; ++j) {
red[i][j] = intp(blend[i][j], redTmp[i][j], red[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < winh; ++i) {
for(int j = 0; j < winw; ++j) {
green[i][j] = intp(blend[i][j], greenTmp[i][j], green[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < winh; ++i) {
for(int j = 0; j < winw; ++j) {
blue[i][j] = intp(blend[i][j], blueTmp[i][j], blue[i][j]);
}
}
}
}

View File

@ -1813,7 +1813,7 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
try {
if (!Glib::file_test(dirname, Glib::FILE_TEST_IS_DIR)) {
return;
continue;
}
dir.reset(new Glib::Dir(dirname));

View File

@ -9937,6 +9937,7 @@ static void decodeFPDeltaRow(Bytef * src, Bytef * dst, size_t tileWidth, size_t
}
#ifndef __F16C__
// From DNG SDK dng_utils.h
static inline uint32_t DNG_HalfToFloat(uint16_t halfValue) {
int32_t sign = (halfValue >> 15) & 0x00000001;
@ -9970,6 +9971,7 @@ static inline uint32_t DNG_HalfToFloat(uint16_t halfValue) {
// Assemble sign, exponent and mantissa.
return (uint32_t) ((sign << 31) | (exponent << 23) | mantissa);
}
#endif
static inline uint32_t DNG_FP24ToFloat(const uint8_t * input) {
int32_t sign = (input [0] >> 7) & 0x01;
@ -10006,11 +10008,32 @@ static inline uint32_t DNG_FP24ToFloat(const uint8_t * input) {
static void expandFloats(Bytef * dst, int tileWidth, int bytesps) {
if (bytesps == 2) {
uint16_t * dst16 = (uint16_t *) dst;
uint32_t * dst32 = (uint32_t *) dst;
uint16_t* const dst16 = reinterpret_cast<uint16_t*>(dst);
#ifndef __F16C__
uint32_t* const dst32 = reinterpret_cast<uint32_t*>(dst);
for (int index = tileWidth - 1; index >= 0; --index) {
dst32[index] = DNG_HalfToFloat(dst16[index]);
dst32[index] = DNG_HalfToFloat(dst16[index]);
}
#else
float* const dst32 = reinterpret_cast<float*>(dst);
int index = tileWidth - 8;
for (; index >= 0; index -= 8) {
__m128i halfFloatv = _mm_loadu_si128((__m128i*)&dst16[index]);
STVFU(dst32[index], _mm_cvtph_ps(halfFloatv));
STVFU(dst32[index + 4], _mm_cvtph_ps(_mm_shuffle_epi32(halfFloatv, _MM_SHUFFLE(0,0,3,2))));
}
index += 4;
if(index >= 0) {
__m128i halfFloatv = _mm_loadu_si128((__m128i*)&dst16[index]);
STVFU(dst32[index], _mm_cvtph_ps(halfFloatv));
index--;
} else {
index += 3;
}
for (; index >= 0; --index) {
dst32[index] = _cvtsh_ss(dst16[index]);
}
#endif
} else if (bytesps == 3) {
uint8_t * dst8 = ((uint8_t *) dst) + (tileWidth - 1) * 3;
uint32_t * dst32 = (uint32_t *) dst;

View File

@ -553,6 +553,8 @@ void RawImageSource::hphd_demosaic ()
}
}
border_interpolate2(W, H, 4, rawData, red, green, blue);
if (plistener) {
plistener->setProgress (1.0);
}
@ -714,7 +716,7 @@ void RawImageSource::border_interpolate(unsigned int border, float (*image)[4],
}
}
void RawImageSource::border_interpolate2( int winw, int winh, int lborders)
void RawImageSource::border_interpolate2( int winw, int winh, int lborders, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue)
{
int bord = lborders;
int width = winw;
@ -1657,7 +1659,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
chr[2] = hdif;
chr[3] = vdif;
border_interpolate2(winw, winh, 7);
border_interpolate2(winw, winh, 7, rawData, red, green, blue);
if (plistener) {
plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::IGV)));
@ -2047,7 +2049,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
vdif = (float (*)) calloc(width * height / 2, sizeof * vdif);
hdif = (float (*)) calloc(width * height / 2, sizeof * hdif);
border_interpolate2(winw, winh, 7);
border_interpolate2(winw, winh, 7, rawData, red, green, blue);
if (plistener) {
plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::IGV)));

View File

@ -0,0 +1,144 @@
////////////////////////////////////////////////////////////////
//
// combine demosaic algorithms
//
//
// copyright (c) 2018 Ingo Weyrich <heckflosse67@gmx.de>
//
// blends output of two demosaicers based on contrast
//
//
// dual_demosaic_RT.cc is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
////////////////////////////////////////////////////////////////
#include "jaggedarray.h"
#include "rtengine.h"
#include "rawimagesource.h"
#include "rt_math.h"
//#define BENCHMARK
#include "StopWatch.h"
#include "rt_algo.h"
using namespace std;
namespace rtengine
{
void RawImageSource::dual_demosaic_RT(bool isBayer, const RAWParams &raw, int winw, int winh, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, double &contrast, bool autoContrast, int autoX, int autoY)
{
BENCHFUN
if (contrast == 0.0 && !autoContrast) {
// contrast == 0.0 means only first demosaicer will be used
if(isBayer) {
if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4) ) {
amaze_demosaic_RT(0, 0, winw, winh, rawData, red, green, blue);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCBVNG4) ) {
dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCDVNG4) ) {
rcd_demosaic();
}
} else {
if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS) ) {
xtrans_interpolate (3, true);
} else {
xtrans_interpolate (1, false);
}
}
return;
}
array2D<float> redTmp(winw, winh);
array2D<float> greenTmp(winw, winh);
array2D<float> blueTmp(winw, winh);
array2D<float> L(winw, winh);
if (isBayer) {
vng4_demosaic(rawData, redTmp, greenTmp, blueTmp);
if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4) || raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
amaze_demosaic_RT(0, 0, winw, winh, rawData, red, green, blue);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCBVNG4) ) {
dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCDVNG4) ) {
rcd_demosaic();
}
} else {
if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS) ) {
xtrans_interpolate (3, true);
} else {
xtrans_interpolate (1, false);
}
fast_xtrans_interpolate(rawData, redTmp, greenTmp, blueTmp);
}
const float xyz_rgb[3][3] = { // XYZ from RGB
{ 0.412453, 0.357580, 0.180423 },
{ 0.212671, 0.715160, 0.072169 },
{ 0.019334, 0.119193, 0.950227 }
};
if (autoContrast && autoX >= 0 && autoY >= 0) {
constexpr int rectSize = 40;
const int autoWidth = min(rectSize, winw - autoX);
const int autoHeight = min(rectSize, winh - autoY);
if (std::min(autoWidth, autoHeight) > 20) {
array2D<float> autoL(autoWidth, autoHeight);
for(int i = 0; i < autoHeight; ++i) {
Color::RGB2L(red[i + autoY] + autoX, green[i + autoY] + autoX, blue[i + autoY] + autoX, autoL[i], xyz_rgb, autoWidth);
}
// calculate contrast based blend factors to use vng4 in regions with low contrast
JaggedArray<float> blend(autoWidth - 2, autoHeight - 2);
int c = calcContrastThreshold(autoL, blend, autoWidth, autoHeight);
if(c < 100) {
contrast = c; // alternative : contrast = c - 1
}
}
}
#pragma omp parallel
{
#pragma omp for
for(int i = 0; i < winh; ++i) {
Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, winw);
}
}
// calculate contrast based blend factors to use vng4 in regions with low contrast
JaggedArray<float> blend(winw, winh);
buildBlendMask(L, blend, winw, winh, contrast / 100.f);
// the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
#pragma omp parallel for
for(int i = 0; i < winh; ++i) {
for(int j = 0; j < winw; ++j) {
red[i][j] = intp(blend[i][j], red[i][j], redTmp[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < winh; ++i) {
for(int j = 0; j < winw; ++j) {
green[i][j] = intp(blend[i][j], green[i][j], greenTmp[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < winh; ++i) {
for(int j = 0; j < winw; ++j) {
blue[i][j] = intp(blend[i][j], blue[i][j], blueTmp[i][j]);
}
}
}
}

View File

@ -1020,14 +1020,14 @@ template<class T> void gaussVerticaldiv (T** src, T** dst, T** divBuffer, const
}
for (int k = 0; k < numcols; k++) {
dst[H - 1][i + k] = rtengine::max(divBuffer[H - 1][i + k] / (temp2[H - 1][k] = temp2Hm1[k]), 0.f);
dst[H - 2][i + k] = rtengine::max(divBuffer[H - 2][i + k] / (temp2[H - 2][k] = B * temp2[H - 2][k] + b1 * temp2[H - 1][k] + b2 * temp2H[k] + b3 * temp2Hp1[k]), 0.f);
dst[H - 3][i + k] = rtengine::max(divBuffer[H - 3][i + k] / (temp2[H - 3][k] = B * temp2[H - 3][k] + b1 * temp2[H - 2][k] + b2 * temp2[H - 1][k] + b3 * temp2H[k]), 0.f);
dst[H - 1][i + k] = rtengine::max(divBuffer[H - 1][i + k] / (temp2[H - 1][k] = temp2Hm1[k]), 0.0);
dst[H - 2][i + k] = rtengine::max(divBuffer[H - 2][i + k] / (temp2[H - 2][k] = B * temp2[H - 2][k] + b1 * temp2[H - 1][k] + b2 * temp2H[k] + b3 * temp2Hp1[k]), 0.0);
dst[H - 3][i + k] = rtengine::max(divBuffer[H - 3][i + k] / (temp2[H - 3][k] = B * temp2[H - 3][k] + b1 * temp2[H - 2][k] + b2 * temp2[H - 1][k] + b3 * temp2H[k]), 0.0);
}
for (int j = H - 4; j >= 0; j--) {
for (int k = 0; k < numcols; k++) {
dst[j][i + k] = rtengine::max(divBuffer[j][i + k] / (temp2[j][k] = B * temp2[j][k] + b1 * temp2[j + 1][k] + b2 * temp2[j + 2][k] + b3 * temp2[j + 3][k]), 0.f);
dst[j][i + k] = rtengine::max(divBuffer[j][i + k] / (temp2[j][k] = B * temp2[j][k] + b1 * temp2[j + 1][k] + b2 * temp2[j + 2][k] + b3 * temp2[j + 3][k]), 0.0);
}
}
}
@ -1050,12 +1050,12 @@ template<class T> void gaussVerticaldiv (T** src, T** dst, T** divBuffer, const
double temp2H = src[H - 1][i] + M[1][0] * (temp2[H - 1][0] - src[H - 1][i]) + M[1][1] * (temp2[H - 2][0] - src[H - 1][i]) + M[1][2] * (temp2[H - 3][0] - src[H - 1][i]);
double temp2Hp1 = src[H - 1][i] + M[2][0] * (temp2[H - 1][0] - src[H - 1][i]) + M[2][1] * (temp2[H - 2][0] - src[H - 1][i]) + M[2][2] * (temp2[H - 3][0] - src[H - 1][i]);
dst[H - 1][i] = rtengine::max(divBuffer[H - 1][i] / (temp2[H - 1][0] = temp2Hm1), 0.f);
dst[H - 2][i] = rtengine::max(divBuffer[H - 2][i] / (temp2[H - 2][0] = B * temp2[H - 2][0] + b1 * temp2[H - 1][0] + b2 * temp2H + b3 * temp2Hp1), 0.f);
dst[H - 3][i] = rtengine::max(divBuffer[H - 3][i] / (temp2[H - 3][0] = B * temp2[H - 3][0] + b1 * temp2[H - 2][0] + b2 * temp2[H - 1][0] + b3 * temp2H), 0.f);
dst[H - 1][i] = rtengine::max(divBuffer[H - 1][i] / (temp2[H - 1][0] = temp2Hm1), 0.0);
dst[H - 2][i] = rtengine::max(divBuffer[H - 2][i] / (temp2[H - 2][0] = B * temp2[H - 2][0] + b1 * temp2[H - 1][0] + b2 * temp2H + b3 * temp2Hp1), 0.0);
dst[H - 3][i] = rtengine::max(divBuffer[H - 3][i] / (temp2[H - 3][0] = B * temp2[H - 3][0] + b1 * temp2[H - 2][0] + b2 * temp2[H - 1][0] + b3 * temp2H), 0.0);
for (int j = H - 4; j >= 0; j--) {
dst[j][i] = rtengine::max(divBuffer[j][i] / (temp2[j][0] = B * temp2[j][0] + b1 * temp2[j + 1][0] + b2 * temp2[j + 2][0] + b3 * temp2[j + 3][0]), 0.f);
dst[j][i] = rtengine::max(divBuffer[j][i] / (temp2[j][0] = B * temp2[j][0] + b1 * temp2[j + 1][0] + b2 * temp2[j + 2][0] + b3 * temp2[j + 3][0]), 0.0);
}
}
}

View File

@ -28,8 +28,6 @@
#include "rawimagesource.h"
#include "rt_math.h"
#include "opthelper.h"
#include "gauss.h"
namespace rtengine
{
@ -414,8 +412,6 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
constexpr float itrans[ColorCount][ColorCount] =
{ { 1.f, 0.8660254f, -0.5f }, { 1.f, -0.8660254f, -0.5f }, { 1.f, 0.f, 1.f } };
std::unique_ptr<PixelsMap> recovered_partial;
if(settings->verbose)
for(int c = 0; c < 3; c++) {
printf("chmax[%d] : %f\tclmax[%d] : %f\tratio[%d] : %f\n", c, chmax[c], c, clmax[c], c, chmax[c] / clmax[c]);
@ -570,7 +566,7 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
//blur highlight data
boxblur2(hilite_full[3], hilite_full4, temp, height, width, 1);
//temp.free(); // free temporary buffer
temp.free(); // free temporary buffer
if(plistener) {
progress += 0.05;
@ -1109,34 +1105,29 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
if (pixel[0] > max_f[0] && pixel[1] > max_f[1] && pixel[2] > max_f[2]) {
//all channels clipped
float Y = (0.299 * clipfix[0] + 0.587 * clipfix[1] + 0.114 * clipfix[2]);
float factor = whitept / Y;
red[i][j] = CLIP(clipfix[0] * factor);
green[i][j] = CLIP(clipfix[1] * factor);
blue[i][j] = CLIP(clipfix[2] * factor);
red[i][j] = clipfix[0] * factor;
green[i][j] = clipfix[1] * factor;
blue[i][j] = clipfix[2] * factor;
} else {//some channels clipped
float notclipped[3] = {pixel[0] <= max_f[0] ? 1.f : 0.f, pixel[1] <= max_f[1] ? 1.f : 0.f, pixel[2] <= max_f[2] ? 1.f : 0.f};
if (notclipped[0] == 0.f) { //red clipped
red[i][j] = CLIP((clipfix[0] * ((notclipped[1] * pixel[1] + notclipped[2] * pixel[2]) /
red[i][j] = max(red[i][j], (clipfix[0] * ((notclipped[1] * pixel[1] + notclipped[2] * pixel[2]) /
(notclipped[1] * clipfix[1] + notclipped[2] * clipfix[2] + epsilon))));
}
if (notclipped[1] == 0.f) { //green clipped
green[i][j] = CLIP((clipfix[1] * ((notclipped[2] * pixel[2] + notclipped[0] * pixel[0]) /
green[i][j] = max(green[i][j], (clipfix[1] * ((notclipped[2] * pixel[2] + notclipped[0] * pixel[0]) /
(notclipped[2] * clipfix[2] + notclipped[0] * clipfix[0] + epsilon))));
}
if (notclipped[2] == 0.f) { //blue clipped
blue[i][j] = CLIP((clipfix[2] * ((notclipped[0] * pixel[0] + notclipped[1] * pixel[1]) /
blue[i][j] = max(blue[i][j], (clipfix[2] * ((notclipped[0] * pixel[0] + notclipped[1] * pixel[1]) /
(notclipped[0] * clipfix[0] + notclipped[1] * clipfix[1] + epsilon))));
}
if (!recovered_partial) {
recovered_partial.reset(new PixelsMap(width, height));
}
recovered_partial->set(j, i);
}
}
Y = (0.299 * red[i][j] + 0.587 * green[i][j] + 0.114 * blue[i][j]);
@ -1150,33 +1141,6 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
}
}
{
for (int c = 0; c < 3; ++c) {
float **color = c == 0 ? red : c == 1 ? green : blue;
if (recovered_partial) {
#ifdef _OPENMP
#pragma omp parallel
#endif
gaussianBlur(color, temp, width, height, 1.5f);
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < height; ++i) {
for (int j = 0; j < width; ++j) {
int skip = recovered_partial->skipIfZero(j, i);
if (skip) {
j += skip-1;
} else if (recovered_partial->get(j, i)) {
color[i][j] = temp[i][j];
}
}
}
}
}
}
if(plistener) {
plistener->setProgress(1.00);
}

View File

@ -68,7 +68,7 @@ public:
virtual ~ImageSource () {}
virtual int load (const Glib::ustring &fname) = 0;
virtual void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true) {};
virtual void demosaic (const RAWParams &raw) {};
virtual void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold) {};
virtual void retinex (const ColorManagementParams& cmp, const RetinexParams &deh, const ToneCurveParams& Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D<float, 4> &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI) {};
virtual void retinexPrepareCurves (const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI) {};
virtual void retinexPrepareBuffers (const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D<float, 4> &conversionBuffer, LUTu &lhist16RETI) {};
@ -80,6 +80,7 @@ public:
virtual bool isRGBSourceModified () const = 0; // tracks whether cached rgb output of demosaic has been modified
virtual void setBorder (unsigned int border) {}
virtual void setCurrentFrame (unsigned int frameNum) = 0;
virtual int getFrameCount () = 0;

View File

@ -373,8 +373,17 @@ void ImProcCoordinator::updatePreviewImage(int todo, Crop* cropCall)
printf("Demosaic X-Trans image with using method: %s\n", rp.xtranssensor.method.c_str());
}
}
if(imgsrc->getSensorType() == ST_BAYER) {
if(params.raw.bayersensor.method != RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
imgsrc->setBorder(params.raw.bayersensor.border);
} else {
imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
}
}
bool autoContrast = false;
double contrastThreshold = 0.f;
imgsrc->demosaic (rp, autoContrast, contrastThreshold); //enabled demosaic
imgsrc->demosaic(rp); //enabled demosaic
// if a demosaic happened we should also call getimage later, so we need to set the M_INIT flag
todo |= M_INIT;
@ -4226,7 +4235,8 @@ void ImProcCoordinator::saveInputICCReference(const Glib::ustring & fname, bool
ppar.icm.input = "(none)";
Imagefloat* im = new Imagefloat(fW, fH);
imgsrc->preprocess(ppar.raw, ppar.lensProf, ppar.coarse);
imgsrc->demosaic(ppar.raw);
double dummy = 0.0;
imgsrc->demosaic (ppar.raw, false, dummy);
ColorTemp currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
if (params.wb.method == "Camera") {

View File

@ -2275,15 +2275,15 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
float Balan = float (params->colorToning.balance);
float chMixRR = float (params->chmixer.red[0]);
float chMixRG = float (params->chmixer.red[1]);
float chMixRB = float (params->chmixer.red[2]);
float chMixGR = float (params->chmixer.green[0]);
float chMixGG = float (params->chmixer.green[1]);
float chMixGB = float (params->chmixer.green[2]);
float chMixBR = float (params->chmixer.blue[0]);
float chMixBG = float (params->chmixer.blue[1]);
float chMixBB = float (params->chmixer.blue[2]);
float chMixRR = float (params->chmixer.red[0])/10.f;
float chMixRG = float (params->chmixer.red[1])/10.f;
float chMixRB = float (params->chmixer.red[2])/10.f;
float chMixGR = float (params->chmixer.green[0])/10.f;
float chMixGG = float (params->chmixer.green[1])/10.f;
float chMixGB = float (params->chmixer.green[2])/10.f;
float chMixBR = float (params->chmixer.blue[0])/10.f;
float chMixBG = float (params->chmixer.blue[1])/10.f;
float chMixBB = float (params->chmixer.blue[2])/10.f;
bool blackwhite = params->blackwhite.enabled;
bool complem = params->blackwhite.enabledcc;
@ -3208,7 +3208,8 @@ void ImProcFunctions::rgbProc(Imagefloat* working, LabImage* lab, PipetteBuffer
}
}
softLight(rtemp, gtemp, btemp, istart, jstart, tW, tH, TS);
if (!blackwhite) {
if (editImgFloat || editWhatever) {
for (int i = istart, ti = 0; i < tH; i++, ti++) {
@ -5871,10 +5872,11 @@ void ImProcFunctions::lab2rgb (const LabImage &src, Imagefloat &dst, const Glib:
void ImProcFunctions::colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread)
{
const float factor = ColorToningParams::LABGRID_CORR_MAX * 3.f;
float a_scale = (params->colorToning.labgridAHigh - params->colorToning.labgridALow) / factor;
float a_base = params->colorToning.labgridALow;
float b_scale = (params->colorToning.labgridBHigh - params->colorToning.labgridBLow) / factor;
float b_base = params->colorToning.labgridBLow;
const float scaling = ColorToningParams::LABGRID_CORR_SCALE;
float a_scale = (params->colorToning.labgridAHigh - params->colorToning.labgridALow) / factor / scaling;
float a_base = params->colorToning.labgridALow / scaling;
float b_scale = (params->colorToning.labgridBHigh - params->colorToning.labgridBLow) / factor / scaling;
float b_base = params->colorToning.labgridBLow / scaling;
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)

View File

@ -401,6 +401,7 @@ public:
void localContrast(LabImage *lab);
void colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread);
void shadowsHighlights(LabImage *lab);
void softLight(float *red, float *green, float *blue, int istart, int jstart, int tW, int tH, int TS);
Image8* lab2rgb(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, bool consider_histogram_settings = true);
Imagefloat* lab2rgbOut(LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, GammaValues *ga = nullptr);

73
rtengine/ipsoftlight.cc Normal file
View File

@ -0,0 +1,73 @@
/* -*- C++ -*-
*
* This file is part of RawTherapee.
*
* Copyright 2018 Alberto Griggio <alberto.griggio@gmail.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef _OPENMP
#include <omp.h>
#endif
#include "improcfun.h"
namespace rtengine {
void ImProcFunctions::softLight(float *red, float *green, float *blue, int istart, int jstart, int tW, int tH, int TS)
{
if (!params->softlight.enabled || !params->softlight.strength) {
return;
}
const float blend = params->softlight.strength / 100.f;
const float orig = 1.f - blend;
const auto apply =
[=](float x) -> float
{
if (!OOG(x)) {
float v = Color::gamma_srgb(x) / MAXVALF;
// Pegtop's formula from
// https://en.wikipedia.org/wiki/Blend_modes#Soft_Light
float v2 = v * v;
float v22 = v2 * 2.f;
v = v2 + v22 - v22 * v;
x = blend * Color::igamma_srgb(v * MAXVALF) + orig * x;
}
return x;
};
#ifdef _OPENMP
#pragma omp parallel if (multiThread)
#endif
{
int ti = 0;
#ifdef _OPENMP
#pragma omp for
#endif
for (int i = istart; i < tH; i++) {
for (int j = jstart, tj = 0; j < tW; j++, tj++) {
const int idx = ti * TS + tj;
red[idx] = apply(red[idx]);
green[idx] = apply(green[idx]);
blue[idx] = apply(blue[idx]);
}
++ti;
}
}
}
} // namespace rtengine

View File

@ -295,7 +295,7 @@ void calcFrameBrightnessFactor(unsigned int frame, uint32_t datalen, LUTu *histo
using namespace std;
using namespace rtengine;
void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, const RAWParams::BayerSensor &bayerParamsIn, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection)
void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, const RAWParams &rawParamsIn, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection)
{
BENCHFUN
if(numFrames != 4) { // fallback for non pixelshift files
@ -303,7 +303,7 @@ BENCHFUN
return;
}
RAWParams::BayerSensor bayerParams = bayerParamsIn;
RAWParams::BayerSensor bayerParams = rawParamsIn.bayersensor;
bool motionDetection = true;
@ -326,7 +326,7 @@ BENCHFUN
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
amaze_vng4_demosaic_RT (winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.dualDemosaicContrast);
dual_demosaic_RT (true, rawParamsIn, winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.dualDemosaicContrast);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[0]), red, green, blue);
}
@ -338,7 +338,7 @@ BENCHFUN
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
amaze_vng4_demosaic_RT (winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], bayerParams.dualDemosaicContrast);
dual_demosaic_RT (true, rawParamsIn, winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], bayerParams.dualDemosaicContrast);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i]);
}
@ -365,7 +365,9 @@ BENCHFUN
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, rawData, red, green, blue, bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
amaze_vng4_demosaic_RT (winw, winh, rawData, red, green, blue, bayerParams.dualDemosaicContrast);
RAWParams rawParamsTmp = rawParamsIn;
rawParamsTmp.bayersensor.method = RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4);
dual_demosaic_RT (true, rawParamsTmp, winw, winh, rawData, red, green, blue, bayerParams.dualDemosaicContrast);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, rawData, red, green, blue);
}

View File

@ -113,7 +113,8 @@ PreviewImage::PreviewImage (const Glib::ustring &fname, const Glib::ustring &ext
params.raw.ca_autocorrect = false;
params.raw.xtranssensor.method = RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST);
rawImage.preprocess(params.raw, params.lensProf, params.coarse);
rawImage.demosaic(params.raw);
double contrastThresholdDummy = 0.0;
rawImage.demosaic(params.raw, false, contrastThresholdDummy);
Imagefloat image(fw, fh);
rawImage.getImage (wb, TR_NONE, &image, pp, params.toneCurve, params.raw);
rtengine::Image8 output(fw, fh);

View File

@ -610,6 +610,7 @@ bool LocalContrastParams::operator!=(const LocalContrastParams &other) const
const double ColorToningParams::LABGRID_CORR_MAX = 12000.f;
const double ColorToningParams::LABGRID_CORR_SCALE = 3.f;
ColorToningParams::ColorToningParams() :
enabled(false),
@ -1791,19 +1792,19 @@ bool VignettingParams::operator !=(const VignettingParams& other) const
ChannelMixerParams::ChannelMixerParams() :
enabled(false),
red{
100,
1000,
0,
0
},
green{
0,
100,
1000,
0
},
blue{
0,
0,
100
1000
}
{
}
@ -1923,7 +1924,8 @@ ResizeParams::ResizeParams() :
method("Lanczos"),
dataspec(3),
width(900),
height(900)
height(900),
allowUpscaling(false)
{
}
@ -1936,7 +1938,8 @@ bool ResizeParams::operator ==(const ResizeParams& other) const
&& method == other.method
&& dataspec == other.dataspec
&& width == other.width
&& height == other.height;
&& height == other.height
&& allowUpscaling == other.allowUpscaling;
}
bool ResizeParams::operator !=(const ResizeParams& other) const
@ -2719,8 +2722,28 @@ bool FilmSimulationParams::operator !=(const FilmSimulationParams& other) const
return !(*this == other);
}
SoftLightParams::SoftLightParams() :
enabled(false),
strength(30)
{
}
bool SoftLightParams::operator ==(const SoftLightParams& other) const
{
return
enabled == other.enabled
&& strength == other.strength;
}
bool SoftLightParams::operator !=(const SoftLightParams& other) const
{
return !(*this == other);
}
RAWParams::BayerSensor::BayerSensor() :
method(getMethodString(Method::AMAZE)),
border(4),
imageNum(0),
ccSteps(0),
black0(0.0),
@ -2757,6 +2780,7 @@ bool RAWParams::BayerSensor::operator ==(const BayerSensor& other) const
{
return
method == other.method
&& border == other.border
&& imageNum == other.imageNum
&& ccSteps == other.ccSteps
&& black0 == other.black0
@ -2815,7 +2839,9 @@ const std::vector<const char*>& RAWParams::BayerSensor::getMethodStrings()
"amaze",
"amazevng4",
"rcd",
"rcdvng4",
"dcb",
"dcbvng4",
"lmmse",
"igv",
"ahd",
@ -2883,6 +2909,7 @@ const std::vector<const char*>& RAWParams::XTransSensor::getMethodStrings()
static const std::vector<const char*> method_strings {
"4-pass",
"3-pass (best)",
"2-pass",
"1-pass (medium)",
"fast",
"mono",
@ -3064,6 +3091,8 @@ void ProcParams::setDefaults()
filmSimulation = FilmSimulationParams();
softlight = SoftLightParams();
raw = RAWParams();
metadata = MetaDataParams();
@ -3618,6 +3647,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->resize.dataspec, "Resize", "DataSpecified", resize.dataspec, keyFile);
saveToKeyfile(!pedited || pedited->resize.width, "Resize", "Width", resize.width, keyFile);
saveToKeyfile(!pedited || pedited->resize.height, "Resize", "Height", resize.height, keyFile);
saveToKeyfile(!pedited || pedited->resize.allowUpscaling, "Resize", "AllowUpscaling", resize.allowUpscaling, keyFile);
// Post resize sharpening
saveToKeyfile(!pedited || pedited->prsharpening.enabled, "PostResizeSharpening", "Enabled", prsharpening.enabled, keyFile);
@ -3784,6 +3814,10 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->hsvequalizer.scurve, "HSV Equalizer", "SCurve", hsvequalizer.scurve, keyFile);
saveToKeyfile(!pedited || pedited->hsvequalizer.vcurve, "HSV Equalizer", "VCurve", hsvequalizer.vcurve, keyFile);
// Soft Light
saveToKeyfile(!pedited || pedited->softlight.enabled, "SoftLight", "Enabled", softlight.enabled, keyFile);
saveToKeyfile(!pedited || pedited->softlight.strength, "SoftLight", "Strength", softlight.strength, keyFile);
// Film simulation
saveToKeyfile(!pedited || pedited->filmSimulation.enabled, "Film Simulation", "Enabled", filmSimulation.enabled, keyFile);
saveToKeyfile(!pedited || pedited->filmSimulation.clutFilename, "Film Simulation", "ClutFilename", filmSimulation.clutFilename, keyFile);
@ -3843,6 +3877,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->raw.deadPixelFilter, "RAW", "DeadPixelFilter", raw.deadPixelFilter, keyFile);
saveToKeyfile(!pedited || pedited->raw.hotdeadpix_thresh, "RAW", "HotDeadPixelThresh", raw.hotdeadpix_thresh, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.method, "RAW Bayer", "Method", raw.bayersensor.method, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.border, "RAW Bayer", "Border", raw.bayersensor.border, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.imageNum, "RAW Bayer", "ImageNum", raw.bayersensor.imageNum + 1, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.ccSteps, "RAW Bayer", "CcSteps", raw.bayersensor.ccSteps, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.exBlack0, "RAW Bayer", "PreBlack0", raw.bayersensor.black0, keyFile);
@ -4028,6 +4063,13 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
memcpy(chmixer.green, gmix.data(), 3 * sizeof(int));
memcpy(chmixer.blue, bmix.data(), 3 * sizeof(int));
}
if (ppVersion < 338) {
for (int i = 0; i < 3; ++i) {
chmixer.red[i] *= 10;
chmixer.green[i] *= 10;
chmixer.blue[i] *= 10;
}
}
if (pedited) {
pedited->chmixer.red[0] = pedited->chmixer.red[1] = pedited->chmixer.red[2] = true;
@ -4765,6 +4807,14 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "Resize", "DataSpecified", pedited, resize.dataspec, pedited->resize.dataspec);
assignFromKeyfile(keyFile, "Resize", "Width", pedited, resize.width, pedited->resize.width);
assignFromKeyfile(keyFile, "Resize", "Height", pedited, resize.height, pedited->resize.height);
if (ppVersion >= 339) {
assignFromKeyfile(keyFile, "Resize", "AllowUpscaling", pedited, resize.allowUpscaling, pedited->resize.allowUpscaling);
} else {
resize.allowUpscaling = true;
if (pedited) {
pedited->resize.allowUpscaling = true;
}
}
}
if (keyFile.has_group("PostResizeSharpening")) {
@ -5145,6 +5195,11 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
}
}
if (keyFile.has_group("SoftLight")) {
assignFromKeyfile(keyFile, "SoftLight", "Enabled", pedited, softlight.enabled, pedited->softlight.enabled);
assignFromKeyfile(keyFile, "SoftLight", "Strength", pedited, softlight.strength, pedited->softlight.strength);
}
if (keyFile.has_group("Film Simulation")) {
assignFromKeyfile(keyFile, "Film Simulation", "Enabled", pedited, filmSimulation.enabled, pedited->filmSimulation.enabled);
assignFromKeyfile(keyFile, "Film Simulation", "ClutFilename", pedited, filmSimulation.clutFilename, pedited->filmSimulation.clutFilename);
@ -5252,6 +5307,13 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "ColorToning", "LabGridBLow", pedited, colorToning.labgridBLow, pedited->colorToning.labgridBLow);
assignFromKeyfile(keyFile, "ColorToning", "LabGridAHigh", pedited, colorToning.labgridAHigh, pedited->colorToning.labgridAHigh);
assignFromKeyfile(keyFile, "ColorToning", "LabGridBHigh", pedited, colorToning.labgridBHigh, pedited->colorToning.labgridBHigh);
if (ppVersion < 337) {
const double scale = ColorToningParams::LABGRID_CORR_SCALE;
colorToning.labgridALow *= scale;
colorToning.labgridAHigh *= scale;
colorToning.labgridBLow *= scale;
colorToning.labgridBHigh *= scale;
}
}
if (keyFile.has_group("RAW")) {
@ -5321,6 +5383,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
if (keyFile.has_group("RAW Bayer")) {
assignFromKeyfile(keyFile, "RAW Bayer", "Method", pedited, raw.bayersensor.method, pedited->raw.bayersensor.method);
assignFromKeyfile(keyFile, "RAW Bayer", "Border", pedited, raw.bayersensor.border, pedited->raw.bayersensor.border);
if (keyFile.has_key("RAW Bayer", "ImageNum")) {
raw.bayersensor.imageNum = keyFile.get_integer("RAW Bayer", "ImageNum") - 1;
@ -5520,6 +5583,7 @@ bool ProcParams::operator ==(const ProcParams& other) const
&& dirpyrequalizer == other.dirpyrequalizer
&& hsvequalizer == other.hsvequalizer
&& filmSimulation == other.filmSimulation
&& softlight == other.softlight
&& rgbCurves == other.rgbCurves
&& colorToning == other.colorToning
&& metadata == other.metadata

View File

@ -456,6 +456,7 @@ struct ColorToningParams {
double labgridAHigh;
double labgridBHigh;
static const double LABGRID_CORR_MAX;
static const double LABGRID_CORR_SCALE;
ColorToningParams();
@ -1138,6 +1139,7 @@ struct ResizeParams {
int dataspec;
int width;
int height;
bool allowUpscaling;
ResizeParams();
@ -1353,6 +1355,17 @@ struct FilmSimulationParams {
};
struct SoftLightParams {
bool enabled;
int strength;
SoftLightParams();
bool operator==(const SoftLightParams &other) const;
bool operator!=(const SoftLightParams &other) const;
};
/**
* Parameters for RAW demosaicing, common to all sensor type
*/
@ -1365,7 +1378,9 @@ struct RAWParams {
AMAZE,
AMAZEVNG4,
RCD,
RCDVNG4,
DCB,
DCBVNG4,
LMMSE,
IGV,
AHD,
@ -1391,6 +1406,7 @@ struct RAWParams {
};
Glib::ustring method;
int border;
int imageNum;
int ccSteps;
double black0;
@ -1448,6 +1464,7 @@ struct RAWParams {
enum class Method {
FOUR_PASS,
THREE_PASS,
TWO_PASS,
ONE_PASS,
FAST,
MONO,
@ -1558,6 +1575,7 @@ public:
DirPyrEqualizerParams dirpyrequalizer; ///< directional pyramid wavelet parameters
HSVEqualizerParams hsvequalizer; ///< hsv wavelet parameters
FilmSimulationParams filmSimulation; ///< film simulation parameters
SoftLightParams softlight; ///< softlight parameters
int rank; ///< Custom image quality ranking
int colorlabel; ///< Custom color label
bool inTrash; ///< Marks deleted image

View File

@ -591,8 +591,8 @@ void RawImageSource::transformRect(const PreviewProps &pp, int tran, int &ssx1,
} else {
ssx1 = sx1;
ssy1 = sy1;
width = (sx2 - sx1) / pp.getSkip() + ((sx2 - sx1) % pp.getSkip() > 0);
height = (sy2 - sy1) / pp.getSkip() + ((sy2 - sy1) % pp.getSkip() > 0);
width = (sx2 + 1 - sx1) / pp.getSkip() + ((sx2 + 1 - sx1) % pp.getSkip() > 0);
height = (sy2 + 1 - sy1) / pp.getSkip() + ((sy2 + 1 - sy1) % pp.getSkip() > 0);
}
}
@ -747,14 +747,11 @@ void RawImageSource::getImage(const ColorTemp &ctemp, int tran, Imagefloat* imag
for (int ix = 0; ix < imheight; ix++) {
int i = sy1 + skip * ix;
if (i >= maxy - skip) {
i = maxy - skip - 1; // avoid trouble
}
i = std::min(i, maxy - skip); // avoid trouble
if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS || ri->get_colors() == 1) {
for (int j = 0, jx = sx1; j < imwidth; j++, jx += skip) {
jx = std::min(jx, maxx - skip - 1); // avoid trouble
jx = std::min(jx, maxx - skip); // avoid trouble
float rtot = 0.f, gtot = 0.f, btot = 0.f;
@ -2083,7 +2080,7 @@ void RawImageSource::preprocess(const RAWParams &raw, const LensProfParams &lens
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
void RawImageSource::demosaic(const RAWParams &raw)
void RawImageSource::demosaic(const RAWParams &raw, bool autoContrast, double &contrastThreshold)
{
MyTime t1, t2;
t1.set();
@ -2097,10 +2094,17 @@ void RawImageSource::demosaic(const RAWParams &raw)
ahd_demosaic();
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZE)) {
amaze_demosaic_RT(0, 0, W, H, rawData, red, green, blue);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4) ) {
amaze_vng4_demosaic_RT (W, H, rawData, red, green, blue, raw.bayersensor.dualDemosaicContrast);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZEVNG4)
|| raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCBVNG4)
|| raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCDVNG4)) {
if (!autoContrast) {
double threshold = raw.bayersensor.dualDemosaicContrast;
dual_demosaic_RT (true, raw, W, H, rawData, red, green, blue, threshold, false);
} else {
dual_demosaic_RT (true, raw, W, H, rawData, red, green, blue, contrastThreshold, true, 0, 0);
}
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
pixelshift(0, 0, W, H, raw.bayersensor, currFrame, ri->get_maker(), ri->get_model(), raw.expos);
pixelshift(0, 0, W, H, raw, currFrame, ri->get_maker(), ri->get_model(), raw.expos);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCB)) {
dcb_demosaic(raw.bayersensor.dcb_iterations, raw.bayersensor.dcb_enhance);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::EAHD)) {
@ -2118,9 +2122,6 @@ void RawImageSource::demosaic(const RAWParams &raw)
} else {
nodemosaic(false);
}
//if (raw.all_enhance) refinement_lassus();
} else if (ri->getSensorType() == ST_FUJI_XTRANS) {
if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST)) {
fast_xtrans_interpolate(rawData, red, green, blue);
@ -2128,8 +2129,13 @@ void RawImageSource::demosaic(const RAWParams &raw)
xtrans_interpolate(1, false);
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::THREE_PASS)) {
xtrans_interpolate(3, true);
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS)) {
xtrans_4pass_demosaic_RT(3, true, raw.xtranssensor.dualDemosaicContrast);
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FOUR_PASS) || raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::TWO_PASS)) {
if (!autoContrast) {
double threshold = raw.xtranssensor.dualDemosaicContrast;
dual_demosaic_RT (false, raw, W, H, rawData, red, green, blue, threshold, false);
} else {
dual_demosaic_RT (false, raw, W, H, rawData, red, green, blue, contrastThreshold, true, 0, 0);
}
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::MONO)) {
nodemosaic(true);
} else {

View File

@ -121,7 +121,7 @@ public:
int load(const Glib::ustring &fname) { return load(fname, false); }
int load(const Glib::ustring &fname, bool firstFrameOnly);
void preprocess(const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true);
void demosaic(const RAWParams &raw);
void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold);
void retinex (const ColorManagementParams& cmp, const RetinexParams &deh, const ToneCurveParams& Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D<float, 4> &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI);
void retinexPrepareCurves(const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI);
void retinexPrepareBuffers(const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D<float, 4> &conversionBuffer, LUTu &lhist16RETI);
@ -130,7 +130,7 @@ public:
void HLRecovery_Global(ToneCurveParams hrp);
void refinement_lassus(int PassCount);
void refinement(int PassCount);
void setBorder(unsigned int rawBorder) {border = rawBorder;}
bool isRGBSourceModified() const
{
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
@ -272,13 +272,13 @@ protected:
void igv_interpolate(int winw, int winh);
void lmmse_interpolate_omp(int winw, int winh, array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, int iterations);
void amaze_demosaic_RT(int winx, int winy, int winw, int winh, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);//Emil's code for AMaZE
void amaze_vng4_demosaic_RT(int winw, int winh, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, double contrast = 0.0);
void dual_demosaic_RT(bool isBayer, const RAWParams &raw, int winw, int winh, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, double &contrast, bool autoContrast = false, int autoX = -1, int autoY = -1);
void fast_demosaic();//Emil's code for fast demosaicing
void dcb_demosaic(int iterations, bool dcb_enhance);
void ahd_demosaic();
void rcd_demosaic();
void border_interpolate(unsigned int border, float (*image)[4], unsigned int start = 0, unsigned int end = 0);
void border_interpolate2(int winw, int winh, int lborders);
void border_interpolate2(int winw, int winh, int lborders, const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);
void dcb_initTileLimits(int &colMin, int &rowMin, int &colMax, int &rowMax, int x0, int y0, int border);
void fill_raw(float (*cache)[3], int x0, int y0, float** rawData);
void fill_border(float (*cache)[3], int border, int x0, int y0);
@ -294,11 +294,10 @@ protected:
void dcb_refinement(float (*image)[3], uint8_t *map, int x0, int y0);
void dcb_color_full(float (*image)[3], int x0, int y0, float (*chroma)[2]);
void cielab(const float (*rgb)[3], float* l, float* a, float *b, const int width, const int height, const int labWidth, const float xyz_cam[3][3]);
void xtransborder_interpolate(int border);
void xtrans_4pass_demosaic_RT (const int passes, const bool useCieLab, double contrast);
void xtransborder_interpolate (int border, array2D<float> &red, array2D<float> &green, array2D<float> &blue);
void xtrans_interpolate(const int passes, const bool useCieLab);
void fast_xtrans_interpolate (const array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);
void pixelshift(int winx, int winy, int winw, int winh, const RAWParams::BayerSensor &bayerParams, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection);
void pixelshift(int winx, int winy, int winw, int winh, const RAWParams &rawParams, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection);
void hflip(Imagefloat* im);
void vflip(Imagefloat* im);
void getRawValues(int x, int y, int rotate, int &R, int &G, int &B);

View File

@ -291,7 +291,7 @@ void RawImageSource::rcd_demosaic()
free(PQ_Dir);
}
border_interpolate2(W, H, rcdBorder);
border_interpolate2(W, H, rcdBorder, rawData, red, green, blue);
if (plistener) {
plistener->setProgress(1);

View File

@ -1,6 +1,8 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2017-2018 Ingo Weyrich <heckflosse67@gmx.de>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -20,7 +22,7 @@
#include <cmath>
#include <cstdint>
#include <vector>
#include <iostream>
#ifdef _OPENMP
#include <omp.h>
#endif
@ -188,7 +190,9 @@ void findMinMaxPercentile(const float* data, size_t size, float minPrct, float&
maxOut += minVal;
}
void buildBlendMask(float** luminance, rtengine::JaggedArray<float> &blend, int W, int H, float contrastThreshold, float amount) {
void buildBlendMask(float** luminance, float **blend, int W, int H, float contrastThreshold, float amount) {
constexpr float scale = 0.0625f / 327.68f;
if(contrastThreshold == 0.f) {
for(int j = 0; j < H; ++j) {
@ -197,64 +201,123 @@ void buildBlendMask(float** luminance, rtengine::JaggedArray<float> &blend, int
}
}
} else {
constexpr float scale = 0.0625f / 327.68f;
#ifdef _OPENMP
#pragma omp parallel
#endif
{
{
#ifdef __SSE2__
const vfloat contrastThresholdv = F2V(contrastThreshold);
const vfloat scalev = F2V(scale);
const vfloat amountv = F2V(amount);
#endif
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16)
#endif
for(int j = 2; j < H - 2; ++j) {
int i = 2;
#ifdef __SSE2__
for(; i < W - 5; i += 4) {
vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) +
SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev;
STVFU(blend[j][i], amountv * calcBlendFactor(contrastv, contrastThresholdv));
}
#endif
for(; i < W - 2; ++i) {
float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) +
rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale;
blend[j][i] = amount * calcBlendFactor(contrast, contrastThreshold);
}
}
#ifdef _OPENMP
#pragma omp single
#endif
{
// upper border
for(int j = 0; j < 2; ++j) {
for(int i = 2; i < W - 2; ++i) {
blend[j][i] = blend[2][i];
}
}
// lower border
for(int j = H - 2; j < H; ++j) {
for(int i = 2; i < W - 2; ++i) {
blend[j][i] = blend[H-3][i];
}
}
for(int j = 0; j < H; ++j) {
// left border
blend[j][0] = blend[j][1] = blend[j][2];
// right border
blend[j][W - 2] = blend[j][W - 1] = blend[j][W - 3];
}
}
// blur blend mask to smooth transitions
gaussianBlur(blend, blend, W, H, 2.0);
}
}
}
int calcContrastThreshold(float** luminance, float **blend, int W, int H) {
constexpr float scale = 0.0625f / 327.68f;
#ifdef __SSE2__
const vfloat scalev = F2V(scale);
#endif
for(int j = 2; j < H - 2; ++j) {
int i = 2;
#ifdef __SSE2__
for(; i < W - 5; i += 4) {
vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) +
SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev;
STVFU(blend[j -2 ][i - 2], contrastv);
}
#endif
for(; i < W - 2; ++i) {
float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) +
rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale;
blend[j -2][i- 2] = contrast;
}
}
const float limit = (W - 2) * (H - 2) / 100.f;
int c;
for (c = 1; c < 100; ++c) {
const float contrastThreshold = c / 100.f;
float sum = 0.f;
#ifdef __SSE2__
const vfloat contrastThresholdv = F2V(contrastThreshold);
const vfloat scalev = F2V(scale);
const vfloat amountv = F2V(amount);
#endif
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16)
vfloat sumv = ZEROV;
#endif
for(int j = 2; j < H - 2; ++j) {
int i = 2;
for(int j = 0; j < H - 4; ++j) {
int i = 0;
#ifdef __SSE2__
for(; i < W - 5; i += 4) {
vfloat contrastv = vsqrtf(SQRV(LVFU(luminance[j][i+1]) - LVFU(luminance[j][i-1])) + SQRV(LVFU(luminance[j+1][i]) - LVFU(luminance[j-1][i])) +
SQRV(LVFU(luminance[j][i+2]) - LVFU(luminance[j][i-2])) + SQRV(LVFU(luminance[j+2][i]) - LVFU(luminance[j-2][i]))) * scalev;
STVFU(blend[j][i], amountv * calcBlendFactor(contrastv, contrastThresholdv));
for(; i < W - 7; i += 4) {
sumv += calcBlendFactor(LVFU(blend[j][i]), contrastThresholdv);
}
#endif
for(; i < W - 2; ++i) {
float contrast = sqrtf(rtengine::SQR(luminance[j][i+1] - luminance[j][i-1]) + rtengine::SQR(luminance[j+1][i] - luminance[j-1][i]) +
rtengine::SQR(luminance[j][i+2] - luminance[j][i-2]) + rtengine::SQR(luminance[j+2][i] - luminance[j-2][i])) * scale;
blend[j][i] = amount * calcBlendFactor(contrast, contrastThreshold);
for(; i < W - 4; ++i) {
sum += calcBlendFactor(blend[j][i], contrastThreshold);
}
}
#ifdef _OPENMP
#pragma omp single
#ifdef __SSE2__
sum += vhadd(sumv);
#endif
{
// upper border
for(int j = 0; j < 2; ++j) {
for(int i = 2; i < W - 2; ++i) {
blend[j][i] = blend[2][i];
}
}
// lower border
for(int j = H - 2; j < H; ++j) {
for(int i = 2; i < W - 2; ++i) {
blend[j][i] = blend[H-3][i];
}
}
for(int j = 0; j < H; ++j) {
// left border
blend[j][0] = blend[j][1] = blend[j][2];
// right border
blend[j][W - 2] = blend[j][W - 1] = blend[j][W - 3];
}
if (sum <= limit) {
break;
}
// blur blend mask to smooth transitions
gaussianBlur(blend, blend, W, H, 2.0);
}
}
return c;
}
}

View File

@ -1,7 +1,7 @@
/*
* This file is part of RawTherapee.
*
* Copyright (c) 2017 Ingo Weyrich <heckflosse67@gmx.de>
* Copyright (c) 2017-2018 Ingo Weyrich <heckflosse67@gmx.de>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -20,10 +20,10 @@
#pragma once
#include <cstddef>
#include "jaggedarray.h"
namespace rtengine
{
void findMinMaxPercentile(const float* data, size_t size, float minPrct, float& minOut, float maxPrct, float& maxOut, bool multiThread = true);
void buildBlendMask(float** luminance, rtengine::JaggedArray<float> &blend, int W, int H, float contrastThreshold, float amount = 1.f);
void buildBlendMask(float** luminance, float **blend, int W, int H, float contrastThreshold, float amount = 1.f);
int calcContrastThreshold(float** luminance, float **blend, int W, int H);
}

View File

@ -289,7 +289,8 @@ Image8 *load_inspector_mode(const Glib::ustring &fname, RawMetaDataLocation &rml
neutral.icm.working = "RT_sRGB";
src.preprocess(neutral.raw, neutral.lensProf, neutral.coarse, false);
src.demosaic(neutral.raw);
double thresholdDummy = 0.f;
src.demosaic(neutral.raw, false, thresholdDummy);
PreviewProps pp(0, 0, w, h, 1);

View File

@ -166,6 +166,13 @@ private:
imgsrc = ii->getImageSource();
tr = getCoarseBitMask(params.coarse);
if(imgsrc->getSensorType() == ST_BAYER) {
if(params.raw.bayersensor.method!= RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)) {
imgsrc->setBorder(params.raw.bayersensor.border);
} else {
imgsrc->setBorder(std::max(params.raw.bayersensor.border, 2));
}
}
imgsrc->getFullSize(fw, fh, tr);
// check the crop params
@ -203,19 +210,20 @@ private:
ipf_p.reset(new ImProcFunctions(&params, true));
ImProcFunctions &ipf = * (ipf_p.get());
pp = PreviewProps(0, 0, fw, fh, 1);
imgsrc->setCurrentFrame(params.raw.bayersensor.imageNum);
imgsrc->preprocess(params.raw, params.lensProf, params.coarse, params.dirpyrDenoise.enabled);
if (pl) {
pl->setProgress(0.20);
}
double contrastThresholdDummy;
imgsrc->demosaic (params.raw, false, contrastThresholdDummy);
imgsrc->demosaic(params.raw);
if (pl) {
pl->setProgress(0.30);
}
pp = PreviewProps (0, 0, fw, fh, 1);
if (params.retinex.enabled) { //enabled Retinex
LUTf cdcurve(65536, 0);
@ -2375,7 +2383,8 @@ private:
}
if (labResize) { // resize lab data
if(labView->W != imw || labView->H != imh) {
if ((labView->W != imw || labView->H != imh) &&
(params.resize.allowUpscaling || (labView->W >= imw && labView->H >= imh))) {
// resize image
tmplab = new LabImage (imw, imh);
ipf.Lanczos (labView, tmplab, tmpScale);
@ -2450,7 +2459,8 @@ private:
pl->setProgress(0.70);
}
if (tmpScale != 1.0 && params.resize.method == "Nearest") { // resize rgb data (gamma applied)
if (tmpScale != 1.0 && params.resize.method == "Nearest" &&
(params.resize.allowUpscaling || (readyImg->getWidth() >= imw && readyImg->getHeight() >= imh))) { // resize rgb data (gamma applied)
Imagefloat* tempImage = new Imagefloat(imw, imh);
ipf.resize(readyImg, tempImage, tmpScale);
delete readyImg;
@ -2570,7 +2580,7 @@ private:
assert(params.resize.enabled);
// resize image
{
if (params.resize.allowUpscaling || (imw <= fw && imh <= fh)) {
std::unique_ptr<LabImage> resized(new LabImage(imw, imh));
ipf.Lanczos(tmplab.get(), resized.get(), scale_factor);
tmplab = std::move(resized);

View File

@ -336,6 +336,7 @@ void RawImageSource::vng4_demosaic (const array2D<float> &rawData, array2D<float
interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
}
}
border_interpolate2(W, H, 3, rawData, red, green, blue);
if(plistenerActive) {
plistener->setProgress (1.0);

View File

@ -114,7 +114,7 @@ void RawImageSource::cielab (const float (*rgb)[3], float* l, float* a, float *b
#define fcol(row,col) xtrans[(row)%6][(col)%6]
#define isgreen(row,col) (xtrans[(row)%3][(col)%3]&1)
void RawImageSource::xtransborder_interpolate (int border)
void RawImageSource::xtransborder_interpolate (int border, array2D<float> &red, array2D<float> &green, array2D<float> &blue)
{
const int height = H, width = W;
@ -201,7 +201,7 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab)
// printf("%d-pass X-Trans interpolation using %s conversion...\n", passes, useCieLab ? "lab" : "yuv");
// }
xtransborder_interpolate(6);
xtransborder_interpolate(6, red, green, blue);
float xyz_cam[3][3];
{
@ -974,7 +974,7 @@ void RawImageSource::fast_xtrans_interpolate (const array2D<float> &rawData, arr
const int height = H, width = W;
xtransborder_interpolate (1);
xtransborder_interpolate (1, red, green, blue);
int xtrans[6][6];
ri->getXtransMatrix(xtrans);
@ -1019,60 +1019,5 @@ void RawImageSource::fast_xtrans_interpolate (const array2D<float> &rawData, arr
#undef fcol
#undef isgreen
void RawImageSource::xtrans_4pass_demosaic_RT(int passes, bool useCieLab, double contrast)
{
BENCHFUN
if (contrast == 0.0) {
// contrast == 0.0 means only AMaZE will be used
xtrans_interpolate (passes, useCieLab);
return;
}
xtrans_interpolate (passes, useCieLab);
array2D<float> redTmp(W, H);
array2D<float> greenTmp(W, H);
array2D<float> blueTmp(W, H);
array2D<float> L(W, H);
fast_xtrans_interpolate(rawData, redTmp, greenTmp, blueTmp);
const float xyz_rgb[3][3] = { // XYZ from RGB
{ 0.412453, 0.357580, 0.180423 },
{ 0.212671, 0.715160, 0.072169 },
{ 0.019334, 0.119193, 0.950227 }
};
#pragma omp parallel
{
#pragma omp for
for(int i = 0; i < H; ++i) {
Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, W);
}
}
// calculate contrast based blend factors to use vng4 in regions with low contrast
JaggedArray<float> blend(W, H);
buildBlendMask(L, blend, W, H, contrast / 100.f);
// the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
#pragma omp parallel for
for(int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
red[i][j] = intp(blend[i][j], red[i][j], redTmp[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
green[i][j] = intp(blend[i][j], green[i][j], greenTmp[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
blue[i][j] = intp(blend[i][j], blue[i][j], blueTmp[i][j]);
}
}
}
}

View File

@ -155,6 +155,7 @@ set(NONCLISOURCEFILES
eventmapper.cc
metadatapanel.cc
labgrid.cc
softlight.cc
)
include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")

View File

@ -143,6 +143,7 @@ enum {
ADDSET_BAYER_PS_SIGMA,
ADDSET_BAYER_DUALDEMOZCONTRAST,
ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION,
ADDSET_SOFTLIGHT_STRENGTH,
ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!
};

View File

@ -205,6 +205,7 @@ void BatchToolPanelCoordinator::initSession ()
// colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRPROTECT], options.baBehav[ADDSET_COLORTONING_BALANCE]);
colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRENGTH], options.baBehav[ADDSET_COLORTONING_BALANCE]);
filmSimulation->setAdjusterBehavior(options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]);
softlight->setAdjusterBehavior(options.baBehav[ADDSET_SOFTLIGHT_STRENGTH]);
retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]);
chmixer->setAdjusterBehavior (options.baBehav[ADDSET_CHMIXER] );
@ -296,6 +297,7 @@ void BatchToolPanelCoordinator::initSession ()
if (options.baBehav[ADDSET_COLORTONING_BALANCE]) { pparams.colorToning.balance = 0; }
if (options.baBehav[ADDSET_COLORTONING_STRENGTH]) { pparams.colorToning.strength = 0; }
if (options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]) { pparams.filmSimulation.strength = 0; }
if (options.baBehav[ADDSET_SOFTLIGHT_STRENGTH]) { pparams.softlight.strength = 0; }
if (options.baBehav[ADDSET_ROTATE_DEGREE]) { pparams.rotate.degree = 0; }
if (options.baBehav[ADDSET_RESIZE_SCALE]) { pparams.resize.scale = 0; }
if (options.baBehav[ADDSET_DIST_AMOUNT]) { pparams.distortion.amount = 0; }

View File

@ -28,6 +28,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
{
auto m = ProcEventMapper::getInstance();
EvDemosaicBorder = m->newEvent(DEMOSAIC, "HISTORY_MSG_RAW_BORDER");
EvDemosaicContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_CONTRAST");
EvDemosaicPixelshiftDemosaicMethod = m->newEvent(DEMOSAIC, "HISTORY_MSG_PIXELSHIFT_DEMOSAIC");
@ -45,6 +46,18 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
borderbox = Gtk::manage(new Gtk::HBox());
border = Gtk::manage(new Adjuster(M("TP_RAW_BORDER"), 0, 16, 1, 4));
border->setAdjusterListener (this);
if (border->delay < options.adjusterMaxDelay) {
border->delay = options.adjusterMaxDelay;
}
border->show();
borderbox->pack_start(*border);
pack_start(*borderbox, Gtk::PACK_SHRINK, 4);
imageNumberBox = Gtk::manage (new Gtk::HBox ());
imageNumberBox->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_IMAGENUM") + ": ")), Gtk::PACK_SHRINK, 4);
imageNumber = Gtk::manage (new MyComboBoxText ());
@ -234,6 +247,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
imageNumber->connect(imageNumber->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::imageNumberChanged) ));
pixelShiftMotionMethod->connect(pixelShiftMotionMethod->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::pixelShiftMotionMethodChanged) ));
pixelShiftDemosaicMethod->connect(pixelShiftDemosaicMethod->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::pixelShiftDemosaicMethodChanged) ));
}
@ -245,6 +259,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
pixelShiftDemosaicMethod->block(true);
//allEnhconn.block (true);
border->setValue(pp->raw.bayersensor.border);
imageNumber->set_active(pp->raw.bayersensor.imageNum);
for (size_t i = 0; i < procparams::RAWParams::BayerSensor::getMethodStrings().size(); ++i) {
@ -294,6 +309,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
}
if(pedited) {
border->setEditedState (pedited->raw.bayersensor.border ? Edited : UnEdited);
ccSteps->setEditedState (pedited->raw.bayersensor.ccSteps ? Edited : UnEdited);
dcbIterations->setEditedState ( pedited->raw.bayersensor.dcbIterations ? Edited : UnEdited);
dcbEnhance->setEdited (pedited->raw.bayersensor.dcbEnhance);
@ -331,9 +347,11 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
}
if (!batchMode) {
dcbOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCB));
dcbOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCB) || pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCBVNG4));
lmmseOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::LMMSE));
dualDemosaicOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::AMAZEVNG4));
dualDemosaicOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::AMAZEVNG4)
|| pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCBVNG4)
|| pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::RCDVNG4));
if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::PIXELSHIFT)) {
pixelShiftOptions->set_visible(pp->raw.bayersensor.pixelShiftMotionCorrectionMethod == RAWParams::BayerSensor::PSMotionCorrectionMethod::CUSTOM);
pixelShiftFrame->show();
@ -365,7 +383,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
pp->raw.bayersensor.ccSteps = ccSteps->getIntValue();
pp->raw.bayersensor.dcb_iterations = dcbIterations->getIntValue();
pp->raw.bayersensor.dcb_enhance = dcbEnhance->getLastActive ();
//pp->raw.bayersensor.all_enhance = allEnhance->getLastActive ();
pp->raw.bayersensor.border = border->getIntValue();
pp->raw.bayersensor.lmmse_iterations = lmmseIterations->getIntValue();
pp->raw.bayersensor.dualDemosaicContrast = dualDemosaicContrast->getValue();
pp->raw.bayersensor.pixelShiftMotionCorrectionMethod = (RAWParams::BayerSensor::PSMotionCorrectionMethod)pixelShiftMotionMethod->get_active_row_number();
@ -399,6 +417,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
if (pedited) {
pedited->raw.bayersensor.border = border->getEditedState ();
pedited->raw.bayersensor.ccSteps = ccSteps->getEditedState ();
pedited->raw.bayersensor.method = method->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.imageNum = imageNumber->get_active_text() != M("GENERAL_UNCHANGED");
@ -426,6 +445,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
void BayerProcess::setAdjusterBehavior (bool falsecoloradd, bool iteradd, bool dualdemozecontrastadd, bool pssigmaadd, bool pssmoothadd, bool pseperisoadd)
{
border->setAddMode(false);
ccSteps->setAddMode(falsecoloradd);
dcbIterations->setAddMode(iteradd);
lmmseIterations->setAddMode(iteradd);
@ -437,6 +457,7 @@ void BayerProcess::setAdjusterBehavior (bool falsecoloradd, bool iteradd, bool d
void BayerProcess::trimValues (rtengine::procparams::ProcParams* pp)
{
border->trimValue(pp->raw.bayersensor.border);
ccSteps->trimValue(pp->raw.bayersensor.ccSteps);
dcbIterations->trimValue(pp->raw.bayersensor.dcb_iterations);
lmmseIterations->trimValue(pp->raw.bayersensor.lmmse_iterations);
@ -457,6 +478,7 @@ void BayerProcess::setBatchMode(bool batchMode)
imageNumber->append (M("GENERAL_UNCHANGED"));
imageNumber->set_active_text (M("GENERAL_UNCHANGED"));
ToolPanel::setBatchMode (batchMode);
border->showEditedCB ();
ccSteps->showEditedCB ();
dcbIterations->showEditedCB ();
lmmseIterations->showEditedCB ();
@ -472,6 +494,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dualDemosaicContrast->setDefault( defParams->raw.bayersensor.dualDemosaicContrast);
pixelShiftEperIso->setDefault( defParams->raw.bayersensor.pixelShiftEperIso);
pixelShiftSigma->setDefault( defParams->raw.bayersensor.pixelShiftSigma);
border->setDefault (defParams->raw.bayersensor.border);
ccSteps->setDefault (defParams->raw.bayersensor.ccSteps);
if (pedited) {
@ -480,6 +503,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dualDemosaicContrast->setDefaultEditedState( pedited->raw.bayersensor.dualDemosaicContrast ? Edited : UnEdited);
pixelShiftEperIso->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftEperIso ? Edited : UnEdited);
pixelShiftSigma->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftSigma ? Edited : UnEdited);
border->setDefaultEditedState(pedited->raw.bayersensor.border ? Edited : UnEdited);
ccSteps->setDefaultEditedState(pedited->raw.bayersensor.ccSteps ? Edited : UnEdited);
} else {
dcbIterations->setDefaultEditedState( Irrelevant );
@ -487,6 +511,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
dualDemosaicContrast->setDefaultEditedState( Irrelevant );
pixelShiftEperIso->setDefaultEditedState( Irrelevant );
pixelShiftSigma->setDefaultEditedState( Irrelevant );
border->setDefaultEditedState(Irrelevant);
ccSteps->setDefaultEditedState(Irrelevant );
}
}
@ -508,6 +533,8 @@ void BayerProcess::adjusterChanged (Adjuster* a, double newval)
listener->panelChanged (EvPixelShiftSigma, a->getTextValue() );
} else if (a == pixelShiftSmooth) {
listener->panelChanged (EvPixelShiftSmooth, a->getTextValue() );
} else if (a == border) {
listener->panelChanged (EvDemosaicBorder, a->getTextValue() );
}
}
}
@ -518,7 +545,7 @@ void BayerProcess::methodChanged ()
const RAWParams::BayerSensor::Method currentMethod = RAWParams::BayerSensor::Method(currentSelection);
if (!batchMode) {
if (currentMethod == procparams::RAWParams::BayerSensor::Method::DCB) {
if (currentMethod == procparams::RAWParams::BayerSensor::Method::DCB || currentMethod == procparams::RAWParams::BayerSensor::Method::DCBVNG4) {
dcbOptions->show();
} else {
dcbOptions->hide();
@ -530,7 +557,7 @@ void BayerProcess::methodChanged ()
lmmseOptions->hide();
}
if (currentMethod == procparams::RAWParams::BayerSensor::Method::AMAZEVNG4) {
if (currentMethod == procparams::RAWParams::BayerSensor::Method::AMAZEVNG4 || currentMethod == procparams::RAWParams::BayerSensor::Method::DCBVNG4 || currentMethod == procparams::RAWParams::BayerSensor::Method::RCDVNG4) {
dualDemosaicOptions->show();
} else {
dualDemosaicOptions->hide();
@ -703,3 +730,4 @@ void BayerProcess::FrameCountChanged(int n, int frameNum)
// }
// imageNumber->block (false);
}

View File

@ -31,7 +31,9 @@ class BayerProcess : public ToolParamBlock, public AdjusterListener, public Chec
protected:
MyComboBoxText* method;
Gtk::HBox* borderbox;
Gtk::HBox *imageNumberBox;
Adjuster* border;
MyComboBoxText* imageNumber;
Adjuster* ccSteps;
Gtk::VBox *dcbOptions;
@ -60,6 +62,8 @@ protected:
int oldMethod;
IdleRegister idle_register;
rtengine::ProcEvent EvDemosaicBorder;
rtengine::ProcEvent EvDemosaicContrast;
rtengine::ProcEvent EvDemosaicPixelshiftDemosaicMethod;
public:

View File

@ -39,9 +39,10 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
rlabel->set_markup (Glib::ustring("\t<span foreground=\"#b00000\"><b>") + M("TP_CHMIXER_RED") + Glib::ustring(":</b></span>"));
rlabel->set_alignment(Gtk::ALIGN_START);
red[0] = Gtk::manage (new Adjuster ("", -200, 200, 1, 100, imgIcon[0]));
red[1] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[1]));
red[2] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[2]));
constexpr double RANGE = 500.0;
red[0] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[0]));
red[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[1]));
red[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[2]));
Gtk::HSeparator* rsep = Gtk::manage (new Gtk::HSeparator ());
@ -58,9 +59,9 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
glabel->set_alignment(Gtk::ALIGN_START);
green[0] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[3]));
green[1] = Gtk::manage (new Adjuster ("", -200, 200, 1, 100, imgIcon[4]));
green[2] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[5]));
green[0] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[3]));
green[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[4]));
green[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[5]));
Gtk::HSeparator* gsep = Gtk::manage (new Gtk::HSeparator ());
@ -75,9 +76,9 @@ ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), f
Gtk::Label* blabel = Gtk::manage (new Gtk::Label ());
blabel->set_markup (Glib::ustring("\t<span foreground=\"#1377d7\"><b>") + M("TP_CHMIXER_BLUE") + Glib::ustring(":</b></span>"));
blabel->set_alignment(Gtk::ALIGN_START);
blue[0] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[6]));
blue[1] = Gtk::manage (new Adjuster ("", -200, 200, 1, 0, imgIcon[7]));
blue[2] = Gtk::manage (new Adjuster ("", -200, 200, 1, 100, imgIcon[8]));
blue[0] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[6]));
blue[1] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 0, imgIcon[7]));
blue[2] = Gtk::manage (new Adjuster ("", -RANGE, RANGE, 0.1, 100, imgIcon[8]));
for (int i = 0; i < 3; i++) {
red[i]->setAdjusterListener (this);
@ -111,9 +112,9 @@ void ChMixer::read (const ProcParams* pp, const ParamsEdited* pedited)
}
for (int i = 0; i < 3; i++) {
red[i]->setValue (pp->chmixer.red[i]);
green[i]->setValue (pp->chmixer.green[i]);
blue[i]->setValue (pp->chmixer.blue[i]);
red[i]->setValue (pp->chmixer.red[i] / 10.0);
green[i]->setValue (pp->chmixer.green[i] / 10.0);
blue[i]->setValue (pp->chmixer.blue[i] / 10.0);
}
enableListener ();
@ -123,9 +124,9 @@ void ChMixer::write (ProcParams* pp, ParamsEdited* pedited)
{
for (int i = 0; i < 3; i++) {
pp->chmixer.red[i] = (int) red[i]->getValue ();
pp->chmixer.green[i] = (int) green[i]->getValue ();
pp->chmixer.blue[i] = (int) blue[i]->getValue ();
pp->chmixer.red[i] = red[i]->getValue() * 10;
pp->chmixer.green[i] = green[i]->getValue() * 10;
pp->chmixer.blue[i] = blue[i]->getValue() * 10;
}
pp->chmixer.enabled = getEnabled();
@ -143,9 +144,9 @@ void ChMixer::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi
{
for (int i = 0; i < 3; i++) {
red[i]->setDefault (defParams->chmixer.red[i]);
green[i]->setDefault (defParams->chmixer.green[i]);
blue[i]->setDefault (defParams->chmixer.blue[i]);
red[i]->setDefault (defParams->chmixer.red[i] / 10.f);
green[i]->setDefault (defParams->chmixer.green[i] / 10.f);
blue[i]->setDefault (defParams->chmixer.blue[i] / 10.f);
}
if (pedited)
@ -167,9 +168,9 @@ void ChMixer::adjusterChanged (Adjuster* a, double newval)
if (listener && getEnabled()) {
Glib::ustring descr = Glib::ustring::compose ("R=%1,%2,%3\nG=%4,%5,%6\nB=%7,%8,%9",
(int)red[0]->getValue(), (int)red[1]->getValue(), (int)red[2]->getValue(),
(int)green[0]->getValue(), (int)green[1]->getValue(), (int)green[2]->getValue(),
(int)blue[0]->getValue(), (int)blue[1]->getValue(), (int)blue[2]->getValue());
red[0]->getValue(), red[1]->getValue(), red[2]->getValue(),
green[0]->getValue(), green[1]->getValue(), green[2]->getValue(),
blue[0]->getValue(), blue[1]->getValue(), blue[2]->getValue());
listener->panelChanged (EvChMixer, descr);
}
}
@ -215,8 +216,14 @@ void ChMixer::trimValues (rtengine::procparams::ProcParams* pp)
{
for (int i = 0; i < 3; i++) {
red[i]->trimValue(pp->chmixer.red[i]);
green[i]->trimValue(pp->chmixer.green[i]);
blue[i]->trimValue(pp->chmixer.blue[i]);
double r = pp->chmixer.red[i] / 10.0;
double g = pp->chmixer.green[i] / 10.0;
double b = pp->chmixer.blue[i] / 10.0;
red[i]->trimValue(r);
green[i]->trimValue(g);
blue[i]->trimValue(b);
pp->chmixer.red[i] = r * 10;
pp->chmixer.green[i] = g * 10;
pp->chmixer.blue[i] = b * 10;
}
}

View File

@ -48,14 +48,26 @@ std::vector<Glib::ustring> listSubDirs (const Glib::RefPtr<Gio::File>& dir, bool
auto enumerator = dir->enumerate_children ("standard::name,standard::type,standard::is-hidden");
while (auto file = enumerator->next_file ()) {
if (file->get_file_type () != Gio::FILE_TYPE_DIRECTORY) {
continue;
while (true) {
try {
auto file = enumerator->next_file ();
if (!file) {
break;
}
if (file->get_file_type () != Gio::FILE_TYPE_DIRECTORY) {
continue;
}
if (!addHidden && file->is_hidden ()) {
continue;
}
subDirs.push_back (file->get_name ());
} catch (const Glib::Exception& exception) {
if (options.rtSettings.verbose) {
std::cerr << exception.what () << std::endl;
}
}
if (!addHidden && file->is_hidden ()) {
continue;
}
subDirs.push_back (file->get_name ());
}
} catch (const Glib::Exception& exception) {

View File

@ -1023,6 +1023,7 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc)
ipc->setPreviewScale (10); // Important
tpc->initImage (ipc, tmb->getType() == FT_Raw);
ipc->setHistogramListener (this);
iareapanel->imageArea->indClippedPanel->silentlyDisableSharpMask();
// iarea->fitZoom (); // tell to the editorPanel that the next image has to be fitted to the screen
iareapanel->imageArea->setPreviewHandler (previewHandler);

View File

@ -211,19 +211,8 @@ void FileBrowserEntry::procParamsChanged (Thumbnail* thm, int whoChangedIt)
void FileBrowserEntry::updateImage (rtengine::IImage8* img, double scale, rtengine::procparams::CropParams cropParams)
{
{
GThreadLock lock;
if ( feih == nullptr ||
feih->destroyed ) {
img->free();
return;
}
redrawRequests++;
feih->pending++;
}
redrawRequests++;
feih->pending++;
struct tiupdate {
FileBrowserEntryIdleHelper* feih;

View File

@ -19,23 +19,27 @@
#ifndef _FILEBROWSERENTRY_
#define _FILEBROWSERENTRY_
#include <atomic>
#include <gtkmm.h>
#include "thumbbrowserentrybase.h"
#include "thumbnail.h"
#include "filethumbnailbuttonset.h"
#include "thumbnaillistener.h"
#include "thumbimageupdater.h"
#include "imageareatoollistener.h"
#include "editenums.h"
#include "../rtengine/rtengine.h"
#include "crophandler.h"
#include "editenums.h"
#include "filethumbnailbuttonset.h"
#include "imageareatoollistener.h"
#include "thumbbrowserentrybase.h"
#include "thumbimageupdater.h"
#include "thumbnail.h"
#include "thumbnaillistener.h"
class FileBrowserEntry;
struct FileBrowserEntryIdleHelper {
FileBrowserEntry* fbentry;
bool destroyed;
int pending;
std::atomic<int> pending;
};
class FileThumbnailButtonSet;

View File

@ -490,6 +490,7 @@ void FileCatalog::exifInfoButtonToggled()
}
fileBrowser->refreshThumbImages ();
refreshHeight();
}
void FileCatalog::on_realize()
@ -564,21 +565,31 @@ std::vector<Glib::ustring> FileCatalog::getFileList ()
auto enumerator = dir->enumerate_children ("standard::name");
while (auto file = enumerator->next_file ()) {
while (true) {
try {
auto file = enumerator->next_file ();
if (!file) {
break;
}
const Glib::ustring fname = file->get_name ();
const Glib::ustring fname = file->get_name ();
auto lastdot = fname.find_last_of ('.');
if (lastdot >= fname.length () - 1) {
continue;
auto lastdot = fname.find_last_of ('.');
if (lastdot >= fname.length () - 1) {
continue;
}
const auto fext = fname.substr (lastdot + 1).lowercase ();
if (extensions.count (fext) == 0) {
continue;
}
names.emplace_back (Glib::build_filename (selectedDirectory, fname));
} catch (Glib::Exception& exception) {
if (options.rtSettings.verbose) {
std::cerr << exception.what () << std::endl;
}
}
const auto fext = fname.substr (lastdot + 1).lowercase ();
if (extensions.count (fext) == 0) {
continue;
}
names.emplace_back (Glib::build_filename (selectedDirectory, fname));
}
} catch (Glib::Exception& exception) {
@ -1201,6 +1212,7 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
params.resize.appliesTo = options.fastexport_resize_appliesTo;
params.resize.method = options.fastexport_resize_method;
params.resize.dataspec = options.fastexport_resize_dataspec;
params.resize.allowUpscaling = false;
}
rtengine::ProcessingJob* pjob = rtengine::ProcessingJob::create (fbe->filename, th->getType() == FT_Raw, params, fastmode && options.fastexport_use_fast_pipeline);

View File

@ -98,6 +98,14 @@ void IndicateClippedPanel::toggleFocusMask ()
previewFocusMask->set_active(!previewFocusMask->get_active());
}
void IndicateClippedPanel::silentlyDisableSharpMask ()
{
ConnectionBlocker conBlocker(connSharpMask);
previewSharpMask->set_active(false);
previewSharpMask->set_image(*iSoff);
}
void IndicateClippedPanel::toggleSharpMask ()
{
previewSharpMask->set_active(!previewSharpMask->get_active());
@ -127,12 +135,12 @@ void IndicateClippedPanel::buttonToggled (Gtk::ToggleButton* tb)
indClippedH->set_active(false);
}
previewFocusMask->set_active(false);
imageArea->sharpMaskSelected(previewSharpMask->get_active());
} else {
previewFocusMask->set_active(false);
previewSharpMask->set_active(false);
}
imageArea->sharpMaskSelected(previewSharpMask->get_active());
previewFocusMask->set_image(previewFocusMask->get_active() ? *iFon : *iFoff);
previewSharpMask->set_image(previewSharpMask->get_active() ? *iSon : *iSoff);

View File

@ -40,6 +40,7 @@ public:
void buttonToggled(Gtk::ToggleButton* tb);
void toggleClipped(bool highlights); // inverts a toggle programmatically
void toggleFocusMask();
void silentlyDisableSharpMask(); // toggle the button off without throwing a toggle event
void toggleSharpMask();
sigc::connection connFocusMask, connSharpMask, connClippedS, connClippedH;

View File

@ -74,10 +74,12 @@ void LabGrid::getParams(double &la, double &lb, double &ha, double &hb) const
void LabGrid::setParams(double la, double lb, double ha, double hb, bool notify)
{
low_a = la;
low_b = lb;
high_a = ha;
high_b = hb;
const double lo = -rtengine::ColorToningParams::LABGRID_CORR_MAX;
const double hi = rtengine::ColorToningParams::LABGRID_CORR_MAX;
low_a = rtengine::LIM(la, lo, hi);
low_b = rtengine::LIM(lb, lo, hi);
high_a = rtengine::LIM(ha, lo, hi);
high_b = rtengine::LIM(hb, lo, hi);
queue_draw();
if (notify) {
notifyListener();

View File

@ -494,6 +494,7 @@ void ParamsEdited::set(bool v)
resize.width = v;
resize.height = v;
resize.enabled = v;
resize.allowUpscaling = v;
icm.input = v;
icm.toneCurve = v;
icm.applyLookTable = v;
@ -509,6 +510,7 @@ void ParamsEdited::set(bool v)
icm.gampos = v;
icm.slpos = v;
raw.bayersensor.method = v;
raw.bayersensor.border = v;
raw.bayersensor.imageNum = v;
raw.bayersensor.ccSteps = v;
raw.bayersensor.exBlack0 = v;
@ -676,6 +678,8 @@ void ParamsEdited::set(bool v)
filmSimulation.enabled = v;
filmSimulation.clutFilename = v;
filmSimulation.strength = v;
softlight.enabled = v;
softlight.strength = v;
metadata.mode = v;
exif = v;
@ -1162,6 +1166,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
resize.width = resize.width && p.resize.width == other.resize.width;
resize.height = resize.height && p.resize.height == other.resize.height;
resize.enabled = resize.enabled && p.resize.enabled == other.resize.enabled;
resize.allowUpscaling = resize.allowUpscaling && p.resize.allowUpscaling == other.resize.allowUpscaling;
icm.input = icm.input && p.icm.input == other.icm.input;
icm.toneCurve = icm.toneCurve && p.icm.toneCurve == other.icm.toneCurve;
icm.applyLookTable = icm.applyLookTable && p.icm.applyLookTable == other.icm.applyLookTable;
@ -1177,6 +1182,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
icm.gampos = icm.gampos && p.icm.gampos == other.icm.gampos;
icm.slpos = icm.slpos && p.icm.slpos == other.icm.slpos;
raw.bayersensor.method = raw.bayersensor.method && p.raw.bayersensor.method == other.raw.bayersensor.method;
raw.bayersensor.border = raw.bayersensor.border && p.raw.bayersensor.border == other.raw.bayersensor.border;
raw.bayersensor.imageNum = raw.bayersensor.imageNum && p.raw.bayersensor.imageNum == other.raw.bayersensor.imageNum;
raw.bayersensor.ccSteps = raw.bayersensor.ccSteps && p.raw.bayersensor.ccSteps == other.raw.bayersensor.ccSteps;
raw.bayersensor.exBlack0 = raw.bayersensor.exBlack0 && p.raw.bayersensor.black0 == other.raw.bayersensor.black0;
@ -1339,6 +1345,8 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
filmSimulation.enabled = filmSimulation.enabled && p.filmSimulation.enabled == other.filmSimulation.enabled;
filmSimulation.clutFilename = filmSimulation.clutFilename && p.filmSimulation.clutFilename == other.filmSimulation.clutFilename;
filmSimulation.strength = filmSimulation.strength && p.filmSimulation.strength == other.filmSimulation.strength;
softlight.enabled = softlight.enabled && p.softlight.enabled == other.softlight.enabled;
softlight.strength = softlight.strength && p.softlight.strength == other.softlight.strength;
metadata.mode = metadata.mode && p.metadata.mode == other.metadata.mode;
// How the hell can we handle that???
@ -3078,6 +3086,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.resize.enabled = mods.resize.enabled;
}
if (resize.allowUpscaling) {
toEdit.resize.allowUpscaling = mods.resize.allowUpscaling;
}
if (icm.input) {
toEdit.icm.input = mods.icm.input;
}
@ -3138,6 +3150,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.raw.bayersensor.method = mods.raw.bayersensor.method;
}
if (raw.bayersensor.border) {
toEdit.raw.bayersensor.border = mods.raw.bayersensor.border;
}
if (raw.bayersensor.imageNum) {
toEdit.raw.bayersensor.imageNum = mods.raw.bayersensor.imageNum;
}
@ -3743,6 +3759,14 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.filmSimulation.strength = dontforceSet && options.baBehav[ADDSET_FILMSIMULATION_STRENGTH] ? toEdit.filmSimulation.strength + mods.filmSimulation.strength : mods.filmSimulation.strength;
}
if (softlight.enabled) {
toEdit.softlight.enabled = mods.softlight.enabled;
}
if (softlight.strength) {
toEdit.softlight.strength = dontforceSet && options.baBehav[ADDSET_SOFTLIGHT_STRENGTH] ? toEdit.softlight.strength + mods.softlight.strength : mods.softlight.strength;
}
if (metadata.mode) {
toEdit.metadata.mode = mods.metadata.mode;
}
@ -3762,7 +3786,7 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
bool RAWParamsEdited::BayerSensor::isUnchanged() const
{
return method && imageNum && dcbIterations && dcbEnhance && lmmseIterations && dualDemosaicContrast /*&& allEnhance*/ && greenEq
return method && border && imageNum && dcbIterations && dcbEnhance && lmmseIterations && dualDemosaicContrast /*&& allEnhance*/ && greenEq
&& pixelShiftMotionCorrectionMethod && pixelShiftEperIso && pixelShiftSigma && pixelShiftShowMotion && pixelShiftShowMotionMaskOnly
&& pixelShiftHoleFill && pixelShiftMedian && pixelShiftNonGreenCross && pixelShiftDemosaicMethod && pixelShiftGreen && pixelShiftBlur && pixelShiftSmooth && pixelShiftEqualBright && pixelShiftEqualBrightChannel
&& linenoise && linenoiseDirection && pdafLinesFilter && exBlack0 && exBlack1 && exBlack2 && exBlack3 && exTwoGreen;

View File

@ -688,6 +688,7 @@ public:
bool width;
bool height;
bool enabled;
bool allowUpscaling;
};
class ColorManagementParamsEdited
@ -831,6 +832,13 @@ public:
bool strength;
};
class SoftLightParamsEdited
{
public:
bool enabled;
bool strength;
};
class RAWParamsEdited
{
@ -840,6 +848,7 @@ public:
public:
bool method;
bool border;
bool imageNum;
bool ccSteps;
bool exBlack0;
@ -968,6 +977,7 @@ public:
WaveletParamsEdited wavelet;
HSVEqualizerParamsEdited hsvequalizer;
FilmSimulationParamsEdited filmSimulation;
SoftLightParamsEdited softlight;
MetaDataParamsEdited metadata;
bool exif;
bool iptc;

View File

@ -78,6 +78,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
blackwhite = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_CHANNELMIXERBW")));
hsveq = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_HSVEQUALIZER")));
filmSimulation = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_FILMSIMULATION")) );
softlight = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_SOFTLIGHT")) );
rgbcurves = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RGBCURVES")));
colortoning = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_COLORTONING")));
@ -104,6 +105,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
// Raw Settings:
raw_method = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_DMETHOD")));
raw_imagenum = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_IMAGENUM")));
raw_border = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_BORDER")));
raw_pixelshift = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_PIXELSHIFT")));
raw_ccSteps = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_FALSECOLOR")));
raw_dcb_iterations = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAW_DCBITERATIONS")));
@ -175,6 +177,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[2]->pack_start (*blackwhite, Gtk::PACK_SHRINK, 2);
vboxes[2]->pack_start (*hsveq, Gtk::PACK_SHRINK, 2);
vboxes[2]->pack_start (*filmSimulation, Gtk::PACK_SHRINK, 2);
vboxes[2]->pack_start (*softlight, Gtk::PACK_SHRINK, 2);
vboxes[2]->pack_start (*rgbcurves, Gtk::PACK_SHRINK, 2);
vboxes[2]->pack_start (*colortoning, Gtk::PACK_SHRINK, 2);
@ -215,6 +218,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[7]->pack_start (*raw, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*hseps[7], Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_method, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_border, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_imagenum, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_pixelshift, Gtk::PACK_SHRINK, 2);
vboxes[7]->pack_start (*raw_ccSteps, Gtk::PACK_SHRINK, 2);
@ -334,6 +338,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
chmixerbwConn = blackwhite->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true));
hsveqConn = hsveq->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true));
filmSimulationConn = filmSimulation->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true));
softlightConn = softlight->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true));
rgbcurvesConn = rgbcurves->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true));
colortoningConn = colortoning->signal_toggled().connect (sigc::bind (sigc::mem_fun(*color, &Gtk::CheckButton::set_inconsistent), true));
@ -359,6 +364,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
// Raw Settings:
raw_methodConn = raw_method->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_borderConn = raw_border->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_imagenumConn = raw_imagenum->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_pixelshiftConn = raw_pixelshift->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
raw_ccStepsConn = raw_ccSteps->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true));
@ -434,6 +440,7 @@ void PartialPasteDlg::rawToggled ()
{
ConnectionBlocker raw_methodBlocker(raw_methodConn);
ConnectionBlocker raw_borderBlocker(raw_borderConn);
ConnectionBlocker raw_imagenumBlocker(raw_imagenumConn);
ConnectionBlocker raw_pixelshiftBlocker(raw_pixelshiftConn);
ConnectionBlocker raw_ccStepsBlocker(raw_ccStepsConn);
@ -461,6 +468,7 @@ void PartialPasteDlg::rawToggled ()
raw->set_inconsistent (false);
raw_method->set_active (raw->get_active ());
raw_border->set_active (raw->get_active ());
raw_imagenum->set_active (raw->get_active ());
raw_pixelshift->set_active (raw->get_active ());
raw_ccSteps->set_active (raw->get_active ());
@ -557,6 +565,7 @@ void PartialPasteDlg::colorToggled ()
ConnectionBlocker chmixerbwBlocker(chmixerbwConn);
ConnectionBlocker hsveqBlocker(hsveqConn);
ConnectionBlocker filmSimulationBlocker(filmSimulationConn);
ConnectionBlocker softlightBlocker(softlightConn);
ConnectionBlocker rgbcurvesBlocker(rgbcurvesConn);
ConnectionBlocker colortoningBlocker(colortoningConn);
@ -568,6 +577,7 @@ void PartialPasteDlg::colorToggled ()
blackwhite->set_active (color->get_active ());
hsveq->set_active (color->get_active ());
filmSimulation->set_active (color->get_active ());
softlight->set_active (color->get_active ());
rgbcurves->set_active (color->get_active ());
colortoning->set_active(color->get_active ());
}
@ -743,6 +753,10 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.filmSimulation = falsePE.filmSimulation;
}
if (!softlight->get_active ()) {
filterPE.softlight = falsePE.softlight;
}
if (!rgbcurves->get_active ()) {
filterPE.rgbCurves = falsePE.rgbCurves;
}
@ -809,7 +823,13 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
if (!raw_method->get_active ()) {
filterPE.raw.bayersensor.method = falsePE.raw.bayersensor.method;
filterPE.raw.bayersensor.dualDemosaicContrast = falsePE.raw.bayersensor.dualDemosaicContrast;
filterPE.raw.xtranssensor.method = falsePE.raw.xtranssensor.method;
filterPE.raw.xtranssensor.dualDemosaicContrast = falsePE.raw.xtranssensor.dualDemosaicContrast;
}
if (!raw_border->get_active ()) {
filterPE.raw.bayersensor.border = falsePE.raw.bayersensor.border;
}
if (!raw_imagenum->get_active ()) {

View File

@ -73,6 +73,7 @@ public:
Gtk::CheckButton* chmixer;
Gtk::CheckButton* blackwhite;
Gtk::CheckButton* hsveq;
Gtk::CheckButton* softlight;
Gtk::CheckButton* filmSimulation;
Gtk::CheckButton* rgbcurves;
Gtk::CheckButton* colortoning;
@ -110,6 +111,7 @@ public:
Gtk::CheckButton* raw_linenoise;
Gtk::CheckButton* raw_greenthresh;
Gtk::CheckButton* raw_method;
Gtk::CheckButton* raw_border;
Gtk::CheckButton* raw_imagenum;
Gtk::CheckButton* raw_ccSteps;
Gtk::CheckButton* raw_dcb_iterations;
@ -129,12 +131,12 @@ public:
sigc::connection wbConn, exposureConn, localcontrastConn, shConn, pcvignetteConn, gradientConn, labcurveConn, colorappearanceConn;
sigc::connection sharpenConn, gradsharpenConn, microcontrastConn, impdenConn, dirpyrdenConn, defringeConn, epdConn, fattalConn, dirpyreqConn, waveletConn, retinexConn;
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn;
sigc::connection vibranceConn, chmixerConn, hsveqConn, rgbcurvesConn, chmixerbwConn, colortoningConn, filmSimulationConn, softlightConn;
sigc::connection distortionConn, cacorrConn, vignettingConn, lcpConn;
sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, prsharpeningConn, perspectiveConn, commonTransConn;
sigc::connection metadataConn, exifchConn, iptcConn, icmConn;
sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_BlurRadiusConn, ff_BlurTypeConn, ff_ClipControlConn;
sigc::connection raw_caredblueConn, raw_ca_autocorrectConn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_pdaf_lines_filterConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_imagenumConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_pixelshiftConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn;
sigc::connection raw_caredblueConn, raw_ca_autocorrectConn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_pdaf_lines_filterConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_borderConn, raw_imagenumConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_pixelshiftConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn;
public:
PartialPasteDlg (const Glib::ustring &title, Gtk::Window* parent);

View File

@ -1,11 +1,17 @@
#pragma once
// This number has to be incremented whenever the PP3 file format is modified or the behaviour of a tool changes
#define PPVERSION 336
#define PPVERSION 339
#define PPVERSION_AEXP 301 //value of PPVERSION when auto exposure algorithm was modified
/*
Log of version changes
339 2018-07-04
added allowUpscaling to ResizeParams
338 2018-06-15
increased precision for the channel mixer
337 2018-06-13
new scales for the LabGrid color toning parameters
336 2018-06-01
new demosaic method combobox for pixelshift
335 2018-05-30

View File

@ -309,6 +309,10 @@ Gtk::Widget* Preferences::getBatchProcPanel()
appendBehavList(mi, M("TP_FILMSIMULATION_STRENGTH"), ADDSET_FILMSIMULATION_STRENGTH, true);
mi = behModel->append();
mi->set_value ( behavColumns.label, M ("TP_SOFTLIGHT_LABEL") );
appendBehavList ( mi, M ( "TP_SOFTLIGHT_STRENGTH" ), ADDSET_SOFTLIGHT_STRENGTH, true );
mi = behModel->append ();
mi->set_value(behavColumns.label, M("TP_COLORTONING_LABEL"));
appendBehavList(mi, M("TP_COLORTONING_SPLITCOCO"), ADDSET_COLORTONING_SPLIT, true);
appendBehavList(mi, M("TP_COLORTONING_SATURATIONTHRESHOLD"), ADDSET_COLORTONING_SATTHRESHOLD, true);

View File

@ -37,7 +37,7 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
hb->show ();
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 100, 1, 0));
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENING_CONTRAST"), 0, 200, 1, 0));
contrast->setAdjusterListener (this);
pack_start(*contrast);
contrast->show();

View File

@ -18,12 +18,15 @@
*/
#include "resize.h"
#include "guiutils.h"
#include "eventmapper.h"
using namespace rtengine;
using namespace rtengine::procparams;
Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), false, true), maxw(100000), maxh(100000)
{
auto m = ProcEventMapper::getInstance();
EvResizeAllowUpscaling = m->newEvent(RESIZE, "HISTORY_MSG_RESIZE_ALLOW_UPSCALING");
cropw = 0;
croph = 0;
@ -88,6 +91,11 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
sbox->pack_start (*hbox);
sizeBox->pack_start (*sbox, Gtk::PACK_SHRINK, 0);
allowUpscaling = Gtk::manage(new Gtk::CheckButton(M("TP_RESIZE_ALLOW_UPSCALING")));
sizeBox->pack_start(*allowUpscaling);
allowUpscaling->signal_toggled().connect(sigc::mem_fun(*this, &Resize::allowUpscalingChanged));
sizeBox->show_all ();
sizeBox->reference ();
@ -137,6 +145,7 @@ void Resize::read (const ProcParams* pp, const ParamsEdited* pedited)
h->set_value (pp->resize.height);
setEnabled (pp->resize.enabled);
spec->set_active (pp->resize.dataspec);
allowUpscaling->set_active(pp->resize.allowUpscaling);
updateGUI();
appliesTo->set_active (0);
@ -175,6 +184,7 @@ void Resize::read (const ProcParams* pp, const ParamsEdited* pedited)
spec->set_active (4);
}
allowUpscaling->set_inconsistent(!pedited->resize.allowUpscaling);
set_inconsistent (multiImage && !pedited->resize.enabled);
}
@ -214,6 +224,8 @@ void Resize::write (ProcParams* pp, ParamsEdited* pedited)
pp->resize.enabled = getEnabled ();
//printf(" L:%d H:%d\n", pp->resize.width, pp->resize.height);
pp->resize.allowUpscaling = allowUpscaling->get_active();
if (pedited) {
pedited->resize.enabled = !get_inconsistent();
pedited->resize.dataspec = dataSpec != MAX_SCALE;
@ -229,6 +241,7 @@ void Resize::write (ProcParams* pp, ParamsEdited* pedited)
pedited->resize.width = false;
pedited->resize.height = false;
}
pedited->resize.allowUpscaling = !allowUpscaling->get_inconsistent();
}
}
@ -620,6 +633,22 @@ void Resize::enabledChanged ()
}
}
void Resize::allowUpscalingChanged()
{
if (listener) {
if (allowUpscaling->get_inconsistent()) {
listener->panelChanged(EvResizeAllowUpscaling, M("GENERAL_UNCHANGED"));
} else if (allowUpscaling->get_active()) {
listener->panelChanged(EvResizeAllowUpscaling, M("GENERAL_ENABLED"));
} else {
listener->panelChanged(EvResizeAllowUpscaling, M("GENERAL_DISABLED"));
}
}
}
void Resize::setAdjusterBehavior (bool scaleadd)
{

View File

@ -66,7 +66,9 @@ private:
int getComputedHeight ();
void notifyBBox ();
void updateGUI ();
void allowUpscalingChanged();
rtengine::ProcEvent EvResizeAllowUpscaling;
Adjuster* scale;
Gtk::VBox* sizeBox;
MyComboBoxText* appliesTo;
@ -74,6 +76,7 @@ private:
MyComboBoxText* spec;
MySpinButton* w;
MySpinButton* h;
Gtk::CheckButton *allowUpscaling;
int maxw, maxh;
int cropw, croph;
sigc::connection sconn, aconn, wconn, hconn;

115
rtgui/softlight.cc Normal file
View File

@ -0,0 +1,115 @@
/** -*- C++ -*-
*
* This file is part of RawTherapee.
*
* Copyright (c) 2018 Alberto Griggio <alberto.griggio@gmail.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include "softlight.h"
#include "eventmapper.h"
#include <iomanip>
#include <cmath>
using namespace rtengine;
using namespace rtengine::procparams;
SoftLight::SoftLight(): FoldableToolPanel(this, "softlight", M("TP_SOFTLIGHT_LABEL"), false, true)
{
auto m = ProcEventMapper::getInstance();
EvSoftLightEnabled = m->newEvent(RGBCURVE, "HISTORY_MSG_SOFTLIGHT_ENABLED");
EvSoftLightStrength = m->newEvent(RGBCURVE, "HISTORY_MSG_SOFTLIGHT_STRENGTH");
strength = Gtk::manage(new Adjuster(M("TP_SOFTLIGHT_STRENGTH"), 0., 100., 1., 30.));
strength->setAdjusterListener(this);
strength->show();
pack_start(*strength);
}
void SoftLight::read(const ProcParams *pp, const ParamsEdited *pedited)
{
disableListener();
if (pedited) {
strength->setEditedState(pedited->softlight.strength ? Edited : UnEdited);
set_inconsistent(multiImage && !pedited->softlight.enabled);
}
setEnabled(pp->softlight.enabled);
strength->setValue(pp->softlight.strength);
enableListener();
}
void SoftLight::write(ProcParams *pp, ParamsEdited *pedited)
{
pp->softlight.strength = strength->getValue();
pp->softlight.enabled = getEnabled();
if (pedited) {
pedited->softlight.strength = strength->getEditedState();
pedited->softlight.enabled = !get_inconsistent();
}
}
void SoftLight::setDefaults(const ProcParams *defParams, const ParamsEdited *pedited)
{
strength->setDefault(defParams->softlight.strength);
if (pedited) {
strength->setDefaultEditedState(pedited->softlight.strength ? Edited : UnEdited);
} else {
strength->setDefaultEditedState(Irrelevant);
}
}
void SoftLight::adjusterChanged(Adjuster* a, double newval)
{
if (listener && getEnabled()) {
listener->panelChanged(EvSoftLightStrength, a->getTextValue());
}
}
void SoftLight::enabledChanged ()
{
if (listener) {
if (get_inconsistent()) {
listener->panelChanged(EvSoftLightEnabled, M("GENERAL_UNCHANGED"));
} else if (getEnabled()) {
listener->panelChanged(EvSoftLightEnabled, M("GENERAL_ENABLED"));
} else {
listener->panelChanged(EvSoftLightEnabled, M("GENERAL_DISABLED"));
}
}
}
void SoftLight::setBatchMode(bool batchMode)
{
ToolPanel::setBatchMode(batchMode);
strength->showEditedCB();
}
void SoftLight::setAdjusterBehavior(bool strengthAdd)
{
strength->setAddMode(strengthAdd);
}

47
rtgui/softlight.h Normal file
View File

@ -0,0 +1,47 @@
/** -*- C++ -*-
*
* This file is part of RawTherapee.
*
* Copyright (c) 2018 Alberto Griggio <alberto.griggio@gmail.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <gtkmm.h>
#include "adjuster.h"
#include "toolpanel.h"
class SoftLight: public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
{
private:
Adjuster *strength;
rtengine::ProcEvent EvSoftLightEnabled;
rtengine::ProcEvent EvSoftLightStrength;
public:
SoftLight();
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr);
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr);
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr);
void setBatchMode(bool batchMode);
void adjusterChanged(Adjuster *a, double newval);
void enabledChanged();
void setAdjusterBehavior(bool strengthAdd);
};

View File

@ -501,8 +501,8 @@ void ThumbBrowserBase::configScrollBars ()
vscroll.get_adjustment()->set_upper (inH);
hscroll.get_adjustment()->set_lower (0);
vscroll.get_adjustment()->set_lower (0);
hscroll.get_adjustment()->set_step_increment (32);
vscroll.get_adjustment()->set_step_increment (32);
hscroll.get_adjustment()->set_step_increment (!fd.empty() ? fd[0]->getEffectiveHeight() : 0);
vscroll.get_adjustment()->set_step_increment (!fd.empty() ? fd[0]->getEffectiveHeight() : 0);
hscroll.get_adjustment()->set_page_increment (iw);
vscroll.get_adjustment()->set_page_increment (ih);
hscroll.get_adjustment()->set_page_size (iw);
@ -567,7 +567,7 @@ void ThumbBrowserBase::arrangeFiles()
MYREADERLOCK_RELEASE(l);
// This will require a Writer access
resizeThumbnailArea(currx, rowHeight);
resizeThumbnailArea(currx, !fd.empty() ? fd[0]->getEffectiveHeight() : rowHeight);
} else {
const int availWidth = internal.get_width();

View File

@ -19,12 +19,15 @@
#ifndef _THUMBNAILBROWSERENTRYBASE_
#define _THUMBNAILBROWSERENTRYBASE_
#include <atomic>
#include <gtkmm.h>
#include "lwbuttonset.h"
#include "thumbnail.h"
#include "threadutils.h"
#include "guiutils.h"
#include "cursormanager.h"
#include "guiutils.h"
#include "lwbuttonset.h"
#include "threadutils.h"
#include "thumbnail.h"
class ThumbBrowserBase;
class ThumbBrowserEntryBase
@ -71,7 +74,7 @@ protected:
int ofsX, ofsY; // offset due to the scrolling of the parent
int redrawRequests;
std::atomic<int> redrawRequests;
ThumbBrowserBase* parent;
ThumbBrowserEntryBase* original;

View File

@ -17,9 +17,13 @@
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <atomic>
#include <set>
#include "thumbimageupdater.h"
#include <gtkmm.h>
#include "thumbimageupdater.h"
#include "guiutils.h"
#include "threadutils.h"
@ -83,7 +87,7 @@ public:
JobList jobs_;
unsigned int active_;
std::atomic<unsigned int> active_;
bool inactive_waiting_;
@ -157,13 +161,11 @@ public:
j.listener_->updateImage(img, scale, thm->getProcParams().crop);
}
{
if ( --active_ == 0 ) {
Glib::Threads::Mutex::Lock lock(mutex_);
if ( --active_ == 0 &&
inactive_waiting_ ) {
if (inactive_waiting_) {
inactive_waiting_ = false;
inactive_.signal();
inactive_.broadcast();
}
}
}
@ -181,8 +183,7 @@ ThumbImageUpdater::ThumbImageUpdater():
{
}
void
ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, ThumbImageUpdateListener* l)
void ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, ThumbImageUpdateListener* l)
{
// nobody listening?
if ( l == nullptr ) {
@ -216,49 +217,51 @@ ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade,
}
void
ThumbImageUpdater::removeJobs(ThumbImageUpdateListener* listener)
void ThumbImageUpdater::removeJobs(ThumbImageUpdateListener* listener)
{
DEBUG("removeJobs(%p)", listener);
Glib::Threads::Mutex::Lock lock(impl_->mutex_);
{
Glib::Threads::Mutex::Lock lock(impl_->mutex_);
for( Impl::JobList::iterator i(impl_->jobs_.begin()); i != impl_->jobs_.end(); ) {
if (i->listener_ == listener) {
DEBUG("erasing specific job");
Impl::JobList::iterator e(i++);
impl_->jobs_.erase(e);
} else {
++i;
for( Impl::JobList::iterator i(impl_->jobs_.begin()); i != impl_->jobs_.end(); ) {
if (i->listener_ == listener) {
DEBUG("erasing specific job");
Impl::JobList::iterator e(i++);
impl_->jobs_.erase(e);
} else {
++i;
}
}
}
while ( impl_->active_ != 0 ) {
// XXX this is nasty... it would be nicer if we weren't called with
// this lock held
GThreadUnLock unlock;
DEBUG("waiting for running jobs1");
impl_->inactive_waiting_ = true;
impl_->inactive_.wait(impl_->mutex_);
{
Glib::Threads::Mutex::Lock lock(impl_->mutex_);
impl_->inactive_waiting_ = true;
impl_->inactive_.wait(impl_->mutex_);
}
}
}
void
ThumbImageUpdater::removeAllJobs()
void ThumbImageUpdater::removeAllJobs()
{
DEBUG("stop");
Glib::Threads::Mutex::Lock lock(impl_->mutex_);
{
Glib::Threads::Mutex::Lock lock(impl_->mutex_);
impl_->jobs_.clear();
impl_->jobs_.clear();
}
while ( impl_->active_ != 0 ) {
// XXX this is nasty... it would be nicer if we weren't called with
// this lock held
GThreadUnLock unlock;
DEBUG("waiting for running jobs2");
impl_->inactive_waiting_ = true;
impl_->inactive_.wait(impl_->mutex_);
{
Glib::Threads::Mutex::Lock lock(impl_->mutex_);
impl_->inactive_waiting_ = true;
impl_->inactive_.wait(impl_->mutex_);
}
}
}

View File

@ -78,6 +78,7 @@ ToolPanelCoordinator::ToolPanelCoordinator(bool batch) : ipc(nullptr), hasChange
dirpyrequalizer = Gtk::manage(new DirPyrEqualizer());
hsvequalizer = Gtk::manage(new HSVEqualizer());
filmSimulation = Gtk::manage(new FilmSimulation());
softlight = Gtk::manage(new SoftLight());
sensorbayer = Gtk::manage(new SensorBayer());
sensorxtrans = Gtk::manage(new SensorXTrans());
bayerprocess = Gtk::manage(new BayerProcess());
@ -112,6 +113,7 @@ ToolPanelCoordinator::ToolPanelCoordinator(bool batch) : ipc(nullptr), hasChange
addPanel(detailsPanel, sharpenMicro);
addPanel(colorPanel, hsvequalizer);
addPanel(colorPanel, filmSimulation);
addPanel (colorPanel, softlight);
addPanel(colorPanel, rgbcurves);
addPanel(colorPanel, colortoning);
addPanel(exposurePanel, epd);

View File

@ -80,6 +80,7 @@
#include "prsharpening.h"
#include "fattaltonemap.h"
#include "localcontrast.h"
#include "softlight.h"
#include "guiutils.h"
class ImageEditorCoordinator;
@ -136,6 +137,7 @@ protected:
Wavelet * wavelet;
DirPyrEqualizer* dirpyrequalizer;
HSVEqualizer* hsvequalizer;
SoftLight *softlight;
FilmSimulation *filmSimulation;
SensorBayer * sensorbayer;
SensorXTrans * sensorxtrans;

View File

@ -118,7 +118,8 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
dualDemosaicContrast->setValue (pp->raw.xtranssensor.dualDemosaicContrast);
ccSteps->setValue (pp->raw.xtranssensor.ccSteps);
if (!batchMode) {
dualDemosaicOptions->set_visible(pp->raw.xtranssensor.method == procparams::RAWParams::XTransSensor::getMethodString(procparams::RAWParams::XTransSensor::Method::FOUR_PASS));
dualDemosaicOptions->set_visible(pp->raw.xtranssensor.method == procparams::RAWParams::XTransSensor::getMethodString(procparams::RAWParams::XTransSensor::Method::FOUR_PASS)
|| pp->raw.xtranssensor.method == procparams::RAWParams::XTransSensor::getMethodString(procparams::RAWParams::XTransSensor::Method::TWO_PASS));
}
methodconn.block (false);
@ -192,7 +193,7 @@ void XTransProcess::methodChanged ()
oldSelection = curSelection;
if (!batchMode) {
if (currentMethod == procparams::RAWParams::XTransSensor::Method::FOUR_PASS) {
if (currentMethod == procparams::RAWParams::XTransSensor::Method::FOUR_PASS || currentMethod == procparams::RAWParams::XTransSensor::Method::TWO_PASS) {
dualDemosaicOptions->show();
} else {
dualDemosaicOptions->hide();