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
2023-03-19 07:47:58 +01:00
committed by GitHub
parent ca08a279d5
commit 69c1caafa1
38 changed files with 1073 additions and 311 deletions

View File

@@ -266,6 +266,17 @@ void ParamsEdited::set(bool v)
wb.temperature = v;
wb.equal = v;
wb.tempBias = v;
wb.observer = v;
wb.itcwb_thres = v;
wb.itcwb_precis = v;
wb.itcwb_size = v;
wb.itcwb_delta = v;
wb.itcwb_fgreen = v;
wb.itcwb_rgreen = v;
wb.itcwb_nopurple = v;
wb.itcwb_sorted = v;
wb.itcwb_forceextra = v;
wb.itcwb_sampling = v;
//colorShift.a = v;
//colorShift.b = v;
//lumaDenoise.enabled = v;
@@ -967,6 +978,17 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
wb.equal = wb.equal && p.wb.equal == other.wb.equal;
wb.temperature = wb.temperature && p.wb.temperature == other.wb.temperature;
wb.tempBias = wb.tempBias && p.wb.tempBias == other.wb.tempBias;
wb.observer = wb.observer && p.wb.observer == other.wb.observer;
wb.itcwb_thres = wb.itcwb_thres && p.wb.itcwb_thres == other.wb.itcwb_thres;
wb.itcwb_precis = wb.itcwb_precis && p.wb.itcwb_precis == other.wb.itcwb_precis;
wb.itcwb_size = wb.itcwb_size && p.wb.itcwb_size == other.wb.itcwb_size;
wb.itcwb_delta = wb.itcwb_delta && p.wb.itcwb_delta == other.wb.itcwb_delta;
wb.itcwb_fgreen = wb.itcwb_fgreen && p.wb.itcwb_fgreen == other.wb.itcwb_fgreen;
wb.itcwb_rgreen = wb.itcwb_rgreen && p.wb.itcwb_rgreen == other.wb.itcwb_rgreen;
wb.itcwb_nopurple = wb.itcwb_nopurple && p.wb.itcwb_nopurple == other.wb.itcwb_nopurple;
wb.itcwb_sorted = wb.itcwb_sorted && p.wb.itcwb_sorted == other.wb.itcwb_sorted;
wb.itcwb_forceextra = wb.itcwb_forceextra && p.wb.itcwb_forceextra == other.wb.itcwb_forceextra;
wb.itcwb_sampling = wb.itcwb_sampling && p.wb.itcwb_sampling == other.wb.itcwb_sampling;
//colorShift.a = colorShift.a && p.colorShift.a == other.colorShift.a;
//colorShift.b = colorShift.b && p.colorShift.b == other.colorShift.b;
//lumaDenoise.enabled = lumaDenoise.enabled && p.lumaDenoise.enabled == other.lumaDenoise.enabled;
@@ -2829,6 +2851,50 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.wb.tempBias = dontforceSet && options.baBehav[ADDSET_WB_TEMPBIAS] ? toEdit.wb.tempBias + mods.wb.tempBias : mods.wb.tempBias;
}
if (wb.observer) {
toEdit.wb.observer = mods.wb.observer;
}
if (wb.itcwb_thres) {
toEdit.wb.itcwb_thres = mods.wb.itcwb_thres;
}
if (wb.itcwb_precis) {
toEdit.wb.itcwb_precis = mods.wb.itcwb_precis;
}
if (wb.itcwb_size) {
toEdit.wb.itcwb_size = mods.wb.itcwb_size;
}
if (wb.itcwb_delta) {
toEdit.wb.itcwb_delta = mods.wb.itcwb_delta;
}
if (wb.itcwb_fgreen) {
toEdit.wb.itcwb_fgreen = mods.wb.itcwb_fgreen;
}
if (wb.itcwb_rgreen) {
toEdit.wb.itcwb_rgreen = mods.wb.itcwb_rgreen;
}
if (wb.itcwb_nopurple) {
toEdit.wb.itcwb_nopurple = mods.wb.itcwb_nopurple;
}
if (wb.itcwb_sorted) {
toEdit.wb.itcwb_sorted = mods.wb.itcwb_sorted;
}
if (wb.itcwb_forceextra) {
toEdit.wb.itcwb_forceextra = mods.wb.itcwb_forceextra;
}
if (wb.itcwb_sampling) {
toEdit.wb.itcwb_sampling = mods.wb.itcwb_sampling;
}
if (wb.green) {
toEdit.wb.green = dontforceSet && options.baBehav[ADDSET_WB_GREEN] ? toEdit.wb.green + mods.wb.green : mods.wb.green;
}