diff --git a/rtdata/languages/default b/rtdata/languages/default index b14210084..13c06f85d 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1117,6 +1117,10 @@ PREFERENCES_LEVAUTDN;Denoising level PREFERENCES_LEVDN;Cell size PREFERENCES_LISS;Auto multi-zone smoothing PREFERENCES_LOCAL;Local adjustements +PREFERENCES_LOCALAJUST_LABEL;Local adjustements Quality Method +PREFERENCES_LOCALAJUST_STD;Standard +PREFERENCES_LOCALAJUST_ENH;Enhanced +PREFERENCES_LOCALAJUST_ENHDEN;Enhanced + chroma denoise PREFERENCES_LOCALSHOWDELIMSPOT;Show spot delimiters PREFERENCES_MAX;Maxi (Tile) PREFERENCES_MAXRECENTFOLDERS;Maximum number of recent folders @@ -1785,7 +1789,7 @@ TP_LOCALLAB_PROXI;Iterations TP_LOCALLAB_ANBSPOT;Help to Move Control point TP_LOCALLAB_ANBSPOT_TOOLTIP;Provisory control (I hope somebody can help to manage events!! and suppress this bad function) TP_LOCALLAB_LIGHTNESS;Lightness -TP_LOCALLAB_METHOD_TOOLTIP;Default - standard.\nIf you select Enhanced or enhanced chroma denoise - only for Color Light-Sharpening-Retinex-CBDL in normal mode\nEnhanced and chroma denoise significantly increases processing times. +TP_LOCALLAB_METHOD_TOOLTIP;Default - in Preferences - Performance et Quality\nIf you select Enhanced or enhanced chroma denoise - only for Color Light-Sharpening-Retinex-CBDL in normal mode\nEnhanced and chroma denoise significantly increases processing times. TP_LOCALLAB_RADIUS;Radius TP_LOCALLAB_RETI;Retinex TP_LOCALLAB_TRANSMISSIONGAIN;Transmission gain diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index c45b4bc4a..26752947d 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -917,7 +917,16 @@ void LocallabParams::setDefaults() centerX = 0; centerY = 0; circrad = 18; - qualityMethod = "enhden"; + + if (options.locaaju == 0) { + qualityMethod = "std"; + } else if (options.locaaju == 1) { + qualityMethod = "enh"; + } else if (options.locaaju == 2) { + qualityMethod = "enhden"; + } + + // qualityMethod = "enhden"; qualitycurveMethod = "none"; proxi = 20; thres = 18; diff --git a/rtgui/options.cc b/rtgui/options.cc index 916b3a494..3021aa3b3 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -429,6 +429,7 @@ void Options::setDefaults () curvebboxpos = 1; prevdemo = PD_Sidecar; mip = MI_opt; + locaaju = lo_enhde; rgbDenoiseThreadLimit = 0; #if defined( _OPENMP ) && defined( __x86_64__ ) @@ -1265,6 +1266,10 @@ int Options::readFromFile (Glib::ustring fname) prevdemo = (prevdemo_t)keyFile.get_integer ("Performance", "PreviewDemosaicFromSidecar"); } + if (keyFile.has_key ("Performance", "Localajustqual")) { + locaaju = (locaaju_t)keyFile.get_integer ("Performance", "Localajustqual"); + } + if (keyFile.has_key ("Profiles", "Mipfiles")) { mip = (mip_t)keyFile.get_integer ("Profiles", "Mipfiles"); } @@ -1831,6 +1836,7 @@ int Options::readFromFile (Glib::ustring fname) if (keyFile.has_key ("Fast Export", "fastexport_resize_height" )) { fastexport_resize_height = keyFile.get_integer ("Fast Export", "fastexport_resize_height" ); } + if (keyFile.has_key ("Fast Export", "fastexport_use_fast_pipeline" )) { fastexport_use_fast_pipeline = keyFile.get_integer ("Fast Export", "fastexport_use_fast_pipeline" ); } @@ -2013,6 +2019,8 @@ int Options::saveToFile (Glib::ustring fname) keyFile.set_integer ("Performance", "PreviewDemosaicFromSidecar", prevdemo); keyFile.set_boolean ("Performance", "Daubechies", rtSettings.daubech); keyFile.set_boolean ("Performance", "SerializeTiffRead", serializeTiffRead); + keyFile.set_integer ("Performance", "Localajustqual", locaaju); + keyFile.set_string ("Output", "Format", saveFormat.format); keyFile.set_integer ("Output", "JpegQuality", saveFormat.jpegQuality); diff --git a/rtgui/options.h b/rtgui/options.h index f032b05b9..1103877d9 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -70,6 +70,7 @@ enum PPLoadLocation {PLL_Cache = 0, PLL_Input = 1}; enum CPBKeyType {CPBKT_TID = 0, CPBKT_NAME = 1, CPBKT_TID_NAME = 2}; enum prevdemo_t {PD_Sidecar = 1, PD_Fast = 0}; enum mip_t {MI_prev = 0, MI_opt = 1}; +enum locaaju_t {lo_std = 0, lo_enh = 1, lo_enhde = 2}; class Options { @@ -247,6 +248,7 @@ public: prevdemo_t prevdemo; // Demosaicing method used for the <100% preview bool serializeTiffRead; mip_t mip; // MIP + locaaju_t locaaju; bool menuGroupRank; bool menuGroupLabel; diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 3eb5b93cd..c9d87d973 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -733,6 +733,20 @@ Gtk::Widget* Preferences::getPerformancePanel () fdenoise->add (*vbdenoise); mainContainer->pack_start (*fdenoise, Gtk::PACK_SHRINK, 4); + Gtk::Frame* flocalajust = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_LOCAL"))); + Gtk::HBox* hblocalajust = Gtk::manage (new Gtk::HBox (false, 4)); + Gtk::Label* llocalajust = Gtk::manage (new Gtk::Label (M ("PREFERENCES_LOCALAJUST_LABEL"))); + clocalajust = Gtk::manage (new Gtk::ComboBoxText ()); + clocalajust->append (M ("PREFERENCES_LOCALAJUST_STD")); + clocalajust->append (M ("PREFERENCES_LOCALAJUST_ENH")); + clocalajust->append (M ("PREFERENCES_LOCALAJUST_ENHDEN")); + clocalajust->set_active (2); + hblocalajust->pack_start (*llocalajust, Gtk::PACK_SHRINK); + hblocalajust->pack_start (*clocalajust); + flocalajust->add (*hblocalajust); + mainContainer->pack_start (*flocalajust, Gtk::PACK_SHRINK, 4); + + return mainContainer; } @@ -1777,6 +1791,7 @@ void Preferences::storePreferences () moptions.prevdemo = (prevdemo_t)cprevdemo->get_active_row_number (); moptions.serializeTiffRead = ctiffserialize->get_active(); moptions.mip = (mip_t)cmip->get_active_row_number (); + moptions.locaaju = (locaaju_t)clocalajust->get_active_row_number (); if (sdcurrent->get_active ()) { moptions.startupDir = STARTUPDIR_CURRENT; @@ -1934,6 +1949,7 @@ void Preferences::fillPreferences () cprevdemo->set_active (moptions.prevdemo); cbdaubech->set_active (moptions.rtSettings.daubech); cmip->set_active (moptions.mip); + clocalajust->set_active (moptions.locaaju); // cbAutocielab->set_active (moptions.rtSettings.autocielab); cbciecamfloat->set_active (moptions.rtSettings.ciecamfloat); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 2aae0180d..e876bfda9 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -141,6 +141,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener Gtk::CheckButton* ctiffserialize; Gtk::ComboBoxText* curveBBoxPosC; Gtk::ComboBoxText* cmip; + Gtk::ComboBoxText* clocalajust; Gtk::ComboBoxText* theme; Gtk::FontButton* fontButton;