Whitebalance - Removed GUI Itcwb from whitebalance and preferences (#6710)
* Change Preferences for observer whitebalance * Change label white balance preferences * Added Preferences 2 parameters Whitebalance auto correlation * Add Preference Temperature correlation - sort and tooltip * Change to rtengine cmakelist * Apply patch from Lawrence37 * Small comment code * Change defaut order prefrences wba * Added force extra algoritm to Preferences * Harmonize itcwb sorted * Add fields to Preferences Itcwb * Change settings precision Itcwb in Preferences * Change tooltip Itcwb preferences * First stage Itwcwb settings in main with pp3 and selction in preferences * Second stage Itwcwb settings in main with pp3 and selction in preferences * Third stage Itwcwb settings in main with pp3 and selction in preferences * Add itcwb_fgreen student - green optimize * Add Itcwb green range * Itcwb history msg - first tooltips * Remove force-extra because always used * reused force-extra to use entire CIExy for sampling datas * Removed inwanted text in console * Set sensitive for Itcwbframe * Various change - comment .. * Small code review - chnage tooltips * Remove settings itcwb_delta in Rawimagesource.cc to simplify * Remove Itcwb Observer - put a single observer for everything - general - itcwb * Fixed conflicts in colortemp.cc * Various change - fixed bug - simplify * Fixed limits for settings pp3 - chnage tooltip * Clean unused code * Put itcwb_findgreen in GUI * Added checkbox 'Low sampling' to find the settings of 5.9 * Set Observer to Observer 10° - preferences default * Missing setting Low sampling * Show white balance multipliers * Change default settings - Itcwb_sorted * Move observer from preferences to WB * Make observer selectable for camera WB * Ensure observer checkbox is in sync with PP3 * Set default ITCWB low sampling for PP3s from <=5.9 Ensure temperature correlation white balance algorithm 1 is used when opening edits from versions 5.9 and earlier. * Removed unused White-balance frame in Preferences * Comment some GUI sliders checkbox * Removed all GUI itcwb in preferences and whitebalance * Removed forgotten code in preferences * Remove labels tooltips history Itcwb --------- Co-authored-by: Lawrence Lee <45837045+Lawrence37@users.noreply.github.com>
This commit is contained in:
Desmis
GitHub
@@ -595,7 +595,6 @@ void Options::setDefaults()
|
||||
rtSettings.monitorIntent = rtengine::RI_RELATIVE;
|
||||
rtSettings.monitorBPC = true;
|
||||
rtSettings.autocielab = false;
|
||||
rtSettings.observer10 = false;
|
||||
rtSettings.autoMonitorProfile = false;
|
||||
rtSettings.adobe = "RTv2_Medium"; // put the name of yours profiles (here windows)
|
||||
rtSettings.prophoto = "RTv2_Large"; // these names appear in the menu "output profile"
|
||||
@@ -623,18 +622,8 @@ void Options::setDefaults()
|
||||
rtSettings.previewselection = 5;//between 1 to 40
|
||||
rtSettings.cbdlsensi = 1.0;//between 0.001 to 1
|
||||
rtSettings.fftwsigma = true; //choice between sigma^2 or empirical formula
|
||||
|
||||
rtSettings.itcwb_thres = 34;//between 10 to 55
|
||||
rtSettings.itcwb_sorted = true;
|
||||
rtSettings.itcwb_greenrange = 0;//between 0 to 2
|
||||
rtSettings.itcwb_greendeltatemp = 2;//between 0 and 4
|
||||
rtSettings.itcwb_forceextra = true;
|
||||
rtSettings.itcwb_sizereference = 3;//between 1 and 5
|
||||
rtSettings.itcwb_delta = 1;//between 0 and 5
|
||||
rtSettings.itcwb_stdobserver10 = true;
|
||||
rtSettings.itcwb_precis = 3;//3 or 5 or 9
|
||||
rtSettings.itcwb_nopurple = true;
|
||||
// end locallab
|
||||
rtSettings.itcwb_enable = true;
|
||||
|
||||
//wavelet
|
||||
rtSettings.edghi = 3.0;//1.1 and 5.
|
||||
@@ -1767,10 +1756,6 @@ void Options::readFromFile(Glib::ustring fname)
|
||||
rtSettings.autocielab = keyFile.get_boolean("Color Management", "Autocielab");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Observer10")) {
|
||||
rtSettings.observer10 = keyFile.get_boolean("Color Management", "Observer10");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "CRI")) {
|
||||
rtSettings.CRI_color = keyFile.get_integer("Color Management", "CRI");
|
||||
}
|
||||
@@ -1802,45 +1787,10 @@ void Options::readFromFile(Glib::ustring fname)
|
||||
rtSettings.level123_cbdl = keyFile.get_double("Color Management", "CBDLlevel123");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_thres")) {
|
||||
rtSettings.itcwb_thres = keyFile.get_integer("Color Management", "Itcwb_thres");
|
||||
if (keyFile.has_key("Color Management", "Itcwb_enable")) {
|
||||
rtSettings.itcwb_enable = keyFile.get_boolean("Color Management", "Itcwb_enable");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_sorted")) {
|
||||
rtSettings.itcwb_sorted = keyFile.get_boolean("Color Management", "Itcwb_sorted");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_forceextra")) {
|
||||
rtSettings.itcwb_forceextra = keyFile.get_boolean("Color Management", "Itcwb_forceextra");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_nopurple")) {
|
||||
rtSettings.itcwb_nopurple = keyFile.get_boolean("Color Management", "Itcwb_nopurple");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_stdobserver10")) {
|
||||
rtSettings.itcwb_stdobserver10 = keyFile.get_boolean("Color Management", "Itcwb_stdobserver10");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_greenrange")) {
|
||||
rtSettings.itcwb_greenrange = keyFile.get_integer("Color Management", "Itcwb_greenrange");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_greendeltatemp")) {
|
||||
rtSettings.itcwb_greendeltatemp = keyFile.get_integer("Color Management", "Itcwb_greendeltatemp");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_sizereference")) {
|
||||
rtSettings.itcwb_sizereference = keyFile.get_integer("Color Management", "Itcwb_sizereference");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_delta")) {
|
||||
rtSettings.itcwb_delta = keyFile.get_integer("Color Management", "Itcwb_delta");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("Color Management", "Itcwb_precis")) {
|
||||
rtSettings.itcwb_precis = keyFile.get_integer("Color Management", "Itcwb_precis");
|
||||
}
|
||||
|
||||
//if (keyFile.has_key ("Color Management", "Colortoningab")) rtSettings.colortoningab = keyFile.get_double("Color Management", "Colortoningab");
|
||||
//if (keyFile.has_key ("Color Management", "Decaction")) rtSettings.decaction = keyFile.get_double("Color Management", "Decaction");
|
||||
@@ -2579,7 +2529,6 @@ void Options::saveToFile(Glib::ustring fname)
|
||||
keyFile.set_string("Color Management", "MonitorProfile", rtSettings.monitorProfile);
|
||||
keyFile.set_boolean("Color Management", "AutoMonitorProfile", rtSettings.autoMonitorProfile);
|
||||
keyFile.set_boolean("Color Management", "Autocielab", rtSettings.autocielab);
|
||||
keyFile.set_boolean("Color Management", "Observer10", rtSettings.observer10);
|
||||
keyFile.set_boolean("Color Management", "RGBcurvesLumamode_Gamut", rtSettings.rgbcurveslumamode_gamut);
|
||||
keyFile.set_integer("Color Management", "Intent", rtSettings.monitorIntent);
|
||||
keyFile.set_boolean("Color Management", "MonitorBPC", rtSettings.monitorBPC);
|
||||
@@ -2612,16 +2561,7 @@ void Options::saveToFile(Glib::ustring fname)
|
||||
//keyFile.set_boolean ("Color Management", "Ciebadpixgauss", rtSettings.ciebadpixgauss);
|
||||
keyFile.set_double("Color Management", "CBDLlevel0", rtSettings.level0_cbdl);
|
||||
keyFile.set_double("Color Management", "CBDLlevel123", rtSettings.level123_cbdl);
|
||||
keyFile.set_integer("Color Management", "Itcwb_thres", rtSettings.itcwb_thres);
|
||||
keyFile.set_boolean("Color Management", "Itcwb_sorted", rtSettings.itcwb_sorted);
|
||||
keyFile.set_integer("Color Management", "Itcwb_greenrange", rtSettings.itcwb_greenrange);
|
||||
keyFile.set_integer("Color Management", "Itcwb_greendeltatemp", rtSettings.itcwb_greendeltatemp);
|
||||
keyFile.set_boolean("Color Management", "Itcwb_forceextra", rtSettings.itcwb_forceextra);
|
||||
keyFile.set_boolean("Color Management", "Itcwb_nopurple", rtSettings.itcwb_nopurple);
|
||||
keyFile.set_integer("Color Management", "Itcwb_sizereference", rtSettings.itcwb_sizereference);
|
||||
keyFile.set_integer("Color Management", "Itcwb_delta", rtSettings.itcwb_delta);
|
||||
keyFile.set_boolean("Color Management", "Itcwb_stdobserver10", rtSettings.itcwb_stdobserver10);
|
||||
keyFile.set_integer("Color Management", "Itcwb_precis", rtSettings.itcwb_precis);
|
||||
keyFile.set_boolean("Color Management", "Itcwb_enable", rtSettings.itcwb_enable);
|
||||
|
||||
//keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab);
|
||||
//keyFile.set_double ("Color Management", "Decaction", rtSettings.decaction);
|
||||
|
||||
Reference in New Issue
Block a user