liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress ciecam options

Browse Source
This commit is contained in:
Desmis 2017-08-14 17:49:11 +02:00
parent 0bb824e2c1
commit 0c7b59ece8
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/default
View File

@ -1347,7 +1347,7 @@ TP_COLORAPP_TCMODE_LABEL2;Curve mode 2
TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode TP_COLORAPP_TCMODE_LABEL3;Curve chroma mode
TP_COLORAPP_TCMODE_LIGHTNESS;Lightness TP_COLORAPP_TCMODE_LIGHTNESS;Lightness
TP_COLORAPP_TCMODE_SATUR;Saturation TP_COLORAPP_TCMODE_SATUR;Saturation
TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5001\nD55 temp=5500\nD65 temp=6504\nD75 temp=7500 TP_COLORAPP_TEMP_TOOLTIP;To select an illuminant always Tint=1.\nA temp=2856\nD50 temp=5003\nD55 temp=5503\nD65 temp=6504\nD75 temp=7504
TP_COLORAPP_TONECIE;Tone mapping using CIECAM02 TP_COLORAPP_TONECIE;Tone mapping using CIECAM02
TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect. TP_COLORAPP_TONECIE_TOOLTIP;If this option is disabled, tone mapping is done in L*a*b* space.\nIf this option is enabled, tone mapping is done using CIECAM02.\nThe Tone Mapping tool must be enabled for this setting to take effect.
TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output] TP_COLORAPP_WBCAM;WB [RT+CAT02] + [output]

8
rtgui/options.cc
View File

@ -642,7 +642,7 @@ void Options::setDefaults ()
#endif #endif
// rtSettings.viewingdevice = 0; // rtSettings.viewingdevice = 0;
// rtSettings.viewingdevicegrey = 3; // rtSettings.viewingdevicegrey = 3;
rtSettings.viewinggreySc = 1; // rtSettings.viewinggreySc = 1;
rtSettings.leveldnv = 2; rtSettings.leveldnv = 2;
rtSettings.leveldnti = 0; rtSettings.leveldnti = 0;
rtSettings.leveldnaut = 0; rtSettings.leveldnaut = 0;
@ -1557,11 +1557,11 @@ int Options::readFromFile (Glib::ustring fname)
rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey"); rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey");
} }
*/ */
/*
if (keyFile.has_key ("Color Management", "greySc")) { if (keyFile.has_key ("Color Management", "greySc")) {
rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc"); rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc");
} }
*/
if (keyFile.has_key ("Color Management", "CBDLArtif")) { if (keyFile.has_key ("Color Management", "CBDLArtif")) {
rtSettings.artifact_cbdl = keyFile.get_double ("Color Management", "CBDLArtif"); rtSettings.artifact_cbdl = keyFile.get_double ("Color Management", "CBDLArtif");
} }
@ -2133,7 +2133,7 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC); keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC);
//keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice); //keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
//keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey); //keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc); // keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc);
keyFile.set_string ("Color Management", "AdobeRGB", rtSettings.adobe); keyFile.set_string ("Color Management", "AdobeRGB", rtSettings.adobe);
keyFile.set_string ("Color Management", "ProPhoto", rtSettings.prophoto); keyFile.set_string ("Color Management", "ProPhoto", rtSettings.prophoto);

12
rtgui/preferences.cc
View File

