diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala index 3212a263e..c38ec1cb5 100644 --- a/rtdata/languages/Catala +++ b/rtdata/languages/Catala @@ -302,7 +302,6 @@ HISTORY_MSG_121;Raw auto CA HISTORY_MSG_122;Auto marc fosc HISTORY_MSG_123;Fitxer de camp fosc HISTORY_MSG_124;Correc. expo. linear -HISTORY_MSG_125;Correc. exposició preservant HL HISTORY_MSG_126;Fitxer de camp pla HISTORY_MSG_127;Auto-sel. camp pla HISTORY_MSG_128;Camp pla borrós - radi @@ -470,7 +469,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtre línia de soroll PARTIALPASTE_RAWCACORR_AUTO;Auto-correcció AC PARTIALPASTE_RAWEXPOS_BLACK;Nivell negre PARTIALPASTE_RAWEXPOS_LINEAR;Factor de corr. linear de punt blanc -PARTIALPASTE_RAWEXPOS_PRESER;Corr. punt blanc preservant HL (EV) PARTIALPASTE_RAWGROUP;Ajustos raw PARTIALPASTE_RAW_DCBENHANCE;Aplica pas de millora DCB PARTIALPASTE_RAW_DCBITERATIONS;Nombre d'iteracions DCB @@ -798,7 +796,6 @@ TP_RAWCACORR_CABLUE;Blau TP_RAWCACORR_CARED;Vermell TP_RAWEXPOS_BLACKS;Nivells negres TP_RAWEXPOS_LINEAR;Punt blanc: factor de correcció linear -TP_RAWEXPOS_PRESER;Punt blanc: correc. clars preservant (EV) TP_RAWEXPOS_TWOGREEN;Dos verds junts TP_RAW_DCBENHANCE;Aplica pas de millora DCB TP_RAW_DCBITERATIONS;Nombre d'iteracions DCB diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified) index 49b60964a..3badf67eb 100644 --- a/rtdata/languages/Chinese (Simplified) +++ b/rtdata/languages/Chinese (Simplified) @@ -463,7 +463,6 @@ PARTIALPASTE_RAWCACORR_AUTO;CA自动更正 PARTIALPASTE_RAWCACORR_CAREDBLUE;红蓝色散 PARTIALPASTE_RAWEXPOS_BLACK;黑色等级 PARTIALPASTE_RAWEXPOS_LINEAR;白点纠正 -PARTIALPASTE_RAWEXPOS_PRESER;高光补偿 PARTIALPASTE_RAWGROUP;Raw设置 PARTIALPASTE_RAW_DCBENHANCE;DCB 增强 PARTIALPASTE_RAW_DCBITERATIONS;DCB 反复 @@ -1055,7 +1054,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !HISTORY_MSG_118;Raw CA correction - Blue !HISTORY_MSG_120;Green equilibration !HISTORY_MSG_121;Raw CA Correction - Auto -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_131;NR - Luma !HISTORY_MSG_132;NR - Chroma !HISTORY_MSG_133;Output gamma @@ -1950,7 +1948,6 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: - !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional) index 78fecbc5a..6fd045ce8 100644 --- a/rtdata/languages/Chinese (Traditional) +++ b/rtdata/languages/Chinese (Traditional) @@ -631,7 +631,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1206,7 +1205,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1898,7 +1896,6 @@ TP_WBALANCE_TEMPERATURE;色溫 !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech index acab88606..8d3296a1c 100644 --- a/rtdata/languages/Czech +++ b/rtdata/languages/Czech @@ -421,7 +421,6 @@ HISTORY_MSG_121;Raw korekce CA - automatická HISTORY_MSG_122;Tmavé snímky - Automatický výběr HISTORY_MSG_123;Tmavé snímky - Soubor HISTORY_MSG_124;Korekce bílého bodu -HISTORY_MSG_125;Zachování světel HISTORY_MSG_126;Flat Field - Soubor HISTORY_MSG_127;Flat Field - Automatický výběr HISTORY_MSG_128;Flat Field - Poloměr rozostření @@ -1056,7 +1055,6 @@ PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA zabránit posunu barev PARTIALPASTE_RAWCACORR_CAREDBLUE;CA červená a modrá PARTIALPASTE_RAWEXPOS_BLACK;Úrovně černé PARTIALPASTE_RAWEXPOS_LINEAR;Korekce bílého bodu -PARTIALPASTE_RAWEXPOS_PRESER;Zachování světel PARTIALPASTE_RAWGROUP;Nastavení Raw PARTIALPASTE_RAW_BORDER;Okraj Raw PARTIALPASTE_RAW_DCBENHANCE;Vylepšení DCB @@ -1882,7 +1880,6 @@ TP_RAWEXPOS_BLACK_BLUE;Modrá TP_RAWEXPOS_BLACK_GREEN;Zelená TP_RAWEXPOS_BLACK_RED;Červená TP_RAWEXPOS_LINEAR;Korekce bílého bodu -TP_RAWEXPOS_PRESER;Zachování světel TP_RAWEXPOS_RGB;Červená, telená, modrá TP_RAWEXPOS_TWOGREEN;Spojit zelené TP_RAW_1PASSMEDIUM;Jeden průchod (Markesteijn) diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk index fc6c23d8a..ff3c2a8e4 100644 --- a/rtdata/languages/Dansk +++ b/rtdata/languages/Dansk @@ -626,7 +626,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1203,7 +1202,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1895,7 +1893,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch index e46744297..6975587c7 100644 --- a/rtdata/languages/Deutsch +++ b/rtdata/languages/Deutsch @@ -457,7 +457,6 @@ HISTORY_MSG_121;(Sensor-Matrix)\nChromatische Aberration\nAutomatische Korrektur HISTORY_MSG_122;(Dunkelbild)\nAutomatische Auswahl HISTORY_MSG_123;(Dunkelbild) - Datei HISTORY_MSG_124;(Weißpunkt)\nKorrekturfaktor -HISTORY_MSG_125;(Belichtungskorrektur)\nLichter schützen HISTORY_MSG_126;(Weißbild) - Datei HISTORY_MSG_127;(Weißbild)\nAutomatische Auswahl HISTORY_MSG_128;(Weißbild)\nUnschärferadius @@ -1098,7 +1097,6 @@ PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;Chromatische Aberration: Farbverschiebung PARTIALPASTE_RAWCACORR_CAREDBLUE;Chromatische Aberration: Rot & Blau PARTIALPASTE_RAWEXPOS_BLACK;Weißpunkt: Schwarzpegel PARTIALPASTE_RAWEXPOS_LINEAR;Weißpunkt: Korrekturfaktor -PARTIALPASTE_RAWEXPOS_PRESER;Weißpunkt: Lichter schützen (EV) PARTIALPASTE_RAWGROUP;RAW PARTIALPASTE_RAW_BORDER;Farbinterpolation: Bildrand PARTIALPASTE_RAW_DCBENHANCE;Farbinterpolation: DCB-Verbesserung @@ -1931,7 +1929,6 @@ TP_RAWEXPOS_BLACK_BLUE;Blau TP_RAWEXPOS_BLACK_GREEN;Grün TP_RAWEXPOS_BLACK_RED;Rot TP_RAWEXPOS_LINEAR;Korrekturfaktor -TP_RAWEXPOS_PRESER;Weißpunkt: Lichter schützen TP_RAWEXPOS_RGB;Rot, Grün, Blau TP_RAWEXPOS_TWOGREEN;Grün-Werte automatisch angleichen TP_RAW_1PASSMEDIUM;1-Pass (Markesteijn) diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK) index 8c4d53306..f6f3cc518 100644 --- a/rtdata/languages/English (UK) +++ b/rtdata/languages/English (UK) @@ -489,7 +489,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1098,7 +1097,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1858,7 +1856,6 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US) index 0ae647a24..34975d449 100644 --- a/rtdata/languages/English (US) +++ b/rtdata/languages/English (US) @@ -381,7 +381,6 @@ !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1019,7 +1018,6 @@ !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1845,7 +1843,6 @@ !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol index d2f0bc4dd..d32a430fd 100644 --- a/rtdata/languages/Espanol +++ b/rtdata/languages/Espanol @@ -440,7 +440,6 @@ HISTORY_MSG_121;Corrección automática AC HISTORY_MSG_122;Auto selección de arch. de Toma Negra HISTORY_MSG_123;Archivo de Toma Negra HISTORY_MSG_124;Corrección de punto blanco -HISTORY_MSG_125;Preservar Luces Altas HISTORY_MSG_126;Archivo de campo plano HISTORY_MSG_127;Auto selección archivo de campo plano HISTORY_MSG_128;Radio de difuminado de campo plano @@ -1081,7 +1080,6 @@ PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA evitar el cambio de color PARTIALPASTE_RAWCACORR_CAREDBLUE;CA Rojo & Azul PARTIALPASTE_RAWEXPOS_BLACK;Nivel de negro PARTIALPASTE_RAWEXPOS_LINEAR;Corrección de punto blanco -PARTIALPASTE_RAWEXPOS_PRESER;Preservar Luces Altas PARTIALPASTE_RAWGROUP;Ajustes Raw PARTIALPASTE_RAW_BORDER;Raw margen/borde PARTIALPASTE_RAW_DCBENHANCE;Aplicar paso de mejora DCB @@ -1972,7 +1970,6 @@ TP_RAWEXPOS_BLACK_BLUE;Azul TP_RAWEXPOS_BLACK_GREEN;Verde TP_RAWEXPOS_BLACK_RED;Rojo TP_RAWEXPOS_LINEAR;Corrección de punto blanco -TP_RAWEXPOS_PRESER;Preservación de Luces Altas TP_RAWEXPOS_RGB;Rojo, Verde, Azul TP_RAWEXPOS_TWOGREEN;Vincular verdes TP_RAW_1PASSMEDIUM;1-pasaje (medio) diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara index 6478433fb..7c934c7cb 100644 --- a/rtdata/languages/Euskara +++ b/rtdata/languages/Euskara @@ -627,7 +627,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1204,7 +1203,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1896,7 +1894,6 @@ TP_WBALANCE_TEMPERATURE;Tenperatura !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index 54108b344..562db238c 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -379,7 +379,6 @@ HISTORY_MSG_121;A.C. Raw - Auto HISTORY_MSG_122;Sélection auto de trame noire HISTORY_MSG_123;Fichier de trame noire HISTORY_MSG_124;Correct. du point blanc -HISTORY_MSG_125;Préservation des HL HISTORY_MSG_126;Champ Uniforme - Fichier HISTORY_MSG_127;Champ Uniforme - Sélection auto HISTORY_MSG_128;Champ Uniforme - Rayon @@ -1018,7 +1017,6 @@ PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;A.C. Raw - Éviter les dérives couleurs PARTIALPASTE_RAWCACORR_CAREDBLUE;A.C. Raw - Rouge et bleu PARTIALPASTE_RAWEXPOS_BLACK;Niveaux de noir PARTIALPASTE_RAWEXPOS_LINEAR;Correction du point blanc -PARTIALPASTE_RAWEXPOS_PRESER;Préservation des hautes humières PARTIALPASTE_RAWGROUP;Réglages RAW PARTIALPASTE_RAW_BORDER;Bord Raw PARTIALPASTE_RAW_DCBENHANCE;Amélioration de DCB @@ -1852,7 +1850,6 @@ TP_RAWEXPOS_BLACK_BLUE;Bleu TP_RAWEXPOS_BLACK_GREEN;Vert TP_RAWEXPOS_BLACK_RED;Rouge TP_RAWEXPOS_LINEAR;Corr. du Point Blanc -TP_RAWEXPOS_PRESER;Préservation des HL TP_RAWEXPOS_RGB;Rouge, Vert, Bleu TP_RAWEXPOS_TWOGREEN;Lier les verts TP_RAW_1PASSMEDIUM;1-Passe (Medium) diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek index 7f3e06086..b7787fa7d 100644 --- a/rtdata/languages/Greek +++ b/rtdata/languages/Greek @@ -626,7 +626,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1203,7 +1202,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1895,7 +1893,6 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew index 789ebfe77..440b96b3f 100644 --- a/rtdata/languages/Hebrew +++ b/rtdata/languages/Hebrew @@ -627,7 +627,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1204,7 +1203,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1896,7 +1894,6 @@ TP_WBALANCE_TEMPERATURE;מידת חום !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano index 92d8c47e8..8f68d5cf9 100644 --- a/rtdata/languages/Italiano +++ b/rtdata/languages/Italiano @@ -332,7 +332,6 @@ HISTORY_MSG_121;AC automatica (Raw) HISTORY_MSG_122;Dark Frame - Automatico HISTORY_MSG_123;Dark Frame - File HISTORY_MSG_124;Correzione Punto di Bianco -HISTORY_MSG_125;Protezione AlteLuci HISTORY_MSG_126;Flat Field - File HISTORY_MSG_127;Flat Field - Automatico HISTORY_MSG_128;Flat Field - Raggio di Sfocamento @@ -600,7 +599,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Filtro per rumore a bande PARTIALPASTE_RAWCACORR_AUTO;Autocorrezione AC PARTIALPASTE_RAWEXPOS_BLACK;Punto del Nero PARTIALPASTE_RAWEXPOS_LINEAR;Correzione Punto del Bianco -PARTIALPASTE_RAWEXPOS_PRESER;Conservazione Alteluci PARTIALPASTE_RAWGROUP;Impostazioni del Raw PARTIALPASTE_RAW_DCBENHANCE;Miglioramento DCB PARTIALPASTE_RAW_DCBITERATIONS;Numero di iterazioni DCB @@ -1135,7 +1133,6 @@ TP_RAWCACORR_CABLUE;Blu TP_RAWCACORR_CARED;Rosso TP_RAWEXPOS_BLACKS;Livelli del nero TP_RAWEXPOS_LINEAR;Punto del Bianco - Correzione -TP_RAWEXPOS_PRESER;Punto del Bianco - Protezione Alteluci TP_RAWEXPOS_TWOGREEN;Valori del verde uniti TP_RAW_DCBENHANCE;Miglioramento DCB TP_RAW_DCBITERATIONS;Numero di iterazioni DCB diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese index 7e543daaf..a05eaacda 100644 --- a/rtdata/languages/Japanese +++ b/rtdata/languages/Japanese @@ -412,7 +412,6 @@ HISTORY_MSG_121;raw 色収差 自動 HISTORY_MSG_122;ダークフレーム 自動 HISTORY_MSG_123;ダークフレーム ファイル HISTORY_MSG_124;リニア露光補正 -HISTORY_MSG_125;露光補正 HLを保持 HISTORY_MSG_126;フラットフィールド ファイル HISTORY_MSG_127;フラットフィールド 自動選択 HISTORY_MSG_128;フラットフィールド・ぼかし半径 @@ -1051,7 +1050,6 @@ PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA 色ずれを回避 PARTIALPASTE_RAWCACORR_CAREDBLUE;色収差 レッドとブルー PARTIALPASTE_RAWEXPOS_BLACK;黒レベル PARTIALPASTE_RAWEXPOS_LINEAR;raw ホワイトポイント リニア補正係数 -PARTIALPASTE_RAWEXPOS_PRESER;raw ホワイトポイント ハイライトを保持したまま補正 (EV) PARTIALPASTE_RAWGROUP;raw 設定 PARTIALPASTE_RAW_BORDER;Rawの境界 PARTIALPASTE_RAW_DCBENHANCE;DCB 拡張処理適用 @@ -1878,7 +1876,6 @@ TP_RAWEXPOS_BLACK_BLUE;ブルー TP_RAWEXPOS_BLACK_GREEN;グリーン TP_RAWEXPOS_BLACK_RED;レッド TP_RAWEXPOS_LINEAR;ホワイトポイント補正 -TP_RAWEXPOS_PRESER;ハイライトを保持 TP_RAWEXPOS_RGB;レッド、グリーン、ブルー TP_RAWEXPOS_TWOGREEN;2つのグリーンを連動 TP_RAW_1PASSMEDIUM;1-パス (Markesteijn) diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian index 20736ed12..dd5b3ca46 100644 --- a/rtdata/languages/Latvian +++ b/rtdata/languages/Latvian @@ -627,7 +627,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1204,7 +1203,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1896,7 +1894,6 @@ TP_WBALANCE_TEMPERATURE;Temperatūra !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar index 2a6ce45a6..8725d2789 100644 --- a/rtdata/languages/Magyar +++ b/rtdata/languages/Magyar @@ -295,7 +295,6 @@ HISTORY_MSG_121;Auto CA HISTORY_MSG_122;Auto ref. feketekép (dark frame) HISTORY_MSG_123;Ref. feketekép állománya HISTORY_MSG_124;Lineáris exp. korrekció -HISTORY_MSG_125;Exp. korrekció csúcsfények megőrzésével HISTORY_MSG_126;Flat Field állomány HISTORY_MSG_127;Flat Field automatikus kivál. HISTORY_MSG_128;Flat Field elmosás sugara @@ -454,7 +453,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Soronkénti zajszűrés PARTIALPASTE_RAWCACORR_AUTO;CA autokorrekció PARTIALPASTE_RAWEXPOS_BLACK;Feketeszint PARTIALPASTE_RAWEXPOS_LINEAR;Raw fehérszint lineáris korrekciós faktor (FÉ) -PARTIALPASTE_RAWEXPOS_PRESER;Raw fehérszint csúcsfény-megőrző faktor (FÉ) PARTIALPASTE_RAWGROUP;Raw beállítások PARTIALPASTE_RAW_DCBENHANCE;DCB javítási lépés alkalmazása PARTIALPASTE_RAW_DCBITERATIONS;DCB iterációk száma @@ -729,7 +727,6 @@ TP_RAWCACORR_CABLUE;Kék TP_RAWCACORR_CARED;Vörös TP_RAWEXPOS_BLACKS;Feketeszintek TP_RAWEXPOS_LINEAR;Fehérszint: lineáris korrelációs faktor -TP_RAWEXPOS_PRESER;Fehérszint: csúcsfény-megőrző korrekció (FÉ) TP_RAWEXPOS_TWOGREEN;Zöldek együtt TP_RAW_DCBENHANCE;DCB helyesbítő lépés alkalmazása TP_RAW_DCBITERATIONS;DCB iterációk száma diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands index 028b02955..7a7d4e6f6 100644 --- a/rtdata/languages/Nederlands +++ b/rtdata/languages/Nederlands @@ -376,7 +376,6 @@ HISTORY_MSG_121;RAW CA-correctie - Auto HISTORY_MSG_122;Donkerframe - Autom. selectie HISTORY_MSG_123;Donkerframe - Bestand HISTORY_MSG_124;Witpunt correctie -HISTORY_MSG_125;Hoge lichten behouden HISTORY_MSG_126;Vlakveld - Bestand HISTORY_MSG_127;Vlakveld - Autom. selectie HISTORY_MSG_128;Vlakveld - Verzachten straal @@ -881,7 +880,6 @@ PARTIALPASTE_RAWCACORR_AUTO;Autom. C/A-correctie PARTIALPASTE_RAWCACORR_CAREDBLUE;CA rood & blauw PARTIALPASTE_RAWEXPOS_BLACK;Zwartniveau PARTIALPASTE_RAWEXPOS_LINEAR;Raw witpunt- lineaire corr. factor -PARTIALPASTE_RAWEXPOS_PRESER;Raw witpunt- herstel hoge lichten (EV) PARTIALPASTE_RAWGROUP;Raw-instellingen PARTIALPASTE_RAW_DCBENHANCE;Pas DCB-verbetering toe PARTIALPASTE_RAW_DCBITERATIONS;aantal DCB-herhalingen @@ -1593,7 +1591,6 @@ TP_RAWEXPOS_BLACK_BLUE;Blauw TP_RAWEXPOS_BLACK_GREEN;Groen TP_RAWEXPOS_BLACK_RED;Rood TP_RAWEXPOS_LINEAR;Witpunt Correctie -TP_RAWEXPOS_PRESER;Herstel hoge lichten TP_RAWEXPOS_RGB;Rood, Groen, Blauw TP_RAWEXPOS_TWOGREEN;Koppel Groen 1 en 2 TP_RAW_1PASSMEDIUM;1 keer (Gemiddeld) diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM index 799019625..f9a53a15e 100644 --- a/rtdata/languages/Norsk BM +++ b/rtdata/languages/Norsk BM @@ -626,7 +626,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1203,7 +1202,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1895,7 +1893,6 @@ TP_WBALANCE_TEMPERATURE;Temperatur !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish index e5a55241a..68693adce 100644 --- a/rtdata/languages/Polish +++ b/rtdata/languages/Polish @@ -336,7 +336,6 @@ HISTORY_MSG_121;Autokorekcja aberracji chromatycznej HISTORY_MSG_122;Czarna klatka - Auto-wybór HISTORY_MSG_123;Czarna klatka - Wybór HISTORY_MSG_124;Korekcja punktu bieli -HISTORY_MSG_125;Zachowanie prześwietleń HISTORY_MSG_126;Puste pole - Wybór HISTORY_MSG_127;Puste pole - Auto-wybór HISTORY_MSG_128;Puste pole - Promień rozmycia @@ -649,7 +648,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Redukcja szumów liniowych PARTIALPASTE_RAWCACORR_AUTO;Autokorekcja aberracji chr. PARTIALPASTE_RAWEXPOS_BLACK;Poziomy czerni PARTIALPASTE_RAWEXPOS_LINEAR;Korekcja punktu bieli -PARTIALPASTE_RAWEXPOS_PRESER;Zachowanie prześwietleń PARTIALPASTE_RAWGROUP;Ustawienia raw PARTIALPASTE_RAW_DCBENHANCE;Zastosuj poprawę DCB PARTIALPASTE_RAW_DCBITERATIONS;Liczba powtórzeń DCB @@ -1252,7 +1250,6 @@ TP_RAWEXPOS_BLACK_BLUE;Niebieski TP_RAWEXPOS_BLACK_GREEN;Zielony TP_RAWEXPOS_BLACK_RED;Czerwony TP_RAWEXPOS_LINEAR;Liniowy współczynnik korekcji -TP_RAWEXPOS_PRESER;Zachowanie prześwietleń TP_RAWEXPOS_RGB;Czerwony, Zielony, Niebieski TP_RAWEXPOS_TWOGREEN;Połącz obie zielenie TP_RAW_DCBENHANCE;Zastosuj poprawę DCB diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters) index 39f1c2b89..f15870f2b 100644 --- a/rtdata/languages/Polish (Latin Characters) +++ b/rtdata/languages/Polish (Latin Characters) @@ -336,7 +336,6 @@ HISTORY_MSG_121;Autokorekcja aberracji chromatycznej HISTORY_MSG_122;Czarna klatka - Auto-wybor HISTORY_MSG_123;Czarna klatka - Wybor HISTORY_MSG_124;Korekcja punktu bieli -HISTORY_MSG_125;Zachowanie przeswietlen HISTORY_MSG_126;Puste pole - Wybor HISTORY_MSG_127;Puste pole - Auto-wybor HISTORY_MSG_128;Puste pole - Promien rozmycia @@ -649,7 +648,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Redukcja szumow liniowych PARTIALPASTE_RAWCACORR_AUTO;Autokorekcja aberracji chr. PARTIALPASTE_RAWEXPOS_BLACK;Poziomy czerni PARTIALPASTE_RAWEXPOS_LINEAR;Korekcja punktu bieli -PARTIALPASTE_RAWEXPOS_PRESER;Zachowanie przeswietlen PARTIALPASTE_RAWGROUP;Ustawienia raw PARTIALPASTE_RAW_DCBENHANCE;Zastosuj poprawe DCB PARTIALPASTE_RAW_DCBITERATIONS;Liczba powtorzen DCB @@ -1252,7 +1250,6 @@ TP_RAWEXPOS_BLACK_BLUE;Niebieski TP_RAWEXPOS_BLACK_GREEN;Zielony TP_RAWEXPOS_BLACK_RED;Czerwony TP_RAWEXPOS_LINEAR;Liniowy wspolczynnik korekcji -TP_RAWEXPOS_PRESER;Zachowanie przeswietlen TP_RAWEXPOS_RGB;Czerwony, Zielony, Niebieski TP_RAWEXPOS_TWOGREEN;Polacz obie zielenie TP_RAW_DCBENHANCE;Zastosuj poprawe DCB diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil) index 249214f7a..c3c4f43e3 100644 --- a/rtdata/languages/Portugues (Brasil) +++ b/rtdata/languages/Portugues (Brasil) @@ -370,7 +370,6 @@ HISTORY_MSG_121;Raw CA Correção - Automática HISTORY_MSG_122;Quadro Escuro - Seleção Automática HISTORY_MSG_123;Quadro Escuro - Arquivo HISTORY_MSG_124;Correção de ponto branco -HISTORY_MSG_125;Preservação da nitidez HISTORY_MSG_126;Flat-Field - Arquivo HISTORY_MSG_127;Flat-Field - Seleção automática HISTORY_MSG_128;Flat-Field - Raio de desfoque @@ -982,7 +981,6 @@ PARTIALPASTE_RAWCACORR_AUTO;Auto correção CA PARTIALPASTE_RAWCACORR_CAREDBLUE;vermelho & azul CA PARTIALPASTE_RAWEXPOS_BLACK;Níveis de preto PARTIALPASTE_RAWEXPOS_LINEAR;Correção de ponto branco -PARTIALPASTE_RAWEXPOS_PRESER;preservação do realce PARTIALPASTE_RAWGROUP;Configurações Raw PARTIALPASTE_RAW_BORDER;Borda raw PARTIALPASTE_RAW_DCBENHANCE;Aprimoramento DCB @@ -1758,7 +1756,6 @@ TP_RAWEXPOS_BLACK_BLUE;Azul TP_RAWEXPOS_BLACK_GREEN;Verde TP_RAWEXPOS_BLACK_RED;Vermelho TP_RAWEXPOS_LINEAR;Correção de ponto branco -TP_RAWEXPOS_PRESER;Preservação do realce TP_RAWEXPOS_RGB;Vermelho, Verde, Azul TP_RAWEXPOS_TWOGREEN;Ligações verdes TP_RAW_1PASSMEDIUM;1-Passar (Medio) diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian index 12802db23..f36bbe194 100644 --- a/rtdata/languages/Russian +++ b/rtdata/languages/Russian @@ -368,7 +368,6 @@ HISTORY_MSG_121;(raw) Авто ХА HISTORY_MSG_122;Авто темновой кадр HISTORY_MSG_123;Файл темнового кадра HISTORY_MSG_124;Коррекция баланса белого -HISTORY_MSG_125;Сохранение пересветов HISTORY_MSG_126;Файл плоского поля HISTORY_MSG_127;Автовыбор плоского поля HISTORY_MSG_128;Радиус размытия плоского поля @@ -704,7 +703,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Фильтр полосообразного PARTIALPASTE_RAWCACORR_AUTO;Автоматическая коррекция ХА PARTIALPASTE_RAWEXPOS_BLACK;Уровень черного PARTIALPASTE_RAWEXPOS_LINEAR;Коррекция точки белого -PARTIALPASTE_RAWEXPOS_PRESER;Сохранение пересветов PARTIALPASTE_RAWGROUP;Настройки Raw PARTIALPASTE_RAW_DCBENHANCE;Применить расширенный DCB PARTIALPASTE_RAW_DCBITERATIONS;Количество проходов DCB @@ -1322,7 +1320,6 @@ TP_RAWEXPOS_BLACK_BLUE;Синий TP_RAWEXPOS_BLACK_GREEN;Зелёный TP_RAWEXPOS_BLACK_RED;Красный TP_RAWEXPOS_LINEAR;Коррекция точки белого -TP_RAWEXPOS_PRESER;Сохранение пересветов TP_RAWEXPOS_RGB;Красный, Зелёный, Синий TP_RAWEXPOS_TWOGREEN;Два зеленых совместно TP_RAW_AHD;AHD diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters) index a337eb3a3..7bbebe45d 100644 --- a/rtdata/languages/Serbian (Cyrilic Characters) +++ b/rtdata/languages/Serbian (Cyrilic Characters) @@ -312,7 +312,6 @@ HISTORY_MSG_121;Сам исправи аберације HISTORY_MSG_122;Сам примени тамни кадар HISTORY_MSG_123;Датотека за тамни кадар HISTORY_MSG_124;Линеарна исправка експ. -HISTORY_MSG_125;Поправка експ. уз очување светлог HISTORY_MSG_126;Датотека са равним пољем HISTORY_MSG_127;Сам изабери равно поље HISTORY_MSG_128;Полупречник равног поља @@ -570,7 +569,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Линијски филтер шума PARTIALPASTE_RAWCACORR_AUTO;Ауто хроматске аберације PARTIALPASTE_RAWEXPOS_BLACK;Ниво црне PARTIALPASTE_RAWEXPOS_LINEAR;Линеарни фактор исправке RAW беле тачке -PARTIALPASTE_RAWEXPOS_PRESER;Raw тачка беле уз очување светлих делова PARTIALPASTE_RAWGROUP;Raw подешавања PARTIALPASTE_RAW_DCBENHANCE;Примени корак ДЦБ побољшања PARTIALPASTE_RAW_DCBITERATIONS;Број ДЦБ понављања @@ -1092,7 +1090,6 @@ TP_RAWCACORR_CABLUE;Плава TP_RAWCACORR_CARED;Црвена TP_RAWEXPOS_BLACKS;Ниво црне TP_RAWEXPOS_LINEAR;Линеарни фактор корекције -TP_RAWEXPOS_PRESER;Очување светлих делова TP_RAWEXPOS_TWOGREEN;Обе зелене TP_RAW_DCBENHANCE;Примени ДЦБ побољшање TP_RAW_DCBITERATIONS;Број ДЦБ пролаза diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters) index 4a7733ae1..597402cea 100644 --- a/rtdata/languages/Serbian (Latin Characters) +++ b/rtdata/languages/Serbian (Latin Characters) @@ -312,7 +312,6 @@ HISTORY_MSG_121;Sam ispravi aberacije HISTORY_MSG_122;Sam primeni tamni kadar HISTORY_MSG_123;Datoteka za tamni kadar HISTORY_MSG_124;Linearna ispravka eksp. -HISTORY_MSG_125;Popravka eksp. uz očuvanje svetlog HISTORY_MSG_126;Datoteka sa ravnim poljem HISTORY_MSG_127;Sam izaberi ravno polje HISTORY_MSG_128;Poluprečnik ravnog polja @@ -570,7 +569,6 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Linijski filter šuma PARTIALPASTE_RAWCACORR_AUTO;Auto hromatske aberacije PARTIALPASTE_RAWEXPOS_BLACK;Nivo crne PARTIALPASTE_RAWEXPOS_LINEAR;Linearni faktor ispravke RAW bele tačke -PARTIALPASTE_RAWEXPOS_PRESER;Raw tačka bele uz očuvanje svetlih delova PARTIALPASTE_RAWGROUP;Raw podešavanja PARTIALPASTE_RAW_DCBENHANCE;Primeni korak DCB poboljšanja PARTIALPASTE_RAW_DCBITERATIONS;Broj DCB ponavljanja @@ -1092,7 +1090,6 @@ TP_RAWCACORR_CABLUE;Plava TP_RAWCACORR_CARED;Crvena TP_RAWEXPOS_BLACKS;Nivo crne TP_RAWEXPOS_LINEAR;Linearni faktor korekcije -TP_RAWEXPOS_PRESER;Očuvanje svetlih delova TP_RAWEXPOS_TWOGREEN;Obe zelene TP_RAW_DCBENHANCE;Primeni DCB poboljšanje TP_RAW_DCBITERATIONS;Broj DCB prolaza diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak index 1948d6554..8d2e16790 100644 --- a/rtdata/languages/Slovak +++ b/rtdata/languages/Slovak @@ -688,7 +688,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1256,7 +1255,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1910,7 +1908,6 @@ ZOOMPANEL_ZOOMOUT;Oddialiť - !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi index 7adcd2ae3..13c389d39 100644 --- a/rtdata/languages/Suomi +++ b/rtdata/languages/Suomi @@ -628,7 +628,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1205,7 +1204,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1896,7 +1894,6 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K] !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish index dac05a20b..d16e7b95d 100644 --- a/rtdata/languages/Swedish +++ b/rtdata/languages/Swedish @@ -346,7 +346,6 @@ HISTORY_MSG_121;Automat. CA-reducering HISTORY_MSG_122;Automat. svartbildsval HISTORY_MSG_123;Svartbildsfil HISTORY_MSG_124;Vitpunktskorrigering -HISTORY_MSG_125;Högdagerbevarande HISTORY_MSG_126;Plattfältsfil HISTORY_MSG_127;Automatiskt val av plattfält HISTORY_MSG_128;Oskärperadie för plattfält @@ -788,7 +787,6 @@ PARTIALPASTE_PRSHARPENING;Skärpning efter storleksändring PARTIALPASTE_RAWCACORR_AUTO;Reducera kromatiska abberationer automatiskt PARTIALPASTE_RAWEXPOS_BLACK;Svärta PARTIALPASTE_RAWEXPOS_LINEAR;Vitpunktskorrigering -PARTIALPASTE_RAWEXPOS_PRESER;Korrigering av högdagrar PARTIALPASTE_RAWGROUP;Råbildsinställningar PARTIALPASTE_RAW_DCBENHANCE;DCB-förbättringssteg PARTIALPASTE_RAW_DCBITERATIONS;Antal DCB-iterationer @@ -1458,7 +1456,6 @@ TP_RAWEXPOS_BLACK_BLUE;Blå TP_RAWEXPOS_BLACK_GREEN;Grön TP_RAWEXPOS_BLACK_RED;Röd TP_RAWEXPOS_LINEAR;Vitpunktskorrigering -TP_RAWEXPOS_PRESER;Bevara högdagrar TP_RAWEXPOS_RGB;Röd, grön, blå TP_RAWEXPOS_TWOGREEN;Två gröna tillsammans TP_RAW_DCBENHANCE;DCB-förbättringssteg diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish index 5af14f592..59b2e8478 100644 --- a/rtdata/languages/Turkish +++ b/rtdata/languages/Turkish @@ -627,7 +627,6 @@ TP_WBALANCE_TEMPERATURE;Isı !HISTORY_MSG_122;Dark-Frame - Auto-selection !HISTORY_MSG_123;Dark-Frame - File !HISTORY_MSG_124;White point correction -!HISTORY_MSG_125;Highlight preservation !HISTORY_MSG_126;Flat-Field - File !HISTORY_MSG_127;Flat-Field - Auto-selection !HISTORY_MSG_128;Flat-Field - Blur radius @@ -1204,7 +1203,6 @@ TP_WBALANCE_TEMPERATURE;Isı !PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue !PARTIALPASTE_RAWEXPOS_BLACK;Black levels !PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -!PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation !PARTIALPASTE_RAWGROUP;Raw Settings !PARTIALPASTE_RAW_BORDER;Raw border !PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -1895,7 +1893,6 @@ TP_WBALANCE_TEMPERATURE;Isı !TP_RAWEXPOS_BLACK_GREEN;Green !TP_RAWEXPOS_BLACK_RED;Red !TP_RAWEXPOS_LINEAR;White-point correction -!TP_RAWEXPOS_PRESER;Highlight preservation !TP_RAWEXPOS_RGB;Red, Green, Blue !TP_RAWEXPOS_TWOGREEN;Link greens !TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtdata/languages/default b/rtdata/languages/default index a3ce455be..0571bd778 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -380,7 +380,6 @@ HISTORY_MSG_121;Raw CA Correction - Auto HISTORY_MSG_122;Dark-Frame - Auto-selection HISTORY_MSG_123;Dark-Frame - File HISTORY_MSG_124;White point correction -HISTORY_MSG_125;Highlight preservation HISTORY_MSG_126;Flat-Field - File HISTORY_MSG_127;Flat-Field - Auto-selection HISTORY_MSG_128;Flat-Field - Blur radius @@ -1170,7 +1169,6 @@ PARTIALPASTE_RAWCACORR_AVOIDCOLORSHIFT;CA avoid color shift PARTIALPASTE_RAWCACORR_CAREDBLUE;CA red & blue PARTIALPASTE_RAWEXPOS_BLACK;Black levels PARTIALPASTE_RAWEXPOS_LINEAR;White point correction -PARTIALPASTE_RAWEXPOS_PRESER;Highlight preservation PARTIALPASTE_RAWGROUP;Raw Settings PARTIALPASTE_RAW_BORDER;Raw border PARTIALPASTE_RAW_DCBENHANCE;DCB enhancement @@ -2153,7 +2151,6 @@ TP_RAWEXPOS_BLACK_BLUE;Blue TP_RAWEXPOS_BLACK_GREEN;Green TP_RAWEXPOS_BLACK_RED;Red TP_RAWEXPOS_LINEAR;White-point correction -TP_RAWEXPOS_PRESER;Highlight preservation TP_RAWEXPOS_RGB;Red, Green, Blue TP_RAWEXPOS_TWOGREEN;Link greens TP_RAW_1PASSMEDIUM;1-pass (Markesteijn) diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt index ef90c111f..a3e2d9fbd 100644 --- a/rtengine/CMakeLists.txt +++ b/rtengine/CMakeLists.txt @@ -56,7 +56,6 @@ set(RTENGINESOURCEFILES dual_demosaic_RT.cc dynamicprofile.cc eahd_demosaic.cc - expo_before_b.cc fast_demo.cc ffmanager.cc flatcurves.cc diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 7339981e5..e8ab4fd5c 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -30,7 +30,7 @@ #include "sleef.c" #include "opthelper.h" #include "median.h" -#define BENCHMARK +//#define BENCHMARK #include "StopWatch.h" #ifdef _OPENMP #include diff --git a/rtengine/expo_before_b.cc b/rtengine/expo_before_b.cc deleted file mode 100644 index cd5e77df5..000000000 --- a/rtengine/expo_before_b.cc +++ /dev/null @@ -1,187 +0,0 @@ - -//////////////////////////////////////////////////////////////// -// -// //exposure correction before interpolation -// -// code dated: December 27, 2010 -// -// Expo_before.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 . -// -//////////////////////////////////////////////////////////////// - - - -// Jacques Desmis -// use fast-demo(provisional) from Emil Martinec -// inspired from work Guillermo Luijk and Manuel LLorens(Perfectraw) -// Ingo Weyrich (2014-07-07) -// optimized the highlight protection case -// needs 2*width*height*sizeof(float) byte less memory than before -// needs about 60% less processing time than before -// -// This function uses parameters: -// exposure (linear): 2^(-8..0..8): currently 0.5 +3 -// preserve (log) : 0..8 : currently 0.1 1 - -#include "rtengine.h" -#include "rawimagesource.h" -#include "mytime.h" -#include "rt_math.h" - -namespace rtengine -{ - -extern const Settings* settings; - -void RawImageSource::processRawWhitepoint(float expos, float preser, array2D &rawData) -{ - MyTime t1e, t2e; - - if (settings->verbose) { - t1e.set(); - } - - int width = W, height = H; - // exposure correction inspired from G.Luijk - - for (int c = 0; c < 4; c++) { - chmax[c] *= expos; - } - - if (fabs(preser) < 0.001f) { - // No highlight protection - simple mutiplication - - if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS) -#ifdef _OPENMP - #pragma omp parallel for -#endif - for (int row = 0; row < height; row++) - for (int col = 0; col < width; col++) { - rawData[row][col] *= expos; - } - else -#ifdef _OPENMP - #pragma omp parallel for -#endif - for (int row = 0; row < height; row++) - for (int col = 0; col < width; col++) { - rawData[row][col * 3] *= expos; - rawData[row][col * 3 + 1] *= expos; - rawData[row][col * 3 + 2] *= expos; - } - } else { - if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS) { - // Demosaic to allow calculation of luminosity. - if(ri->getSensorType() == ST_BAYER) { - fast_demosaic(); - } else { - fast_xtrans_interpolate(rawData, red, green, blue); - } - } - - // Find maximum to adjust LUTs. New float engines clips only at the very end - float maxValFloat = 0.f; -#ifdef _OPENMP - #pragma omp parallel -#endif - { - float maxValFloatThr = 0.f; - - if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS) -#ifdef _OPENMP - #pragma omp for schedule(dynamic,16) nowait -#endif - for(int row = 0; row < height; row++) - for (int col = 0; col < width; col++) { - if (rawData[row][col] > maxValFloatThr) { - maxValFloatThr = rawData[row][col]; - } - } - else -#ifdef _OPENMP - #pragma omp for schedule(dynamic,16) nowait -#endif - for(int row = 0; row < height; row++) - for (int col = 0; col < width; col++) { - for (int c = 0; c < 3; c++) - if (rawData[row][col * 3 + c] > maxValFloatThr) { - maxValFloatThr = rawData[row][col * 3 + c]; - } - } - -#ifdef _OPENMP - #pragma omp critical -#endif - { - if(maxValFloatThr > maxValFloat) { - maxValFloat = maxValFloatThr; - } - } - } - - // Exposure correction with highlight preservation - int maxVal = maxValFloat; - LUTf lut(maxVal + 1); - float K; - - if(expos > 1) { - // Positive exposure - K = (float) maxVal / expos * exp(-preser * log(2.0)); - - for (int j = max(1, (int)K); j <= maxVal; j++) { - lut[(int)j] = (((float)maxVal - K * expos) / ((float)maxVal - K) * (j - maxVal) + (float) maxVal) / j; - } - } else { - // Negative exposure - float EV = log(expos) / log(2.0); // Convert exp. linear to EV - K = (float)maxVal * exp(-preser * log(2.0)); - - for (int j = 0; j <= maxVal; j++) { - lut[(int)j] = exp(EV * ((float)maxVal - j) / ((float)maxVal - K) * log(2.0)); - } - } - - if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS) -#ifdef _OPENMP - #pragma omp parallel for schedule(dynamic,16) -#endif - for(int row = 0; row < height; row++) - for(int col = 0; col < width; col++) { - float lumi = 0.299f * red[row][col] + 0.587f * green[row][col] + 0.114f * blue[row][col]; - rawData[row][col] *= lumi < K ? expos : lut[lumi]; - } - else -#ifdef _OPENMP - #pragma omp parallel for -#endif - for(int row = 0; row < height; row++) - for(int col = 0; col < width; col++) { - float lumi = 0.299f * rawData[row][col * 3] + 0.587f * rawData[row][col * 3 + 1] + 0.114f * rawData[row][col * 3 + 2]; - float fac = lumi < K ? expos : lut[lumi]; - - for (int c = 0; c < 3; c++) { - rawData[row][col * 3 + c] *= fac; - } - } - - } - - if (settings->verbose) { - t2e.set(); - printf("Exposure before %d usec\n", t2e.etime(t1e)); - } - -} - -} //namespace diff --git a/rtengine/procevents.h b/rtengine/procevents.h index 7b1effa2d..e60355fd7 100644 --- a/rtengine/procevents.h +++ b/rtengine/procevents.h @@ -70,10 +70,10 @@ enum ProcEventCode { EvToneCurveMode1 = 40, EvToneCurve2 = 41, EvToneCurveMode2 = 42, - EvLDNRadius = 43, // obsolete - EvLDNEdgeTolerance = 44, // obsolete - EvCDNEnabled = 45, // obsolete - EvBlendCMSMatrix = 46, // obsolete + obsolete_43 = 43, // obsolete + obsolete_44 = 44, // obsolete + obsolete_45 = 45, // obsolete + obsolete_46 = 46, // obsolete EvDCPToneCurve = 47, EvDCPIlluminant = 48, EvSHEnabled = 49, @@ -93,7 +93,7 @@ enum ProcEventCode { EvCrop = 63, EvCACorr = 64, EvHREnabled = 65, - EvHRAmount = 66, //obsolete + obsolete_66 = 66, //obsolete EvHRMethod = 67, EvWProfile = 68, EvOProfile = 69, @@ -138,7 +138,7 @@ enum ProcEventCode { EvResizeBoundingBox = 108, EvResizeAppliesTo = 109, EvLAvoidColorShift = 110, - EvLSatLimiter = 111, // obsolete + obsolete_111 = 111, // obsolete EvLRSTProtection = 112, EvDemosaicDCBIter = 113, EvDemosaicFalseColorIter = 114, @@ -151,7 +151,7 @@ enum ProcEventCode { EvPreProcessAutoDF = 121, EvPreProcessDFFile = 122, EvPreProcessExpCorrLinear = 123, - EvPreProcessExpCorrPH = 124, + obsolete_124 = 124, // obsolete EvFlatFieldFile = 125, EvFlatFieldAutoSelect = 126, EvFlatFieldBlurRadius = 127, diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 6fae604bb..ae21bcd86 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -3008,7 +3008,6 @@ RAWParams::RAWParams() : cared(0.0), cablue(0.0), expos(1.0), - preser(0.0), hotPixelFilter(false), deadPixelFilter(false), hotdeadpix_thresh(100) @@ -3034,7 +3033,6 @@ bool RAWParams::operator ==(const RAWParams& other) const && cared == other.cared && cablue == other.cablue && expos == other.expos - && preser == other.preser && hotPixelFilter == other.hotPixelFilter && deadPixelFilter == other.deadPixelFilter && hotdeadpix_thresh == other.hotdeadpix_thresh; @@ -4062,7 +4060,6 @@ int ProcParams::save(const Glib::ustring& fname, const Glib::ustring& fname2, bo // Raw exposition saveToKeyfile(!pedited || pedited->raw.exPos, "RAW", "PreExposure", raw.expos, keyFile); - saveToKeyfile(!pedited || pedited->raw.exPreser, "RAW", "PrePreserv", raw.preser, keyFile); // MetaData saveToKeyfile(!pedited || pedited->metadata.mode, "MetaData", "Mode", metadata.mode, keyFile); @@ -5685,7 +5682,6 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited) assignFromKeyfile(keyFile, "RAW", "DeadPixelFilter", pedited, raw.deadPixelFilter, pedited->raw.deadPixelFilter); assignFromKeyfile(keyFile, "RAW", "HotDeadPixelThresh", pedited, raw.hotdeadpix_thresh, pedited->raw.hotdeadpix_thresh); assignFromKeyfile(keyFile, "RAW", "PreExposure", pedited, raw.expos, pedited->raw.exPos); - assignFromKeyfile(keyFile, "RAW", "PrePreserv", pedited, raw.preser, pedited->raw.exPreser); if (ppVersion < 320) { assignFromKeyfile(keyFile, "RAW", "Method", pedited, raw.bayersensor.method, pedited->raw.bayersensor.method); diff --git a/rtengine/procparams.h b/rtengine/procparams.h index 9bb5e6473..bd6aa97f5 100644 --- a/rtengine/procparams.h +++ b/rtengine/procparams.h @@ -1604,7 +1604,6 @@ struct RAWParams { // exposure before interpolation double expos; - double preser; bool hotPixelFilter; bool deadPixelFilter; diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 81e97d3ee..50abb4252 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -428,7 +428,6 @@ RawImageSource::RawImageSource() , plistener(nullptr) , scale_mul{} , c_black{} - , c_white{} , cblacksom{} , ref_pre_mul{} , refwb_red(0.0) @@ -638,6 +637,11 @@ void RawImageSource::getImage(const ColorTemp &ctemp, int tran, Imagefloat* imag bool isMono = (ri->getSensorType() == ST_FUJI_XTRANS && raw.xtranssensor.method == RAWParams::XTransSensor::getMethodString(RAWParams::XTransSensor::Method::MONO)) || (ri->getSensorType() == ST_BAYER && raw.bayersensor.method == RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::MONO)); + + for (int i = 0; i < 4; ++i) { + c_white[i] = (ri->get_white(i) - cblacksom[i]) / raw.expos + cblacksom[i]; + } + float gain = calculate_scale_mul(new_scale_mul, new_pre_mul, c_white, cblacksom, isMono, ri->get_colors()); rm = new_scale_mul[0] / scale_mul[0] * gain; gm = new_scale_mul[1] / scale_mul[1] * gain; @@ -1622,10 +1626,6 @@ int RawImageSource::load (const Glib::ustring &fname, bool firstFrameOnly) camProfile = ICCStore::getInstance()->createFromMatrix(imatrices.xyz_cam, false, "Camera"); inverse33(imatrices.xyz_cam, imatrices.cam_xyz); - for (int c = 0; c < 4; c++) { - c_white[c] = ri->get_white(c); - } - // First we get the "as shot" ("Camera") white balance and store it float pre_mul[4]; // FIXME: get_colorsCoeff not so much used nowadays, when we have calculate_scale_mul() function here @@ -2053,16 +2053,6 @@ void RawImageSource::preprocess(const RAWParams &raw, const LensProfParams &lens } } - if (raw.expos != 1) { - if (numFrames == 4) { - for (int i = 0; i < 4; ++i) { - processRawWhitepoint(raw.expos, raw.preser, *rawDataFrames[i]); - } - } else { - processRawWhitepoint(raw.expos, raw.preser, rawData); - } - } - if (prepareDenoise && dirpyrdenoiseExpComp == INFINITY) { LUTu aehist; int aehistcompr; @@ -3543,6 +3533,10 @@ void RawImageSource::scaleColors(int winx, int winy, int winw, int winh, const R cblacksom[i] = max(c_black[i] + black_lev[i], 0.0f); // adjust black level } + for (int i = 0; i < 4; ++i) { + c_white[i] = (ri->get_white(i) - cblacksom[i]) / raw.expos + cblacksom[i]; + } + initialGain = calculate_scale_mul(scale_mul, ref_pre_mul, c_white, cblacksom, isMono, ri->get_colors()); // recalculate scale colors with adjusted levels //fprintf(stderr, "recalc: %f [%f %f %f %f]\n", initialGain, scale_mul[0], scale_mul[1], scale_mul[2], scale_mul[3]); @@ -4746,13 +4740,13 @@ void RawImageSource::getRAWHistogram(LUTu & histRedRaw, LUTu & histGreenRaw, LUT histGreenRaw.clear(); histBlueRaw.clear(); - const float maxWhite = rtengine::max(ri->get_white(0), ri->get_white(1), ri->get_white(2), ri->get_white(3)); + const float maxWhite = rtengine::max(c_white[0], c_white[1], c_white[2], c_white[3]); const float scale = maxWhite <= 1.f ? 65535.f : 1.f; // special case for float raw images in [0.0;1.0] range const float multScale = maxWhite <= 1.f ? 1.f / 255.f : 255.f; - const float mult[4] = { multScale / (ri->get_white(0) - cblacksom[0]), - multScale / (ri->get_white(1) - cblacksom[1]), - multScale / (ri->get_white(2) - cblacksom[2]), - multScale / (ri->get_white(3) - cblacksom[3]) + const float mult[4] = { multScale / (c_white[0] - cblacksom[0]), + multScale / (c_white[1] - cblacksom[1]), + multScale / (c_white[2] - cblacksom[2]), + multScale / (c_white[3] - cblacksom[3]) }; const bool fourColours = ri->getSensorType() == ST_BAYER && ((mult[1] != mult[3] || cblacksom[1] != cblacksom[3]) || FC(0, 0) == 3 || FC(0, 1) == 3 || FC(1, 0) == 3 || FC(1, 1) == 3); diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h index 53adaafc0..743d6cf4f 100644 --- a/rtengine/rawimagesource.h +++ b/rtengine/rawimagesource.h @@ -252,7 +252,6 @@ protected: bool freeBuffer ); void ddct8x8s(int isgn, float a[8][8]); - void processRawWhitepoint(float expos, float preser, array2D &rawData); // exposure before interpolation int interpolateBadPixelsBayer(PixelsMap &bitmapBads, array2D &rawData); int interpolateBadPixelsNColours(PixelsMap &bitmapBads, const int colours); diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc index ac9f265e8..6fe659ba1 100644 --- a/rtengine/refreshmap.cc +++ b/rtengine/refreshmap.cc @@ -151,7 +151,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = { DARKFRAME, // EvPreProcessAutoDF DARKFRAME, // EvPreProcessDFFile DARKFRAME, // EvPreProcessExpCorrLinear - DARKFRAME, // EvPreProcessExpCorrPH + 0, // --unused-- FLATFIELD, // EvFlatFieldFile, FLATFIELD, // EvFlatFieldAutoSelect, FLATFIELD, // EvFlatFieldBlurRadius, diff --git a/rtgui/addsetids.h b/rtgui/addsetids.h index 86361b720..163bc27ef 100644 --- a/rtgui/addsetids.h +++ b/rtgui/addsetids.h @@ -42,7 +42,6 @@ enum { ADDSET_PREPROCESS_LINEDENOISE, ADDSET_RAWCACORR, ADDSET_RAWEXPOS_LINEAR, - ADDSET_RAWEXPOS_PRESER, ADDSET_RAWEXPOS_BLACKS, ADDSET_SHARPENEDGE_AMOUNT, ADDSET_SHARPENMICRO_AMOUNT, diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc index 05919d72f..be87c29bf 100644 --- a/rtgui/batchtoolpanelcoord.cc +++ b/rtgui/batchtoolpanelcoord.cc @@ -174,7 +174,7 @@ void BatchToolPanelCoordinator::initSession () bayerpreprocess->setAdjusterBehavior (false, false); rawcacorrection->setAdjusterBehavior (false); flatfield->setAdjusterBehavior (false); - rawexposure->setAdjusterBehavior (false, false); + rawexposure->setAdjusterBehavior (false); bayerrawexposure->setAdjusterBehavior (false); xtransrawexposure->setAdjusterBehavior (false); } else { @@ -223,7 +223,7 @@ void BatchToolPanelCoordinator::initSession () bayerpreprocess->setAdjusterBehavior (options.baBehav[ADDSET_PREPROCESS_LINEDENOISE], options.baBehav[ADDSET_PREPROCESS_GREENEQUIL]); rawcacorrection->setAdjusterBehavior (options.baBehav[ADDSET_RAWCACORR]); flatfield->setAdjusterBehavior (options.baBehav[ADDSET_RAWFFCLIPCONTROL]); - rawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_LINEAR], options.baBehav[ADDSET_RAWEXPOS_PRESER]); + rawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_LINEAR]); bayerrawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_BLACKS]); xtransrawexposure->setAdjusterBehavior (options.baBehav[ADDSET_RAWEXPOS_BLACKS]); @@ -355,7 +355,6 @@ void BatchToolPanelCoordinator::initSession () if (options.baBehav[ADDSET_DIRPYRDN_GAMMA]) { pparams.dirpyrDenoise.gamma = 0; } if (options.baBehav[ADDSET_RAWCACORR]) { pparams.raw.cablue = pparams.raw.cared = 0; } if (options.baBehav[ADDSET_RAWEXPOS_LINEAR]) { pparams.raw.expos = 0; } - if (options.baBehav[ADDSET_RAWEXPOS_PRESER]) { pparams.raw.preser = 0; } if (options.baBehav[ADDSET_RAWEXPOS_BLACKS]) { 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; diff --git a/rtgui/options.cc b/rtgui/options.cc index 9fe2450a9..c6c2ef810 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -356,7 +356,14 @@ void Options::setDefaults() fbShowDateTime = true; fbShowBasicExif = true; fbShowExpComp = false; +#ifdef WIN32 + // use windows setting for visibility of hidden files/folders + SHELLFLAGSTATE sft = { 0 }; + SHGetSettings(&sft, SSF_SHOWALLOBJECTS); + fbShowHidden = sft.fShowAllObjects; +#else fbShowHidden = false; +#endif fbArrangement = 2; // was 0 navRGBUnit = NavigatorUnit::PERCENT; navHSVUnit = NavigatorUnit::PERCENT; @@ -959,9 +966,11 @@ void Options::readFromFile(Glib::ustring fname) fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp"); } +#ifndef WIN32 if (keyFile.has_key("File Browser", "BrowserShowsHidden")) { fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden"); } +#endif if (keyFile.has_key("File Browser", "MaxPreviewHeight")) { maxThumbnailHeight = keyFile.get_integer("File Browser", "MaxPreviewHeight"); @@ -1937,7 +1946,9 @@ void Options::saveToFile(Glib::ustring fname) keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime); keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif); keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp); +#ifndef WIN32 keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden); +#endif keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize); keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab); keyFile.set_integer("File Browser", "ThumbnailSizeQueue", thumbSizeQueue); diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 04ea895c9..30df5caf4 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -463,7 +463,6 @@ void ParamsEdited::set(bool v) raw.ff_AutoClipControl = v; raw.ff_clipControl = v; raw.exPos = v; - raw.exPreser = v; wavelet.enabled = v; wavelet.strength = v; wavelet.balance = v; @@ -1202,7 +1201,6 @@ void ParamsEdited::initFrom(const std::vector& raw.ff_AutoClipControl = raw.ff_AutoClipControl && p.raw.ff_AutoClipControl == other.raw.ff_AutoClipControl; raw.ff_clipControl = raw.ff_clipControl && p.raw.ff_clipControl == other.raw.ff_clipControl; raw.exPos = raw.exPos && p.raw.expos == other.raw.expos; - raw.exPreser = raw.exPreser && p.raw.preser == other.raw.preser; wavelet.enabled = wavelet.enabled && p.wavelet.enabled == other.wavelet.enabled; wavelet.strength = wavelet.strength && p.wavelet.strength == other.wavelet.strength; wavelet.balance = wavelet.balance && p.wavelet.balance == other.wavelet.balance; @@ -3442,10 +3440,6 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng toEdit.raw.expos = dontforceSet && options.baBehav[ADDSET_RAWEXPOS_LINEAR] ? toEdit.raw.expos + mods.raw.expos : mods.raw.expos; } - if (raw.exPreser) { - toEdit.raw.preser = dontforceSet && options.baBehav[ADDSET_RAWEXPOS_PRESER] ? toEdit.raw.preser + mods.raw.preser : mods.raw.preser; - } - if (raw.hotPixelFilter) { toEdit.raw.hotPixelFilter = mods.raw.hotPixelFilter; } @@ -3948,7 +3942,7 @@ bool RAWParamsEdited::XTransSensor::isUnchanged() const bool RAWParamsEdited::isUnchanged() const { return bayersensor.isUnchanged() && xtranssensor.isUnchanged() && ca_autocorrect && ca_avoidcolourshift && caautoiterations && cared && cablue && hotPixelFilter && deadPixelFilter && hotdeadpix_thresh && darkFrame - && df_autoselect && ff_file && ff_AutoSelect && ff_BlurRadius && ff_BlurType && exPos && exPreser && ff_AutoClipControl && ff_clipControl; + && df_autoselect && ff_file && ff_AutoSelect && ff_BlurRadius && ff_BlurType && exPos && ff_AutoClipControl && ff_clipControl; } bool LensProfParamsEdited::isUnchanged() const diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h index db9668a46..56674e357 100644 --- a/rtgui/paramsedited.h +++ b/rtgui/paramsedited.h @@ -978,7 +978,6 @@ public: bool ff_AutoClipControl; bool ff_clipControl; bool exPos; - bool exPreser; bool isUnchanged() const; }; diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc index 78dee34d6..463529c38 100644 --- a/rtgui/partialpastedlg.cc +++ b/rtgui/partialpastedlg.cc @@ -122,7 +122,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren raw_pdaf_lines_filter = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_PREPROCESS_PDAFLINESFILTER"))); //--- raw_expos = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWEXPOS_LINEAR"))); - raw_preser = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWEXPOS_PRESER"))); raw_black = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_RAWEXPOS_BLACK"))); //--- df_file = Gtk::manage (new Gtk::CheckButton (M("PARTIALPASTE_DARKFRAMEFILE"))); @@ -235,14 +234,12 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren vboxes[8]->pack_start (*raw_dcb_enhance, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*raw_lmmse_iterations, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0); - vboxes[8]->pack_start (*raw_linenoise, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*raw_greenthresh, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*raw_hotpix_filt, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*raw_deadpix_filt, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*raw_pdaf_lines_filter, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0); vboxes[8]->pack_start (*raw_expos, Gtk::PACK_SHRINK, 2); - vboxes[8]->pack_start (*raw_preser, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*raw_black, Gtk::PACK_SHRINK, 2); vboxes[8]->pack_start (*Gtk::manage (new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 0); vboxes[8]->pack_start (*df_file, Gtk::PACK_SHRINK, 2); @@ -391,7 +388,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren raw_pdaf_lines_filterConn = raw_pdaf_lines_filter->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true)); //--- raw_exposConn = raw_expos->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true)); - raw_preserConn = raw_preser->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true)); raw_blackConn = raw_black->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true)); //--- df_fileConn = df_file->signal_toggled().connect (sigc::bind (sigc::mem_fun(*raw, &Gtk::CheckButton::set_inconsistent), true)); @@ -469,7 +465,6 @@ void PartialPasteDlg::rawToggled () ConnectionBlocker raw_deadpix_filtBlocker(raw_deadpix_filtConn); ConnectionBlocker raw_pdaf_lines_filterBlocker(raw_pdaf_lines_filterConn); ConnectionBlocker raw_exposBlocker(raw_exposConn); - ConnectionBlocker raw_preserBlocker(raw_preserConn); ConnectionBlocker raw_blackBlocker(raw_blackConn); ConnectionBlocker df_fileBlocker(df_fileConn); ConnectionBlocker df_AutoSelectBlocker(df_AutoSelectConn); @@ -498,7 +493,6 @@ void PartialPasteDlg::rawToggled () raw_deadpix_filt->set_active (raw->get_active ()); raw_pdaf_lines_filter->set_active (raw->get_active ()); raw_expos->set_active (raw->get_active ()); - raw_preser->set_active (raw->get_active ()); raw_black->set_active (raw->get_active ()); df_file->set_active (raw->get_active ()); df_AutoSelect->set_active (raw->get_active ()); @@ -928,10 +922,6 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param filterPE.raw.exPos = falsePE.raw.exPos; } - if (!raw_preser->get_active ()) { - filterPE.raw.exPreser = falsePE.raw.exPreser; - } - if (!raw_ca_autocorrect->get_active ()) { filterPE.raw.ca_autocorrect = falsePE.raw.ca_autocorrect; filterPE.raw.caautoiterations = falsePE.raw.caautoiterations; diff --git a/rtgui/partialpastedlg.h b/rtgui/partialpastedlg.h index f6ae125bf..fb49b4926 100644 --- a/rtgui/partialpastedlg.h +++ b/rtgui/partialpastedlg.h @@ -103,7 +103,6 @@ public: // options in raw: Gtk::CheckButton* raw_expos; - Gtk::CheckButton* raw_preser; Gtk::CheckButton* raw_black; Gtk::CheckButton* raw_ca_autocorrect; Gtk::CheckButton* raw_caredblue; @@ -139,7 +138,7 @@ public: sigc::connection coarserotConn, finerotConn, cropConn, resizeConn, prsharpeningConn, perspectiveConn, commonTransConn; sigc::connection metadataConn, exifchConn, iptcConn, icmConn; sigc::connection df_fileConn, df_AutoSelectConn, ff_fileConn, ff_AutoSelectConn, ff_BlurRadiusConn, ff_BlurTypeConn, ff_ClipControlConn; - sigc::connection raw_caredblueConn, raw_ca_autocorrectConn, raw_ca_avoid_colourshiftconn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_pdaf_lines_filterConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_borderConn, raw_imagenumConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_pixelshiftConn, raw_dcb_enhanceConn, raw_exposConn, raw_preserConn, raw_blackConn; + sigc::connection raw_caredblueConn, raw_ca_autocorrectConn, raw_ca_avoid_colourshiftconn, raw_hotpix_filtConn, raw_deadpix_filtConn, raw_pdaf_lines_filterConn, raw_linenoiseConn, raw_greenthreshConn, raw_ccStepsConn, raw_methodConn, raw_borderConn, raw_imagenumConn, raw_dcb_iterationsConn, raw_lmmse_iterationsConn, raw_pixelshiftConn, raw_dcb_enhanceConn, raw_exposConn, raw_blackConn; public: PartialPasteDlg (const Glib::ustring &title, Gtk::Window* parent); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index c8a597bc4..383c17416 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -404,7 +404,6 @@ Gtk::Widget* Preferences::getBatchProcPanel() mi = behModel->append(); mi->set_value(behavColumns.label, M("TP_EXPOS_WHITEPOINT_LABEL")); appendBehavList(mi, M("TP_RAWEXPOS_LINEAR"), ADDSET_RAWEXPOS_LINEAR, false); - appendBehavList(mi, M("TP_RAWEXPOS_PRESER"), ADDSET_RAWEXPOS_PRESER, false); mi = behModel->append(); mi->set_value(behavColumns.label, M("TP_RAWEXPOS_BLACKS")); diff --git a/rtgui/rawexposure.cc b/rtgui/rawexposure.cc index af0766e31..0c5191476 100644 --- a/rtgui/rawexposure.cc +++ b/rtgui/rawexposure.cc @@ -33,19 +33,7 @@ RAWExposure::RAWExposure () : FoldableToolPanel(this, "rawexposure", M("TP_EXPOS } PexPos->show(); - PexPreser = Gtk::manage(new Adjuster (M("TP_RAWEXPOS_PRESER"), 0, 2.5, 0.1, 0)); - PexPreser->setAdjusterListener (this); - - if (PexPreser->delay < options.adjusterMaxDelay) { - PexPreser->delay = options.adjusterMaxDelay; - } - - PexPreser->show(); - pack_start( *PexPos, Gtk::PACK_SHRINK, 4);//exposi - // raw highlight exposure setting is obsolete, removing from GUI - //pack_start( *PexPreser, Gtk::PACK_SHRINK, 4); - PexPos->setLogScale(100, 0); } @@ -55,11 +43,9 @@ void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsE if(pedited ) { PexPos->setEditedState( pedited->raw.exPos ? Edited : UnEdited ); - PexPreser->setEditedState( pedited->raw.exPreser ? Edited : UnEdited ); } PexPos->setValue (pp->raw.expos); - PexPreser->setValue (pp->raw.preser);//exposi enableListener (); } @@ -67,11 +53,9 @@ void RAWExposure::read(const rtengine::procparams::ProcParams* pp, const ParamsE void RAWExposure::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedited) { pp->raw.expos = PexPos->getValue(); - pp->raw.preser = PexPreser->getValue();//exposi if (pedited) { pedited->raw.exPos = PexPos->getEditedState (); - pedited->raw.exPreser = PexPreser->getEditedState ();//exposi } } @@ -83,8 +67,6 @@ void RAWExposure::adjusterChanged(Adjuster* a, double newval) if (a == PexPos ) { listener->panelChanged (EvPreProcessExpCorrLinear, value ); - } else if (a == PexPreser && ABS(PexPos->getValue() - 1.0) > 0.0001) { // update takes long, only do it if it would have an effect - listener->panelChanged (EvPreProcessExpCorrPH, value ); } } } @@ -97,33 +79,27 @@ void RAWExposure::setBatchMode(bool batchMode) { ToolPanel::setBatchMode (batchMode); PexPos->showEditedCB (); - PexPreser->showEditedCB ();//exposure } void RAWExposure::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited) { PexPos->setDefault( defParams->raw.expos); - PexPreser->setDefault( defParams->raw.preser); if (pedited) { PexPos->setDefaultEditedState( pedited->raw.exPos ? Edited : UnEdited); - PexPreser->setDefaultEditedState( pedited->raw.exPreser ? Edited : UnEdited); } else { PexPos->setDefaultEditedState( Irrelevant ); - PexPreser->setDefaultEditedState( Irrelevant ); } } -void RAWExposure::setAdjusterBehavior (bool pexposadd, bool pexpreseradd) +void RAWExposure::setAdjusterBehavior (bool pexposadd) { PexPos->setAddMode(pexposadd); - PexPreser->setAddMode(pexpreseradd); } void RAWExposure::trimValues (rtengine::procparams::ProcParams* pp) { PexPos->trimValue(pp->raw.expos); - PexPreser->trimValue(pp->raw.preser); } diff --git a/rtgui/rawexposure.h b/rtgui/rawexposure.h index a04d0e3db..f34776d19 100644 --- a/rtgui/rawexposure.h +++ b/rtgui/rawexposure.h @@ -29,7 +29,6 @@ class RAWExposure : public ToolParamBlock, public AdjusterListener, public Folda protected: Adjuster* PexPos; - Adjuster* PexPreser; private: // Gtk::CheckButton* PextwoGreen; @@ -43,7 +42,7 @@ public: void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override; void adjusterChanged (Adjuster* a, double newval) override; void adjusterAutoToggled (Adjuster* a, bool newval) override; - void setAdjusterBehavior (bool pexposadd, bool pexpreseradd); + void setAdjusterBehavior (bool pexposadd); void trimValues (rtengine::procparams::ProcParams* pp) override; };