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

Save provisory work for autowb ITCWB

Browse Source
This commit is contained in:
Desmis
2019-06-25 13:56:52 +02:00
parent 66c9cd6177
commit 5dbc61579d
15 changed files with 6317 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rtgui/options.cc
View File

@@ -583,6 +583,13 @@ void Options::setDefaults()
rtSettings.amchroma = 40;//between 20 and 140 low values increase effect..and also artifacts, high values reduces
rtSettings.level0_cbdl = 0;
rtSettings.level123_cbdl = 30;
rtSettings.itcwb_thres = 34;//between 10 to 55
rtSettings.itcwb_sort = false;
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.protectred = 60;
rtSettings.protectredh = 0.3;
@@ -1485,6 +1492,35 @@ 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_sort")) {
rtSettings.itcwb_sort = keyFile.get_boolean("Color Management", "Itcwb_sort");
}
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_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", "Colortoningab")) rtSettings.colortoningab = keyFile.get_double("Color Management", "Colortoningab");
//if (keyFile.has_key ("Color Management", "Decaction")) rtSettings.decaction = keyFile.get_double("Color Management", "Decaction");
@@ -2148,6 +2184,14 @@ 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_sort", rtSettings.itcwb_sort);
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_integer("Color Management", "Itcwb_sizereference", rtSettings.itcwb_sizereference);
keyFile.set_integer("Color Management", "Itcwb_delta", rtSettings.itcwb_delta);
//keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab);
//keyFile.set_double ("Color Management", "Decaction", rtSettings.decaction);
keyFile.set_string("Color Management", "ClutsDirectory", clutsDir);

9
rtgui/whitebalance.cc
View File

@@ -175,6 +175,14 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
row[methodColumns.colId] = i + 100;
}
if (currType == WBEntry::Type::AUTO) {
// Creating the auto category
row = *(refTreeModel->append());
row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)];
row[methodColumns.colLabel] = M("TP_WBALANCE_AUTO_HEADER");
row[methodColumns.colId] = i + 100;
}
if (currType == WBEntry::Type::WATER) {
// Creating the under water subcategory header
row = *(refTreeModel->append());
@@ -213,6 +221,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
|| currType == WBEntry::Type::WATER
|| currType == WBEntry::Type::FLASH
|| currType == WBEntry::Type::LED
|| currType == WBEntry::Type::AUTO
) {
childrow = *(refTreeModel->append(row.children()));
childrow[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)];