@ -878,14 +878,14 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
grey->append (M("PREFERENCES_GREY30")); grey->append (M("PREFERENCES_GREY30"));
grey->append (M("PREFERENCES_GREY40")); grey->append (M("PREFERENCES_GREY40"));
*/ */
/*
Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START)); Gtk::Label* greySclab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_GREYSC") + ":", Gtk::ALIGN_START));
setExpandAlignProperties (greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties (greySclab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
greySc = Gtk::manage (new Gtk::ComboBoxText ()); greySc = Gtk::manage (new Gtk::ComboBoxText ());
setExpandAlignProperties (greySc, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); setExpandAlignProperties (greySc, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
greySc->append (M ("PREFERENCES_GREYSCA")); greySc->append (M ("PREFERENCES_GREYSCA"));
greySc->append (M ("PREFERENCES_GREYSC18")); greySc->append (M ("PREFERENCES_GREYSC18"));
*/
Gtk::Frame* fcielab = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CIEART_FRAME")) ); Gtk::Frame* fcielab = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_CIEART_FRAME")) );
setExpandAlignProperties (fcielab, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START); setExpandAlignProperties (fcielab, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
@ -900,8 +900,8 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
colo->attach (*greylab, 0, 2, 1, 1); colo->attach (*greylab, 0, 2, 1, 1);
colo->attach (*grey, 1, 2, 1, 1); colo->attach (*grey, 1, 2, 1, 1);
*/ */
colo->attach (*greySclab, 0, 3, 1, 1); // colo->attach (*greySclab, 0, 3, 1, 1);
colo->attach (*greySc, 1, 3, 1, 1); // colo->attach (*greySc, 1, 3, 1, 1);
cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CIEART_LABEL"))); cbciecamfloat = Gtk::manage (new Gtk::CheckButton (M ("PREFERENCES_CIEART_LABEL")));
setExpandAlignProperties (cbciecamfloat, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties (cbciecamfloat, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
colo->attach (*cbciecamfloat, 0, 4, 2, 1); colo->attach (*cbciecamfloat, 0, 4, 2, 1);
@ -1716,7 +1716,7 @@ void Preferences::storePreferences ()
moptions.rtSettings.iccDirectory = iccDir->get_filename (); moptions.rtSettings.iccDirectory = iccDir->get_filename ();
// moptions.rtSettings.viewingdevice = view->get_active_row_number (); // moptions.rtSettings.viewingdevice = view->get_active_row_number ();
// moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number (); // moptions.rtSettings.viewingdevicegrey = grey->get_active_row_number ();
moptions.rtSettings.viewinggreySc = greySc->get_active_row_number (); // moptions.rtSettings.viewinggreySc = greySc->get_active_row_number ();
// moptions.rtSettings.autocielab = cbAutocielab->get_active (); // moptions.rtSettings.autocielab = cbAutocielab->get_active ();
moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active (); moptions.rtSettings.ciecamfloat = cbciecamfloat->get_active ();
moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active (); moptions.rtSettings.HistogramWorking = ckbHistogramWorking->get_active ();
@ -1876,7 +1876,7 @@ void Preferences::fillPreferences ()
// view->set_active (moptions.rtSettings.viewingdevice); // view->set_active (moptions.rtSettings.viewingdevice);
// grey->set_active (moptions.rtSettings.viewingdevicegrey); // grey->set_active (moptions.rtSettings.viewingdevicegrey);
greySc->set_active (moptions.rtSettings.viewinggreySc); // greySc->set_active (moptions.rtSettings.viewinggreySc);
dnv->set_active (moptions.rtSettings.leveldnv); dnv->set_active (moptions.rtSettings.leveldnv);
dnti->set_active (moptions.rtSettings.leveldnti); dnti->set_active (moptions.rtSettings.leveldnti);
dnliss->set_active (moptions.rtSettings.leveldnliss); dnliss->set_active (moptions.rtSettings.leveldnliss);

6
rtgui/preferences.h
View File

@ -122,9 +122,9 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::SpinButton* panFactor; Gtk::SpinButton* panFactor;
Gtk::CheckButton* rememberZoomPanCheckbutton; Gtk::CheckButton* rememberZoomPanCheckbutton;
Gtk::ComboBoxText* view; // Gtk::ComboBoxText* view;
Gtk::ComboBoxText* grey; // Gtk::ComboBoxText* grey;
Gtk::ComboBoxText* greySc; // Gtk::ComboBoxText* greySc;
Gtk::ComboBoxText* dnv; Gtk::ComboBoxText* dnv;
Gtk::ComboBoxText* dnti; Gtk::ComboBoxText* dnti;
Gtk::ComboBoxText* dnaut; Gtk::ComboBoxText* dnaut;