diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 42d26f21f..8f928ebc7 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -1321,6 +1321,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1329,6 +1330,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1894,12 +1896,15 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!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_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1915,6 +1920,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index d19c9d366..b4404728f 100644
--- a/rtdata/languages/Chinese (Simplified)
+++ b/rtdata/languages/Chinese (Simplified)
@@ -1428,6 +1428,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1436,6 +1437,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1867,8 +1869,10 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
@@ -1876,6 +1880,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FALSECOLOR;False color suppression steps
!TP_RAW_FAST;Fast
@@ -1893,6 +1898,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index dbb316209..cdb0bc822 100644
--- a/rtdata/languages/Chinese (Traditional)
+++ b/rtdata/languages/Chinese (Traditional)
@@ -983,6 +983,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -991,6 +992,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1815,8 +1817,10 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
@@ -1824,6 +1828,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FALSECOLOR;False color suppression steps
!TP_RAW_FAST;Fast
@@ -1841,6 +1846,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index f5a4c16c3..4b88d089c 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -2233,7 +2233,9 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!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_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
@@ -2242,6 +2244,10 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!SAMPLEFORMAT_64;32-bit floating-point
!TP_BWMIX_MIXC;Channel Mixer
!TP_BWMIX_NEUTRAL;Reset
+!TP_RAW_4PASS;4-Pass
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
+!TP_RAW_PIXELSHIFTDMETHOD;Demosaic method for motion
!TP_SHARPENING_CONTRAST;Contrast threshold
!TP_SHARPENMICRO_CONTRAST;Contrast threshold
!TP_TM_FATTAL_AMOUNT;Amount
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index f23bce005..48871b32a 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -978,6 +978,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -986,6 +987,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1812,14 +1814,17 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1836,6 +1841,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 993206ed3..d696da4dd 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -463,11 +463,11 @@ HISTORY_MSG_154;(Dynamik)\nHautfarbtöne schützen
HISTORY_MSG_155;(Dynamik)\nFarbverschiebungen\nvermeiden
HISTORY_MSG_156;(Dynamik)\nPastell und gesättigte\nTöne koppeln
HISTORY_MSG_157;(Dynamik)\nPastell/gesättigte Töne\nSchwelle
-HISTORY_MSG_158;(Dynamikkompression)\nIntensität
-HISTORY_MSG_159;(Dynamikkompression)\nKantenschutz
-HISTORY_MSG_160;(Dynamikkompression)\nFaktor
-HISTORY_MSG_161;(Dynamikkompression)\nIterationen
-HISTORY_MSG_162;(Dynamikkompression)
+HISTORY_MSG_158;(Tonwertkorrektur)\nIntensität
+HISTORY_MSG_159;(Tonwertkorrektur)\nKantenschutz
+HISTORY_MSG_160;(Tonwertkorrektur)\nFaktor
+HISTORY_MSG_161;(Tonwertkorrektur)\nIterationen
+HISTORY_MSG_162;(Tonwertkorrektur)
HISTORY_MSG_163;(RGB-Kurven) - Rot
HISTORY_MSG_164;(RGB-Kurven) - Grün
HISTORY_MSG_165;(RGB-Kurven) - Blau
@@ -664,7 +664,7 @@ HISTORY_MSG_356;(Wavelet)\nKantenschärfung\nSchwelle hoch
HISTORY_MSG_357;(Wavelet)\nRauschreduzierung\nSchärfung verknüpfen
HISTORY_MSG_358;(Wavelet) - Gamut\nKontrastkurve
HISTORY_MSG_359;(Vorverarbeitung)\nHot / Dead-Pixel-Filter\nSchwelle
-HISTORY_MSG_360;(Dynamikkompression)\nGamma
+HISTORY_MSG_360;(Tonwertkorrektur)\nGamma
HISTORY_MSG_361;(Wavelet) - Endretusche\nFarbausgleich
HISTORY_MSG_362;(Wavelet) - Restbild\nKompression
HISTORY_MSG_363;(Wavelet) - Restbild\nKompression - Intensität
@@ -776,6 +776,9 @@ HISTORY_MSG_484;(CIECAM02) - Szene\nAuto Yb%
HISTORY_MSG_485;(Objektivkorrektur)\nProfil
HISTORY_MSG_486;(Objektivkorrektur)\nProfil - Kamera
HISTORY_MSG_487;(Objektivkorrektur)\nProfil - Objektiv
+HISTORY_MSG_488;(Dynamikkompression)
+HISTORY_MSG_489;(Dynamikkompression)\nSchwelle
+HISTORY_MSG_490;(Dynamikkompression)\nIntensität
HISTORY_MSG_491;(Weißabgleich)
HISTORY_MSG_492;(RGB-Kurven)
HISTORY_MSG_493;(L*a*b*)
@@ -793,6 +796,7 @@ HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;(Sensor-Matrix)\nVorverarbeitung\nR
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;(Sensor-Matrix)\nVorverarbeitung\nPDAF-Zeilenfilter
HISTORY_MSG_PRSHARPEN_CONTRAST;(Skalieren) - Schärfen\nKontrastschwelle
HISTORY_MSG_SHARPENING_CONTRAST;(Schärfung)\nKontrastschwelle
+HISTORY_MSG_TM_FATTAL_ANCHOR;(Dynamikkompression)\nHelligkeitsverschiebung
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s
HISTORY_SNAPSHOT;Schnappschuss
@@ -955,7 +959,7 @@ PARTIALPASTE_DIALOGLABEL;Selektives Einfügen des Bearbeitungsprofils
PARTIALPASTE_DIRPYRDENOISE;Rauschreduzierung
PARTIALPASTE_DIRPYREQUALIZER;Detailebenenkontrast
PARTIALPASTE_DISTORTION;Verzeichnungskorrektur
-PARTIALPASTE_EPD;Dynamikkompression
+PARTIALPASTE_EPD;Tonwertkorrektur
PARTIALPASTE_EQUALIZER;Anzahl der Ebenen
PARTIALPASTE_EVERYTHING;Alle Parameter aktivieren / deaktivieren
PARTIALPASTE_EXIFCHANGES;Änderungen an Exif-Daten
@@ -1005,6 +1009,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;Schatten/Lichter
PARTIALPASTE_SHARPENEDGE;Kantenschärfung
PARTIALPASTE_SHARPENING;Schärfung
PARTIALPASTE_SHARPENMICRO;Mikrokontrast
+PARTIALPASTE_TM_FATTAL;Dynamikkompression
PARTIALPASTE_VIBRANCE;Dynamik
PARTIALPASTE_VIGNETTING;Vignettierungskorrektur
PARTIALPASTE_WAVELETGROUP;Wavelet
@@ -1460,8 +1465,8 @@ TP_COLORAPP_TCMODE_LABEL3;Farbkurve Modus
TP_COLORAPP_TCMODE_LIGHTNESS;Helligkeit (J)
TP_COLORAPP_TCMODE_SATUR;Sättigung (S)
TP_COLORAPP_TEMP_TOOLTIP;Um eine Farbtemperatur auszuwählen\nsetzen Sie die Tönung immer auf "1".\nA Temp=2856\nD50 Temp=5003\nD55 Temp=5503\nD65 Temp=6504\nD75 Temp=7504
-TP_COLORAPP_TONECIE;Dynamikkompression mittels\nCIECAM02-Helligkeit (Q)
-TP_COLORAPP_TONECIE_TOOLTIP;Wenn diese Option ausgeschaltet ist, wird die Dynamikkompression im L*a*b*-Farbraum durchgeführt.\nWenn die Option eingeschaltet ist, wird CIECAM02 für die Dynamikkompression verwendet. Das Werkzeug Dynamikkompression muss aktiviert sein, damit diese Option berücksichtigt wird.
+TP_COLORAPP_TONECIE;Tonwertkorrektur mittels\nCIECAM02-Helligkeit (Q)
+TP_COLORAPP_TONECIE_TOOLTIP;Wenn diese Option ausgeschaltet ist, wird die Tonwertkorrektur im L*a*b*-Farbraum durchgeführt.\nWenn die Option eingeschaltet ist, wird CIECAM02 für die Tonwertkorrektur verwendet. Das Werkzeug Tonwertkorrektur muss aktiviert sein, damit diese Option berücksichtigt wird.
TP_COLORAPP_WBCAM;[RT+CAT02] + [Ausgabe]
TP_COLORAPP_WBRT;[RT] + [Ausgabe]
TP_COLORAPP_YB;Yb% (Ø Luminanz)
@@ -1606,11 +1611,11 @@ TP_DISTORTION_AUTO_TIP;Korrigiert die Verzeichnung in RAW-Bildern durch Vergleic
TP_DISTORTION_LABEL;Verzeichnungskorrektur
TP_EPD_EDGESTOPPING;Kantenschutz
TP_EPD_GAMMA;Gamma
-TP_EPD_LABEL;Dynamikkompression
+TP_EPD_LABEL;Tonwertkorrektur
TP_EPD_REWEIGHTINGITERATES;Iterationen
TP_EPD_SCALE;Faktor
TP_EPD_STRENGTH;Intensität
-TP_EPD_TOOLTIP;Dynamikkompression ist mit dem L*a*b*- und CIECAM02-Modus möglich.\n\nFür den CIECAM02-Modus müssen folgende Optionen aktiviert sein:\n1. CIECAM02\n2. Algorithmus = Helligkeit + Farbigkeit (QM)\n3. Dynamikkompression mittels CIECAM02-Helligkeit (Q)
+TP_EPD_TOOLTIP;Tonwertkorrektur ist mit dem L*a*b*- und CIECAM02-Modus möglich.\n\nFür den CIECAM02-Modus müssen folgende Optionen aktiviert sein:\n1. CIECAM02\n2. Algorithmus = Helligkeit + Farbigkeit (QM)\n3. Tonwertkorrektur mittels CIECAM02-Helligkeit (Q)
TP_EXPOSURE_AUTOLEVELS;Auto
TP_EXPOSURE_AUTOLEVELS_TIP;Automatische Belichtungseinstellung\nbasierend auf Bildanalyse.
TP_EXPOSURE_BLACKLEVEL;Schwarzwert
@@ -2037,6 +2042,10 @@ TP_SHARPENMICRO_CONTRAST;Kontrastschwelle
TP_SHARPENMICRO_LABEL;Mikrokontrast
TP_SHARPENMICRO_MATRIX;3×3-Matrix statt 5×5-Matrix
TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
+TP_TM_FATTAL_AMOUNT;Intensität
+TP_TM_FATTAL_ANCHOR;Helligkeitsverschiebung
+TP_TM_FATTAL_LABEL;Dynamikkompression
+TP_TM_FATTAL_THRESHOLD;Schwelle
TP_VIBRANCE_AVOIDCOLORSHIFT;Farbverschiebungen vermeiden
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;Hautfarbtöne
@@ -2221,7 +2230,7 @@ TP_WAVELET_TILESIZE;Kachelgröße
TP_WAVELET_TILESLIT;Kleine Kacheln
TP_WAVELET_TILES_TOOLTIP;“Ganzes Bild“ (empfohlen) liefert eine bessere Qualität.\n“Kacheln“ benötigen weniger Speicher und ist nur für\nComputer mit wenig RAM zu empfehlen.
TP_WAVELET_TMSTRENGTH;Intensität
-TP_WAVELET_TMSTRENGTH_TOOLTIP;Kontrolliert die Intensität der Dynamik- oder\nKontrastkompression des Restbildes. Ist der\nWert ungleich 0, werden die Intensitäts- und\nGammaregler des Dynamikkompressions-\nWerkzeugs im Belichtungsreiter deaktiviert.
+TP_WAVELET_TMSTRENGTH_TOOLTIP;Kontrolliert die Intensität der Dynamik- oder\nKontrastkompression des Restbildes. Ist der\nWert ungleich 0, werden die Intensitäts- und\nGammaregler des Tonwertkorrektur-\nWerkzeugs im Belichtungsreiter deaktiviert.
TP_WAVELET_TMTYPE;Kompression
TP_WAVELET_TON;Tönung
TP_WBALANCE_AUTO;Automatisch
@@ -2284,12 +2293,9 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: -
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
-!HISTORY_MSG_488;Dynamic Range Compression
-!HISTORY_MSG_489;DRC - Threshold
-!HISTORY_MSG_490;DRC - Amount
-!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!TP_TM_FATTAL_AMOUNT;Amount
-!TP_TM_FATTAL_ANCHOR;Anchor
-!TP_TM_FATTAL_LABEL;Dynamic Range Compression
-!TP_TM_FATTAL_THRESHOLD;Threshold
+!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
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 3df222ced..9ba753ef5 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -814,6 +814,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_491;White Balance
!HISTORY_MSG_492;RGB Curves
!HISTORY_MSG_493;L*a*b* Adjustments
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -822,6 +823,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1775,8 +1777,10 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
@@ -1784,6 +1788,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1800,6 +1805,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index e639b0866..88254c317 100644
--- a/rtdata/languages/English (US)
+++ b/rtdata/languages/English (US)
@@ -728,6 +728,7 @@
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -736,6 +737,7 @@
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1762,8 +1764,10 @@
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
@@ -1771,6 +1775,7 @@
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FALSECOLOR;False color suppression steps
!TP_RAW_FAST;Fast
@@ -1788,6 +1793,7 @@
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index c20a54871..5f4866261 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -1708,6 +1708,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1716,6 +1717,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1977,9 +1979,12 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_RAWCACORR_CASTR;Strength
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1993,6 +1998,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index b1a005afe..59a73eee7 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -979,6 +979,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -987,6 +988,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1813,14 +1815,17 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1837,6 +1842,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index 4e5435f71..8ab919cc2 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -1464,7 +1464,7 @@ TP_DIRPYRDENOISE_CHROMINANCE_METHODADVANCED_TOOLTIP;Manuel\nAgit sur l'image ent
TP_DIRPYRDENOISE_CHROMINANCE_METHOD_TOOLTIP;Manuel\nAgit sur l'image entière.\nVous controlez les paramètres de réduction de bruit manuellement.\n\nGlobal automatique\nAgit sur l'image entière.\n9 zones sont utilisées pour calculer un réglage de réduction de bruit de chroma.\n\nAutomatique multi-zones\nPas d'aperçu - ne fonctionne que lors de l'enregistrement, mais utiliser la méthode "Aperçu" en faisant correspondre la taille et le centre de la tuile à la taille et au centre de l'aperçu, vous permet d'avoir une idée des résultats attendus.\nL'image est divisé en tuiles (entre 10 et 70 en fonction de la taille de l'image) et chaque tuile reçoit son propre réglage de réduction de bruit de chrominance.\n\nAperçu\nAgit sur l'image entière.\nLa partie de l'image visible dans l'aperçu est utilisé pour calculer un réglage de réduction de bruit de chroma.
TP_DIRPYRDENOISE_CHROMINANCE_PMZ;Aperçu multi-zones
TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW;Aperçu
-TP_DIRPYRDENOISE_CHROMINANCE_PREVIEWRESIDUAL_INFO_TOOLTIP;Affiche les niveaux de bruit résiduel de la partie de l'image visible dans l'aperçu après les ondelettes.\n\n>300 Très bruité\n100-300 Bruité\n50-100 Peu bruité\n<50 Très peu bruité\n\nAttention, les valeurs diffèreront entre le mode RVB et L*a*b*. Les valeurs RVB sont moins précises car le mode RVB ne séparent pas complètement la luminance et la chrominance.
+TP_DIRPYRDENOISE_CHROMINANCE_PREVIEWRESIDUAL_INFO_TOOLTIP;Affiche les niveaux de bruit résiduels de la partie de l'image visible dans l'aperçu après les ondelettes.\n\n>300 Très bruité\n100-300 Bruité\n50-100 Peu bruité\n<50 Très peu bruité\n\nAttention, les valeurs diffèreront entre le mode RVB et L*a*b*. Les valeurs RVB sont moins précises car le mode RVB ne séparent pas complètement la luminance et la chrominance.
TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO;Taille de l'aperçu=%1, Centre: Px=%2 Py=%3
TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO;Bruit de l'aperçu: Moyen=%1 Haut=%2
TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO_EMPTY;Bruit de l'aperçu: Moyen= - Haut= -
@@ -1478,18 +1478,18 @@ TP_DIRPYRDENOISE_LUMINANCE_CURVE;Courbe de luminance
TP_DIRPYRDENOISE_LUMINANCE_DETAIL;Niveau de détails de Luminance
TP_DIRPYRDENOISE_LUMINANCE_FRAME;Luminance
TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING;Luminance
-TP_DIRPYRDENOISE_MAIN_COLORSPACE;Méthode
+TP_DIRPYRDENOISE_MAIN_COLORSPACE;Espace colorimétrique
TP_DIRPYRDENOISE_MAIN_COLORSPACE_LAB;Lab
TP_DIRPYRDENOISE_MAIN_COLORSPACE_LABEL;Réduction du bruit
TP_DIRPYRDENOISE_MAIN_COLORSPACE_RGB;RVB
TP_DIRPYRDENOISE_MAIN_COLORSPACE_TOOLTIP;Pour les images raw, les méthodes RVB ou Lab peuvent être utilisées.\n\nPour les images non-raw la méthode Lab sera utilisée, indépendamment de ce qu'indique ce bouton.
TP_DIRPYRDENOISE_MAIN_GAMMA;Gamma
TP_DIRPYRDENOISE_MAIN_GAMMA_TOOLTIP;Gamma fait varier la quantité de réduction de bruit sur l'échelle des tons. Les plus petites valeurs cibleront les ombres, les plus hautes valeurs cibleront les tons les plus clairs.
-TP_DIRPYRDENOISE_MAIN_MODE;Qualité
-TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Haut
-TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Standard
-TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;La qualité peut être adapté à la trame du bruit. Régler sur "haut" augmentera l'effet de la réduction de bruit au prix d'un temps de traitement plus long.
-TP_DIRPYRDENOISE_MEDIAN_METHOD;Méthode
+TP_DIRPYRDENOISE_MAIN_MODE;Mode
+TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;Agressif
+TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;Conservatif
+TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;"Conservatif" préserve les motifs chromatiques de basse fréquence tandis que "agressif" les efface.
+TP_DIRPYRDENOISE_MEDIAN_METHOD;Méthode médiane
TP_DIRPYRDENOISE_MEDIAN_METHOD_CHROMINANCE;Chroma uniquement
TP_DIRPYRDENOISE_MEDIAN_METHOD_LAB;L*a*b*
TP_DIRPYRDENOISE_MEDIAN_METHOD_LABEL;Filtre Médian
@@ -2205,7 +2205,9 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -2226,6 +2228,10 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!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_AMAZEVNG4;AMaZE+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.
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index 15d2dcc60..8d9cd5815 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -978,6 +978,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -986,6 +987,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1812,14 +1814,17 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1836,6 +1841,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 8eed4426e..223d2e45c 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -979,6 +979,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -987,6 +988,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1813,14 +1815,17 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1837,6 +1842,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 898bfb188..9a7db12e9 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -1583,6 +1583,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1591,6 +1592,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1915,9 +1917,12 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!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_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1931,6 +1936,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 41672fd6c..540b59521 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -164,7 +164,7 @@ FILEBROWSER_MOVETODARKFDIR;ダークフレーム・ディレクトリに移動
FILEBROWSER_MOVETOFLATFIELDDIR;フラットフィールド・ディレクトリに移動
FILEBROWSER_NEW_NAME;新しい名前:
FILEBROWSER_OPENDEFAULTVIEWER;Windowsのデフォルト・ビューア（キュー処理）
-FILEBROWSER_PARTIALPASTEPROFILE;プロファイルの貼り付け - 一部
+FILEBROWSER_PARTIALPASTEPROFILE;プロファイルの貼り付け - 一部
FILEBROWSER_PASTEPROFILE;プロファイルの貼り付け
FILEBROWSER_POPUPCANCELJOB;ジョブ キャンセル
FILEBROWSER_POPUPCOLORLABEL;カラー・ラベル
@@ -186,11 +186,11 @@ FILEBROWSER_POPUPPROCESSFAST;キューに追加 (高速書き出し)
FILEBROWSER_POPUPPROFILEOPERATIONS;プロファイルの操作
FILEBROWSER_POPUPRANK;ランク
FILEBROWSER_POPUPRANK0;ランクなし
-FILEBROWSER_POPUPRANK1;ランク 1 *
+FILEBROWSER_POPUPRANK1;ランク 1 *
FILEBROWSER_POPUPRANK2;ランク 2 **
-FILEBROWSER_POPUPRANK3;ランク 3 ***
-FILEBROWSER_POPUPRANK4;ランク 4 ****
-FILEBROWSER_POPUPRANK5;ランク 5 *****
+FILEBROWSER_POPUPRANK3;ランク 3 ***
+FILEBROWSER_POPUPRANK4;ランク 4 ****
+FILEBROWSER_POPUPRANK5;ランク 5 *****
FILEBROWSER_POPUPREMOVE;ファイルシステムから削除
FILEBROWSER_POPUPREMOVEINCLPROC;ファイルシステムとバッチの結果から削除
FILEBROWSER_POPUPRENAME;名前変更
@@ -530,15 +530,15 @@ HISTORY_MSG_248;L*a*b* HH カーブ
HISTORY_MSG_249;ディテールレベルのコントラスト - しきい値
HISTORY_MSG_250;ノイズ低減 - 強化
HISTORY_MSG_251;白黒 - アルゴリズム
-HISTORY_MSG_252;CbDL 肌色の目標/保護
-HISTORY_MSG_253;CbDL アーティファクトを軽減
-HISTORY_MSG_254;CbDL 肌色の色相
-HISTORY_MSG_255;ノイズ低減 - メディアン
+HISTORY_MSG_252;CbDL 肌色の目標/保護
+HISTORY_MSG_253;CbDL アーティファクトを軽減
+HISTORY_MSG_254;CbDL 肌色の色相
+HISTORY_MSG_255;ノイズ低減 - メディアン
HISTORY_MSG_256;ノイズ低減 - フィルターの種類
HISTORY_MSG_257;カラートーン調整
HISTORY_MSG_258;カラートーン調整 - カラーのカーブ
HISTORY_MSG_259;カラートーン調整 - 不透明度のカーブ
-HISTORY_MSG_260;カラートーン調整 - a*(b*)の不透明度
+HISTORY_MSG_260;カラートーン調整 - a*(b*)の不透明度
HISTORY_MSG_261;カラートーン調整 - 方法
HISTORY_MSG_262;カラートーン調整 - b*の不透明度
HISTORY_MSG_263;カラートーン調整 - シャドウのレッド
@@ -550,7 +550,7 @@ HISTORY_MSG_268;カラートーン調整 - 中間トーンのブルー
HISTORY_MSG_269;カラートーン調整 - ハイライトのレッド
HISTORY_MSG_270;カラートーン調整 - ハイライトのグリーン
HISTORY_MSG_271;カラートーン調整 - ハイライトのブルー
-HISTORY_MSG_272;カラートーン調整 - バランス
+HISTORY_MSG_272;カラートーン調整 - バランス
HISTORY_MSG_273;カラートーン調整 - SMHでカラーバランス
HISTORY_MSG_274;カラートーン調整 - シャドウの彩度
HISTORY_MSG_275;カラートーン調整 - ハイライトの彩度
@@ -558,7 +558,7 @@ HISTORY_MSG_276;カラートーン調整 - 不透明度
HISTORY_MSG_277;カラートーン調整 - カーブをリセット
HISTORY_MSG_278;カラートーン調整 - 明度を維持
HISTORY_MSG_279;カラートーン調整 - シャドウ
-HISTORY_MSG_280;カラートーン調整 - ハイライト
+HISTORY_MSG_280;カラートーン調整 - ハイライト
HISTORY_MSG_281;カラートーン調整 - 彩度の保護
HISTORY_MSG_282;カラートーン調整 - 彩度のしきい値
HISTORY_MSG_283;カラートーン調整 - 強さを維持
@@ -583,7 +583,7 @@ HISTORY_MSG_301;輝度ノイズの調整方法
HISTORY_MSG_302;色ノイズの調整方法
HISTORY_MSG_303;色ノイズの調整方法
HISTORY_MSG_304;W- コントラストレベル
-HISTORY_MSG_305;ウェーブレットのレベル
+HISTORY_MSG_305;ウェーブレット
HISTORY_MSG_306;W- プロセス
HISTORY_MSG_307;W- プレビュー
HISTORY_MSG_308;W- プレビューの方向
@@ -623,8 +623,8 @@ HISTORY_MSG_341;W- エッジパフォーマンス
HISTORY_MSG_342;W- ES 最初のレベル
HISTORY_MSG_343;W- 色度のレベル
HISTORY_MSG_344;W- 色度 方式 スライダー/カーブ
-HISTORY_MSG_345;W- ES ローカルコントラスト
-HISTORY_MSG_346;W- ES ローカルコントラスト 方式
+HISTORY_MSG_345;W- ES ローカルコントラスト
+HISTORY_MSG_346;W- ES ローカルコントラスト 方式
HISTORY_MSG_347;W- ノイズ低減とリファイン レベル1
HISTORY_MSG_348;W- ノイズ低減とリファイン レベル2
HISTORY_MSG_349;W- ノイズ低減とリファイン レベル3
@@ -750,6 +750,9 @@ HISTORY_MSG_484;CAM02 - 撮影環境のYb 自動
HISTORY_MSG_485;レンズ補正
HISTORY_MSG_486;レンズ補正 - カメラ
HISTORY_MSG_487;レンズ補正 - レンズ
+HISTORY_MSG_488;ダイナミックレンジ圧縮
+HISTORY_MSG_489;DRC - しきい値
+HISTORY_MSG_490;DRC - 量
HISTORY_MSG_491;ホワイトバランス
HISTORY_MSG_492;RGBカーブ
HISTORY_MSG_493;L*a*b*調整
@@ -767,6 +770,7 @@ HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;ラインノイズフィルタの
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAFラインフィルタ
HISTORY_MSG_PRSHARPEN_CONTRAST;PRS - コントラストのしきい値
HISTORY_MSG_SHARPENING_CONTRAST;シャープ化 - コントラストのしきい値
+HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - アンカー
HISTORY_NEWSNAPSHOT;追加
HISTORY_NEWSNAPSHOT_TOOLTIP;ショートカット: Alt-s
HISTORY_SNAPSHOT;スナップショット
@@ -979,6 +983,7 @@ PARTIALPASTE_SHADOWSHIGHLIGHTS;シャドウ/ハイライト
PARTIALPASTE_SHARPENEDGE;エッジ
PARTIALPASTE_SHARPENING;シャープ化 (USM/RL)
PARTIALPASTE_SHARPENMICRO;マイクロコントラスト
+PARTIALPASTE_TM_FATTAL;ダイナミックレンジ圧縮
PARTIALPASTE_VIBRANCE;自然な彩度
PARTIALPASTE_VIGNETTING;周辺光量補正
PARTIALPASTE_WAVELETGROUP;ウェーブレット処理
@@ -1522,10 +1527,10 @@ TP_DIRPYRDENOISE_CHROMINANCE_METHODADVANCED_TOOLTIP;手動\n画像全体に作
TP_DIRPYRDENOISE_CHROMINANCE_METHOD_TOOLTIP;手動\n画像全体に作用します\nノイズ低減の設定を手動で行います\n\n自動（分割方式）\n画像全体に作用します\n画像を9つに分割して、そこから全体の色ノイズ低減に適した設定を自動的に行います\n\n自動（多分割方式）\nプレビュー画像には反映されません-保存画像だけに反映されます。但し、タイルサイズとその中心をプレビューサイズとその中心にマッチさせる〝プレビュー”方式を使えば、効果がどれ位か予測がつきます。\n画像をタイル状に分割し（タイル数は画像サイズ次第で、10～70枚になります）、各タイルにあった色ノイズ低減の設定を自動で行います\n\n自動（プレビュー方式）\n画像全体に作用します\nプレビューで見えている画像の一部を使って全体の色ノイズ低減に適した設定を自動で行います
TP_DIRPYRDENOISE_CHROMINANCE_PMZ;自動（プレビュー方式）
TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW;プレビュー方式
-TP_DIRPYRDENOISE_CHROMINANCE_PREVIEWRESIDUAL_INFO_TOOLTIP;ウェーブレット変換後、プレビューで見える部分画像で残ったノイズのレベルを表示します\n\n>300以上 非常にノイズが多い\n100～300 ノイズが多い\n50～100 ノイズが少ない\n50以下 ノイズが非常に少ない\n\n算出値はRGBとL*a*b*モードでは異なります。RGBモードは輝度と色を完全に切り離すことが出来ないので、算出値の精度は劣ります。
-TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO;プレビューのサイズ=%1, 中心: Px=%2 Py=%3
-TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO;プレビューのノイズ: 中間色度=%1 高色度=%2
-TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO_EMPTY;プレビューのノイズ: 中間色度= - 高色度= -
+TP_DIRPYRDENOISE_CHROMINANCE_PREVIEWRESIDUAL_INFO_TOOLTIP;ウェーブレット変換後、プレビューに表示されている画像のノイズのレベルを表示します\n\n>300以上 非常にノイズが多い\n100～300 ノイズが多い\n50～100 ノイズが少ない\n50以下 ノイズが非常に少ない\n\n算出値はRGBとL*a*b*モードでは異なります。RGBモードは輝度と色を完全に切り離すことが出来ないので、算出値の精度は劣ります。
+TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_INFO;プレビュー画像のサイズ=%1, 中心: Px=%2 Py=%3
+TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO;プレビュー画像のノイズ: 平均値=%1 最大値=%2
+TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_NOISEINFO_EMPTY;プレビュー画像のノイズ: 平均値= - 最大値= -
TP_DIRPYRDENOISE_CHROMINANCE_PREVIEW_TILEINFO;タイルのサイズ=%1, 中心位置: X座標=%2 Y座標=%3
TP_DIRPYRDENOISE_CHROMINANCE_REDGREEN;色差 レッド/グリーン
TP_DIRPYRDENOISE_ENH;強化モード
@@ -1536,17 +1541,17 @@ TP_DIRPYRDENOISE_LUMINANCE_CURVE;輝度カーブ
TP_DIRPYRDENOISE_LUMINANCE_DETAIL;輝度 細部の復元
TP_DIRPYRDENOISE_LUMINANCE_FRAME;輝度ノイズ
TP_DIRPYRDENOISE_LUMINANCE_SMOOTHING;輝度
-TP_DIRPYRDENOISE_MAIN_COLORSPACE;方式
+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;ガンマ
TP_DIRPYRDENOISE_MAIN_GAMMA_TOOLTIP;ガンマは、トーンの範囲全体でノイズ低減の量を変化させます。値が大きいほど明るいトーンに効果を及ぼし、値が小さいほどシャドウをターゲットにします
-TP_DIRPYRDENOISE_MAIN_MODE;ノイズ低減の質
-TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;高い
-TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;標準
-TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;ノイズの状態に応じて低減効果の質を選べます：1-標準 2－高い\n2の方がノイズ低減効果は高くなりますが、その分処理時間が増えます。
+TP_DIRPYRDENOISE_MAIN_MODE;モード
+TP_DIRPYRDENOISE_MAIN_MODE_AGGRESSIVE;積極的
+TP_DIRPYRDENOISE_MAIN_MODE_CONSERVATIVE;控えめ
+TP_DIRPYRDENOISE_MAIN_MODE_TOOLTIP;”控えめ”モードは低周波の色度パターンが維持されますが、”積極的”モードではそれらも取り除かれます
TP_DIRPYRDENOISE_MEDIAN_METHOD;方式
TP_DIRPYRDENOISE_MEDIAN_METHOD_CHROMINANCE;色ノイズだけ
TP_DIRPYRDENOISE_MEDIAN_METHOD_LAB;L*a*b*
@@ -1619,7 +1624,7 @@ TP_EXPOSURE_TCMODE_SATANDVALBLENDING;彩度と明度のブレンド
TP_EXPOSURE_TCMODE_STANDARD;標準
TP_EXPOSURE_TCMODE_WEIGHTEDSTD;加重平均
TP_EXPOS_BLACKPOINT_LABEL;raw ブラック・ポイント
-TP_EXPOS_WHITEPOINT_LABEL;raw ホワイト・ポイント
+TP_EXPOS_WHITEPOINT_LABEL;raw ホワイト・ポイント
TP_FILMSIMULATION_LABEL;フィルムシミュレーション
TP_FILMSIMULATION_SLOWPARSEDIR;RawTherapeeはフィルムシミュレーション機能に使う画像をHald CLUTフォルダーの中から探すよう設計されています（プログラムに組み込むにはフォルダーが大き過ぎるため）。\n変更するには、環境設定 > 画像処理 > フィルムシミュレーションと進み\nどのフォルダーが使われているか確認します。機能を利用する場合は、Hald CLUTだけが入っているフォルダーを指定するか、 この機能を使わない場合はそのフォルダーを空にしておきます。\n\n詳しくはRawPediaを参照して下さい。\n\nフィルム画像のスキャンを止めますか？
TP_FILMSIMULATION_STRENGTH;強さ
@@ -1998,6 +2003,10 @@ TP_SHARPENMICRO_CONTRAST;コントラストのしきい値
TP_SHARPENMICRO_LABEL;マイクロコントラスト
TP_SHARPENMICRO_MATRIX;3×3マトリクスの代わりに 5×5
TP_SHARPENMICRO_UNIFORMITY;均等
+TP_TM_FATTAL_AMOUNT;量
+TP_TM_FATTAL_ANCHOR;アンカー
+TP_TM_FATTAL_LABEL;ダイナミックレンジ圧縮
+TP_TM_FATTAL_THRESHOLD;しきい値
TP_VIBRANCE_AVOIDCOLORSHIFT;色ずれを回避
TP_VIBRANCE_CURVEEDITOR_SKINTONES;HH
TP_VIBRANCE_CURVEEDITOR_SKINTONES_LABEL;肌色トーン
@@ -2245,12 +2254,9 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
! Untranslated keys follow; remove the ! prefix after an entry is translated.
!!!!!!!!!!!!!!!!!!!!!!!!!
-!HISTORY_MSG_488;Dynamic Range Compression
-!HISTORY_MSG_489;DRC - Threshold
-!HISTORY_MSG_490;DRC - Amount
-!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
-!PARTIALPASTE_TM_FATTAL;Dynamic Range Compression
-!TP_TM_FATTAL_AMOUNT;Amount
-!TP_TM_FATTAL_ANCHOR;Anchor
-!TP_TM_FATTAL_LABEL;Dynamic Range Compression
-!TP_TM_FATTAL_THRESHOLD;Threshold
+!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
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 6f3d76156..d951d2461 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -979,6 +979,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -987,6 +988,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1813,14 +1815,17 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1837,6 +1842,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 6d8e29d59..70489ded5 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -1252,6 +1252,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1260,6 +1261,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1887,12 +1889,15 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!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_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1908,6 +1913,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index 35d07dcef..aa96073a4 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -2143,6 +2143,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -2151,6 +2152,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -2236,7 +2238,11 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!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_AMAZEVNG4;AMaZE+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
!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_PIXELSHIFTEQUALBRIGHTCHANNEL;Equalize per channel
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index db3a3b569..b433dc902 100644
--- a/rtdata/languages/Norsk BM
+++ b/rtdata/languages/Norsk BM
@@ -978,6 +978,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -986,6 +987,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1812,14 +1814,17 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1836,6 +1841,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index 021c3b1e8..b9b336f3f 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -1665,6 +1665,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1673,6 +1674,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1924,9 +1926,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_RAWCACORR_CASTR;Strength
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1940,6 +1945,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index f34fb4791..19ca6a4dd 100644
--- a/rtdata/languages/Polish (Latin Characters)
+++ b/rtdata/languages/Polish (Latin Characters)
@@ -1665,6 +1665,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1673,6 +1674,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1924,9 +1926,12 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_RAWCACORR_CASTR;Strength
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1940,6 +1945,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 6fa8881a4..961b18455 100644
--- a/rtdata/languages/Portugues (Brasil)
+++ b/rtdata/languages/Portugues (Brasil)
@@ -1633,7 +1633,9 @@ TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolado
!HISTORY_MSG_488;Dynamic Range Compression
!HISTORY_MSG_489;DRC - Threshold
!HISTORY_MSG_490;DRC - Amount
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!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_SHARPENING_CONTRAST;Sharpening - Contrast threshold
!HISTORY_MSG_TM_FATTAL_ANCHOR;DRC - Anchor
@@ -1766,8 +1768,10 @@ TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolado
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
@@ -1775,6 +1779,7 @@ TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolado
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FALSECOLOR;False color suppression steps
!TP_RAW_FAST;Fast
@@ -1792,6 +1797,7 @@ TP_ICM_DCPILLUMINANT_INTERPOLATED;Interpolado
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 6ca6b1066..089381e47 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -1645,7 +1645,9 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!HISTORY_MSG_490;DRC - Amount
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1942,9 +1944,13 @@ ZOOMPANEL_ZOOMOUT;Отдалить\nГорячая клавиша: -
!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_AMAZEVNG4;AMaZE+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.
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 863fc6a69..ddfb8b80d 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)
+++ b/rtdata/languages/Serbian (Cyrilic Characters)
@@ -1559,6 +1559,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1567,6 +1568,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1916,9 +1918,12 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!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_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1932,6 +1937,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index d0d7f4155..3af583ba8 100644
--- a/rtdata/languages/Serbian (Latin Characters)
+++ b/rtdata/languages/Serbian (Latin Characters)
@@ -1559,6 +1559,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1567,6 +1568,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1916,9 +1918,12 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!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_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1932,6 +1937,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index edccb8924..3ba135a71 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -1041,6 +1041,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1049,6 +1050,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1827,12 +1829,15 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1849,6 +1854,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index d1e898b91..ce22a396b 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -980,6 +980,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -988,6 +989,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1813,14 +1815,17 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1837,6 +1842,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index ee93aa468..819cf8340 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -1945,6 +1945,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -1953,6 +1954,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -2108,9 +2110,12 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!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_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HPHD;HPHD
@@ -2122,6 +2127,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index 9ae60cf81..e57ab4c1e 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -979,6 +979,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_493;L*a*b* Adjustments
!HISTORY_MSG_CLAMPOOG;Out-of-gamut color clipping
!HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+!HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
!HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
!HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
!HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -987,6 +988,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
!HISTORY_MSG_METADATA_MODE;Metadata copy mode
!HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+!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
@@ -1812,14 +1814,17 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RAWEXPOS_TWOGREEN;Link greens
!TP_RAW_1PASSMEDIUM;1-Pass (Medium)
!TP_RAW_3PASSBEST;3-Pass (Best)
+!TP_RAW_4PASS;4-Pass
!TP_RAW_AHD;AHD
!TP_RAW_AMAZE;AMaZE
+!TP_RAW_AMAZEVNG4;AMaZE+VNG4
!TP_RAW_DCB;DCB
!TP_RAW_DCBENHANCE;DCB enhancement
!TP_RAW_DCBITERATIONS;Number of DCB iterations
!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.
+!TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
!TP_RAW_EAHD;EAHD
!TP_RAW_FAST;Fast
!TP_RAW_HD;Threshold
@@ -1836,6 +1841,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RAW_NONE;None (Shows sensor pattern)
!TP_RAW_PIXELSHIFT;Pixel Shift
!TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+!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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtdata/languages/default b/rtdata/languages/default
index e83ad4387..48372a552 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -849,6 +849,7 @@ HISTORY_MSG_LOCNOISELEQUAL;Local - deNoise Equalizer white-black
HISTORY_MSG_LOCSHAPEMETH;Local - Shape Rt-spot method
HISTORY_MSG_LOCSPOTDUP;Local - Spot duplicated
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
+HISTORY_MSG_DUALDEMOSAIC_CONTRAST;AMaZE+VNG4 - Contrast threshold
HISTORY_MSG_HISTMATCHING;Auto-Matched Tone Curve
HISTORY_MSG_LOCALCONTRAST_AMOUNT;Local Contrast - Amount
HISTORY_MSG_LOCALCONTRAST_DARKNESS;Local Contrast - Darkness
@@ -857,6 +858,7 @@ HISTORY_MSG_LOCALCONTRAST_LIGHTNESS;Local Contrast - Lightness
HISTORY_MSG_LOCALCONTRAST_RADIUS;Local Contrast - Radius
HISTORY_MSG_METADATA_MODE;Metadata copy mode
HISTORY_MSG_MICROCONTRAST_CONTRAST;Microcontrast - Contrast threshold
+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
@@ -979,6 +981,7 @@ MAIN_TOOLTIP_INDCLIPPEDH;Clipped highlight indication.\nShortcut: <
MAIN_TOOLTIP_INDCLIPPEDS;Clipped shadow indication.\nShortcut: >
MAIN_TOOLTIP_PREVIEWB;Preview the Blue channel.\nShortcut: b
MAIN_TOOLTIP_PREVIEWFOCUSMASK;Preview the Focus Mask.\nShortcut: Shift-f\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 Sharpening Contrast Mask.\nShortcut: None\n\nOnly works when sharpening is enabled and zoom >= 100%
MAIN_TOOLTIP_PREVIEWG;Preview the Green channel.\nShortcut: g
MAIN_TOOLTIP_PREVIEWL;Preview the Luminosity.\nShortcut: v\n\n0.299*R + 0.587*G + 0.114*B
MAIN_TOOLTIP_PREVIEWR;Preview the Red channel.\nShortcut: r
@@ -2019,8 +2022,10 @@ 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_AHD;AHD
TP_RAW_AMAZE;AMaZE
+TP_RAW_AMAZEVNG4;AMaZE+VNG4
TP_RAW_DCB;DCB
TP_RAW_DCBENHANCE;DCB enhancement
TP_RAW_DCBITERATIONS;Number of DCB iterations
@@ -2028,6 +2033,7 @@ TP_RAW_DMETHOD;Method
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.
+TP_RAW_DUALDEMOSAICCONTRAST;Contrast threshold
TP_RAW_EAHD;EAHD
TP_RAW_FALSECOLOR;False color suppression steps
TP_RAW_FAST;Fast
@@ -2045,6 +2051,7 @@ TP_RAW_MONO;Mono
TP_RAW_NONE;None (Shows sensor pattern)
TP_RAW_PIXELSHIFT;Pixel Shift
TP_RAW_PIXELSHIFTBLUR;Blur motion mask
+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_PIXELSHIFTEQUALBRIGHT;Equalize brightness of frames
diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
index a14027233..06e398fad 100644
--- a/rtengine/CMakeLists.txt
+++ b/rtengine/CMakeLists.txt
@@ -33,6 +33,7 @@ set(RTENGINESOURCEFILES
FTblockDN.cc
PF_correct_RT.cc
amaze_demosaic_RT.cc
+ amaze_vng4_demosaic_RT.cc
cJSON.c
calc_distort.cc
camconst.cc
@@ -123,6 +124,7 @@ set(RTENGINESOURCEFILES
gamutwarning.cc
ipshadowshighlights.cc
xtrans_demosaic.cc
+ vng4_demosaic_RT.cc
)
if(LENSFUN_HAS_LOAD_DIRECTORY)
diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc
index 4fe0bee69..1e1b97768 100644
--- a/rtengine/amaze_demosaic_RT.cc
+++ b/rtengine/amaze_demosaic_RT.cc
@@ -38,7 +38,7 @@
namespace rtengine
{
-void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, array2D &rawData, array2D &red, array2D &green, array2D &blue)
+void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue)
{
BENCHFUN
diff --git a/rtengine/amaze_vng4_demosaic_RT.cc b/rtengine/amaze_vng4_demosaic_RT.cc
new file mode 100644
index 000000000..08e142a4e
--- /dev/null
+++ b/rtengine/amaze_vng4_demosaic_RT.cc
@@ -0,0 +1,93 @@
+////////////////////////////////////////////////////////////////
+//
+// combined AMaZE + VNG4 demosaic algorithm
+//
+//
+// copyright (c) 2018 Ingo Weyrich
+//
+// 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 .
+//
+////////////////////////////////////////////////////////////////
+
+#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 &rawData, array2D &red, array2D &green, array2D &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 redTmp(winw, winh);
+ array2D greenTmp(winw, winh);
+ array2D blueTmp(winw, winh);
+ array2D 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 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]);
+ }
+ }
+
+}
+}
diff --git a/rtengine/camconst.cc b/rtengine/camconst.cc
index 3d4342ed9..43de5d688 100644
--- a/rtengine/camconst.cc
+++ b/rtengine/camconst.cc
@@ -25,6 +25,7 @@ CameraConst::CameraConst() : pdafOffset(0)
memset(raw_crop, 0, sizeof(raw_crop));
memset(raw_mask, 0, sizeof(raw_mask));
white_max = 0;
+ globalGreenEquilibration = -1;
}
@@ -310,17 +311,17 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
}
}
- ji = cJSON_GetObjectItem(js, "pdafPattern");
+ ji = cJSON_GetObjectItem(js, "pdaf_pattern");
if (ji) {
if (ji->type != cJSON_Array) {
- fprintf(stderr, "\"pdafPattern\" must be an array\n");
+ fprintf(stderr, "\"pdaf_pattern\" must be an array\n");
goto parse_error;
}
for (ji = ji->child; ji != nullptr; ji = ji->next) {
if (ji->type != cJSON_Number) {
- fprintf(stderr, "\"pdafPattern\" array must contain numbers\n");
+ fprintf(stderr, "\"pdaf_pattern\" array must contain numbers\n");
goto parse_error;
}
@@ -328,17 +329,28 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
}
}
- ji = cJSON_GetObjectItem(js, "pdafOffset");
+ ji = cJSON_GetObjectItem(js, "pdaf_offset");
if (ji) {
if (ji->type != cJSON_Number) {
- fprintf(stderr, "\"pdafOffset\" must contain a number\n");
+ fprintf(stderr, "\"pdaf_offset\" must contain a number\n");
goto parse_error;
}
cc->pdafOffset = ji->valueint;
}
+ ji = cJSON_GetObjectItem(js, "global_green_equilibration");
+
+ if (ji) {
+ if (ji->type != cJSON_False && ji->type != cJSON_True) {
+ fprintf(stderr, "\"global_green_equilibration\" must be a boolean\n");
+ goto parse_error;
+ }
+
+ cc->globalGreenEquilibration = (ji->type == cJSON_True);
+ }
+
return cc;
parse_error:
@@ -606,6 +618,24 @@ CameraConst::get_WhiteLevel(const int idx, const int iso_speed, const float fnum
return lvl.levels[idx];
}
+bool
+CameraConst::has_globalGreenEquilibration()
+{
+ return globalGreenEquilibration >= 0;
+}
+
+bool
+CameraConst::get_globalGreenEquilibration()
+{
+ return globalGreenEquilibration > 0;
+}
+
+void
+CameraConst::update_globalGreenEquilibration(bool other)
+{
+ globalGreenEquilibration = (other ? 1 : 0);
+}
+
bool
CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
{
@@ -739,6 +769,9 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
existingcc->update_Crop(cc);
existingcc->update_pdafPattern(cc->get_pdafPattern());
existingcc->update_pdafOffset(cc->get_pdafOffset());
+ if (cc->has_globalGreenEquilibration()) {
+ existingcc->update_globalGreenEquilibration(cc->get_globalGreenEquilibration());
+ }
if (settings->verbose) {
printf("Merging camera constants for \"%s\"\n", make_model.c_str());
diff --git a/rtengine/camconst.h b/rtengine/camconst.h
index 60e17201b..eb43da483 100644
--- a/rtengine/camconst.h
+++ b/rtengine/camconst.h
@@ -26,6 +26,8 @@ private:
std::map mApertureScaling;
std::vector pdafPattern;
int pdafOffset;
+ int globalGreenEquilibration;
+
CameraConst();
static bool parseLevels(CameraConst *cc, int bw, void *ji);
static bool parseApertureScaling(CameraConst *cc, void *ji);
@@ -45,10 +47,13 @@ public:
void get_rawMask(int idx, int& top, int& left, int& bottom, int& right);
int get_BlackLevel(int idx, int iso_speed);
int get_WhiteLevel(int idx, int iso_speed, float fnumber);
+ bool has_globalGreenEquilibration();
+ bool get_globalGreenEquilibration();
void update_Levels(const CameraConst *other);
void update_Crop(CameraConst *other);
void update_pdafPattern(const std::vector &other);
void update_pdafOffset(int other);
+ void update_globalGreenEquilibration(bool other);
};
class CameraConstantsStore
diff --git a/rtengine/camconst.json b/rtengine/camconst.json
index 597c5e4d4..449484e8a 100644
--- a/rtengine/camconst.json
+++ b/rtengine/camconst.json
@@ -83,10 +83,10 @@ Examples:
// instead, to take care of possible light leaks from the light sensing area to the optically black (masked)
// area or sensor imperfections at the outer borders.
- // list of indices of the rows with on-sensor PDAF pixels, for cameras that have such features. The indices here form a pattern that is repeated for the whole height of the sensor. The values are relative to the "pdafOffset" value (see below)
- "pdafPattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
+ // list of indices of the rows with on-sensor PDAF pixels, for cameras that have such features. The indices here form a pattern that is repeated for the whole height of the sensor. The values are relative to the "pdaf_offset" value (see below)
+ "pdaf_pattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
// index of the first row of the PDAF pattern in the sensor (0 is the topmost row). Allowed to be negative for convenience (this means that the first repetition of the pattern doesn't start from the first row)
- "pdafOffset" : 3
+ "pdaf_offset" : 3
},
{
@@ -1604,6 +1604,7 @@ Camera constants:
{ // Quality B, missing per ISO samples
"make_model": "OLYMPUS E-M1",
+ "global_green_equilibration" : true,
"dcraw_matrix": [ 7687,-1984,-606,-4327,11928,2721,-1381,2339,6452 ], // dng d65
"ranges": { "white": 4080 } // nominal 4095-4094, spread with some settings as long exposure
},
@@ -1618,12 +1619,14 @@ Camera constants:
{ // Quality A, white level correction
"make_model": "OLYMPUS E-PM2",
+ "global_green_equilibration" : true,
"dcraw_matrix": [ 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 ],
"ranges": { "white": 4040 } // nominal 4056
},
{ // Quality B, with long exposure noise reduction White Level gets WL-BL = around 256_12-bit levels less
"make_model": [ "OLYMPUS E-PL7", "OLYMPUS E-PL8" ],
+ "global_green_equilibration" : true,
"dcraw_matrix": [ 9197,-3190,-659,-2606,10830,2039,-458,1250,5458 ], // DNG_v9.8 D65
"ranges": { "white": 4080 } // nominal 4093
},
@@ -1640,6 +1643,11 @@ Camera constants:
"ranges": { "white": 4050 } // safe for worst case detected, nominal is 4093
},
+ { // Quality C, only green equilibration
+ "make_model" : ["OLYMPUS E-3", "OLYMPUS E-520"],
+ "global_green_equilibration" : true
+ },
+
{ // Quality C, proper ISO 100-125-160 samples missing, pixelshift files have no black offset etc. #4574
"make_model": [ "Panasonic DC-G9" ],
"dcraw_matrix": [ 7685, -2375, -634, -3687, 11700, 2249, -748, 1546, 5111 ], // Adobe DNG Converter 10.3 ColorMatrix2
@@ -2269,8 +2277,8 @@ Camera constants:
"ranges": { "black": 512, "white": 16300 },
// detected by hand, using the picture from https://www.dpreview.com/forums/thread/3923513
// P 11 P 23 P 17 P 17 P 17 P 23 P 11 P 17 P 17 P 17 P 23 P 11 P 23 P 11 P 17 P 23 P 11 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 23 P 11 P 17 P 11 P 23
- "pdafPattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
- "pdafOffset" : 3
+ "pdaf_pattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
+ "pdaf_offset" : 3
},
{ // Quality A
@@ -2279,8 +2287,8 @@ Camera constants:
"raw_crop": [ 0, 0, 6024, 4024 ],
"ranges": { "black": 512, "white": 16300 },
// contributed by Horshak from https://www.dpreview.com/forums/post/60873077
- "pdafPattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
- "pdafOffset" : 3
+ "pdaf_pattern" : [ 0,12,36,54,72,90,114,126,144,162,180,204,216,240,252,270,294,306,324,342,366,384,396,414,432,450,474,492,504,522,540,564,576,594,606,630 ],
+ "pdaf_offset" : 3
},
{ // Quality C, only pdaf data
@@ -2291,8 +2299,8 @@ Camera constants:
//
// rotated to match the start of the frame
// P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11 P 5 P 17 P 11 P 11 P 17 P 11 P 5
- "pdafPattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420],
- "pdafOffset" : 9
+ "pdaf_pattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420],
+ "pdaf_offset" : 9
},
{ // Quality A, correction for frame width
@@ -2314,8 +2322,8 @@ Camera constants:
"raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
"ranges": { "black": 512, "white": 16300 },
// PDAF info provided by Horshack with the rawshack tool (http://testcams.com/rawshack/)
- "pdafPattern" : [ 0,24,36,60,84,120,132,156,192,204,240,252,276,300,324,360,372,396,420 ],
- "pdafOffset" : 31
+ "pdaf_pattern" : [ 0,24,36,60,84,120,132,156,192,204,240,252,276,300,324,360,372,396,420 ],
+ "pdaf_offset" : 31
},
{ // Quality C, color matrix copied from ILCE-9, LongExposures 2-3sec only
@@ -2345,8 +2353,8 @@ Camera constants:
"dcraw_matrix": [ 6640,-1847,-503,-5238,13010,2474,-993,1673,6527 ], // DNG_v10.1 D65
"raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
"ranges": { "black": 512, "white": 16300 },
- "pdafPattern" : [0, 24, 36, 60, 84, 120, 132, 156, 192, 204, 240, 252, 276, 300, 324, 360, 372, 396, 420, 444, 480, 492, 504, 540, 564, 576, 612, 636, 660, 696, 720, 732, 756, 780, 804, 840],
- "pdafOffset" : 31
+ "pdaf_pattern" : [0, 24, 36, 60, 84, 120, 132, 156, 192, 204, 240, 252, 276, 300, 324, 360, 372, 396, 420, 444, 480, 492, 504, 540, 564, 576, 612, 636, 660, 696, 720, 732, 756, 780, 804, 840],
+ "pdaf_offset" : 31
},
{ // Quality B, color matrix copied from a7rm2
@@ -2357,8 +2365,8 @@ Camera constants:
// the A9 is the same as the A7III, rotated of 1 position
// source: https://www.dpreview.com/forums/post/60857788
// P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11 P 5 P 17 P 11 P 11 P 17 P 11 P 5
- "pdafPattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420 ],
- "pdafOffset" : -7
+ "pdaf_pattern" : [ 0,12,24,36,54,66,72,84,96,114,120,132,150,156,174,180,192,204,216,234,240,252,264,276,282,300,306,324,336,342,360,372,384,402,414,420 ],
+ "pdaf_offset" : -7
},
{ // Quality B, correction for frame width
diff --git a/rtengine/color.cc b/rtengine/color.cc
index 9b7d786e6..b5fdbe9fe 100644
--- a/rtengine/color.cc
+++ b/rtengine/color.cc
@@ -1859,6 +1859,45 @@ void Color::RGB2Lab(float *R, float *G, float *B, float *L, float *a, float *b,
}
}
+void Color::RGB2L(float *R, float *G, float *B, float *L, const float wp[3][3], int width)
+{
+
+#ifdef __SSE2__
+ vfloat minvalfv = F2V(0.f);
+ vfloat maxvalfv = F2V(MAXVALF);
+#endif
+ int i = 0;
+
+#ifdef __SSE2__
+ for(;i < width - 3; i+=4) {
+ const vfloat rv = LVFU(R[i]);
+ const vfloat gv = LVFU(G[i]);
+ const vfloat bv = LVFU(B[i]);
+ const vfloat yv = F2V(wp[1][0]) * rv + F2V(wp[1][1]) * gv + F2V(wp[1][2]) * bv;
+
+ vmask maxMask = vmaskf_gt(yv, maxvalfv);
+ vmask minMask = vmaskf_lt(yv, minvalfv);
+ if (_mm_movemask_ps((vfloat)vorm(maxMask, minMask))) {
+ // take slower code path for all 4 pixels if one of the values is > MAXVALF. Still faster than non SSE2 version
+ for(int k = 0; k < 4; ++k) {
+ float y = yv[k];
+ L[i + k] = computeXYZ2LabY(y);
+ }
+ } else {
+ STVFU(L[i], cachefy[yv]);
+ }
+ }
+#endif
+ for(;i < width; ++i) {
+ const float rv = R[i];
+ const float gv = G[i];
+ const float bv = B[i];
+ float y = wp[1][0] * rv + wp[1][1] * gv + wp[1][2] * bv;
+
+ L[i] = computeXYZ2LabY(y);
+ }
+}
+
void Color::XYZ2Lab(float X, float Y, float Z, float &L, float &a, float &b)
{
diff --git a/rtengine/color.h b/rtengine/color.h
index 7929c77a1..b0527bc9b 100644
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -612,6 +612,7 @@ public:
*/
static void XYZ2Lab(float x, float y, float z, float &L, float &a, float &b);
static void RGB2Lab(float *X, float *Y, float *Z, float *L, float *a, float *b, const float wp[3][3], int width);
+ static void RGB2L(float *X, float *Y, float *Z, float *L, const float wp[3][3], int width);
/**
* @brief Convert Lab in Yuv
diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc
index 164c7680e..ec65a030a 100644
--- a/rtengine/dcp.cc
+++ b/rtengine/dcp.cc
@@ -1795,51 +1795,51 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
file_std_profiles.clear();
if (!loadAll) {
- profileDir.assign (rt_profile_dir);
+ profileDir = { rt_profile_dir, Glib::build_filename(options.rtdir, "dcpprofiles") };
return;
}
- if (!rt_profile_dir.empty()) {
- std::deque dirs = {
- rt_profile_dir
- };
+ std::deque dirs = {
+ rt_profile_dir,
+ Glib::build_filename(options.rtdir, "dcpprofiles")
+ };
- while (!dirs.empty()) {
- // Process directory
- const Glib::ustring dirname = dirs.back();
- dirs.pop_back();
+ while (!dirs.empty()) {
+ // Process directory
+ const Glib::ustring dirname = dirs.back();
+ dirs.pop_back();
- std::unique_ptr dir;
+ std::unique_ptr dir;
- try {
- if (!Glib::file_test(dirname, Glib::FILE_TEST_IS_DIR)) {
- return;
- }
-
- dir.reset(new Glib::Dir(dirname));
- } catch (Glib::Exception& exception) {
+ try {
+ if (!Glib::file_test(dirname, Glib::FILE_TEST_IS_DIR)) {
return;
}
- for (const Glib::ustring& sname : *dir) {
- const Glib::ustring fname = Glib::build_filename(dirname, sname);
+ dir.reset(new Glib::Dir(dirname));
+ } catch (Glib::Exception& exception) {
+ return;
+ }
- if (!Glib::file_test(fname, Glib::FILE_TEST_IS_DIR)) {
- // File
- const auto lastdot = sname.rfind('.');
+ for (const Glib::ustring& sname : *dir) {
+ const Glib::ustring fname = Glib::build_filename(dirname, sname);
- if (
- lastdot != Glib::ustring::npos
- && lastdot <= sname.size() - 4
- && !sname.casefold().compare(lastdot, 4, ".dcp")
+ if (!Glib::file_test(fname, Glib::FILE_TEST_IS_DIR)) {
+ // File
+ const auto lastdot = sname.rfind('.');
+
+ if (
+ lastdot != Glib::ustring::npos
+ && lastdot <= sname.size() - 4
+ && !sname.casefold().compare(lastdot, 4, ".dcp")
) {
- const Glib::ustring cam_short_name = sname.substr(0, lastdot).uppercase();
- file_std_profiles[cam_short_name] = fname; // They will be loaded and cached on demand
- }
- } else {
- // Directory
- dirs.push_front(fname);
+ const Glib::ustring cam_short_name = sname.substr(0, lastdot).uppercase();
+ file_std_profiles[cam_short_name] = fname; // They will be loaded and cached on demand
}
+ } else {
+ // Directory
+ dirs.push_front(fname);
+ }
}
}
@@ -1850,7 +1850,6 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
if (real != file_std_profiles.end()) {
file_std_profiles[alias_name] = real->second;
- }
}
}
}
@@ -1907,11 +1906,13 @@ DCPProfile* DCPStore::getStdProfile(const Glib::ustring& requested_cam_short_nam
}
// profile not found, looking if we're in loadAll=false mode
- if (!profileDir.empty()) {
- const Glib::ustring fname = Glib::build_filename(profileDir, requested_cam_short_name + Glib::ustring(".dcp"));
+ for (const auto &dir : profileDir) {
+ if (!dir.empty()) {
+ const Glib::ustring fname = Glib::build_filename(dir, requested_cam_short_name + Glib::ustring(".dcp"));
- if (Glib::file_test(fname, Glib::FILE_TEST_EXISTS)) {
- return getProfile(fname);
+ if (Glib::file_test(fname, Glib::FILE_TEST_EXISTS)) {
+ return getProfile(fname);
+ }
}
}
diff --git a/rtengine/dcp.h b/rtengine/dcp.h
index 10bbf8f7e..bedc7f76d 100644
--- a/rtengine/dcp.h
+++ b/rtengine/dcp.h
@@ -166,7 +166,7 @@ private:
DCPStore() = default;
mutable MyMutex mutex;
- Glib::ustring profileDir;
+ std::vector profileDir;
// these contain standard profiles from RT. keys are all in uppercase, file path is value
std::map file_std_profiles;
diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 839e08006..10cf4277e 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -1800,7 +1800,7 @@ void Crop::update(int todo)
if ((params.colorappearance.enabled && !settings->autocielab) || (!params.colorappearance.enabled)) {
parent->ipf.MLmicrocontrast(labnCrop);
- parent->ipf.sharpening (labnCrop, params.sharpening);
+ parent->ipf.sharpening (labnCrop, params.sharpening, parent->sharpMask);
}
}
@@ -1930,7 +1930,7 @@ void Crop::update(int todo)
float d, dj, yb; // not used after this block
parent->ipf.ciecam_02float (cieCrop, float (adap), 1, 2, labnCrop, ¶ms, parent->customColCurve1, parent->customColCurve2, parent->customColCurve3,
- dummy, dummy, parent->CAMBrightCurveJ, parent->CAMBrightCurveQ, parent->CAMMean, 5, skip, execsharp, d, dj, yb, 1);
+ dummy, dummy, parent->CAMBrightCurveJ, parent->CAMBrightCurveQ, parent->CAMMean, 5, skip, execsharp, d, dj, yb, 1, parent->sharpMask);
} else {
// CIECAM is disabled, we free up its image buffer to save some space
if (cieCrop) {
diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc
index 582b00629..f94f6bad6 100644
--- a/rtengine/demosaic_algos.cc
+++ b/rtengine/demosaic_algos.cc
@@ -284,11 +284,11 @@ void RawImageSource::eahd_demosaic ()
// Interpolate R and B
for (int i = 0; i < H; i++) {
if (i == 0) {
- interpolate_row_rb_mul_pp (red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
} else if (i == H - 1) {
- interpolate_row_rb_mul_pp (red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
} else {
- interpolate_row_rb_mul_pp (red[i], blue[i], green[i - 1], green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ 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);
}
}
}
@@ -545,11 +545,11 @@ void RawImageSource::hphd_demosaic ()
for (int i = 0; i < H; i++) {
if (i == 0) {
- interpolate_row_rb_mul_pp (red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
} else if (i == H - 1) {
- interpolate_row_rb_mul_pp (red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
} else {
- interpolate_row_rb_mul_pp (red[i], blue[i], green[i - 1], green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ 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);
}
}
@@ -558,320 +558,6 @@ void RawImageSource::hphd_demosaic ()
}
}
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-#define fc(row,col) (prefilters >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)
-typedef unsigned short ushort;
-void RawImageSource::vng4_demosaic ()
-{
- const signed short int *cp, terms[] = {
- -2, -2, +0, -1, 0, 0x01, -2, -2, +0, +0, 1, 0x01, -2, -1, -1, +0, 0, 0x01,
- -2, -1, +0, -1, 0, 0x02, -2, -1, +0, +0, 0, 0x03, -2, -1, +0, +1, 1, 0x01,
- -2, +0, +0, -1, 0, 0x06, -2, +0, +0, +0, 1, 0x02, -2, +0, +0, +1, 0, 0x03,
- -2, +1, -1, +0, 0, 0x04, -2, +1, +0, -1, 1, 0x04, -2, +1, +0, +0, 0, 0x06,
- -2, +1, +0, +1, 0, 0x02, -2, +2, +0, +0, 1, 0x04, -2, +2, +0, +1, 0, 0x04,
- -1, -2, -1, +0, 0, 0x80, -1, -2, +0, -1, 0, 0x01, -1, -2, +1, -1, 0, 0x01,
- -1, -2, +1, +0, 1, 0x01, -1, -1, -1, +1, 0, 0x88, -1, -1, +1, -2, 0, 0x40,
- -1, -1, +1, -1, 0, 0x22, -1, -1, +1, +0, 0, 0x33, -1, -1, +1, +1, 1, 0x11,
- -1, +0, -1, +2, 0, 0x08, -1, +0, +0, -1, 0, 0x44, -1, +0, +0, +1, 0, 0x11,
- -1, +0, +1, -2, 1, 0x40, -1, +0, +1, -1, 0, 0x66, -1, +0, +1, +0, 1, 0x22,
- -1, +0, +1, +1, 0, 0x33, -1, +0, +1, +2, 1, 0x10, -1, +1, +1, -1, 1, 0x44,
- -1, +1, +1, +0, 0, 0x66, -1, +1, +1, +1, 0, 0x22, -1, +1, +1, +2, 0, 0x10,
- -1, +2, +0, +1, 0, 0x04, -1, +2, +1, +0, 1, 0x04, -1, +2, +1, +1, 0, 0x04,
- +0, -2, +0, +0, 1, 0x80, +0, -1, +0, +1, 1, 0x88, +0, -1, +1, -2, 0, 0x40,
- +0, -1, +1, +0, 0, 0x11, +0, -1, +2, -2, 0, 0x40, +0, -1, +2, -1, 0, 0x20,
- +0, -1, +2, +0, 0, 0x30, +0, -1, +2, +1, 1, 0x10, +0, +0, +0, +2, 1, 0x08,
- +0, +0, +2, -2, 1, 0x40, +0, +0, +2, -1, 0, 0x60, +0, +0, +2, +0, 1, 0x20,
- +0, +0, +2, +1, 0, 0x30, +0, +0, +2, +2, 1, 0x10, +0, +1, +1, +0, 0, 0x44,
- +0, +1, +1, +2, 0, 0x10, +0, +1, +2, -1, 1, 0x40, +0, +1, +2, +0, 0, 0x60,
- +0, +1, +2, +1, 0, 0x20, +0, +1, +2, +2, 0, 0x10, +1, -2, +1, +0, 0, 0x80,
- +1, -1, +1, +1, 0, 0x88, +1, +0, +1, +2, 0, 0x08, +1, +0, +2, -1, 0, 0x40,
- +1, +0, +2, +1, 0, 0x10
- },
- chood[] = { -1, -1, -1, 0, -1, +1, 0, +1, +1, +1, +1, 0, +1, -1, 0, -1 };
-
- double progress = 0.0;
- const bool plistenerActive = plistener;
-
- if (plistenerActive) {
- plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::VNG4)));
- plistener->setProgress (progress);
- }
-
- const unsigned prefilters = ri->prefilters;
- const int width = W, height = H;
- constexpr unsigned int colors = 4;
- float (*image)[4];
-
- image = (float (*)[4]) calloc (height * width, sizeof * image);
-
-#ifdef _OPENMP
- #pragma omp parallel for
-#endif
-
- for (int ii = 0; ii < H; ii++)
- for (int jj = 0; jj < W; jj++) {
- image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj];
- }
-
- {
- int lcode[16][16][32];
- float mul[16][16][8];
- float csum[16][16][4];
-
-// first linear interpolation
- for (int row = 0; row < 16; row++)
- for (int col = 0; col < 16; col++) {
- int * ip = lcode[row][col];
- int mulcount = 0;
- float sum[4];
- memset (sum, 0, sizeof sum);
-
- for (int y = -1; y <= 1; y++)
- for (int x = -1; x <= 1; x++) {
- int shift = (y == 0) + (x == 0);
-
- if (shift == 2) {
- continue;
- }
-
- int color = fc(row + y, col + x);
- *ip++ = (width * y + x) * 4 + color;
-
- mul[row][col][mulcount] = (1 << shift);
- *ip++ = color;
- sum[color] += (1 << shift);
- mulcount++;
- }
-
- int colcount = 0;
-
- for (unsigned int c = 0; c < colors; c++)
- if (c != fc(row, col)) {
- *ip++ = c;
- csum[row][col][colcount] = sum[c];
- colcount ++;
- }
- }
-
-#ifdef _OPENMP
- #pragma omp parallel for
-#endif
-
- for (int row = 1; row < height - 1; row++) {
- for (int col = 1; col < width - 1; col++) {
- float * pix = image[row * width + col];
- int * ip = lcode[row & 15][col & 15];
- float sum[4];
- memset (sum, 0, sizeof sum);
-
- for (int i = 0; i < 8; i++, ip += 2) {
- sum[ip[1]] += pix[ip[0]] * mul[row & 15][col & 15][i];
- }
-
- for (unsigned int i = 0; i < colors - 1; i++, ip++) {
- pix[ip[0]] = sum[ip[0]] / csum[row & 15][col & 15][i];
- }
- }
- }
- }
-
- const int prow = 7, pcol = 1;
- int *code[8][2];
- int t, g;
- int * ip = (int *) calloc ((prow + 1) * (pcol + 1), 1280);
-
- for (int row = 0; row <= prow; row++) /* Precalculate for VNG */
- for (int col = 0; col <= pcol; col++) {
- code[row][col] = ip;
-
- for (cp = terms, t = 0; t < 64; t++) {
- int y1 = *cp++;
- int x1 = *cp++;
- int y2 = *cp++;
- int x2 = *cp++;
- int weight = *cp++;
- int grads = *cp++;
- unsigned int color = fc(row + y1, col + x1);
-
- if (fc(row + y2, col + x2) != color) {
- continue;
- }
-
- int diag = (fc(row, col + 1) == color && fc(row + 1, col) == color) ? 2 : 1;
-
- if (abs(y1 - y2) == diag && abs(x1 - x2) == diag) {
- continue;
- }
-
- *ip++ = (y1 * width + x1) * 4 + color;
- *ip++ = (y2 * width + x2) * 4 + color;
- *ip++ = weight;
-
- for (g = 0; g < 8; g++)
- if (grads & (1 << g)) {
- *ip++ = g;
- }
-
- *ip++ = -1;
- }
-
- *ip++ = INT_MAX;
-
- for (cp = chood, g = 0; g < 8; g++) {
- int y = *cp++;
- int x = *cp++;
- *ip++ = (y * width + x) * 4;
- unsigned int color = fc(row, col);
-
- if (fc(row + y, col + x) != color && fc(row + y * 2, col + x * 2) == color) {
- *ip++ = (y * width + x) * 8 + color;
- } else {
- *ip++ = 0;
- }
- }
- }
-
- if(plistenerActive) {
- progress = 0.1;
- plistener->setProgress (progress);
- }
-
-
-#ifdef _OPENMP
- #pragma omp parallel
-#endif
- {
- float gval[8], thold, sum[3];
- int g;
- const int progressStep = 64;
- const double progressInc = (0.98 - progress) / ((height - 2) / progressStep);
-#ifdef _OPENMP
- #pragma omp for nowait
-#endif
-
- for (int row = 2; row < height - 2; row++) { /* Do VNG interpolation */
- for (int col = 2; col < width - 2; col++) {
- float * pix = image[row * width + col];
- int * ip = code[row & prow][col & pcol];
- memset (gval, 0, sizeof gval);
-
- while ((g = ip[0]) != INT_MAX) { /* Calculate gradients */
- float diff = fabsf(pix[g] - pix[ip[1]]) * (1 << ip[2]);
- gval[ip[3]] += diff;
- ip += 4;
-
- while ((g = *ip++) != -1) {
- gval[g] += diff;
- }
- }
-
- ip++;
- {
- float gmin, gmax;
- gmin = gmax = gval[0]; /* Choose a threshold */
-
- for (g = 1; g < 8; g++) {
- if (gmin > gval[g]) {
- gmin = gval[g];
- }
-
- if (gmax < gval[g]) {
- gmax = gval[g];
- }
- }
-
- thold = gmin + (gmax / 2);
- }
- memset (sum, 0, sizeof sum);
- float t1, t2;
- int color = fc(row, col);
- t1 = t2 = pix[color];
-
- if(color & 1) {
- int num = 0;
-
- for (g = 0; g < 8; g++, ip += 2) { /* Average the neighbors */
- if (gval[g] <= thold) {
- if(ip[1]) {
- sum[0] += (t1 + pix[ip[1]]) * 0.5f;
- }
-
- sum[1] += pix[ip[0] + (color ^ 2)];
- num++;
- }
- }
-
- t1 += (sum[1] - sum[0]) / num;
- } else {
- int num = 0;
-
- for (g = 0; g < 8; g++, ip += 2) { /* Average the neighbors */
- if (gval[g] <= thold) {
- sum[1] += pix[ip[0] + 1];
- sum[2] += pix[ip[0] + 3];
-
- if(ip[1]) {
- sum[0] += (t1 + pix[ip[1]]) * 0.5f;
- }
-
- num++;
- }
- }
-
- t1 += (sum[1] - sum[0]) / num;
- t2 += (sum[2] - sum[0]) / num;
- }
-
- green[row][col] = 0.5f * (t1 + t2);
- }
-
- if(plistenerActive) {
- if((row % progressStep) == 0)
-#ifdef _OPENMP
- #pragma omp critical (updateprogress)
-#endif
- {
- progress += progressInc;
- plistener->setProgress (progress);
- }
- }
- }
-
- }
- free (code[0][0]);
- free (image);
-
- if(plistenerActive) {
- plistener->setProgress (0.98);
- }
-
- // Interpolate R and B
-#ifdef _OPENMP
- #pragma omp parallel for
-#endif
-
- for (int i = 0; i < H; i++) {
- if (i == 0)
- // rm, gm, bm must be recovered
- //interpolate_row_rb_mul_pp (red, blue, NULL, green[i], green[i+1], i, rm, gm, bm, 0, W, 1);
- {
- interpolate_row_rb_mul_pp (red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
- } else if (i == H - 1) {
- interpolate_row_rb_mul_pp (red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
- } else {
- interpolate_row_rb_mul_pp (red[i], blue[i], green[i - 1], green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
- }
- }
-
- if(plistenerActive) {
- plistener->setProgress (1.0);
- }
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
#undef fc
#define fc(row,col) \
(ri->get_filters() >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)
diff --git a/rtengine/expo_before_b.cc b/rtengine/expo_before_b.cc
index f94b2c292..eda8c9e37 100644
--- a/rtengine/expo_before_b.cc
+++ b/rtengine/expo_before_b.cc
@@ -82,7 +82,7 @@ void RawImageSource::processRawWhitepoint(float expos, float preser, array2DgetSensorType() == ST_BAYER) {
fast_demosaic();
} else {
- fast_xtrans_interpolate();
+ fast_xtrans_interpolate(rawData, red, green, blue);
}
}
diff --git a/rtengine/gauss.cc b/rtengine/gauss.cc
index 3c53a7820..caa5e28b5 100644
--- a/rtengine/gauss.cc
+++ b/rtengine/gauss.cc
@@ -163,15 +163,15 @@ template void gauss3x3div (T** RESTRICT src, T** RESTRICT dst, T** REST
#pragma omp single nowait
#endif
{
- dst[0][0] = divBuffer[0][0] / (src[0][0] > 0.f ? src[0][0] : 1.f);
+ dst[0][0] = rtengine::max(divBuffer[0][0] / (src[0][0] > 0.f ? src[0][0] : 1.f), 0.f);
for (int j = 1; j < W - 1; j++)
{
float tmp = (b1 * (src[0][j - 1] + src[0][j + 1]) + b0 * src[0][j]);
- dst[0][j] = divBuffer[0][j] / (tmp > 0.f ? tmp : 1.f);
+ dst[0][j] = rtengine::max(divBuffer[0][j] / (tmp > 0.f ? tmp : 1.f), 0.f);
}
- dst[0][W - 1] = divBuffer[0][W - 1] / (src[0][W - 1] > 0.f ? src[0][W - 1] : 1.f);
+ dst[0][W - 1] = rtengine::max(divBuffer[0][W - 1] / (src[0][W - 1] > 0.f ? src[0][W - 1] : 1.f), 0.f);
}
#ifdef _OPENMP
@@ -180,15 +180,15 @@ template void gauss3x3div (T** RESTRICT src, T** RESTRICT dst, T** REST
for (int i = 1; i < H - 1; i++) {
float tmp = (b1 * (src[i - 1][0] + src[i + 1][0]) + b0 * src[i][0]);
- dst[i][0] = divBuffer[i][0] / (tmp > 0.f ? tmp : 1.f);
+ dst[i][0] = rtengine::max(divBuffer[i][0] / (tmp > 0.f ? tmp : 1.f), 0.f);
for (int j = 1; j < W - 1; j++) {
tmp = (c2 * (src[i - 1][j - 1] + src[i - 1][j + 1] + src[i + 1][j - 1] + src[i + 1][j + 1]) + c1 * (src[i - 1][j] + src[i][j - 1] + src[i][j + 1] + src[i + 1][j]) + c0 * src[i][j]);
- dst[i][j] = divBuffer[i][j] / (tmp > 0.f ? tmp : 1.f);
+ dst[i][j] = rtengine::max(divBuffer[i][j] / (tmp > 0.f ? tmp : 1.f), 0.f);
}
tmp = (b1 * (src[i - 1][W - 1] + src[i + 1][W - 1]) + b0 * src[i][W - 1]);
- dst[i][W - 1] = divBuffer[i][W - 1] / (tmp > 0.f ? tmp : 1.f);
+ dst[i][W - 1] = rtengine::max(divBuffer[i][W - 1] / (tmp > 0.f ? tmp : 1.f), 0.f);
}
// last row
@@ -196,14 +196,14 @@ template void gauss3x3div (T** RESTRICT src, T** RESTRICT dst, T** REST
#pragma omp single
#endif
{
- dst[H - 1][0] = divBuffer[H - 1][0] / (src[H - 1][0] > 0.f ? src[H - 1][0] : 1.f);
+ dst[H - 1][0] = rtengine::max(divBuffer[H - 1][0] / (src[H - 1][0] > 0.f ? src[H - 1][0] : 1.f), 0.f);
for (int j = 1; j < W - 1; j++) {
float tmp = (b1 * (src[H - 1][j - 1] + src[H - 1][j + 1]) + b0 * src[H - 1][j]);
- dst[H - 1][j] = divBuffer[H - 1][j] / (tmp > 0.f ? tmp : 1.f);
+ dst[H - 1][j] = rtengine::max(divBuffer[H - 1][j] / (tmp > 0.f ? tmp : 1.f), 0.f);
}
- dst[H - 1][W - 1] = divBuffer[H - 1][W - 1] / (src[H - 1][W - 1] > 0.f ? src[H - 1][W - 1] : 1.f);
+ dst[H - 1][W - 1] = rtengine::max(divBuffer[H - 1][W - 1] / (src[H - 1][W - 1] > 0.f ? src[H - 1][W - 1] : 1.f), 0.f);
}
}
@@ -859,8 +859,8 @@ template void gaussVerticalSsediv (T** src, T** dst, T** divBuffer, con
Tv1 = Rv1;
Rv = LVF(tmp[j][0]) * Bv + Tv * b1v + Tm2v * b2v + Tm3v * b3v;
Rv1 = LVF(tmp[j][4]) * Bv + Tv1 * b1v + Tm2v1 * b2v + Tm3v1 * b3v;
- STVFU( dst[j][i], LVFU(divBuffer[j][i]) / vself(vmaskf_gt(Rv, ZEROV), Rv, onev));
- STVFU( dst[j][i + 4], LVFU(divBuffer[j][i + 4]) / vself(vmaskf_gt(Rv1, ZEROV), Rv1, onev));
+ STVFU( dst[j][i], vmaxf(LVFU(divBuffer[j][i]) / vself(vmaskf_gt(Rv, ZEROV), Rv, onev), ZEROV));
+ STVFU( dst[j][i + 4], vmaxf(LVFU(divBuffer[j][i + 4]) / vself(vmaskf_gt(Rv1, ZEROV), Rv1, onev), ZEROV));
Tm3v = Tm2v;
Tm3v1 = Tm2v1;
Tm2v = Tv;
@@ -895,7 +895,7 @@ template void gaussVerticalSsediv (T** src, T** dst, T** divBuffer, con
}
for (int j = 0; j < H; j++) {
- dst[j][i] = divBuffer[j][i] / (tmp[j][0] > 0.f ? tmp[j][0] : 1.f);
+ dst[j][i] = rtengine::max(divBuffer[j][i] / (tmp[j][0] > 0.f ? tmp[j][0] : 1.f), 0.f);
}
}
@@ -1020,14 +1020,14 @@ template void gaussVerticaldiv (T** src, T** dst, T** divBuffer, const
}
for (int k = 0; k < numcols; k++) {
- dst[H - 1][i + k] = divBuffer[H - 1][i + k] / (temp2[H - 1][k] = temp2Hm1[k]);
- dst[H - 2][i + k] = 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]);
- dst[H - 3][i + k] = 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]);
+ 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);
}
for (int j = H - 4; j >= 0; j--) {
for (int k = 0; k < numcols; k++) {
- dst[j][i + k] = 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]);
+ 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);
}
}
}
@@ -1050,12 +1050,12 @@ template 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] = divBuffer[H - 1][i] / (temp2[H - 1][0] = temp2Hm1);
- dst[H - 2][i] = divBuffer[H - 2][i] / (temp2[H - 2][0] = B * temp2[H - 2][0] + b1 * temp2[H - 1][0] + b2 * temp2H + b3 * temp2Hp1);
- dst[H - 3][i] = 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);
+ 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);
for (int j = H - 4; j >= 0; j--) {
- dst[j][i] = 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]);
+ 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);
}
}
}
diff --git a/rtengine/green_equil_RT.cc b/rtengine/green_equil_RT.cc
index 934b7df4a..361bde882 100644
--- a/rtengine/green_equil_RT.cc
+++ b/rtengine/green_equil_RT.cc
@@ -46,7 +46,6 @@ void RawImageSource::green_equilibrate_global(array2D &rawData)
for (int i = border; i < H - border; i++) {
double avgg = 0.;
-
for (int j = border + ((FC(i, border) & 1) ^ 1); j < W - border; j += 2) {
avgg += rawData[i][j];
}
diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc
index 50f249190..eeb9ef1c4 100644
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@@ -334,6 +334,8 @@ public:
fileStdProfilesFileNames.clear();
if (loadAll) {
loadProfiles(stdProfilesDir, nullptr, nullptr, &fileStdProfilesFileNames, true);
+ Glib::ustring user_input_icc_dir = Glib::build_filename(options.rtdir, "iccprofiles", "input");
+ loadProfiles(user_input_icc_dir, nullptr, nullptr, &fileStdProfilesFileNames, true);
}
defaultMonitorProfile = settings->monitorProfile;
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 083c38e95..ab72b6acb 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -42,7 +42,7 @@ extern const Settings* settings;
ImProcCoordinator::ImProcCoordinator()
: orig_prev(nullptr), oprevi(nullptr), oprevl(nullptr), nprevl(nullptr), reserv(nullptr), fattal_11_dcrop_cache(nullptr), previmg(nullptr), workimg(nullptr),
ncie (nullptr), imgsrc (nullptr), lastAwbEqual (0.), lastAwbTempBias (0.0), ipf (¶ms, true), monitorIntent (RI_RELATIVE),
- softProof(false), gamutCheck(false), scale(10), highDetailPreprocessComputed(false), highDetailRawComputed(false),
+ softProof (false), gamutCheck (false), sharpMask(false), scale (10), highDetailPreprocessComputed (false), highDetailRawComputed (false),
allocated(false), bwAutoR(-9000.f), bwAutoG(-9000.f), bwAutoB(-9000.f), CAMMean(NAN), coordX(0), coordY(0), localX(0), localY(0),
ctColorCurve(),
hltonecurve(65536),
@@ -4205,6 +4205,11 @@ void ImProcCoordinator::getSoftProofing(bool & softProof, bool & gamutCheck)
gamutCheck = this->gamutCheck;
}
+void ImProcCoordinator::setSharpMask (bool sharpMask)
+{
+ this->sharpMask = sharpMask;
+}
+
void ImProcCoordinator::saveInputICCReference(const Glib::ustring & fname, bool apply_wb)
{
diff --git a/rtengine/improccoordinator.h b/rtengine/improccoordinator.h
index 91232f9d4..c51504017 100644
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -81,6 +81,7 @@ protected:
RenderingIntent monitorIntent;
bool softProof;
bool gamutCheck;
+ bool sharpMask;
int scale;
bool highDetailPreprocessComputed;
@@ -466,8 +467,7 @@ public:
void getMonitorProfile(Glib::ustring& profile, RenderingIntent& intent) const;
void setSoftProofing(bool softProof, bool gamutCheck);
void getSoftProofing(bool &softProof, bool &gamutCheck);
-//>>>>>>> dev
-
+ void setSharpMask (bool sharpMask);
bool updateTryLock()
{
return updaterThreadStart.trylock();
diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc
index 891a0a323..1d70f381f 100644
--- a/rtengine/improcfun.cc
+++ b/rtengine/improcfun.cc
@@ -473,7 +473,8 @@ void ImProcFunctions::firstAnalysis(const Imagefloat* const original, const Proc
void ImProcFunctions::ciecam_02float(CieImage* ncie, float adap, int pW, int pwb, LabImage* lab, const ProcParams* params,
const ColorAppearance & customColCurve1, const ColorAppearance & customColCurve2, const ColorAppearance & customColCurve3,
- LUTu & histLCAM, LUTu & histCCAM, LUTf & CAMBrightCurveJ, LUTf & CAMBrightCurveQ, float &mean, int Iterates, int scale, bool execsharp, float &d, float &dj, float &yb, int rtt)
+ LUTu & histLCAM, LUTu & histCCAM, LUTf & CAMBrightCurveJ, LUTf & CAMBrightCurveQ, float &mean, int Iterates, int scale, bool execsharp, float &d, float &dj, float &yb, int rtt,
+ bool showSharpMask)
{
if (params->colorappearance.enabled) {
@@ -1687,7 +1688,7 @@ void ImProcFunctions::ciecam_02float(CieImage* ncie, float adap, int pW, int pwb
if (params->sharpening.enabled)
if (execsharp) {
float **buffer = lab->L; // We can use the L-buffer from lab as buffer to save some memory
- ImProcFunctions::sharpeningcam(ncie, buffer); // sharpening adapted to CIECAM
+ ImProcFunctions::sharpeningcam (ncie, buffer, showSharpMask); // sharpening adapted to CIECAM
}
//if(params->dirpyrequalizer.enabled) if(execsharp) {
diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h
index 0fe89065f..9b31bbc7a 100644
--- a/rtengine/improcfun.h
+++ b/rtengine/improcfun.h
@@ -238,12 +238,13 @@ public:
void ciecam_02float(CieImage* ncie, float adap, int pW, int pwb, LabImage* lab, const ProcParams* params,
const ColorAppearance & customColCurve1, const ColorAppearance & customColCurve, const ColorAppearance & customColCurve3,
- LUTu &histLCAM, LUTu &histCCAM, LUTf & CAMBrightCurveJ, LUTf & CAMBrightCurveQ, float &mean, int Iterates, int scale, bool execsharp, float &d, float &dj, float &yb, int rtt);
+ LUTu &histLCAM, LUTu &histCCAM, LUTf & CAMBrightCurveJ, LUTf & CAMBrightCurveQ, float &mean, int Iterates, int scale, bool execsharp, float &d, float &dj, float &yb, int rtt,
+ bool showSharpMask = false);
void chromiLuminanceCurve(PipetteBuffer *pipetteBuffer, int pW, LabImage* lold, LabImage* lnew, LUTf &acurve, LUTf &bcurve, LUTf & satcurve, LUTf & satclcurve, LUTf &clcurve, LUTf &curve, bool utili, bool autili, bool butili, bool ccutili, bool cclutili, bool clcutili, LUTu &histCCurve, LUTu &histLurve);
void vibrance(LabImage* lab); //Jacques' vibrance
// void colorCurve (LabImage* lold, LabImage* lnew);
- void sharpening (LabImage* lab, const SharpeningParams &sharpenParam);
- void sharpeningcam(CieImage* ncie, float** buffer);
+ void sharpening (LabImage* lab, const SharpeningParams &sharpenParam, bool showMask = false);
+ void sharpeningcam (CieImage* ncie, float** buffer, bool showMask = false);
void transform(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const FramesMetaData *metadata, int rawRotationDeg, bool fullImage);
float resizeScale(const ProcParams* params, int fw, int fh, int &imw, int &imh);
void lab2monitorRgb(LabImage* lab, Image8* image);
diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc
index 4771d8dc9..4d790bf1e 100644
--- a/rtengine/ipsharpen.cc
+++ b/rtengine/ipsharpen.cc
@@ -26,99 +26,11 @@
#include "opthelper.h"
//#define BENCHMARK
#include "StopWatch.h"
+#include "rt_algo.h"
using namespace std;
namespace {
-float calcBlendFactor(float val, float threshold) {
- // sigmoid function
- // result is in ]0;1] range
- // inflexion point is at (x, y) (threshold, 0.5)
- return 1.f / (1.f + xexpf(16.f - 16.f * val / threshold));
-}
-
-#ifdef __SSE2__
-vfloat calcBlendFactor(vfloat valv, vfloat thresholdv) {
- // sigmoid function
- // result is in ]0;1] range
- // inflexion point is at (x, y) (threshold, 0.5)
- const vfloat onev = F2V(1.f);
- const vfloat c16v = F2V(16.f);
- return onev / (onev + xexpf(c16v - c16v * valv / thresholdv));
-}
-#endif
-
-void buildBlendMask(float** luminance, rtengine::JaggedArray &blend, int W, int H, float contrastThreshold, float amount = 1.f) {
-BENCHFUN
-
- if(contrastThreshold == 0.f) {
- for(int j = 0; j < H; ++j) {
- for(int i = 0; i < W; ++i) {
- blend[j][i] = 1.f;
- }
- }
- } 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(SQR(luminance[j][i+1] - luminance[j][i-1]) + SQR(luminance[j+1][i] - luminance[j-1][i]) +
- SQR(luminance[j][i+2] - luminance[j][i-2]) + 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);
- }
- }
-}
-
void sharpenHaloCtrl (float** luminance, float** blurmap, float** base, float** blend, int W, int H, const SharpeningParams &sharpenParam)
{
@@ -278,22 +190,12 @@ BENCHFUN
if (!needdamp) {
// apply gaussian blur and divide luminance by result of gaussian blur
gaussianBlur(tmpI, tmp, W, H, sigma, nullptr, GAUSS_DIV, luminance);
-#ifdef _OPENMP
- #pragma omp for
-#endif
- for (int i = 0; i < H; ++i) {
- for(int j = 0; j < W; ++j) {
- tmp[i][j] = max(tmp[i][j], 0.f);
- }
- }
} else {
// apply gaussian blur + damping
gaussianBlur(tmpI, tmp, W, H, sigma);
dcdamping(tmp, luminance, damping, W, H);
}
-
gaussianBlur(tmp, tmpI, W, H, sigma, nullptr, GAUSS_MULT);
-
} // end for
#ifdef _OPENMP
@@ -378,7 +280,7 @@ void ImProcFunctions::deconvsharpeningloc (float** luminance, float** tmp, int W
-void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpenParam)
+void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpenParam, bool showMask)
{
if ((!sharpenParam.enabled) || sharpenParam.amount < 1 || lab->W < 8 || lab->H < 8) {
@@ -386,6 +288,23 @@ void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpen
}
int W = lab->W, H = lab->H;
+
+ if(showMask) {
+ // calculate contrast based blend factors to reduce sharpening in regions with low contrast
+ JaggedArray blend(W, H);
+ buildBlendMask(lab->L, blend, W, H, sharpenParam.contrast / 100.f, sharpenParam.method == "rld" ? sharpenParam.deconvamount / 100.0 : 1.f);
+#ifdef _OPENMP
+ #pragma omp parallel for
+#endif
+
+ for (int i = 0; i < H; ++i) {
+ for (int j = 0; j < W; ++j) {
+ lab->L[i][j] = blend[i][j] * 32768.f;
+ }
+ }
+ return;
+ }
+
JaggedArray b2(W, H);
if (sharpenParam.method == "rld") {
@@ -959,12 +878,31 @@ void ImProcFunctions::MLmicrocontrastcam(CieImage* ncie)
MLmicrocontrast(ncie->sh_p, ncie->W, ncie->H);
}
-void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
+void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2, bool showMask)
{
if ((!params->sharpening.enabled) || params->sharpening.amount < 1 || ncie->W < 8 || ncie->H < 8) {
return;
}
+ int W = ncie->W, H = ncie->H;
+
+ if(showMask) {
+ // calculate contrast based blend factors to reduce sharpening in regions with low contrast
+ JaggedArray blend(W, H);
+ buildBlendMask(ncie->sh_p, blend, W, H, params->sharpening.contrast / 100.f);
+#ifdef _OPENMP
+ #pragma omp parallel for
+#endif
+
+ for (int i = 0; i < H; ++i) {
+ for (int j = 0; j < W; ++j) {
+ ncie->sh_p[i][j] = blend[i][j] * 32768.f;
+ }
+ }
+ return;
+ }
+
+
if (params->sharpening.method == "rld") {
deconvsharpening (ncie->sh_p, b2, ncie->W, ncie->H, params->sharpening);
return;
@@ -972,7 +910,6 @@ void ImProcFunctions::sharpeningcam (CieImage* ncie, float** b2)
// Rest is UNSHARP MASK
- int W = ncie->W, H = ncie->H;
float** b3 = nullptr;
if (params->sharpening.edgesonly) {
diff --git a/rtengine/pixelshift.cc b/rtengine/pixelshift.cc
index 488538e8a..174c02065 100644
--- a/rtengine/pixelshift.cc
+++ b/rtengine/pixelshift.cc
@@ -323,19 +323,22 @@ BENCHFUN
if(motionDetection) {
if(!showOnlyMask) {
if(bayerParams.pixelShiftMedian) { // We need the demosaiced frames for motion correction
- if(bayerParams.pixelShiftLmmse) {
+ 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);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[0]), red, green, blue);
}
-
multi_array2D redTmp(winw, winh);
multi_array2D greenTmp(winw, winh);
multi_array2D blueTmp(winw, winh);
for(int i = 0; i < 3; i++) {
- if(bayerParams.pixelShiftLmmse) {
+ 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);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i]);
}
@@ -359,8 +362,10 @@ BENCHFUN
}
}
} else {
- if(bayerParams.pixelShiftLmmse) {
+ 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);
} else {
amaze_demosaic_RT(winx, winy, winw, winh, rawData, red, green, blue);
}
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index 2e0ca9728..65590b3d8 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -33,7 +33,6 @@
#include "../rtgui/version.h"
using namespace std;
-extern Options options;
namespace
{
@@ -1850,7 +1849,7 @@ autoc(false),
enabledcc(true),
enabled(false),
filter("None"),
-setting("NormalContrast"),
+ setting("RGB-Rel"),
method("Desaturation"),
mixerRed(33),
mixerOrange(33),
@@ -2734,6 +2733,7 @@ RAWParams::BayerSensor::BayerSensor() :
greenthresh(0),
dcb_iterations(2),
lmmse_iterations(2),
+ dualDemosaicContrast(20),
pixelShiftMotionCorrectionMethod(PSMotionCorrectionMethod::AUTO),
pixelShiftEperIso(0.0),
pixelShiftSigma(1.0),
@@ -2744,10 +2744,10 @@ RAWParams::BayerSensor::BayerSensor() :
pixelShiftGreen(true),
pixelShiftBlur(true),
pixelShiftSmoothFactor(0.7),
- pixelShiftLmmse(false),
pixelShiftEqualBright(false),
pixelShiftEqualBrightChannel(false),
pixelShiftNonGreenCross(true),
+ pixelShiftDemosaicMethod(getPSDemosaicMethodString(PSDemosaicMethod::AMAZE)),
dcb_enhance(true),
pdafLinesFilter(false)
{
@@ -2769,6 +2769,7 @@ bool RAWParams::BayerSensor::operator ==(const BayerSensor& other) const
&& greenthresh == other.greenthresh
&& dcb_iterations == other.dcb_iterations
&& lmmse_iterations == other.lmmse_iterations
+ && dualDemosaicContrast == other.dualDemosaicContrast
&& pixelShiftMotionCorrectionMethod == other.pixelShiftMotionCorrectionMethod
&& pixelShiftEperIso == other.pixelShiftEperIso
&& pixelShiftSigma == other.pixelShiftSigma
@@ -2779,10 +2780,10 @@ bool RAWParams::BayerSensor::operator ==(const BayerSensor& other) const
&& pixelShiftGreen == other.pixelShiftGreen
&& pixelShiftBlur == other.pixelShiftBlur
&& pixelShiftSmoothFactor == other.pixelShiftSmoothFactor
- && pixelShiftLmmse == other.pixelShiftLmmse
&& pixelShiftEqualBright == other.pixelShiftEqualBright
&& pixelShiftEqualBrightChannel == other.pixelShiftEqualBrightChannel
&& pixelShiftNonGreenCross == other.pixelShiftNonGreenCross
+ && pixelShiftDemosaicMethod == other.pixelShiftDemosaicMethod
&& dcb_enhance == other.dcb_enhance
&& pdafLinesFilter == other.pdafLinesFilter;
}
@@ -2802,28 +2803,29 @@ void RAWParams::BayerSensor::setPixelShiftDefaults()
pixelShiftGreen = true;
pixelShiftBlur = true;
pixelShiftSmoothFactor = 0.7;
- pixelShiftLmmse = false;
pixelShiftEqualBright = false;
pixelShiftEqualBrightChannel = false;
pixelShiftNonGreenCross = true;
+ pixelShiftDemosaicMethod = getPSDemosaicMethodString(PSDemosaicMethod::AMAZE);
}
const std::vector& RAWParams::BayerSensor::getMethodStrings()
{
static const std::vector method_strings {
"amaze",
- "igv",
+ "amazevng4",
+ "rcd",
+ "dcb",
"lmmse",
+ "igv",
+ "ahd",
"eahd",
"hphd",
"vng4",
- "dcb",
- "ahd",
- "rcd",
"fast",
"mono",
- "none",
- "pixelshift"
+ "pixelshift",
+ "none"
};
return method_strings;
}
@@ -2833,8 +2835,26 @@ Glib::ustring RAWParams::BayerSensor::getMethodString(Method method)
return getMethodStrings()[toUnderlying(method)];
}
+const std::vector& RAWParams::BayerSensor::getPSDemosaicMethodStrings()
+{
+ static const std::vector method_strings {
+ "amaze",
+ "amazevng4",
+ "lmmse"
+ };
+ return method_strings;
+}
+
+Glib::ustring RAWParams::BayerSensor::getPSDemosaicMethodString(PSDemosaicMethod method)
+{
+ return getPSDemosaicMethodStrings()[toUnderlying(method)];
+}
+
+
+
RAWParams::XTransSensor::XTransSensor() :
method(getMethodString(Method::THREE_PASS)),
+ dualDemosaicContrast(20),
ccSteps(0),
blackred(0.0),
blackgreen(0.0),
@@ -2846,6 +2866,7 @@ bool RAWParams::XTransSensor::operator ==(const XTransSensor& other) const
{
return
method == other.method
+ && dualDemosaicContrast == other.dualDemosaicContrast
&& ccSteps == other.ccSteps
&& blackred == other.blackred
&& blackgreen == other.blackgreen
@@ -2860,6 +2881,7 @@ bool RAWParams::XTransSensor::operator !=(const XTransSensor& other) const
const std::vector& RAWParams::XTransSensor::getMethodStrings()
{
static const std::vector method_strings {
+ "4-pass",
"3-pass (best)",
"1-pass (medium)",
"fast",
@@ -3834,6 +3856,7 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->raw.bayersensor.dcbIterations, "RAW Bayer", "DCBIterations", raw.bayersensor.dcb_iterations, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.dcbEnhance, "RAW Bayer", "DCBEnhance", raw.bayersensor.dcb_enhance, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.lmmseIterations, "RAW Bayer", "LMMSEIterations", raw.bayersensor.lmmse_iterations, keyFile);
+ saveToKeyfile(!pedited || pedited->raw.bayersensor.dualDemosaicContrast, "RAW Bayer", "DualDemosaicContrast", raw.bayersensor.dualDemosaicContrast, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftMotionCorrectionMethod, "RAW Bayer", "PixelShiftMotionCorrectionMethod", toUnderlying(raw.bayersensor.pixelShiftMotionCorrectionMethod), keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftEperIso, "RAW Bayer", "PixelShiftEperIso", raw.bayersensor.pixelShiftEperIso, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftSigma, "RAW Bayer", "PixelShiftSigma", raw.bayersensor.pixelShiftSigma, keyFile);
@@ -3844,12 +3867,13 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftGreen, "RAW Bayer", "pixelShiftGreen", raw.bayersensor.pixelShiftGreen, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftBlur, "RAW Bayer", "pixelShiftBlur", raw.bayersensor.pixelShiftBlur, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftSmooth, "RAW Bayer", "pixelShiftSmoothFactor", raw.bayersensor.pixelShiftSmoothFactor, keyFile);
- saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftLmmse, "RAW Bayer", "pixelShiftLmmse", raw.bayersensor.pixelShiftLmmse, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftEqualBright, "RAW Bayer", "pixelShiftEqualBright", raw.bayersensor.pixelShiftEqualBright, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftEqualBrightChannel, "RAW Bayer", "pixelShiftEqualBrightChannel", raw.bayersensor.pixelShiftEqualBrightChannel, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftNonGreenCross, "RAW Bayer", "pixelShiftNonGreenCross", raw.bayersensor.pixelShiftNonGreenCross, keyFile);
+ saveToKeyfile(!pedited || pedited->raw.bayersensor.pixelShiftDemosaicMethod, "RAW Bayer", "pixelShiftDemosaicMethod", raw.bayersensor.pixelShiftDemosaicMethod, keyFile);
saveToKeyfile(!pedited || pedited->raw.bayersensor.pdafLinesFilter, "RAW Bayer", "PDAFLinesFilter", raw.bayersensor.pdafLinesFilter, keyFile);
saveToKeyfile(!pedited || pedited->raw.xtranssensor.method, "RAW X-Trans", "Method", raw.xtranssensor.method, keyFile);
+ saveToKeyfile(!pedited || pedited->raw.xtranssensor.dualDemosaicContrast, "RAW X-Trans", "DualDemosaicContrast", raw.xtranssensor.dualDemosaicContrast, keyFile);
saveToKeyfile(!pedited || pedited->raw.xtranssensor.ccSteps, "RAW X-Trans", "CcSteps", raw.xtranssensor.ccSteps, keyFile);
saveToKeyfile(!pedited || pedited->raw.xtranssensor.exBlackRed, "RAW X-Trans", "PreBlackRed", raw.xtranssensor.blackred, keyFile);
saveToKeyfile(!pedited || pedited->raw.xtranssensor.exBlackGreen, "RAW X-Trans", "PreBlackGreen", raw.xtranssensor.blackgreen, keyFile);
@@ -5323,6 +5347,7 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "RAW Bayer", "DCBIterations", pedited, raw.bayersensor.dcb_iterations, pedited->raw.bayersensor.dcbIterations);
assignFromKeyfile(keyFile, "RAW Bayer", "DCBEnhance", pedited, raw.bayersensor.dcb_enhance, pedited->raw.bayersensor.dcbEnhance);
assignFromKeyfile(keyFile, "RAW Bayer", "LMMSEIterations", pedited, raw.bayersensor.lmmse_iterations, pedited->raw.bayersensor.lmmseIterations);
+ assignFromKeyfile(keyFile, "RAW Bayer", "DualDemosaicContrast", pedited, raw.bayersensor.dualDemosaicContrast, pedited->raw.bayersensor.dualDemosaicContrast);
if (keyFile.has_key("RAW Bayer", "PixelShiftMotionCorrectionMethod")) {
raw.bayersensor.pixelShiftMotionCorrectionMethod = (RAWParams::BayerSensor::PSMotionCorrectionMethod)keyFile.get_integer("RAW Bayer", "PixelShiftMotionCorrectionMethod");
@@ -5344,15 +5369,32 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftGreen", pedited, raw.bayersensor.pixelShiftGreen, pedited->raw.bayersensor.pixelShiftGreen);
assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftBlur", pedited, raw.bayersensor.pixelShiftBlur, pedited->raw.bayersensor.pixelShiftBlur);
assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftSmoothFactor", pedited, raw.bayersensor.pixelShiftSmoothFactor, pedited->raw.bayersensor.pixelShiftSmooth);
- assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftLmmse", pedited, raw.bayersensor.pixelShiftLmmse, pedited->raw.bayersensor.pixelShiftLmmse);
assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftEqualBright", pedited, raw.bayersensor.pixelShiftEqualBright, pedited->raw.bayersensor.pixelShiftEqualBright);
assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftEqualBrightChannel", pedited, raw.bayersensor.pixelShiftEqualBrightChannel, pedited->raw.bayersensor.pixelShiftEqualBrightChannel);
assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftNonGreenCross", pedited, raw.bayersensor.pixelShiftNonGreenCross, pedited->raw.bayersensor.pixelShiftNonGreenCross);
+
+ if (ppVersion < 336) {
+ if (keyFile.has_key("RAW Bayer", "pixelShiftLmmse")) {
+ bool useLmmse = keyFile.get_boolean ("RAW Bayer", "pixelShiftLmmse");
+ if (useLmmse) {
+ raw.bayersensor.pixelShiftDemosaicMethod = raw.bayersensor.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::LMMSE);
+ } else {
+ raw.bayersensor.pixelShiftDemosaicMethod = raw.bayersensor.getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod::AMAZE);
+ }
+ if (pedited) {
+ pedited->raw.bayersensor.pixelShiftDemosaicMethod = true;
+ }
+ }
+ } else {
+ assignFromKeyfile(keyFile, "RAW Bayer", "pixelShiftDemosaicMethod", pedited, raw.bayersensor.pixelShiftDemosaicMethod, pedited->raw.bayersensor.pixelShiftDemosaicMethod);
+ }
+
assignFromKeyfile(keyFile, "RAW Bayer", "PDAFLinesFilter", pedited, raw.bayersensor.pdafLinesFilter, pedited->raw.bayersensor.pdafLinesFilter);
}
if (keyFile.has_group("RAW X-Trans")) {
assignFromKeyfile(keyFile, "RAW X-Trans", "Method", pedited, raw.xtranssensor.method, pedited->raw.xtranssensor.method);
+ assignFromKeyfile(keyFile, "RAW X-Trans", "DualDemosaicContrast", pedited, raw.xtranssensor.dualDemosaicContrast, pedited->raw.xtranssensor.dualDemosaicContrast);
assignFromKeyfile(keyFile, "RAW X-Trans", "CcSteps", pedited, raw.xtranssensor.ccSteps, pedited->raw.xtranssensor.ccSteps);
assignFromKeyfile(keyFile, "RAW X-Trans", "PreBlackRed", pedited, raw.xtranssensor.blackred, pedited->raw.xtranssensor.exBlackRed);
assignFromKeyfile(keyFile, "RAW X-Trans", "PreBlackGreen", pedited, raw.xtranssensor.blackgreen, pedited->raw.xtranssensor.exBlackGreen);
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 8e55b55de..b2ba036dd 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1363,18 +1363,19 @@ struct RAWParams {
struct BayerSensor {
enum class Method {
AMAZE,
- IGV,
+ AMAZEVNG4,
+ RCD,
+ DCB,
LMMSE,
+ IGV,
+ AHD,
EAHD,
HPHD,
VNG4,
- DCB,
- AHD,
- RCD,
FAST,
MONO,
- NONE,
- PIXELSHIFT
+ PIXELSHIFT,
+ NONE
};
enum class PSMotionCorrectionMethod {
@@ -1383,6 +1384,12 @@ struct RAWParams {
CUSTOM
};
+ enum class PSDemosaicMethod {
+ AMAZE,
+ AMAZEVNG4,
+ LMMSE
+ };
+
Glib::ustring method;
int imageNum;
int ccSteps;
@@ -1402,6 +1409,7 @@ struct RAWParams {
int greenthresh;
int dcb_iterations;
int lmmse_iterations;
+ double dualDemosaicContrast;
PSMotionCorrectionMethod pixelShiftMotionCorrectionMethod;
double pixelShiftEperIso;
double pixelShiftSigma;
@@ -1412,10 +1420,10 @@ struct RAWParams {
bool pixelShiftGreen;
bool pixelShiftBlur;
double pixelShiftSmoothFactor;
- bool pixelShiftLmmse;
bool pixelShiftEqualBright;
bool pixelShiftEqualBrightChannel;
bool pixelShiftNonGreenCross;
+ Glib::ustring pixelShiftDemosaicMethod;
bool dcb_enhance;
bool pdafLinesFilter;
@@ -1428,6 +1436,9 @@ struct RAWParams {
static const std::vector& getMethodStrings();
static Glib::ustring getMethodString(Method method);
+
+ static const std::vector& getPSDemosaicMethodStrings();
+ static Glib::ustring getPSDemosaicMethodString(PSDemosaicMethod method);
};
/**
@@ -1435,6 +1446,7 @@ struct RAWParams {
*/
struct XTransSensor {
enum class Method {
+ FOUR_PASS,
THREE_PASS,
ONE_PASS,
FAST,
@@ -1443,6 +1455,7 @@ struct RAWParams {
};
Glib::ustring method;
+ double dualDemosaicContrast;
int ccSteps;
double blackred;
double blackgreen;
diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc
index 6ead97c2f..3c982c8b1 100644
--- a/rtengine/rawimage.cc
+++ b/rtengine/rawimage.cc
@@ -120,6 +120,8 @@ void RawImage::get_colorsCoeff(float *pre_mul_, float *scale_mul_, float *cblack
memset(dsum, 0, sizeof dsum);
+ constexpr float blackThreshold = 8.f;
+ constexpr float whiteThreshold = 25.f;
if (this->isBayer()) {
// calculate number of pixels per color
dsum[FC(0, 0) + 4] += (int)(((W + 1) / 2) * ((H + 1) / 2));
@@ -137,8 +139,8 @@ void RawImage::get_colorsCoeff(float *pre_mul_, float *scale_mul_, float *cblack
float whitefloat[4];
for (int c = 0; c < 4; c++) {
- cblackfloat[c] = cblack_[c];
- whitefloat[c] = this->get_white(c) - 25;
+ cblackfloat[c] = cblack_[c] + blackThreshold;
+ whitefloat[c] = this->get_white(c) - whiteThreshold;
}
float *tempdata = data[0];
@@ -156,7 +158,7 @@ void RawImage::get_colorsCoeff(float *pre_mul_, float *scale_mul_, float *cblack
int c = FC(y, x);
val = tempdata[y * W + x];
- if (val > whitefloat[c]) { // calculate number of pixels to be substracted from sum and skip the block
+ if (val > whitefloat[c] || val < cblackfloat[c]) { // calculate number of pixels to be subtracted from sum and skip the block
dsumthr[FC(row, col) + 4] += (int)(((xmax - col + 1) / 2) * ((ymax - row + 1) / 2));
dsumthr[FC(row, col + 1) + 4] += (int)(((xmax - col) / 2) * ((ymax - row + 1) / 2));
dsumthr[FC(row + 1, col) + 4] += (int)(((xmax - col + 1) / 2) * ((ymax - row) / 2));
@@ -164,10 +166,6 @@ void RawImage::get_colorsCoeff(float *pre_mul_, float *scale_mul_, float *cblack
goto skip_block2;
}
- if (val < cblackfloat[c]) {
- val = cblackfloat[c];
- }
-
sum[c] += val;
}
@@ -204,11 +202,13 @@ skip_block2:
memset(dsumthr, 0, sizeof dsumthr);
float sum[8];
// make local copies of the black and white values to avoid calculations and conversions
+ float cblackfloat[4];
float whitefloat[4];
for (int c = 0; c < 4; c++)
{
- whitefloat[c] = this->get_white(c) - 25;
+ cblackfloat[c] = cblack_[c] + blackThreshold;
+ whitefloat[c] = this->get_white(c) - whiteThreshold;
}
#pragma omp for nowait
@@ -223,13 +223,11 @@ skip_block2:
int c = XTRANSFC(y, x);
float val = data[y][x];
- if (val > whitefloat[c]) {
+ if (val > whitefloat[c] || val < cblackfloat[c]) {
goto skip_block3;
}
- if ((val -= cblack_[c]) < 0) {
- val = 0;
- }
+ val -= cblack_[c];
sum[c] += val;
sum[c + 4]++;
@@ -264,27 +262,16 @@ skip_block3:
for (size_t y = row; y < row + 8 && y < H; y++)
for (size_t x = col; x < col + 8 && x < W; x++)
for (int c = 0; c < 3; c++) {
- if (this->isBayer()) {
- c = FC(y, x);
- val = data[y][x];
- } else {
- val = data[y][3 * x + c];
- }
+ val = data[y][3 * x + c];
- if (val > this->get_white(c) - 25) {
+ if (val > this->get_white(c) - whiteThreshold || val < cblack_[c] + blackThreshold) {
goto skip_block;
}
- if ((val -= cblack_[c]) < 0) {
- val = 0;
- }
+ val -= cblack_[c];
sum[c] += val;
sum[c + 4]++;
-
- if (this->isBayer()) {
- break;
- }
}
for (c = 0; c < 8; c++) {
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 7f8867b2f..01882fe9c 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -35,6 +35,7 @@
#include "improcfun.h"
#include "rtlensfun.h"
#include "pdaflinesfilter.h"
+#include "camconst.h"
#ifdef _OPENMP
#include
#endif
@@ -1956,8 +1957,19 @@ void RawImageSource::preprocess(const RAWParams &raw, const LensProfParams &lens
}
}
- // check if it is an olympus E camera or green equilibration is enabled. If yes, compute G channel pre-compensation factors
- if (ri->getSensorType() == ST_BAYER && (raw.bayersensor.greenthresh || (((idata->getMake().size() >= 7 && idata->getMake().substr(0, 7) == "OLYMPUS" && idata->getModel()[0] == 'E') || (idata->getMake().size() >= 9 && idata->getMake().substr(0, 9) == "Panasonic")) && raw.bayersensor.method != RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::VNG4)))) {
+ // check if green equilibration is needed. If yes, compute G channel pre-compensation factors
+ const auto globalGreenEq =
+ [&]() -> bool
+ {
+ CameraConstantsStore *ccs = CameraConstantsStore::getInstance();
+ CameraConst *cc = ccs->get(ri->get_maker().c_str(), ri->get_model().c_str());
+ return cc && cc->get_globalGreenEquilibration();
+ };
+
+ if ( ri->getSensorType() == ST_BAYER && (raw.bayersensor.greenthresh || (globalGreenEq() && raw.bayersensor.method != RAWParams::BayerSensor::getMethodString( RAWParams::BayerSensor::Method::VNG4))) ) {
+ if (settings->verbose) {
+ printf("Performing global green equilibration...\n");
+ }
// global correction
if (numFrames == 4) {
for (int i = 0; i < 4; ++i) {
@@ -2080,11 +2092,13 @@ void RawImageSource::demosaic(const RAWParams &raw)
if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::HPHD)) {
hphd_demosaic();
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::VNG4)) {
- vng4_demosaic();
+ vng4_demosaic (rawData, red, green, blue);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD)) {
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::PIXELSHIFT)) {
pixelshift(0, 0, W, H, raw.bayersensor, currFrame, ri->get_maker(), ri->get_model(), raw.expos);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCB)) {
@@ -2109,11 +2123,13 @@ void RawImageSource::demosaic(const RAWParams &raw)
} else if (ri->getSensorType() == ST_FUJI_XTRANS) {
if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::FAST)) {
- fast_xtrans_interpolate();
+ fast_xtrans_interpolate(rawData, red, green, blue);
} else if (raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::ONE_PASS)) {
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::MONO)) {
nodemosaic(true);
} else {
@@ -5147,7 +5163,7 @@ ColorTemp RawImageSource::getSpotWB(std::vector &red, std::vector &red, std::vector &red, std::vector &red, std::vector &rawData, float* ar, float* ab, float* pg, float* cg, float* ng, int i, float r_mul, float g_mul, float b_mul, int x1, int width, int skip);
float* CA_correct_RT (const bool autoCA, const double cared, const double cablue, const double caautostrength, array2D &rawData, double *fitParamsTransfer, bool fitParamsIn, bool fitParamsOut, float * buffer, bool freeBuffer);
void ddct8x8s(int isgn, float a[8][8]);
@@ -266,12 +266,13 @@ protected:
void nodemosaic(bool bw);
void eahd_demosaic();
void hphd_demosaic();
- void vng4_demosaic();
+ void vng4_demosaic(const array2D &rawData, array2D &red, array2D &green, array2D &blue, bool keepGreens = false);
void ppg_demosaic();
void jdl_interpolate_omp();
void igv_interpolate(int winw, int winh);
void lmmse_interpolate_omp(int winw, int winh, array2D &rawData, array2D &red, array2D &green, array2D &blue, int iterations);
- void amaze_demosaic_RT(int winx, int winy, int winw, int winh, array2D &rawData, array2D &red, array2D &green, array2D &blue);//Emil's code for AMaZE
+ void amaze_demosaic_RT(int winx, int winy, int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue);//Emil's code for AMaZE
+ void amaze_vng4_demosaic_RT(int winw, int winh, const array2D &rawData, array2D &red, array2D &green, array2D &blue, double contrast = 0.0);
void fast_demosaic();//Emil's code for fast demosaicing
void dcb_demosaic(int iterations, bool dcb_enhance);
void ahd_demosaic();
@@ -294,8 +295,9 @@ protected:
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 xtrans_interpolate(const int passes, const bool useCieLab);
- void fast_xtrans_interpolate();
+ void fast_xtrans_interpolate (const array2D &rawData, array2D &red, array2D &green, array2D &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 hflip(Imagefloat* im);
void vflip(Imagefloat* im);
diff --git a/rtengine/rawimagesource_i.h b/rtengine/rawimagesource_i.h
index 689ab03db..91d62ecab 100644
--- a/rtengine/rawimagesource_i.h
+++ b/rtengine/rawimagesource_i.h
@@ -276,7 +276,7 @@ inline void RawImageSource::interpolate_row_rb (float* ar, float* ab, float* pg,
}
}
-inline void RawImageSource::interpolate_row_rb_mul_pp (float* ar, float* ab, float* pg, float* cg, float* ng, int i, float r_mul, float g_mul, float b_mul, int x1, int width, int skip)
+inline void RawImageSource::interpolate_row_rb_mul_pp (const array2D &rawData, float* ar, float* ab, float* pg, float* cg, float* ng, int i, float r_mul, float g_mul, float b_mul, int x1, int width, int skip)
{
if ((ri->ISRED(i, 0) || ri->ISRED(i, 1)) && pg && ng) {
diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc
index 79508cfb3..cff145de8 100644
--- a/rtengine/rt_algo.cc
+++ b/rtengine/rt_algo.cc
@@ -25,7 +25,31 @@
#include
#endif
+#include "gauss.h"
+#include "opthelper.h"
#include "rt_algo.h"
+#include "rt_math.h"
+#include "sleef.c"
+
+namespace {
+float calcBlendFactor(float val, float threshold) {
+ // sigmoid function
+ // result is in ]0;1] range
+ // inflexion point is at (x, y) (threshold, 0.5)
+ return 1.f / (1.f + xexpf(16.f - 16.f * val / threshold));
+}
+
+#ifdef __SSE2__
+vfloat calcBlendFactor(vfloat valv, vfloat thresholdv) {
+ // sigmoid function
+ // result is in ]0;1] range
+ // inflexion point is at (x, y) (threshold, 0.5)
+ const vfloat onev = F2V(1.f);
+ const vfloat c16v = F2V(16.f);
+ return onev / (onev + xexpf(c16v - c16v * valv / thresholdv));
+}
+#endif
+}
namespace rtengine
{
@@ -164,4 +188,73 @@ void findMinMaxPercentile(const float* data, size_t size, float minPrct, float&
maxOut += minVal;
}
+void buildBlendMask(float** luminance, rtengine::JaggedArray &blend, int W, int H, float contrastThreshold, float amount) {
+
+ if(contrastThreshold == 0.f) {
+ for(int j = 0; j < H; ++j) {
+ for(int i = 0; i < W; ++i) {
+ blend[j][i] = amount;
+ }
+ }
+ } 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);
+ }
+ }
+}
}
diff --git a/rtengine/rt_algo.h b/rtengine/rt_algo.h
index 2630bbf41..1aac26c3e 100644
--- a/rtengine/rt_algo.h
+++ b/rtengine/rt_algo.h
@@ -20,10 +20,10 @@
#pragma once
#include
+#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 &blend, int W, int H, float contrastThreshold, float amount = 1.f);
}
diff --git a/rtengine/rtengine.h b/rtengine/rtengine.h
index 1fcc92735..7279feaf2 100644
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -494,6 +494,7 @@ public:
virtual void getMonitorProfile (Glib::ustring& monitorProfile, RenderingIntent& intent) const = 0;
virtual void setSoftProofing (bool softProof, bool gamutCheck) = 0;
virtual void getSoftProofing (bool &softProof, bool &gamutCheck) = 0;
+ virtual void setSharpMask (bool sharpMask) = 0;
virtual ~StagedImageProcessor () {}
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index 36e8115ad..9f76b0ba3 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -2660,8 +2660,6 @@ private:
}
if (params.raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::PIXELSHIFT)) {
- params.raw.bayersensor.method = procparams::RAWParams::BayerSensor::getMethodString(params.raw.bayersensor.pixelShiftLmmse ? procparams::RAWParams::BayerSensor::Method::LMMSE : procparams::RAWParams::BayerSensor::Method::AMAZE);
- } else if (params.raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::AMAZE)) {
params.raw.bayersensor.method = procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::RCD);
}
diff --git a/rtengine/vng4_demosaic_RT.cc b/rtengine/vng4_demosaic_RT.cc
new file mode 100644
index 000000000..d6520607e
--- /dev/null
+++ b/rtengine/vng4_demosaic_RT.cc
@@ -0,0 +1,344 @@
+////////////////////////////////////////////////////////////////
+//
+// VNG4 demosaic algorithm
+//
+// optimized for speed by Ingo Weyrich
+//
+//
+// vng4_interpolate_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 .
+//
+////////////////////////////////////////////////////////////////
+
+#include "rtengine.h"
+#include "rawimagesource.h"
+#include "rawimagesource_i.h"
+#include "../rtgui/multilangmgr.h"
+//#define BENCHMARK
+#include "StopWatch.h"
+
+namespace rtengine
+{
+#define fc(row,col) (prefilters >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)
+typedef unsigned short ushort;
+void RawImageSource::vng4_demosaic (const array2D &rawData, array2D &red, array2D &green, array2D &blue, bool keepGreens)
+{
+ BENCHFUN
+ const signed short int *cp, terms[] = {
+ -2, -2, +0, -1, 0, 0x01, -2, -2, +0, +0, 1, 0x01, -2, -1, -1, +0, 0, 0x01,
+ -2, -1, +0, -1, 0, 0x02, -2, -1, +0, +0, 0, 0x03, -2, -1, +0, +1, 1, 0x01,
+ -2, +0, +0, -1, 0, 0x06, -2, +0, +0, +0, 1, 0x02, -2, +0, +0, +1, 0, 0x03,
+ -2, +1, -1, +0, 0, 0x04, -2, +1, +0, -1, 1, 0x04, -2, +1, +0, +0, 0, 0x06,
+ -2, +1, +0, +1, 0, 0x02, -2, +2, +0, +0, 1, 0x04, -2, +2, +0, +1, 0, 0x04,
+ -1, -2, -1, +0, 0, 0x80, -1, -2, +0, -1, 0, 0x01, -1, -2, +1, -1, 0, 0x01,
+ -1, -2, +1, +0, 1, 0x01, -1, -1, -1, +1, 0, 0x88, -1, -1, +1, -2, 0, 0x40,
+ -1, -1, +1, -1, 0, 0x22, -1, -1, +1, +0, 0, 0x33, -1, -1, +1, +1, 1, 0x11,
+ -1, +0, -1, +2, 0, 0x08, -1, +0, +0, -1, 0, 0x44, -1, +0, +0, +1, 0, 0x11,
+ -1, +0, +1, -2, 1, 0x40, -1, +0, +1, -1, 0, 0x66, -1, +0, +1, +0, 1, 0x22,
+ -1, +0, +1, +1, 0, 0x33, -1, +0, +1, +2, 1, 0x10, -1, +1, +1, -1, 1, 0x44,
+ -1, +1, +1, +0, 0, 0x66, -1, +1, +1, +1, 0, 0x22, -1, +1, +1, +2, 0, 0x10,
+ -1, +2, +0, +1, 0, 0x04, -1, +2, +1, +0, 1, 0x04, -1, +2, +1, +1, 0, 0x04,
+ +0, -2, +0, +0, 1, 0x80, +0, -1, +0, +1, 1, 0x88, +0, -1, +1, -2, 0, 0x40,
+ +0, -1, +1, +0, 0, 0x11, +0, -1, +2, -2, 0, 0x40, +0, -1, +2, -1, 0, 0x20,
+ +0, -1, +2, +0, 0, 0x30, +0, -1, +2, +1, 1, 0x10, +0, +0, +0, +2, 1, 0x08,
+ +0, +0, +2, -2, 1, 0x40, +0, +0, +2, -1, 0, 0x60, +0, +0, +2, +0, 1, 0x20,
+ +0, +0, +2, +1, 0, 0x30, +0, +0, +2, +2, 1, 0x10, +0, +1, +1, +0, 0, 0x44,
+ +0, +1, +1, +2, 0, 0x10, +0, +1, +2, -1, 1, 0x40, +0, +1, +2, +0, 0, 0x60,
+ +0, +1, +2, +1, 0, 0x20, +0, +1, +2, +2, 0, 0x10, +1, -2, +1, +0, 0, 0x80,
+ +1, -1, +1, +1, 0, 0x88, +1, +0, +1, +2, 0, 0x08, +1, +0, +2, -1, 0, 0x40,
+ +1, +0, +2, +1, 0, 0x10
+ },
+ chood[] = { -1, -1, -1, 0, -1, +1, 0, +1, +1, +1, +1, 0, +1, -1, 0, -1 };
+
+ double progress = 0.0;
+ const bool plistenerActive = plistener;
+
+ if (plistenerActive) {
+ plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::VNG4)));
+ plistener->setProgress (progress);
+ }
+
+ const unsigned prefilters = ri->prefilters;
+ const int width = W, height = H;
+ constexpr unsigned int colors = 4;
+ float (*image)[4];
+
+ image = (float (*)[4]) calloc (height * width, sizeof * image);
+
+#ifdef _OPENMP
+ #pragma omp parallel for
+#endif
+
+ for (int ii = 0; ii < H; ii++)
+ for (int jj = 0; jj < W; jj++) {
+ image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj];
+ }
+
+ {
+ int lcode[16][16][32];
+ float mul[16][16][8];
+ float csum[16][16][4];
+
+// first linear interpolation
+ for (int row = 0; row < 16; row++)
+ for (int col = 0; col < 16; col++) {
+ int * ip = lcode[row][col];
+ int mulcount = 0;
+ float sum[4];
+ memset (sum, 0, sizeof sum);
+
+ for (int y = -1; y <= 1; y++)
+ for (int x = -1; x <= 1; x++) {
+ int shift = (y == 0) + (x == 0);
+
+ if (shift == 2) {
+ continue;
+ }
+
+ int color = fc(row + y, col + x);
+ *ip++ = (width * y + x) * 4 + color;
+
+ mul[row][col][mulcount] = (1 << shift);
+ *ip++ = color;
+ sum[color] += (1 << shift);
+ mulcount++;
+ }
+
+ int colcount = 0;
+
+ for (unsigned int c = 0; c < colors; c++)
+ if (c != fc(row, col)) {
+ *ip++ = c;
+ csum[row][col][colcount] = sum[c];
+ colcount ++;
+ }
+ }
+
+#ifdef _OPENMP
+ #pragma omp parallel for
+#endif
+
+ for (int row = 1; row < height - 1; row++) {
+ for (int col = 1; col < width - 1; col++) {
+ float * pix = image[row * width + col];
+ int * ip = lcode[row & 15][col & 15];
+ float sum[4];
+ memset (sum, 0, sizeof sum);
+
+ for (int i = 0; i < 8; i++, ip += 2) {
+ sum[ip[1]] += pix[ip[0]] * mul[row & 15][col & 15][i];
+ }
+
+ for (unsigned int i = 0; i < colors - 1; i++, ip++) {
+ pix[ip[0]] = sum[ip[0]] / csum[row & 15][col & 15][i];
+ }
+ }
+ }
+ }
+
+ const int prow = 7, pcol = 1;
+ int *code[8][2];
+ int t, g;
+ int * ip = (int *) calloc ((prow + 1) * (pcol + 1), 1280);
+
+ for (int row = 0; row <= prow; row++) /* Precalculate for VNG */
+ for (int col = 0; col <= pcol; col++) {
+ code[row][col] = ip;
+
+ for (cp = terms, t = 0; t < 64; t++) {
+ int y1 = *cp++;
+ int x1 = *cp++;
+ int y2 = *cp++;
+ int x2 = *cp++;
+ int weight = *cp++;
+ int grads = *cp++;
+ unsigned int color = fc(row + y1, col + x1);
+
+ if (fc(row + y2, col + x2) != color) {
+ continue;
+ }
+
+ int diag = (fc(row, col + 1) == color && fc(row + 1, col) == color) ? 2 : 1;
+
+ if (abs(y1 - y2) == diag && abs(x1 - x2) == diag) {
+ continue;
+ }
+
+ *ip++ = (y1 * width + x1) * 4 + color;
+ *ip++ = (y2 * width + x2) * 4 + color;
+ *ip++ = weight;
+
+ for (g = 0; g < 8; g++)
+ if (grads & (1 << g)) {
+ *ip++ = g;
+ }
+
+ *ip++ = -1;
+ }
+
+ *ip++ = INT_MAX;
+
+ for (cp = chood, g = 0; g < 8; g++) {
+ int y = *cp++;
+ int x = *cp++;
+ *ip++ = (y * width + x) * 4;
+ unsigned int color = fc(row, col);
+
+ if (fc(row + y, col + x) != color && fc(row + y * 2, col + x * 2) == color) {
+ *ip++ = (y * width + x) * 8 + color;
+ } else {
+ *ip++ = 0;
+ }
+ }
+ }
+
+ if(plistenerActive) {
+ progress = 0.1;
+ plistener->setProgress (progress);
+ }
+
+#ifdef _OPENMP
+ #pragma omp parallel
+#endif
+ {
+ float gval[8], thold, sum[3];
+ int g;
+ const int progressStep = 64;
+ const double progressInc = (0.98 - progress) / ((height - 2) / progressStep);
+#ifdef _OPENMP
+ #pragma omp for schedule(dynamic, 16) nowait
+#endif
+
+ for (int row = 2; row < height - 2; row++) { /* Do VNG interpolation */
+ for (int col = 2; col < width - 2; col++) {
+ float * pix = image[row * width + col];
+ int color = fc(row, col);
+ if (keepGreens && (color & 1)) {
+ green[row][col] = pix[color];
+ } else {
+ int * ip = code[row & prow][col & pcol];
+ memset (gval, 0, sizeof gval);
+
+ while ((g = ip[0]) != INT_MAX) { /* Calculate gradients */
+ float diff = fabsf(pix[g] - pix[ip[1]]) * (1 << ip[2]);
+ gval[ip[3]] += diff;
+ ip += 4;
+
+ while ((g = *ip++) != -1) {
+ gval[g] += diff;
+ }
+ }
+
+ ip++;
+ {
+ float gmin, gmax;
+ gmin = gmax = gval[0]; /* Choose a threshold */
+
+ for (g = 1; g < 8; g++) {
+ if (gmin > gval[g]) {
+ gmin = gval[g];
+ }
+
+ if (gmax < gval[g]) {
+ gmax = gval[g];
+ }
+ }
+
+ thold = gmin + (gmax / 2);
+ }
+ memset (sum, 0, sizeof sum);
+ float t1, t2;
+ t1 = t2 = pix[color];
+
+ if(color & 1) {
+ int num = 0;
+
+ for (g = 0; g < 8; g++, ip += 2) { /* Average the neighbors */
+ if (gval[g] <= thold) {
+ if(ip[1]) {
+ sum[0] += (t1 + pix[ip[1]]) * 0.5f;
+ }
+
+ sum[1] += pix[ip[0] + (color ^ 2)];
+ num++;
+ }
+ }
+
+ t1 += (sum[1] - sum[0]) / num;
+ } else {
+ int num = 0;
+
+ for (g = 0; g < 8; g++, ip += 2) { /* Average the neighbors */
+ if (gval[g] <= thold) {
+ sum[1] += pix[ip[0] + 1];
+ sum[2] += pix[ip[0] + 3];
+
+ if(ip[1]) {
+ sum[0] += (t1 + pix[ip[1]]) * 0.5f;
+ }
+
+ num++;
+ }
+ }
+
+ t1 += (sum[1] - sum[0]) / num;
+ t2 += (sum[2] - sum[0]) / num;
+ }
+
+ green[row][col] = 0.5f * (t1 + t2);
+ }
+ }
+
+ if(plistenerActive) {
+ if((row % progressStep) == 0)
+#ifdef _OPENMP
+ #pragma omp critical (updateprogress)
+#endif
+ {
+ progress += progressInc;
+ plistener->setProgress (progress);
+ }
+ }
+ }
+
+ }
+ free (code[0][0]);
+ free (image);
+
+ if(plistenerActive) {
+ plistener->setProgress (0.98);
+ }
+
+ // Interpolate R and B
+#ifdef _OPENMP
+ #pragma omp parallel for
+#endif
+
+ for (int i = 0; i < H; i++) {
+ if (i == 0)
+ // rm, gm, bm must be recovered
+ //interpolate_row_rb_mul_pp (red, blue, NULL, green[i], green[i+1], i, rm, gm, bm, 0, W, 1);
+ {
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], nullptr, green[i], green[i + 1], i, 1.0, 1.0, 1.0, 0, W, 1);
+ } else if (i == H - 1) {
+ interpolate_row_rb_mul_pp (rawData, red[i], blue[i], green[i - 1], green[i], nullptr, i, 1.0, 1.0, 1.0, 0, W, 1);
+ } else {
+ 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);
+ }
+ }
+
+ if(plistenerActive) {
+ plistener->setProgress (1.0);
+ }
+}
+}
diff --git a/rtengine/xtrans_demosaic.cc b/rtengine/xtrans_demosaic.cc
index a8e964ad0..411388ee5 100644
--- a/rtengine/xtrans_demosaic.cc
+++ b/rtengine/xtrans_demosaic.cc
@@ -21,6 +21,7 @@
#include "rtengine.h"
#include "rawimagesource.h"
+#include "rt_algo.h"
#include "rt_math.h"
#include "../rtgui/multilangmgr.h"
#include "opthelper.h"
@@ -957,7 +958,7 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab)
}
#undef CLIP
-void RawImageSource::fast_xtrans_interpolate ()
+void RawImageSource::fast_xtrans_interpolate (const array2D &rawData, array2D &red, array2D &green, array2D &blue)
{
// if (settings->verbose) {
// printf("fast X-Trans interpolation...\n");
@@ -1017,4 +1018,61 @@ void RawImageSource::fast_xtrans_interpolate ()
}
#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 redTmp(W, H);
+ array2D greenTmp(W, H);
+ array2D blueTmp(W, H);
+ array2D 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 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]);
+ }
+ }
+
+}
+
}
\ No newline at end of file
diff --git a/rtgui/addsetids.h b/rtgui/addsetids.h
index c5913a6e2..15c6ba078 100644
--- a/rtgui/addsetids.h
+++ b/rtgui/addsetids.h
@@ -136,6 +136,13 @@ enum {
ADDSET_FATTAL_ANCHOR,
ADDSET_SHARPENMICRO_CONTRAST,
ADDSET_SHARP_CONTRAST,
+ ADDSET_BAYER_FALSE_COLOR_SUPPRESSION,
+ ADDSET_BAYER_ITER,
+ ADDSET_BAYER_PS_SMOOTH,
+ ADDSET_BAYER_PS_EPERISO,
+ ADDSET_BAYER_PS_SIGMA,
+ ADDSET_BAYER_DUALDEMOZCONTRAST,
+ ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION,
ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!
};
diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc
index addf994f5..54882c15c 100644
--- a/rtgui/batchtoolpanelcoord.cc
+++ b/rtgui/batchtoolpanelcoord.cc
@@ -165,6 +165,8 @@ void BatchToolPanelCoordinator::initSession ()
dirpyrequalizer->setAdjusterBehavior (false, false, false);
wavelet->setAdjusterBehavior (false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false);
dirpyrdenoise->setAdjusterBehavior (false, false, false, false, false, false, false);
+ bayerprocess->setAdjusterBehavior(false, false, false, false, false, false);
+ xtransprocess->setAdjusterBehavior(false, false);
bayerpreprocess->setAdjusterBehavior (false, false);
rawcacorrection->setAdjusterBehavior (false);
flatfield->setAdjusterBehavior (false);
@@ -211,6 +213,8 @@ void BatchToolPanelCoordinator::initSession ()
dirpyrequalizer->setAdjusterBehavior (options.baBehav[ADDSET_DIRPYREQ], options.baBehav[ADDSET_DIRPYREQ_THRESHOLD], options.baBehav[ADDSET_DIRPYREQ_SKINPROTECT]);
wavelet->setAdjusterBehavior (options.baBehav[ADDSET_WA], options.baBehav[ADDSET_WA_THRESHOLD], options.baBehav[ADDSET_WA_THRESHOLD2], options.baBehav[ADDSET_WA_THRES], options.baBehav[ADDSET_WA_CHRO], options.baBehav[ADDSET_WA_CHROMA], options.baBehav[ADDSET_WA_CONTRAST], options.baBehav[ADDSET_WA_SKINPROTECT], options.baBehav[ADDSET_WA_RESCHRO], options.baBehav[ADDSET_WA_TMRS], options.baBehav[ADDSET_WA_RESCON], options.baBehav[ADDSET_WA_RESCONH], options.baBehav[ADDSET_WA_THRR], options.baBehav[ADDSET_WA_THRRH], options.baBehav[ADDSET_WA_SKYPROTECT], options.baBehav[ADDSET_WA_EDGRAD], options.baBehav[ADDSET_WA_EDGVAL], options.baBehav[ADDSET_WA_STRENGTH], options.baBehav[ADDSET_WA_GAMMA], options.baBehav[ADDSET_WA_EDGEDETECT], options.baBehav[ADDSET_WA_EDGEDETECTTHR], options.baBehav[ADDSET_WA_EDGEDETECTTHR2]);
dirpyrdenoise->setAdjusterBehavior (options.baBehav[ADDSET_DIRPYRDN_LUMA], options.baBehav[ADDSET_DIRPYRDN_LUMDET], options.baBehav[ADDSET_DIRPYRDN_CHROMA], options.baBehav[ADDSET_DIRPYRDN_CHROMARED], options.baBehav[ADDSET_DIRPYRDN_CHROMABLUE], options.baBehav[ADDSET_DIRPYRDN_GAMMA], options.baBehav[ADDSET_DIRPYRDN_PASSES]);
+ bayerprocess->setAdjusterBehavior(options.baBehav[ADDSET_BAYER_FALSE_COLOR_SUPPRESSION], options.baBehav[ADDSET_BAYER_ITER], options.baBehav[ADDSET_BAYER_DUALDEMOZCONTRAST], options.baBehav[ADDSET_BAYER_PS_SIGMA], options.baBehav[ADDSET_BAYER_PS_SMOOTH], options.baBehav[ADDSET_BAYER_PS_EPERISO]);
+ xtransprocess->setAdjusterBehavior(options.baBehav[ADDSET_BAYER_FALSE_COLOR_SUPPRESSION], options.baBehav[ADDSET_BAYER_DUALDEMOZCONTRAST]);
bayerpreprocess->setAdjusterBehavior (options.baBehav[ADDSET_PREPROCESS_LINEDENOISE], options.baBehav[ADDSET_PREPROCESS_GREENEQUIL]);
rawcacorrection->setAdjusterBehavior (options.baBehav[ADDSET_RAWCACORR]);
flatfield->setAdjusterBehavior (options.baBehav[ADDSET_RAWFFCLIPCONTROL]);
@@ -351,6 +355,13 @@ void BatchToolPanelCoordinator::initSession ()
pparams.raw.bayersensor.black0 = pparams.raw.bayersensor.black1 = pparams.raw.bayersensor.black2 = pparams.raw.bayersensor.black3 =
pparams.raw.xtranssensor.blackred = pparams.raw.xtranssensor.blackgreen = pparams.raw.xtranssensor.blackblue = 0;
}
+ if (options.baBehav[ADDSET_BAYER_FALSE_COLOR_SUPPRESSION]) { pparams.raw.bayersensor.ccSteps = 0; }
+ if (options.baBehav[ADDSET_BAYER_ITER]) { pparams.raw.bayersensor.dcb_iterations = 0; pparams.raw.bayersensor.lmmse_iterations = 0; }
+ if (options.baBehav[ADDSET_BAYER_PS_SMOOTH]) { pparams.raw.bayersensor.pixelShiftSmoothFactor = 0; }
+ if (options.baBehav[ADDSET_BAYER_PS_EPERISO]) { pparams.raw.bayersensor.pixelShiftEperIso = 0; }
+ if (options.baBehav[ADDSET_BAYER_PS_SIGMA]) { pparams.raw.bayersensor.pixelShiftSigma = 0; }
+ if (options.baBehav[ADDSET_BAYER_DUALDEMOZCONTRAST]) { pparams.raw.bayersensor.dualDemosaicContrast = 0; }
+ if (options.baBehav[ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION]) { pparams.raw.xtranssensor.ccSteps = 0; }
if (options.baBehav[ADDSET_RAWFFCLIPCONTROL]) { pparams.raw.ff_clipControl = 0; }
if (options.baBehav[ADDSET_PREPROCESS_GREENEQUIL]) { pparams.raw.bayersensor.greenthresh = 0; }
if (options.baBehav[ADDSET_PREPROCESS_LINEDENOISE]) { pparams.raw.bayersensor.linenoise = 0; }
diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc
index 73fea1aa3..c6f04c053 100644
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -17,6 +17,7 @@
* along with RawTherapee. If not, see .
*/
#include "bayerprocess.h"
+#include "eventmapper.h"
#include "options.h"
#include "guiutils.h"
using namespace rtengine;
@@ -25,6 +26,11 @@ using namespace rtengine::procparams;
BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RAW_LABEL"), true)
{
+
+ auto m = ProcEventMapper::getInstance();
+ EvDemosaicContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_CONTRAST");
+ EvDemosaicPixelshiftDemosaicMethod = m->newEvent(DEMOSAIC, "HISTORY_MSG_PIXELSHIFT_DEMOSAIC");
+
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
method = Gtk::manage (new MyComboBoxText ());
@@ -93,18 +99,37 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
lmmseOptions->pack_start(*lmmseIterations);
pack_start( *lmmseOptions, Gtk::PACK_SHRINK, 4);
- pixelShiftFrame = Gtk::manage (new Gtk::VBox ());
- pixelShiftFrame->set_border_width(0);
+ dualDemosaicOptions = Gtk::manage (new Gtk::VBox ());
+
+ dualDemosaicContrast = Gtk::manage(new Adjuster (M("TP_RAW_DUALDEMOSAICCONTRAST"), 0, 100, 1, 20));
+ dualDemosaicContrast->setAdjusterListener (this);
+
+ if (dualDemosaicContrast->delay < options.adjusterMaxDelay) {
+ dualDemosaicContrast->delay = options.adjusterMaxDelay;
+ }
+
+ dualDemosaicContrast->show();
+ dualDemosaicOptions->pack_start(*dualDemosaicContrast);
+ pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
+
+
+ // -------------------- PixelShift ----------------------
+
+
+ pixelShiftFrame = Gtk::manage(new Gtk::Frame(M("TP_RAW_PIXELSHIFT")));
+
+ Gtk::VBox *pixelShiftMainVBox = Gtk::manage (new Gtk::VBox ());
+ pixelShiftMainVBox->set_border_width(0);
pixelShiftEqualBright = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTEQUALBRIGHT"), multiImage));
pixelShiftEqualBright->setCheckBoxListener (this);
pixelShiftEqualBright->set_tooltip_text (M("TP_RAW_PIXELSHIFTEQUALBRIGHT_TOOLTIP"));
- pixelShiftFrame->pack_start(*pixelShiftEqualBright);
+ pixelShiftMainVBox->pack_start(*pixelShiftEqualBright);
pixelShiftEqualBrightChannel = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL"), multiImage));
pixelShiftEqualBrightChannel->setCheckBoxListener (this);
pixelShiftEqualBrightChannel->set_tooltip_text (M("TP_RAW_PIXELSHIFTEQUALBRIGHTCHANNEL_TOOLTIP"));
- pixelShiftFrame->pack_start(*pixelShiftEqualBrightChannel);
+ pixelShiftMainVBox->pack_start(*pixelShiftEqualBrightChannel);
Gtk::HBox* hb3 = Gtk::manage (new Gtk::HBox ());
hb3->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_PIXELSHIFTMOTIONMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
@@ -115,7 +140,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
pixelShiftMotionMethod->set_active(toUnderlying(RAWParams::BayerSensor::PSMotionCorrectionMethod::AUTO));
pixelShiftMotionMethod->show();
hb3->pack_start(*pixelShiftMotionMethod);
- pixelShiftFrame->pack_start(*hb3);
+ pixelShiftMainVBox->pack_start(*hb3);
pixelShiftOptions = Gtk::manage (new Gtk::VBox ());
pixelShiftOptions->set_border_width(0);
@@ -123,12 +148,23 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
pixelShiftShowMotion = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTSHOWMOTION"), multiImage));
pixelShiftShowMotion->setCheckBoxListener (this);
pixelShiftShowMotion->set_tooltip_text (M("TP_RAW_PIXELSHIFTSHOWMOTION_TOOLTIP"));
- pixelShiftFrame->pack_start(*pixelShiftShowMotion);
+ pixelShiftMainVBox->pack_start(*pixelShiftShowMotion);
pixelShiftShowMotionMaskOnly = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY"), multiImage));
pixelShiftShowMotionMaskOnly->setCheckBoxListener (this);
pixelShiftShowMotionMaskOnly->set_tooltip_text (M("TP_RAW_PIXELSHIFTSHOWMOTIONMASKONLY_TOOLTIP"));
- pixelShiftFrame->pack_start(*pixelShiftShowMotionMaskOnly);
+ pixelShiftMainVBox->pack_start(*pixelShiftShowMotionMaskOnly);
+
+
+ Gtk::HBox* hb4 = Gtk::manage (new Gtk::HBox ());
+ hb4->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_PIXELSHIFTDMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
+ pixelShiftDemosaicMethod = Gtk::manage (new MyComboBoxText ());
+ for(const auto method_string : procparams::RAWParams::BayerSensor::getPSDemosaicMethodStrings()) {
+ pixelShiftDemosaicMethod->append(M("TP_RAW_" + Glib::ustring(method_string).uppercase()));
+ }
+ pixelShiftDemosaicMethod->set_active(0);
+ hb4->pack_start(*pixelShiftDemosaicMethod);
+ pixelShiftOptions->pack_start(*hb4);
pixelShiftGreen = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTGREEN"), multiImage));
pixelShiftGreen->setCheckBoxListener (this);
@@ -188,14 +224,8 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
pixelShiftMedian->set_tooltip_text (M("TP_RAW_PIXELSHIFTMEDIAN_TOOLTIP"));
pixelShiftOptions->pack_start(*pixelShiftMedian);
-
- pixelShiftLmmse = Gtk::manage (new CheckBox(M("TP_RAW_PIXELSHIFTLMMSE"), multiImage));
- pixelShiftLmmse->setCheckBoxListener (this);
- pixelShiftLmmse->set_tooltip_text (M("TP_RAW_PIXELSHIFTLMMSE_TOOLTIP"));
- pixelShiftOptions->pack_start(*pixelShiftLmmse);
-
-
- pixelShiftFrame->pack_start(*pixelShiftOptions);
+ pixelShiftMainVBox->pack_start(*pixelShiftOptions);
+ pixelShiftFrame->add(*pixelShiftMainVBox);
pixelShiftOptions->hide();
pack_start( *pixelShiftFrame, Gtk::PACK_SHRINK, 4);
@@ -203,6 +233,7 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
method->connect(method->signal_changed().connect( sigc::mem_fun(*this, &BayerProcess::methodChanged) ));
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) ));
}
@@ -211,9 +242,9 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
disableListener ();
method->block (true);
imageNumber->block (true);
+ pixelShiftDemosaicMethod->block(true);
//allEnhconn.block (true);
- method->set_active(std::numeric_limits::max());
imageNumber->set_active(pp->raw.bayersensor.imageNum);
for (size_t i = 0; i < procparams::RAWParams::BayerSensor::getMethodStrings().size(); ++i) {
@@ -223,31 +254,38 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
break;
}
}
+ for (size_t i = 0; i < procparams::RAWParams::BayerSensor::getPSDemosaicMethodStrings().size(); ++i) {
+ if (pp->raw.bayersensor.pixelShiftDemosaicMethod == procparams::RAWParams::BayerSensor::getPSDemosaicMethodStrings()[i]) {
+ pixelShiftDemosaicMethod->set_active(i);
+ break;
+ }
+ }
- //allEnhance->set_active(pp->raw.bayersensor.all_enhance);
dcbIterations->setValue (pp->raw.bayersensor.dcb_iterations);
dcbEnhance->setValue (pp->raw.bayersensor.dcb_enhance);
pixelShiftShowMotion->setValue (pp->raw.bayersensor.pixelShiftShowMotion);
+ pixelShiftShowMotionMaskOnly->setValue (pp->raw.bayersensor.pixelShiftShowMotionMaskOnly);
if (!batchMode) {
pixelShiftShowMotionMaskOnly->set_sensitive (pp->raw.bayersensor.pixelShiftShowMotion);
}
- pixelShiftShowMotionMaskOnly->setValue (pp->raw.bayersensor.pixelShiftShowMotionMaskOnly);
pixelShiftHoleFill->setValue (pp->raw.bayersensor.pixelShiftHoleFill);
pixelShiftMedian->setValue (pp->raw.bayersensor.pixelShiftMedian);
pixelShiftGreen->setValue (pp->raw.bayersensor.pixelShiftGreen);
pixelShiftBlur->setValue (pp->raw.bayersensor.pixelShiftBlur);
+ pixelShiftSmooth->setValue (pp->raw.bayersensor.pixelShiftSmoothFactor);
if (!batchMode) {
pixelShiftSmooth->set_sensitive (pp->raw.bayersensor.pixelShiftBlur);
}
- pixelShiftSmooth->setValue (pp->raw.bayersensor.pixelShiftSmoothFactor);
- pixelShiftLmmse->setValue (pp->raw.bayersensor.pixelShiftLmmse);
pixelShiftEqualBright->setValue (pp->raw.bayersensor.pixelShiftEqualBright);
- pixelShiftEqualBrightChannel->set_sensitive (pp->raw.bayersensor.pixelShiftEqualBright);
pixelShiftEqualBrightChannel->setValue (pp->raw.bayersensor.pixelShiftEqualBrightChannel);
+ if (!batchMode) {
+ pixelShiftEqualBrightChannel->set_sensitive (pp->raw.bayersensor.pixelShiftEqualBright);
+ }
pixelShiftNonGreenCross->setValue (pp->raw.bayersensor.pixelShiftNonGreenCross);
ccSteps->setValue (pp->raw.bayersensor.ccSteps);
lmmseIterations->setValue (pp->raw.bayersensor.lmmse_iterations);
+ dualDemosaicContrast->setValue (pp->raw.bayersensor.dualDemosaicContrast);
pixelShiftMotionMethod->set_active ((int)pp->raw.bayersensor.pixelShiftMotionCorrectionMethod);
pixelShiftEperIso->setValue (pp->raw.bayersensor.pixelShiftEperIso);
pixelShiftSigma->setValue (pp->raw.bayersensor.pixelShiftSigma);
@@ -266,51 +304,44 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
pixelShiftGreen->setEdited (pedited->raw.bayersensor.pixelShiftGreen);
pixelShiftBlur->setEdited (pedited->raw.bayersensor.pixelShiftBlur);
pixelShiftSmooth->setEditedState ( pedited->raw.bayersensor.pixelShiftSmooth ? Edited : UnEdited);
- pixelShiftLmmse->setEdited (pedited->raw.bayersensor.pixelShiftLmmse);
pixelShiftEqualBright->setEdited (pedited->raw.bayersensor.pixelShiftEqualBright);
pixelShiftEqualBrightChannel->setEdited (pedited->raw.bayersensor.pixelShiftEqualBrightChannel);
pixelShiftNonGreenCross->setEdited (pedited->raw.bayersensor.pixelShiftNonGreenCross);
lmmseIterations->setEditedState ( pedited->raw.bayersensor.lmmseIterations ? Edited : UnEdited);
+ dualDemosaicContrast->setEditedState ( pedited->raw.bayersensor.dualDemosaicContrast ? Edited : UnEdited);
pixelShiftEperIso->setEditedState ( pedited->raw.bayersensor.pixelShiftEperIso ? Edited : UnEdited);
pixelShiftSigma->setEditedState ( pedited->raw.bayersensor.pixelShiftSigma ? Edited : UnEdited);
if(!pedited->raw.bayersensor.method) {
- method->set_active(std::numeric_limits::max()); // No name
+ method->set_active_text(M("GENERAL_UNCHANGED"));
}
+
if(!pedited->raw.bayersensor.imageNum) {
imageNumber->set_active_text(M("GENERAL_UNCHANGED"));
}
+
if(!pedited->raw.bayersensor.pixelShiftMotionCorrectionMethod) {
pixelShiftMotionMethod->set_active_text(M("GENERAL_UNCHANGED"));
}
+
+ if(!pedited->raw.bayersensor.pixelShiftDemosaicMethod) {
+ pixelShiftDemosaicMethod->set_active_text(M("GENERAL_UNCHANGED"));
+ }
+
}
if (!batchMode) {
- if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCB) ||
- method->get_active_row_number() == std::numeric_limits::max()) {
- dcbOptions->show();
- } else {
- dcbOptions->hide();
- }
- if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::LMMSE) ||
- method->get_active_row_number() == std::numeric_limits::max()) {
- lmmseOptions->show();
- } else {
- lmmseOptions->hide();
- }
- if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::PIXELSHIFT) ||
- method->get_active_row_number() == std::numeric_limits::max()) {
- if(pp->raw.bayersensor.pixelShiftMotionCorrectionMethod == RAWParams::BayerSensor::PSMotionCorrectionMethod::CUSTOM) {
- pixelShiftOptions->show();
- } else {
- pixelShiftOptions->hide();
- }
+ dcbOptions->set_visible(pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::DCB));
+ 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));
+ 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();
} else {
pixelShiftFrame->hide();
}
- // Flase color suppression is applied to all demozaicing method, so don't hide anything
+ // False color suppression is applied to all demozaicing method, so don't hide anything
/*if (pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::EAHD) ||
pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::HPHD) ||
pp->raw.bayersensor.method == procparams::RAWParams::BayerSensor::getMethodString(procparams::RAWParams::BayerSensor::Method::VNG4))
@@ -323,6 +354,7 @@ void BayerProcess::read(const rtengine::procparams::ProcParams* pp, const Params
method->block (false);
imageNumber->block (false);
+ pixelShiftDemosaicMethod->block(false);
//allEnhconn.block (false);
enableListener ();
@@ -335,6 +367,7 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
pp->raw.bayersensor.dcb_enhance = dcbEnhance->getLastActive ();
//pp->raw.bayersensor.all_enhance = allEnhance->getLastActive ();
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();
pp->raw.bayersensor.pixelShiftEperIso = pixelShiftEperIso->getValue();
pp->raw.bayersensor.pixelShiftSigma = pixelShiftSigma->getValue();
@@ -345,31 +378,37 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
pp->raw.bayersensor.pixelShiftGreen = pixelShiftGreen->getLastActive ();
pp->raw.bayersensor.pixelShiftBlur = pixelShiftBlur->getLastActive ();
pp->raw.bayersensor.pixelShiftSmoothFactor = pixelShiftSmooth->getValue();
- pp->raw.bayersensor.pixelShiftLmmse = pixelShiftLmmse->getLastActive ();
pp->raw.bayersensor.pixelShiftEqualBright = pixelShiftEqualBright->getLastActive ();
pp->raw.bayersensor.pixelShiftEqualBrightChannel = pixelShiftEqualBrightChannel->getLastActive ();
pp->raw.bayersensor.pixelShiftNonGreenCross = pixelShiftNonGreenCross->getLastActive ();
int currentRow = method->get_active_row_number();
- if( currentRow >= 0 && currentRow < std::numeric_limits::max()) {
+ if( currentRow >= 0 && method->get_active_text() != M("GENERAL_UNCHANGED")) {
pp->raw.bayersensor.method = procparams::RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method(currentRow));
}
currentRow = imageNumber->get_active_row_number();
- if (currentRow < 4) {
+ if (currentRow >= 0 && imageNumber->get_active_text() != M("GENERAL_UNCHANGED")) {
pp->raw.bayersensor.imageNum = currentRow;
}
+ currentRow = pixelShiftDemosaicMethod->get_active_row_number();
+ if( currentRow >= 0 && pixelShiftDemosaicMethod->get_active_text() != M("GENERAL_UNCHANGED")) {
+ pp->raw.bayersensor.pixelShiftDemosaicMethod = procparams::RAWParams::BayerSensor::getPSDemosaicMethodString(RAWParams::BayerSensor::PSDemosaicMethod(currentRow));
+ }
+
if (pedited) {
pedited->raw.bayersensor.ccSteps = ccSteps->getEditedState ();
- pedited->raw.bayersensor.method = method->get_active_row_number() != std::numeric_limits::max();
+ pedited->raw.bayersensor.method = method->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.imageNum = imageNumber->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.dcbIterations = dcbIterations->getEditedState ();
pedited->raw.bayersensor.dcbEnhance = !dcbEnhance->get_inconsistent();
//pedited->raw.bayersensor.allEnhance = !allEnhance->get_inconsistent();
pedited->raw.bayersensor.lmmseIterations = lmmseIterations->getEditedState ();
+ pedited->raw.bayersensor.dualDemosaicContrast = dualDemosaicContrast->getEditedState ();
pedited->raw.bayersensor.pixelShiftMotionCorrectionMethod = pixelShiftMotionMethod->get_active_text() != M("GENERAL_UNCHANGED");
+ pedited->raw.bayersensor.pixelShiftDemosaicMethod = pixelShiftDemosaicMethod->get_active_text() != M("GENERAL_UNCHANGED");
pedited->raw.bayersensor.pixelShiftEperIso = pixelShiftEperIso->getEditedState ();
pedited->raw.bayersensor.pixelShiftSigma = pixelShiftSigma->getEditedState ();
pedited->raw.bayersensor.pixelShiftShowMotion = !pixelShiftShowMotion->get_inconsistent();
@@ -379,25 +418,49 @@ void BayerProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pe
pedited->raw.bayersensor.pixelShiftGreen = !pixelShiftGreen->get_inconsistent();
pedited->raw.bayersensor.pixelShiftBlur = !pixelShiftBlur->get_inconsistent();
pedited->raw.bayersensor.pixelShiftSmooth = pixelShiftSmooth->getEditedState();
- pedited->raw.bayersensor.pixelShiftLmmse = !pixelShiftLmmse->get_inconsistent();
pedited->raw.bayersensor.pixelShiftEqualBright = !pixelShiftEqualBright->get_inconsistent();
pedited->raw.bayersensor.pixelShiftEqualBrightChannel = !pixelShiftEqualBrightChannel->get_inconsistent();
pedited->raw.bayersensor.pixelShiftNonGreenCross = !pixelShiftNonGreenCross->get_inconsistent();
}
}
+void BayerProcess::setAdjusterBehavior (bool falsecoloradd, bool iteradd, bool dualdemozecontrastadd, bool pssigmaadd, bool pssmoothadd, bool pseperisoadd)
+{
+ ccSteps->setAddMode(falsecoloradd);
+ dcbIterations->setAddMode(iteradd);
+ lmmseIterations->setAddMode(iteradd);
+ pixelShiftSmooth->setAddMode(pssmoothadd);
+ pixelShiftEperIso->setAddMode(pseperisoadd);
+ pixelShiftSigma->setAddMode(pssigmaadd);
+ dualDemosaicContrast->setAddMode(dualdemozecontrastadd);
+}
+
+void BayerProcess::trimValues (rtengine::procparams::ProcParams* pp)
+{
+ ccSteps->trimValue(pp->raw.bayersensor.ccSteps);
+ dcbIterations->trimValue(pp->raw.bayersensor.dcb_iterations);
+ lmmseIterations->trimValue(pp->raw.bayersensor.lmmse_iterations);
+ pixelShiftSmooth->trimValue(pp->raw.bayersensor.pixelShiftSmoothFactor);
+ pixelShiftEperIso->trimValue(pp->raw.bayersensor.pixelShiftEperIso);
+ pixelShiftSigma->trimValue(pp->raw.bayersensor.pixelShiftSigma);
+ dualDemosaicContrast->trimValue(pp->raw.bayersensor.dualDemosaicContrast);
+}
+
void BayerProcess::setBatchMode(bool batchMode)
{
method->append (M("GENERAL_UNCHANGED"));
- method->set_active(std::numeric_limits::max()); // No name
+ method->set_active_text(M("GENERAL_UNCHANGED")); // No name
pixelShiftMotionMethod->append (M("GENERAL_UNCHANGED"));
pixelShiftMotionMethod->set_active_text (M("GENERAL_UNCHANGED"));
+ pixelShiftDemosaicMethod->append (M("GENERAL_UNCHANGED"));
+ pixelShiftDemosaicMethod->set_active_text(M("GENERAL_UNCHANGED")); // No name
imageNumber->append (M("GENERAL_UNCHANGED"));
imageNumber->set_active_text (M("GENERAL_UNCHANGED"));
ToolPanel::setBatchMode (batchMode);
ccSteps->showEditedCB ();
dcbIterations->showEditedCB ();
lmmseIterations->showEditedCB ();
+ dualDemosaicContrast->showEditedCB ();
pixelShiftEperIso->showEditedCB ();
pixelShiftSigma->showEditedCB ();
}
@@ -406,6 +469,7 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
{
dcbIterations->setDefault( defParams->raw.bayersensor.dcb_iterations);
lmmseIterations->setDefault( defParams->raw.bayersensor.lmmse_iterations);
+ dualDemosaicContrast->setDefault( defParams->raw.bayersensor.dualDemosaicContrast);
pixelShiftEperIso->setDefault( defParams->raw.bayersensor.pixelShiftEperIso);
pixelShiftSigma->setDefault( defParams->raw.bayersensor.pixelShiftSigma);
ccSteps->setDefault (defParams->raw.bayersensor.ccSteps);
@@ -413,12 +477,14 @@ void BayerProcess::setDefaults(const rtengine::procparams::ProcParams* defParams
if (pedited) {
dcbIterations->setDefaultEditedState( pedited->raw.bayersensor.dcbIterations ? Edited : UnEdited);
lmmseIterations->setDefaultEditedState( pedited->raw.bayersensor.lmmseIterations ? Edited : UnEdited);
+ dualDemosaicContrast->setDefaultEditedState( pedited->raw.bayersensor.dualDemosaicContrast ? Edited : UnEdited);
pixelShiftEperIso->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftEperIso ? Edited : UnEdited);
pixelShiftSigma->setDefaultEditedState( pedited->raw.bayersensor.pixelShiftSigma ? Edited : UnEdited);
ccSteps->setDefaultEditedState(pedited->raw.bayersensor.ccSteps ? Edited : UnEdited);
} else {
dcbIterations->setDefaultEditedState( Irrelevant );
lmmseIterations->setDefaultEditedState( Irrelevant );
+ dualDemosaicContrast->setDefaultEditedState( Irrelevant );
pixelShiftEperIso->setDefaultEditedState( Irrelevant );
pixelShiftSigma->setDefaultEditedState( Irrelevant );
ccSteps->setDefaultEditedState(Irrelevant );
@@ -434,6 +500,8 @@ void BayerProcess::adjusterChanged (Adjuster* a, double newval)
listener->panelChanged (EvDemosaicFalseColorIter, a->getTextValue() );
} else if (a == lmmseIterations) {
listener->panelChanged (EvDemosaicLMMSEIter, a->getTextValue() );
+ } else if (a == dualDemosaicContrast) {
+ listener->panelChanged (EvDemosaicContrast, a->getTextValue() );
} else if (a == pixelShiftEperIso) {
listener->panelChanged (EvPixelShiftEperIso, a->getTextValue() );
} else if (a == pixelShiftSigma) {
@@ -446,23 +514,29 @@ void BayerProcess::adjusterChanged (Adjuster* a, double newval)
void BayerProcess::methodChanged ()
{
- const int curSelection = method->get_active_row_number();
- const RAWParams::BayerSensor::Method method = RAWParams::BayerSensor::Method(curSelection);
+ const int currentSelection = method->get_active_row_number();
+ const RAWParams::BayerSensor::Method currentMethod = RAWParams::BayerSensor::Method(currentSelection);
if (!batchMode) {
- if (method == procparams::RAWParams::BayerSensor::Method::DCB) {
+ if (currentMethod == procparams::RAWParams::BayerSensor::Method::DCB) {
dcbOptions->show();
} else {
dcbOptions->hide();
}
- if (method == procparams::RAWParams::BayerSensor::Method::LMMSE) {
+ if (currentMethod == procparams::RAWParams::BayerSensor::Method::LMMSE) {
lmmseOptions->show();
} else {
lmmseOptions->hide();
}
- if (method == procparams::RAWParams::BayerSensor::Method::PIXELSHIFT) {
+ if (currentMethod == procparams::RAWParams::BayerSensor::Method::AMAZEVNG4) {
+ dualDemosaicOptions->show();
+ } else {
+ dualDemosaicOptions->hide();
+ }
+
+ if (currentMethod == procparams::RAWParams::BayerSensor::Method::PIXELSHIFT) {
if(pixelShiftMotionMethod->get_active_row_number() == 2) {
pixelShiftOptions->show();
} else {
@@ -474,21 +548,22 @@ void BayerProcess::methodChanged ()
}
}
- Glib::ustring methodName = "";
- bool ppreq = false;
-
- if (curSelection >= 0 && curSelection < std::numeric_limits::max()) {
- methodName = procparams::RAWParams::BayerSensor::getMethodString(method);
-
- if (method == procparams::RAWParams::BayerSensor::Method::MONO || RAWParams::BayerSensor::Method(oldMethod) == procparams::RAWParams::BayerSensor::Method::MONO) {
- ppreq = true;
- }
+ if (listener && method->get_active_row_number() >= 0) {
+ listener->panelChanged (
+ currentMethod == procparams::RAWParams::BayerSensor::Method::MONO || RAWParams::BayerSensor::Method(oldMethod) == procparams::RAWParams::BayerSensor::Method::MONO
+ ? EvDemosaicMethodPreProc
+ : EvDemosaicMethod, method->get_active_text());
}
- oldMethod = curSelection;
+ oldMethod = currentSelection;
- if (listener) {
- listener->panelChanged (ppreq ? EvDemosaicMethodPreProc : EvDemosaicMethod, methodName);
+}
+
+void BayerProcess::pixelShiftDemosaicMethodChanged ()
+{
+
+ if (listener && pixelShiftDemosaicMethod->get_active_row_number() >= 0) {
+ listener->panelChanged (EvDemosaicPixelshiftDemosaicMethod, pixelShiftDemosaicMethod->get_active_text());
}
}
@@ -536,10 +611,6 @@ void BayerProcess::checkBoxToggled (CheckBox* c, CheckValue newval)
if (listener) {
listener->panelChanged (EvPixelShiftBlur, pixelShiftBlur->getValueAsStr ());
}
- } else if (c == pixelShiftLmmse) {
- if (listener) {
- listener->panelChanged (EvPixelShiftLmmse, pixelShiftLmmse->getValueAsStr ());
- }
} else if (c == pixelShiftEqualBright) {
if (!batchMode) {
pixelShiftEqualBrightChannel->set_sensitive(newval != CheckValue::off);
@@ -569,13 +640,13 @@ void BayerProcess::pixelShiftMotionMethodChanged ()
pixelShiftOptions->show();
pixelShiftShowMotion->show();
pixelShiftShowMotionMaskOnly->show();
- } else {
+ } else if(pixelShiftMotionMethod->get_active_row_number() > 0) {
pixelShiftOptions->hide();
pixelShiftShowMotion->show();
pixelShiftShowMotionMaskOnly->show();
}
}
- if (listener) {
+ if (listener && pixelShiftMotionMethod->get_active_row_number() >= 0) {
listener->panelChanged (EvPixelShiftMotionMethod, pixelShiftMotionMethod->get_active_text());
}
}
diff --git a/rtgui/bayerprocess.h b/rtgui/bayerprocess.h
index 48b445d90..2b3e420bc 100644
--- a/rtgui/bayerprocess.h
+++ b/rtgui/bayerprocess.h
@@ -39,9 +39,10 @@ protected:
CheckBox* dcbEnhance;
Gtk::VBox *lmmseOptions;
Adjuster* lmmseIterations;
- Gtk::VBox *pixelShiftFrame;
+ Gtk::Frame *pixelShiftFrame;
Gtk::VBox *pixelShiftOptions;
MyComboBoxText* pixelShiftMotionMethod;
+ MyComboBoxText* pixelShiftDemosaicMethod;
CheckBox* pixelShiftShowMotion;
CheckBox* pixelShiftShowMotionMaskOnly;
CheckBox* pixelShiftNonGreenCross;
@@ -49,29 +50,35 @@ protected:
CheckBox* pixelShiftBlur;
CheckBox* pixelShiftHoleFill;
CheckBox* pixelShiftMedian;
- CheckBox* pixelShiftLmmse;
CheckBox* pixelShiftEqualBright;
CheckBox* pixelShiftEqualBrightChannel;
Adjuster* pixelShiftSmooth;
Adjuster* pixelShiftEperIso;
Adjuster* pixelShiftSigma;
+ Gtk::VBox *dualDemosaicOptions;
+ Adjuster* dualDemosaicContrast;
int oldMethod;
IdleRegister idle_register;
+ rtengine::ProcEvent EvDemosaicContrast;
+ rtengine::ProcEvent EvDemosaicPixelshiftDemosaicMethod;
public:
BayerProcess ();
- void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
- void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
- void setBatchMode (bool batchMode);
- void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
+ void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
+ void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
+ void setAdjusterBehavior(bool falsecoloradd, bool iteradd, bool dualdemozecontrastadd, bool pssigmaadd, bool pssmoothadd, bool pseperisoadd);
+ void trimValues(rtengine::procparams::ProcParams* pp);
+ void setBatchMode(bool batchMode);
+ void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
- void methodChanged ();
- void imageNumberChanged ();
- void adjusterChanged (Adjuster* a, double newval);
- void checkBoxToggled (CheckBox* c, CheckValue newval);
+ void methodChanged();
+ void imageNumberChanged();
+ void adjusterChanged(Adjuster* a, double newval);
+ void checkBoxToggled(CheckBox* c, CheckValue newval);
void pixelShiftMotionMethodChanged();
+ void pixelShiftDemosaicMethodChanged();
void FrameCountChanged(int n, int frameNum);
};
diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index 6970a2f31..507d3aee6 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -128,7 +128,7 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
setting->append (M("TP_BWMIX_SET_ROYGCBPMREL"));
setting->append (M("TP_BWMIX_SET_INFRARED"));
- setting->set_active (0);
+ setting->set_active (11);
settingHBox->pack_start (*setting);
mixerVBox->pack_start (*settingHBox);
settingconn = setting->signal_changed().connect ( sigc::mem_fun(*this, &BlackWhite::settingChanged) );
@@ -388,9 +388,21 @@ bool BlackWhite::BWComputed_ ()
disableListener ();
mixerRed->setValue (nextredbw);
+ adjusterChanged(mixerRed, mixerRed->getValue());
mixerGreen->setValue (nextgreenbw);
+ adjusterChanged(mixerGreen, mixerGreen->getValue());
mixerBlue->setValue (nextbluebw);
+ adjusterChanged(mixerBlue, mixerBlue->getValue());
+ autoconn.block (true);
+ autoch->set_active (true);
+ autoconn.block (false);
+ lastAuto = false;
+ nextcount++;
enableListener ();
+ if (listener && nextcount <= 1 ) {
+ // activated only 1 time, but perhaps in some cases if we want that all is update pp3, auto, sliders : nextcount <= 2 but it cost time and result is identical
+ listener->panelChanged (EvAutoch, M("GENERAL_ENABLED"));
+ }
updateRGBLabel();
@@ -789,6 +801,7 @@ void BlackWhite::filterChanged ()
if (listener && (multiImage || getEnabled())) {
listener->panelChanged (EvBWfilter, filter->get_active_text ());
+ listener->panelChanged (EvAutoch, M("GENERAL_ENABLED"));
}
}
@@ -884,6 +897,7 @@ void BlackWhite::neutral_pressed ()
updateRGBLabel();
+ nextcount = 0;
if(listener) {
listener->panelChanged (EvNeutralBW, M("GENERAL_RESET"));
}
@@ -1089,6 +1103,7 @@ void BlackWhite::adjusterChanged (Adjuster* a, double newval)
autoch->set_inconsistent (false);
}
+ nextcount = 0;
autoconn.block(true);
autoch->set_active (false);
autoconn.block(false);
diff --git a/rtgui/blackwhite.h b/rtgui/blackwhite.h
index 5f0ffec44..07ad6a160 100644
--- a/rtgui/blackwhite.h
+++ b/rtgui/blackwhite.h
@@ -138,6 +138,7 @@ private:
double nextredbw;
double nextgreenbw;
double nextbluebw;
+ int nextcount = 0;
IdleRegister idle_register;
};
diff --git a/rtgui/exportpanel.cc b/rtgui/exportpanel.cc
index 75156b56b..6c9b96ab7 100644
--- a/rtgui/exportpanel.cc
+++ b/rtgui/exportpanel.cc
@@ -60,7 +60,7 @@ ExportPanel::ExportPanel () : listener (nullptr)
// ---------------------- Bayer sensor frame -----------------------
- Gtk::Frame *bayerFrame = Gtk::manage ( new Gtk::Frame (M ("TP_RAW_SENSOR_BAYER")));
+ Gtk::Frame *bayerFrame = Gtk::manage ( new Gtk::Frame (M ("TP_RAW_SENSOR_BAYER_LABEL")));
Gtk::VBox* bayerFrameVBox = Gtk::manage (new Gtk::VBox ());
Gtk::HBox* hb_raw_bayer_method = Gtk::manage (new Gtk::HBox ());
@@ -83,7 +83,7 @@ ExportPanel::ExportPanel () : listener (nullptr)
// ---------------------- Bayer sensor frame -----------------------
- Gtk::Frame *xtransFrame = Gtk::manage ( new Gtk::Frame (M ("TP_RAW_SENSOR_XTRANS")));
+ Gtk::Frame *xtransFrame = Gtk::manage ( new Gtk::Frame (M ("TP_RAW_SENSOR_XTRANS_LABEL")));
Gtk::VBox* xtransFrameVBox = Gtk::manage (new Gtk::VBox ());
Gtk::HBox* hb_raw_xtrans_method = Gtk::manage (new Gtk::HBox ());
@@ -130,9 +130,11 @@ ExportPanel::ExportPanel () : listener (nullptr)
bayerFrameVBox->pack_start (*bypass_raw_bayer_linenoise, Gtk::PACK_SHRINK, 4);
bayerFrameVBox->pack_start (*bypass_raw_bayer_greenthresh, Gtk::PACK_SHRINK, 4);
bayerFrame->add (*bayerFrameVBox);
+ bypass_box->pack_start(*bayerFrame, Gtk::PACK_SHRINK, 4);
xtransFrameVBox->pack_start (*hb_raw_xtrans_method, Gtk::PACK_SHRINK, 4);
xtransFrame->add (*xtransFrameVBox);
+ bypass_box->pack_start(*xtransFrame, Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*bypass_raw_ccSteps, Gtk::PACK_SHRINK, 4);
bypass_box->pack_start (*bypass_raw_ca, Gtk::PACK_SHRINK, 4);
@@ -271,14 +273,14 @@ void ExportPanel::SaveSettingsAsDefault()
//saving Bayer demosaic_method
int currentRow = raw_bayer_method->get_active_row_number();
- if (currentRow >= 0 && currentRow < std::numeric_limits::max()) {
+ if (currentRow >= 0) {
FE_OPT_STORE_ (options.fastexport_raw_bayer_method, procparams::RAWParams::BayerSensor::getMethodStrings()[currentRow]);
}
//saving X-Trans demosaic_method
currentRow = raw_xtrans_method->get_active_row_number();
- if (currentRow >= 0 && currentRow < std::numeric_limits::max()) {
+ if (currentRow >= 0) {
FE_OPT_STORE_ (options.fastexport_raw_xtrans_method, procparams::RAWParams::XTransSensor::getMethodStrings()[currentRow]);
}
@@ -332,7 +334,7 @@ void ExportPanel::LoadDefaultSettings()
bypass_raw_ff->set_active (options.fastexport_bypass_raw_ff );
// Bayer demosaic method
- raw_bayer_method->set_active(std::numeric_limits::max());
+ raw_bayer_method->set_active(0);
for (size_t i = 0; i < RAWParams::BayerSensor::getMethodStrings().size(); ++i)
if (options.fastexport_raw_bayer_method == procparams::RAWParams::BayerSensor::getMethodStrings()[i]) {
@@ -341,7 +343,7 @@ void ExportPanel::LoadDefaultSettings()
}
// X-Trans demosaic method
- raw_xtrans_method->set_active(std::numeric_limits::max());
+ raw_xtrans_method->set_active(0);
for (size_t i = 0; i < procparams::RAWParams::XTransSensor::getMethodStrings().size(); ++i)
if (options.fastexport_raw_xtrans_method == procparams::RAWParams::XTransSensor::getMethodStrings()[i]) {
diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc
index 2b57aa470..21b5f319a 100644
--- a/rtgui/flatfield.cc
+++ b/rtgui/flatfield.cc
@@ -136,7 +136,7 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
flatFieldClipControl->setAutoInconsistent(multiImage && !pedited->raw.ff_AutoClipControl);
if( !pedited->raw.ff_BlurType ) {
- flatFieldBlurType->set_active(std::numeric_limits::max()); // No name
+ flatFieldBlurType->set_active_text(M("GENERAL_UNCHANGED"));
}
}
@@ -217,7 +217,7 @@ void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedit
int currentRow = flatFieldBlurType->get_active_row_number();
- if( currentRow >= 0 && currentRow < std::numeric_limits::max()) {
+ if( currentRow >= 0 && flatFieldBlurType->get_active_text() != M("GENERAL_UNCHANGED")) {
pp->raw.ff_BlurType = procparams::RAWParams::getFlatFieldBlurTypeStrings()[currentRow];
}
@@ -227,7 +227,7 @@ void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedit
pedited->raw.ff_BlurRadius = flatFieldBlurRadius->getEditedState ();
pedited->raw.ff_clipControl = flatFieldClipControl->getEditedState ();
pedited->raw.ff_AutoClipControl = !flatFieldClipControl->getAutoInconsistent();
- pedited->raw.ff_BlurType = flatFieldBlurType->get_active_row_number() != std::numeric_limits::max();
+ pedited->raw.ff_BlurType = flatFieldBlurType->get_active_text() != M("GENERAL_UNCHANGED");
}
}
@@ -340,20 +340,14 @@ void FlatField::flatFieldBlurTypeChanged ()
const int curSelection = flatFieldBlurType->get_active_row_number();
const RAWParams::FlatFieldBlurType blur_type = RAWParams::FlatFieldBlurType(curSelection);
- Glib::ustring s;
-
- if (curSelection >= 0 && curSelection < std::numeric_limits::max()) {
- s = flatFieldBlurType->get_active_text();
- }
-
if (multiImage || blur_type == procparams::RAWParams::FlatFieldBlurType::AREA) {
flatFieldClipControl->show();
} else {
flatFieldClipControl->hide();
}
- if (listener) {
- listener->panelChanged (EvFlatFieldBlurType, s);
+ if (listener && curSelection >= 0) {
+ listener->panelChanged (EvFlatFieldBlurType, flatFieldBlurType->get_active_text());
}
}
diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc
index 038e04629..b5989b098 100644
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -241,13 +241,14 @@ bool ImageArea::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
mainCropWindow->expose (cr);
}
+ for (std::list::reverse_iterator i = cropWins.rbegin(); i != cropWins.rend(); ++i) {
+ (*i)->expose (cr);
+ }
+
if (options.showInfo && infotext != "") {
iBackBuffer.copySurface(cr);
}
- for (std::list::reverse_iterator i = cropWins.rbegin(); i != cropWins.rend(); ++i) {
- (*i)->expose (cr);
- }
return true;
}
@@ -560,6 +561,14 @@ void ImageArea::spotWBSelected (int x, int y)
}
}
+void ImageArea::sharpMaskSelected (bool sharpMask)
+{
+
+ if (listener) {
+ listener->sharpMaskSelected (sharpMask);
+ }
+}
+
void ImageArea::getScrollImageSize (int& w, int& h)
{
diff --git a/rtgui/imagearea.h b/rtgui/imagearea.h
index 65fc14cce..de9ba1f71 100644
--- a/rtgui/imagearea.h
+++ b/rtgui/imagearea.h
@@ -131,6 +131,7 @@ public:
void setToolHand ();
void straightenReady (double rotDeg);
void spotWBSelected (int x, int y);
+ void sharpMaskSelected (bool sharpMask);
int getSpotWBRectSize ();
void redraw ();
diff --git a/rtgui/imageareatoollistener.h b/rtgui/imageareatoollistener.h
index b7d5cec94..d11ec2e6f 100644
--- a/rtgui/imageareatoollistener.h
+++ b/rtgui/imageareatoollistener.h
@@ -29,6 +29,7 @@ class ImageAreaToolListener
public:
virtual ~ImageAreaToolListener() {}
virtual void spotWBselected (int x, int y, Thumbnail* thm = nullptr) {}
+ virtual void sharpMaskSelected (bool sharpMask) {}
virtual int getSpotWBRectSize ()
{
return 8;
diff --git a/rtgui/indclippedpanel.cc b/rtgui/indclippedpanel.cc
index ae7cff644..1ccc79edf 100644
--- a/rtgui/indclippedpanel.cc
+++ b/rtgui/indclippedpanel.cc
@@ -27,11 +27,20 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
iFon = new RTImage ("previewmodeF-focusScreen-on.png");
iFoff = new RTImage ("previewmodeF-focusScreen-off.png");
+ // for previewSharpMask, needs to be replaced with different icons
+ iSon = new RTImage ("previewmodeF-focusScreen-on.png");
+ iSoff = new RTImage ("previewmodeF-focusScreen-off.png");
+
previewFocusMask = Gtk::manage (new Gtk::ToggleButton ());
previewFocusMask->set_relief(Gtk::RELIEF_NONE);
previewFocusMask->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWFOCUSMASK"));
previewFocusMask->set_image(*iFoff);
+ previewSharpMask = Gtk::manage (new Gtk::ToggleButton ());
+ previewSharpMask->set_relief(Gtk::RELIEF_NONE);
+ previewSharpMask->set_tooltip_markup (M("MAIN_TOOLTIP_PREVIEWSHARPMASK"));
+ previewSharpMask->set_image(*iSoff);
+
Glib::ustring tt;
indClippedH = Gtk::manage (new Gtk::ToggleButton ());
@@ -57,13 +66,16 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
}
previewFocusMask->set_active (false);
+ previewSharpMask->set_active (false);
indClippedH->set_active (options.showClippedHighlights);
indClippedS->set_active (options.showClippedShadows);
pack_start (*previewFocusMask, Gtk::PACK_SHRINK, 0);
+ pack_start (*previewSharpMask, Gtk::PACK_SHRINK, 0);
pack_start (*indClippedS, Gtk::PACK_SHRINK, 0);
pack_start (*indClippedH, Gtk::PACK_SHRINK, 0);
+ connSharpMask = previewSharpMask->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), previewSharpMask) );
connFocusMask = previewFocusMask->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), previewFocusMask) );
connClippedS = indClippedS->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indClippedS) );
connClippedH = indClippedH->signal_toggled().connect( sigc::bind(sigc::mem_fun(*this, &IndicateClippedPanel::buttonToggled), indClippedH) );
@@ -86,27 +98,46 @@ void IndicateClippedPanel::toggleFocusMask ()
previewFocusMask->set_active(!previewFocusMask->get_active());
}
+void IndicateClippedPanel::toggleSharpMask ()
+{
+ previewSharpMask->set_active(!previewSharpMask->get_active());
+}
+
void IndicateClippedPanel::buttonToggled (Gtk::ToggleButton* tb)
{
connFocusMask.block(true);
+ connSharpMask.block(true);
connClippedS.block(true);
connClippedH.block(true);
- if (tb != previewFocusMask) {
- previewFocusMask->set_active(false);
- } else {
+ if (tb == previewFocusMask) {
if (indClippedS->get_active()) {
indClippedS->set_active(false);
}
if (indClippedH->get_active()) {
indClippedH->set_active(false);
}
+ previewSharpMask->set_active(false);
+ } else if (tb == previewSharpMask) {
+ if (indClippedS->get_active()) {
+ indClippedS->set_active(false);
+ }
+ if (indClippedH->get_active()) {
+ indClippedH->set_active(false);
+ }
+ previewFocusMask->set_active(false);
+ imageArea->sharpMaskSelected(previewSharpMask->get_active());
+ } else {
+ previewFocusMask->set_active(false);
+ previewSharpMask->set_active(false);
}
previewFocusMask->set_image(previewFocusMask->get_active() ? *iFon : *iFoff);
+ previewSharpMask->set_image(previewSharpMask->get_active() ? *iSon : *iSoff);
connFocusMask.block(false);
+ connSharpMask.block(false);
connClippedS.block(false);
connClippedH.block(false);
@@ -123,4 +154,6 @@ IndicateClippedPanel::~IndicateClippedPanel ()
{
delete iFon;
delete iFoff;
+ delete iSon;
+ delete iSoff;
}
diff --git a/rtgui/indclippedpanel.h b/rtgui/indclippedpanel.h
index 1da4b61de..b4225a9cb 100644
--- a/rtgui/indclippedpanel.h
+++ b/rtgui/indclippedpanel.h
@@ -19,13 +19,15 @@
#define _INDCLIPPEDPANEL_
#include
+#include
class ImageArea;
class IndicateClippedPanel : public Gtk::HBox
{
protected:
- Gtk::Image* iFon, *iFoff;
+ Gtk::Image* iFon, *iFoff, *iSon, *iSoff;
+ Gtk::ToggleButton* previewSharpMask;
Gtk::ToggleButton* previewFocusMask;
Gtk::ToggleButton* indClippedH;
Gtk::ToggleButton* indClippedS;
@@ -38,8 +40,9 @@ public:
void buttonToggled(Gtk::ToggleButton* tb);
void toggleClipped(bool highlights); // inverts a toggle programmatically
void toggleFocusMask();
+ void toggleSharpMask();
- sigc::connection connFocusMask, connClippedS, connClippedH;
+ sigc::connection connFocusMask, connSharpMask, connClippedS, connClippedH;
bool showFocusMask ()
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index 20e614239..0cf024234 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -520,6 +520,7 @@ void ParamsEdited::set(bool v)
raw.bayersensor.dcbEnhance = v;
//raw.bayersensor.allEnhance = v;
raw.bayersensor.lmmseIterations = v;
+ raw.bayersensor.dualDemosaicContrast = v;
raw.bayersensor.pixelShiftMotionCorrectionMethod = v;
raw.bayersensor.pixelShiftEperIso = v;
raw.bayersensor.pixelShiftSigma = v;
@@ -530,15 +531,16 @@ void ParamsEdited::set(bool v)
raw.bayersensor.pixelShiftGreen = v;
raw.bayersensor.pixelShiftBlur = v;
raw.bayersensor.pixelShiftSmooth = v;
- raw.bayersensor.pixelShiftLmmse = v;
raw.bayersensor.pixelShiftEqualBright = v;
raw.bayersensor.pixelShiftEqualBrightChannel = v;
raw.bayersensor.pixelShiftNonGreenCross = v;
+ raw.bayersensor.pixelShiftDemosaicMethod = v;
raw.bayersensor.greenEq = v;
raw.bayersensor.linenoise = v;
raw.bayersensor.linenoiseDirection = v;
raw.bayersensor.pdafLinesFilter = v;
raw.xtranssensor.method = v;
+ raw.xtranssensor.dualDemosaicContrast = v;
raw.xtranssensor.ccSteps = v;
raw.xtranssensor.exBlackRed = v;
raw.xtranssensor.exBlackGreen = v;
@@ -1186,6 +1188,7 @@ void ParamsEdited::initFrom(const std::vector&
raw.bayersensor.dcbEnhance = raw.bayersensor.dcbEnhance && p.raw.bayersensor.dcb_enhance == other.raw.bayersensor.dcb_enhance;
//raw.bayersensor.allEnhance = raw.bayersensor.allEnhance && p.raw.bayersensor.all_enhance == other.raw.bayersensor.all_enhance;
raw.bayersensor.lmmseIterations = raw.bayersensor.lmmseIterations && p.raw.bayersensor.lmmse_iterations == other.raw.bayersensor.lmmse_iterations;
+ raw.bayersensor.dualDemosaicContrast = raw.bayersensor.dualDemosaicContrast && p.raw.bayersensor.dualDemosaicContrast == other.raw.bayersensor.dualDemosaicContrast;
raw.bayersensor.pixelShiftMotionCorrectionMethod = raw.bayersensor.pixelShiftMotionCorrectionMethod && p.raw.bayersensor.pixelShiftMotionCorrectionMethod == other.raw.bayersensor.pixelShiftMotionCorrectionMethod;
raw.bayersensor.pixelShiftEperIso = raw.bayersensor.pixelShiftEperIso && p.raw.bayersensor.pixelShiftEperIso == other.raw.bayersensor.pixelShiftEperIso;
raw.bayersensor.pixelShiftSigma = raw.bayersensor.pixelShiftSigma && p.raw.bayersensor.pixelShiftSigma == other.raw.bayersensor.pixelShiftSigma;
@@ -1196,15 +1199,16 @@ void ParamsEdited::initFrom(const std::vector&
raw.bayersensor.pixelShiftGreen = raw.bayersensor.pixelShiftGreen && p.raw.bayersensor.pixelShiftGreen == other.raw.bayersensor.pixelShiftGreen;
raw.bayersensor.pixelShiftBlur = raw.bayersensor.pixelShiftBlur && p.raw.bayersensor.pixelShiftBlur == other.raw.bayersensor.pixelShiftBlur;
raw.bayersensor.pixelShiftSmooth = raw.bayersensor.pixelShiftSmooth && p.raw.bayersensor.pixelShiftSmoothFactor == other.raw.bayersensor.pixelShiftSmoothFactor;
- raw.bayersensor.pixelShiftLmmse = raw.bayersensor.pixelShiftLmmse && p.raw.bayersensor.pixelShiftLmmse == other.raw.bayersensor.pixelShiftLmmse;
raw.bayersensor.pixelShiftEqualBright = raw.bayersensor.pixelShiftEqualBright && p.raw.bayersensor.pixelShiftEqualBright == other.raw.bayersensor.pixelShiftEqualBright;
raw.bayersensor.pixelShiftEqualBrightChannel = raw.bayersensor.pixelShiftEqualBrightChannel && p.raw.bayersensor.pixelShiftEqualBrightChannel == other.raw.bayersensor.pixelShiftEqualBrightChannel;
raw.bayersensor.pixelShiftNonGreenCross = raw.bayersensor.pixelShiftNonGreenCross && p.raw.bayersensor.pixelShiftNonGreenCross == other.raw.bayersensor.pixelShiftNonGreenCross;
+ raw.bayersensor.pixelShiftDemosaicMethod = raw.bayersensor.pixelShiftDemosaicMethod && p.raw.bayersensor.pixelShiftDemosaicMethod == other.raw.bayersensor.pixelShiftDemosaicMethod;
raw.bayersensor.greenEq = raw.bayersensor.greenEq && p.raw.bayersensor.greenthresh == other.raw.bayersensor.greenthresh;
raw.bayersensor.linenoise = raw.bayersensor.linenoise && p.raw.bayersensor.linenoise == other.raw.bayersensor.linenoise;
raw.bayersensor.linenoiseDirection = raw.bayersensor.linenoiseDirection && p.raw.bayersensor.linenoiseDirection == other.raw.bayersensor.linenoiseDirection;
raw.bayersensor.pdafLinesFilter = raw.bayersensor.pdafLinesFilter && p.raw.bayersensor.pdafLinesFilter == other.raw.bayersensor.pdafLinesFilter;
raw.xtranssensor.method = raw.xtranssensor.method && p.raw.xtranssensor.method == other.raw.xtranssensor.method;
+ raw.xtranssensor.dualDemosaicContrast = raw.xtranssensor.dualDemosaicContrast && p.raw.xtranssensor.dualDemosaicContrast == other.raw.xtranssensor.dualDemosaicContrast;
raw.xtranssensor.ccSteps = raw.xtranssensor.ccSteps && p.raw.xtranssensor.ccSteps == other.raw.xtranssensor.ccSteps;
raw.xtranssensor.exBlackRed = raw.xtranssensor.exBlackRed && p.raw.xtranssensor.blackred == other.raw.xtranssensor.blackred;
raw.xtranssensor.exBlackGreen = raw.xtranssensor.exBlackGreen && p.raw.xtranssensor.blackgreen == other.raw.xtranssensor.blackgreen;
@@ -3174,6 +3178,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.raw.bayersensor.lmmse_iterations = mods.raw.bayersensor.lmmse_iterations;
}
+ if (raw.bayersensor.dualDemosaicContrast) {
+ toEdit.raw.bayersensor.dualDemosaicContrast = mods.raw.bayersensor.dualDemosaicContrast;
+ }
+
if (raw.bayersensor.pixelShiftMotionCorrectionMethod) {
toEdit.raw.bayersensor.pixelShiftMotionCorrectionMethod = mods.raw.bayersensor.pixelShiftMotionCorrectionMethod;
}
@@ -3214,10 +3222,6 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.raw.bayersensor.pixelShiftSmoothFactor = mods.raw.bayersensor.pixelShiftSmoothFactor;
}
- if (raw.bayersensor.pixelShiftLmmse) {
- toEdit.raw.bayersensor.pixelShiftLmmse = mods.raw.bayersensor.pixelShiftLmmse;
- }
-
if (raw.bayersensor.pixelShiftEqualBright) {
toEdit.raw.bayersensor.pixelShiftEqualBright = mods.raw.bayersensor.pixelShiftEqualBright;
}
@@ -3230,6 +3234,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.raw.bayersensor.pixelShiftNonGreenCross = mods.raw.bayersensor.pixelShiftNonGreenCross;
}
+ if (raw.bayersensor.pixelShiftDemosaicMethod) {
+ toEdit.raw.bayersensor.pixelShiftDemosaicMethod = mods.raw.bayersensor.pixelShiftDemosaicMethod;
+ }
+
if (raw.bayersensor.greenEq) {
toEdit.raw.bayersensor.greenthresh = dontforceSet && options.baBehav[ADDSET_PREPROCESS_GREENEQUIL] ? toEdit.raw.bayersensor.greenthresh + mods.raw.bayersensor.greenthresh : mods.raw.bayersensor.greenthresh;
}
@@ -3250,6 +3258,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.raw.xtranssensor.method = mods.raw.xtranssensor.method;
}
+ if (raw.xtranssensor.dualDemosaicContrast) {
+ toEdit.raw.xtranssensor.dualDemosaicContrast = mods.raw.xtranssensor.dualDemosaicContrast;
+ }
+
if (raw.xtranssensor.ccSteps) {
toEdit.raw.xtranssensor.ccSteps = mods.raw.xtranssensor.ccSteps;
}
@@ -3750,9 +3762,9 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
bool RAWParamsEdited::BayerSensor::isUnchanged() const
{
- return method && imageNum && dcbIterations && dcbEnhance && lmmseIterations/*&& allEnhance*/ && greenEq
+ return method && imageNum && dcbIterations && dcbEnhance && lmmseIterations && dualDemosaicContrast /*&& allEnhance*/ && greenEq
&& pixelShiftMotionCorrectionMethod && pixelShiftEperIso && pixelShiftSigma && pixelShiftShowMotion && pixelShiftShowMotionMaskOnly
- && pixelShiftHoleFill && pixelShiftMedian && pixelShiftNonGreenCross && pixelShiftGreen && pixelShiftBlur && pixelShiftSmooth && pixelShiftLmmse && pixelShiftEqualBright && pixelShiftEqualBrightChannel
+ && pixelShiftHoleFill && pixelShiftMedian && pixelShiftNonGreenCross && pixelShiftDemosaicMethod && pixelShiftGreen && pixelShiftBlur && pixelShiftSmooth && pixelShiftEqualBright && pixelShiftEqualBrightChannel
&& linenoise && linenoiseDirection && pdafLinesFilter && exBlack0 && exBlack1 && exBlack2 && exBlack3 && exTwoGreen;
}
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index dc738f45e..4c5e8dacc 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -850,6 +850,7 @@ public:
bool dcbIterations;
bool dcbEnhance;
bool lmmseIterations;
+ bool dualDemosaicContrast;
bool pixelShiftMotionCorrectionMethod;
bool pixelShiftEperIso;
bool pixelShiftSigma;
@@ -860,10 +861,10 @@ public:
bool pixelShiftGreen;
bool pixelShiftBlur;
bool pixelShiftSmooth;
- bool pixelShiftLmmse;
bool pixelShiftEqualBright;
bool pixelShiftEqualBrightChannel;
bool pixelShiftNonGreenCross;
+ bool pixelShiftDemosaicMethod;
//bool allEnhance;
bool greenEq;
@@ -879,6 +880,7 @@ public:
public:
bool method;
+ bool dualDemosaicContrast;
bool ccSteps;
bool exBlackRed;
bool exBlackGreen;
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index c9ed1cd14..99411e46c 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -852,7 +852,7 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.raw.bayersensor.pixelShiftEqualBrightChannel = falsePE.raw.bayersensor.pixelShiftEqualBrightChannel;
filterPE.raw.bayersensor.pixelShiftGreen = falsePE.raw.bayersensor.pixelShiftGreen;
filterPE.raw.bayersensor.pixelShiftHoleFill = falsePE.raw.bayersensor.pixelShiftHoleFill;
- filterPE.raw.bayersensor.pixelShiftLmmse = falsePE.raw.bayersensor.pixelShiftLmmse;
+ filterPE.raw.bayersensor.pixelShiftDemosaicMethod = falsePE.raw.bayersensor.pixelShiftDemosaicMethod;
filterPE.raw.bayersensor.pixelShiftMedian = falsePE.raw.bayersensor.pixelShiftMedian;
filterPE.raw.bayersensor.pixelShiftMotionCorrectionMethod = falsePE.raw.bayersensor.pixelShiftMotionCorrectionMethod;
filterPE.raw.bayersensor.pixelShiftNonGreenCross = falsePE.raw.bayersensor.pixelShiftNonGreenCross;
diff --git a/rtgui/ppversion.h b/rtgui/ppversion.h
index e9f7ad60e..1fb34ca0a 100644
--- a/rtgui/ppversion.h
+++ b/rtgui/ppversion.h
@@ -1,11 +1,15 @@
#pragma once
// This number has to be incremented whenever the PP3 file format is modified or the behaviour of a tool changes
-#define PPVERSION 334
+#define PPVERSION 336
#define PPVERSION_AEXP 301 //value of PPVERSION when auto exposure algorithm was modified
/*
Log of version changes
+ 336 2018-06-01
+ new demosaic method combobox for pixelshift
+ 335 2018-05-30
+ new contrast adjuster in Bayer process tool
334 2018-05-13
new contrast threshold adjuster in Microcontrast tool
333 2018-04-26
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index e4524fde6..2031a41e2 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -388,6 +388,19 @@ Gtk::Widget* Preferences::getBatchProcPanel()
appendBehavList(mi, M("TP_WAVELET_EDGEDETECTTHR2"), ADDSET_WA_EDGEDETECTTHR2, true);
mi = behModel->append();
+ mi->set_value (behavColumns.label, M ("TP_RAW_SENSOR_BAYER_LABEL"));
+ appendBehavList (mi, M ("TP_RAW_FALSECOLOR"), ADDSET_BAYER_FALSE_COLOR_SUPPRESSION, false);
+ appendBehavList (mi, M ("TP_RAW_DCBITERATIONS") + ", " + M("TP_RAW_LMMSEITERATIONS"), ADDSET_BAYER_ITER, false);
+ appendBehavList (mi, M ("TP_RAW_DUALDEMOSAICCONTRAST"), ADDSET_BAYER_DUALDEMOZCONTRAST, false);
+ appendBehavList (mi, M ("TP_RAW_PIXELSHIFTSIGMA"), ADDSET_BAYER_PS_SIGMA, false);
+ appendBehavList (mi, M ("TP_RAW_PIXELSHIFTSMOOTH"), ADDSET_BAYER_PS_SMOOTH, false);
+ appendBehavList (mi, M ("TP_RAW_PIXELSHIFTEPERISO"), ADDSET_BAYER_PS_EPERISO, false);
+
+ mi = behModel->append ();
+ mi->set_value (behavColumns.label, M ("TP_RAW_SENSOR_XTRANS_LABEL"));
+ appendBehavList (mi, M ("TP_RAW_FALSECOLOR"), ADDSET_XTRANS_FALSE_COLOR_SUPPRESSION, false);
+
+ mi = behModel->append ();
mi->set_value(behavColumns.label, M("TP_PREPROCESS_LABEL"));
appendBehavList(mi, M("TP_PREPROCESS_GREENEQUIL"), ADDSET_PREPROCESS_GREENEQUIL, false);
appendBehavList(mi, M("TP_PREPROCESS_LINEDENOISE"), ADDSET_PREPROCESS_LINEDENOISE, true);
diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc
index 2fff95904..34557ccc4 100644
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -23,6 +23,103 @@
#include "../rtengine/mytime.h"
+namespace
+{
+
+Glib::ustring getPaddedName(const Glib::ustring& name)
+{
+ enum class State {
+ OTHER,
+ NUMBER
+ };
+
+ constexpr unsigned int pad_width = 16;
+
+ Glib::ustring res;
+
+ State state = State::OTHER;
+ Glib::ustring number;
+
+ for (auto c : name) {
+ switch (state) {
+ case State::OTHER: {
+ switch (c) {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': {
+ number += c;
+
+ state = State::NUMBER;
+ break;
+ }
+
+ default: {
+ res += c;
+ break;
+ }
+ }
+ break;
+ }
+
+ case State::NUMBER: {
+ switch (c) {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9': {
+ number += c;
+ break;
+ }
+
+ default: {
+ if (number.size() < pad_width) {
+ res.append(pad_width - number.size(), '0');
+ }
+ res += number;
+ res += c;
+ number.clear();
+
+ state = State::OTHER;
+ break;
+ }
+ }
+ break;
+ }
+ }
+ }
+
+ switch (state) {
+ case State::OTHER: {
+ break;
+ }
+
+ case State::NUMBER: {
+ if (number.size() < pad_width) {
+ res.append(pad_width - number.size(), '0');
+ }
+ res += number;
+ break;
+ }
+ }
+
+ return res;
+}
+
+}
+
ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) :
fnlabw(0),
fnlabh(0),
@@ -57,7 +154,7 @@ ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) :
bbFramed(false),
bbPreview(nullptr),
cursor_type(CSUndefined),
- collate_name(dispname.casefold().collate_key()),
+ collate_name(getPaddedName(dispname).casefold_collate_key()),
thumbnail(nullptr),
filename(fname),
shortname(dispname),
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index b4b13b862..32e500582 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -679,6 +679,16 @@ void ToolPanelCoordinator::spotWBselected(int x, int y, Thumbnail* thm)
}
}
+void ToolPanelCoordinator::sharpMaskSelected(bool sharpMask)
+{
+
+ if (!ipc) {
+ return;
+ }
+ ipc->beginUpdateParams ();
+ ipc->setSharpMask(sharpMask);
+ ipc->endUpdateParams (rtengine::EvShrEnabled);
+}
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index d53973231..c046c67ee 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -285,6 +285,7 @@ public:
// imageareatoollistener interface
void spotWBselected(int x, int y, Thumbnail* thm = nullptr);
+ void sharpMaskSelected (bool sharpMask);
void cropSelectionReady();
void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr);
ToolBar* getToolBar()
diff --git a/rtgui/xtransprocess.cc b/rtgui/xtransprocess.cc
index 9e0c94ea0..1b2b4a40d 100644
--- a/rtgui/xtransprocess.cc
+++ b/rtgui/xtransprocess.cc
@@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see .
*/
+#include "eventmapper.h"
#include "xtransprocess.h"
#include "options.h"
#include "guiutils.h"
@@ -25,6 +26,9 @@ using namespace rtengine::procparams;
XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP_RAW_LABEL"), true)
{
+ auto m = ProcEventMapper::getInstance();
+ EvDemosaicContrast = m->newEvent(DEMOSAIC, "HISTORY_MSG_DUALDEMOSAIC_CONTRAST");
+
Gtk::HBox* hb1 = Gtk::manage (new Gtk::HBox ());
hb1->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_RAW_DMETHOD") + ": ")), Gtk::PACK_SHRINK, 4);
method = Gtk::manage (new MyComboBoxText ());
@@ -63,6 +67,19 @@ XTransProcess::XTransProcess () : FoldableToolPanel(this, "xtransprocess", M("TP
hb1->pack_end (*method, Gtk::PACK_EXPAND_WIDGET, 4);
pack_start( *hb1, Gtk::PACK_SHRINK, 4);
+ dualDemosaicOptions = Gtk::manage (new Gtk::VBox ());
+
+ dualDemosaicContrast = Gtk::manage(new Adjuster (M("TP_RAW_DUALDEMOSAICCONTRAST"), 0, 100, 1, 20));
+ dualDemosaicContrast->setAdjusterListener (this);
+
+ if (dualDemosaicContrast->delay < options.adjusterMaxDelay) {
+ dualDemosaicContrast->delay = options.adjusterMaxDelay;
+ }
+
+ dualDemosaicContrast->show();
+ dualDemosaicOptions->pack_start(*dualDemosaicContrast);
+ pack_start( *dualDemosaicOptions, Gtk::PACK_SHRINK, 4);
+
pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
ccSteps = Gtk::manage (new Adjuster (M("TP_RAW_FALSECOLOR"), 0, 5, 1, 0 ));
ccSteps->setAdjusterListener (this);
@@ -83,8 +100,6 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
disableListener ();
methodconn.block (true);
- method->set_active(std::numeric_limits::max());
-
for (size_t i = 0; i < RAWParams::XTransSensor::getMethodStrings().size(); ++i)
if( pp->raw.xtranssensor.method == RAWParams::XTransSensor::getMethodStrings()[i]) {
method->set_active(i);
@@ -93,14 +108,18 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
}
if(pedited ) {
+ dualDemosaicContrast->setEditedState ( pedited->raw.xtranssensor.dualDemosaicContrast ? Edited : UnEdited);
ccSteps->setEditedState (pedited->raw.xtranssensor.ccSteps ? Edited : UnEdited);
if( !pedited->raw.xtranssensor.method ) {
- method->set_active(std::numeric_limits::max()); // No name
+ method->set_active_text(M("GENERAL_UNCHANGED"));
}
}
-
+ 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));
+ }
methodconn.block (false);
@@ -109,35 +128,47 @@ void XTransProcess::read(const rtengine::procparams::ProcParams* pp, const Param
void XTransProcess::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited)
{
+ pp->raw.xtranssensor.dualDemosaicContrast = dualDemosaicContrast->getValue();
pp->raw.xtranssensor.ccSteps = ccSteps->getIntValue();
int currentRow = method->get_active_row_number();
- if (currentRow >= 0 && currentRow < std::numeric_limits::max()) {
+ if (currentRow >= 0 && method->get_active_text() != M("GENERAL_UNCHANGED")) {
pp->raw.xtranssensor.method = procparams::RAWParams::XTransSensor::getMethodStrings()[currentRow];
}
if (pedited) {
- pedited->raw.xtranssensor.method = method->get_active_row_number() != std::numeric_limits::max();
+ pedited->raw.xtranssensor.method = method->get_active_text() != M("GENERAL_UNCHANGED");
+ pedited->raw.xtranssensor.dualDemosaicContrast = dualDemosaicContrast->getEditedState ();
pedited->raw.xtranssensor.ccSteps = ccSteps->getEditedState ();
}
}
+void XTransProcess::setAdjusterBehavior (bool falsecoloradd, bool dualDemosaicContrastAdd)
+{
+ dualDemosaicContrast->setAddMode(dualDemosaicContrastAdd);
+ ccSteps->setAddMode(falsecoloradd);
+}
+
void XTransProcess::setBatchMode(bool batchMode)
{
method->append (M("GENERAL_UNCHANGED"));
- method->set_active(std::numeric_limits::max()); // No name
+ method->set_active_text(M("GENERAL_UNCHANGED"));
ToolPanel::setBatchMode (batchMode);
+ dualDemosaicContrast->showEditedCB ();
ccSteps->showEditedCB ();
}
void XTransProcess::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
{
+ dualDemosaicContrast->setDefault( defParams->raw.xtranssensor.dualDemosaicContrast);
ccSteps->setDefault (defParams->raw.xtranssensor.ccSteps);
if (pedited) {
+ dualDemosaicContrast->setDefaultEditedState( pedited->raw.xtranssensor.dualDemosaicContrast ? Edited : UnEdited);
ccSteps->setDefaultEditedState(pedited->raw.xtranssensor.ccSteps ? Edited : UnEdited);
} else {
+ dualDemosaicContrast->setDefaultEditedState(Irrelevant );
ccSteps->setDefaultEditedState(Irrelevant );
}
}
@@ -147,6 +178,8 @@ void XTransProcess::adjusterChanged (Adjuster* a, double newval)
if (listener) {
if (a == ccSteps) {
listener->panelChanged (EvDemosaicFalseColorIter, a->getTextValue() );
+ } else if (a == dualDemosaicContrast) {
+ listener->panelChanged (EvDemosaicContrast, a->getTextValue() );
}
}
}
@@ -154,22 +187,22 @@ void XTransProcess::adjusterChanged (Adjuster* a, double newval)
void XTransProcess::methodChanged ()
{
const int curSelection = method->get_active_row_number();
- const RAWParams::XTransSensor::Method method = RAWParams::XTransSensor::Method(curSelection);
-
- Glib::ustring methodName;
- bool ppreq = false;
-
- if (curSelection >= 0 && curSelection < std::numeric_limits::max()) {
- methodName = RAWParams::XTransSensor::getMethodStrings()[curSelection];
-
- if (method == RAWParams::XTransSensor::Method::MONO || RAWParams::XTransSensor::Method(oldSelection) == RAWParams::XTransSensor::Method::MONO) {
- ppreq = true;
- }
- }
+ const RAWParams::XTransSensor::Method currentMethod = RAWParams::XTransSensor::Method(curSelection);
oldSelection = curSelection;
- if (listener) {
- listener->panelChanged (ppreq ? EvDemosaicMethodPreProc : EvDemosaicMethod, methodName);
+ if (!batchMode) {
+ if (currentMethod == procparams::RAWParams::XTransSensor::Method::FOUR_PASS) {
+ dualDemosaicOptions->show();
+ } else {
+ dualDemosaicOptions->hide();
+ }
+
+ }
+ if (listener && method->get_active_row_number() >= 0) {
+ listener->panelChanged (
+ currentMethod == RAWParams::XTransSensor::Method::MONO || RAWParams::XTransSensor::Method(oldSelection) == RAWParams::XTransSensor::Method::MONO
+ ? EvDemosaicMethodPreProc
+ : EvDemosaicMethod, method->get_active_text());
}
}
diff --git a/rtgui/xtransprocess.h b/rtgui/xtransprocess.h
index 44ed2e670..edc0965b8 100644
--- a/rtgui/xtransprocess.h
+++ b/rtgui/xtransprocess.h
@@ -32,21 +32,25 @@ protected:
MyComboBoxText* method;
Adjuster* ccSteps;
+ Gtk::VBox *dualDemosaicOptions;
+ Adjuster* dualDemosaicContrast;
int oldSelection;
sigc::connection methodconn;
+ rtengine::ProcEvent EvDemosaicContrast;
public:
XTransProcess ();
- void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
- void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
- void setBatchMode (bool batchMode);
- void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
+ void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
+ void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
+ void setAdjusterBehavior(bool falsecoloradd, bool dualDemosaicContrastAdd);
+ void setBatchMode(bool batchMode);
+ void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
- void methodChanged ();
- void adjusterChanged (Adjuster* a, double newval);
+ void methodChanged();
+ void adjusterChanged(Adjuster* a, double newval);
};
#endif