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

Auto remember last white balance stop size

Browse Source 
see issue 1032
This commit is contained in:
Oliver Duis
2011-10-05 20:07:33 +02:00
parent 8d1a1d7d95
commit 6f18cadcd5
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/options.cc
View File

@@ -155,6 +155,7 @@ void Options::setDefaults () {
FileBrowserToolbarSingleRow = true; FileBrowserToolbarSingleRow = true;
hideTPVScrollbar = false; hideTPVScrollbar = false;
UseIconNoText = true; UseIconNoText = true;
whiteBalanceSpotSize = 8;
squareDetailWindow = false; squareDetailWindow = false;
menuGroupRank = true; menuGroupRank = true;
menuGroupLabel = true; menuGroupLabel = true;
@@ -422,6 +423,8 @@ if (keyFile.has_group ("Color Management")) {
if (keyFile.has_key ("Color Management", "Intent")) rtSettings.colorimetricIntent = keyFile.get_integer("Color Management", "Intent"); if (keyFile.has_key ("Color Management", "Intent")) rtSettings.colorimetricIntent = keyFile.get_integer("Color Management", "Intent");
if (keyFile.has_key ("Color Management", "WhiteBalanceSpotSize")) whiteBalanceSpotSize = keyFile.get_integer("Color Management", "WhiteBalanceSpotSize");
// Disabled (default is true) till issues are sorted out // Disabled (default is true) till issues are sorted out
//if (keyFile.has_key ("Color Management", "LCMSSafeMode")) rtSettings.LCMSSafeMode = keyFile.get_boolean ("Color Management", "LCMSSafeMode"); //if (keyFile.has_key ("Color Management", "LCMSSafeMode")) rtSettings.LCMSSafeMode = keyFile.get_boolean ("Color Management", "LCMSSafeMode");
} }
@@ -598,6 +601,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_string ("Color Management", "B_eta", rtSettings.beta); keyFile.set_string ("Color Management", "B_eta", rtSettings.beta);
keyFile.set_string ("Color Management", "B_est", rtSettings.best); keyFile.set_string ("Color Management", "B_est", rtSettings.best);
keyFile.set_string ("Color Management", "B_ruce", rtSettings.bruce); keyFile.set_string ("Color Management", "B_ruce", rtSettings.bruce);
keyFile.set_integer ("Color Management", "WhiteBalanceSpotSize", whiteBalanceSpotSize);
Glib::ArrayHandle<int> bab = baBehav; Glib::ArrayHandle<int> bab = baBehav;
keyFile.set_integer_list ("Batch Processing", "AdjusterBehavior", bab); keyFile.set_integer_list ("Batch Processing", "AdjusterBehavior", bab);

1
rtgui/options.h
View File

@@ -156,6 +156,7 @@ class Options {
bool FileBrowserToolbarSingleRow; bool FileBrowserToolbarSingleRow;
bool hideTPVScrollbar; bool hideTPVScrollbar;
bool UseIconNoText; bool UseIconNoText;
int whiteBalanceSpotSize;
bool menuGroupRank; bool menuGroupRank;
bool menuGroupLabel; bool menuGroupLabel;

13
rtgui/whitebalance.cc
View File

@@ -18,6 +18,7 @@
*/ */
#include <whitebalance.h> #include <whitebalance.h>
#include <iomanip> #include <iomanip>
#include <options.h>
#define MINTEMP 1200 #define MINTEMP 1200
#define MAXTEMP 12000 #define MAXTEMP 12000
@@ -62,12 +63,11 @@ WhiteBalance::WhiteBalance () : Gtk::VBox(), FoldableToolPanel(this), wbp(NULL),
spotsize = Gtk::manage (new MyComboBoxText ()); spotsize = Gtk::manage (new MyComboBoxText ());
spotsize->show (); spotsize->show ();
spotsize->append_text ("2"); spotsize->append_text ("2"); if (options.whiteBalanceSpotSize==2) spotsize->set_active(0);
spotsize->append_text ("4"); spotsize->append_text ("4"); if (options.whiteBalanceSpotSize==4) spotsize->set_active(1);
spotsize->append_text ("8"); spotsize->append_text ("8"); if (options.whiteBalanceSpotSize==8) spotsize->set_active(2);
spotsize->append_text ("16"); spotsize->append_text ("16"); if (options.whiteBalanceSpotSize==16) spotsize->set_active(3);
spotsize->append_text ("32"); spotsize->append_text ("32"); if (options.whiteBalanceSpotSize==32) spotsize->set_active(4);
spotsize->set_active (2);
spotbox->pack_end (*spotsize, Gtk::PACK_EXPAND_WIDGET, 4); spotbox->pack_end (*spotsize, Gtk::PACK_EXPAND_WIDGET, 4);
spotbox->pack_end (*slab, Gtk::PACK_SHRINK, 4); spotbox->pack_end (*slab, Gtk::PACK_SHRINK, 4);
@@ -166,6 +166,7 @@ void WhiteBalance::spotPressed () {
} }
void WhiteBalance::spotSizeChanged () { void WhiteBalance::spotSizeChanged () {
options.whiteBalanceSpotSize=getSize();
if (wblistener) if (wblistener)
wblistener->spotWBRequested (getSize()); wblistener->spotWBRequested (getSize());