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

separate settings for preview and batch

Browse Source
This commit is contained in:
Andrey Skvortsov
2010-09-12 23:36:29 -07:00
parent 5cc9fdf758
commit 800e82b762
15 changed files with 135 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/editorpanel.cc
View File

@@ -381,6 +381,8 @@ void EditorPanel::close () {
void EditorPanel::saveProfile () {
if (!ipc)
return;
ProcParams params;
ipc->getParams (&params);
@@ -641,7 +643,8 @@ BatchQueueEntry* EditorPanel::createBatchQueueEntry () {
rtengine::procparams::ProcParams pparams;
ipc->getParams (&pparams);
rtengine::ProcessingJob* job = rtengine::ProcessingJob::create (ipc->getInitialImage(), pparams);
//rtengine::ProcessingJob* job = rtengine::ProcessingJob::create (ipc->getInitialImage(), pparams);
rtengine::ProcessingJob* job = rtengine::ProcessingJob::create (openThm->getFileName (), openThm->getType()==FT_Raw, pparams);
int prevh = options.maxThumbnailHeight;
int prevw = prevh;
guint8* prev = NULL;//(guint8*) previewHandler->getImagePreview (prevw, prevh);

5
rtgui/options.cc
View File

@@ -120,7 +120,8 @@ void Options::setDefaults () {
baBehav = std::vector<int> (babehav, babehav+ADDSET_PARAM_NUM);
rtSettings.dualThreadEnabled = true;
rtSettings.demosaicMethod = "amaze";//Emil's code for AMaZE
rtSettings.demosaicMethod = "hphd";
rtSettings.demosaicMethodBatch = "hphd";
rtSettings.ca_autocorrect = false;//Emil's CA correction
rtSettings.hotdeadpix_filt = true;//Emil's hot/dead pixel filter
@@ -266,6 +267,7 @@ if (keyFile.has_group ("GUI")) {
if (keyFile.has_group ("Algorithms")) {
if (keyFile.has_key ("Algorithms", "DemosaicMethod")) rtSettings.demosaicMethod = keyFile.get_string ("Algorithms", "DemosaicMethod");
if (keyFile.has_key ("Algorithms", "DemosaicMethodBatch")) rtSettings.demosaicMethodBatch = keyFile.get_string ("Algorithms", "DemosaicMethodBatch");
if (keyFile.has_key ("Algorithms", "ColorCorrection")) rtSettings.colorCorrectionSteps = keyFile.get_integer ("Algorithms", "ColorCorrection");
if(keyFile.has_key("Algorithms", "DCBIterations")) rtSettings.dcb_iterations = keyFile.get_integer("Algorithms", "DCBIterations");
if(keyFile.has_key("Algorithms", "DCBEnhance")) rtSettings.dcb_enhance = keyFile.get_boolean("Algorithms", "DCBEnhance");
@@ -394,6 +396,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_integer_list ("GUI", "CurvePanelsExpanded", crvopen);
keyFile.set_string ("Algorithms", "DemosaicMethod", rtSettings.demosaicMethod);
keyFile.set_string ("Algorithms", "DemosaicMethodBatch", rtSettings.demosaicMethodBatch);
keyFile.set_integer ("Algorithms", "ColorCorrection", rtSettings.colorCorrectionSteps);
keyFile.set_integer ("Algorithms", "DCBIterations", rtSettings.dcb_iterations);
keyFile.set_boolean ("Algorithms", "DCBEnhance", rtSettings.dcb_enhance);

71
rtgui/preferences.cc
View File

@@ -255,6 +255,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () {
Gtk::VBox* fdb = Gtk::manage (new Gtk::VBox ());
fdb->set_border_width (4);
fdem->add (*fdb);
Gtk::Label* dmlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_DMETHOD")+":"));
dmethod = Gtk::manage (new Gtk::ComboBoxText ());
Gtk::HBox* hb11 = Gtk::manage (new Gtk::HBox ());
@@ -268,6 +269,21 @@ Gtk::Widget* Preferences::getProcParamsPanel () {
dmethod->append_text ("DCB");
dmethod->append_text ("AHD");
dmethod->append_text ("Bilinear");
Gtk::Label* dmlab2 = Gtk::manage (new Gtk::Label (M("PREFERENCES_DMETHODBATCH")+": "));
dmethodBatch = Gtk::manage (new Gtk::ComboBoxText ());
Gtk::HBox* hb111 = Gtk::manage (new Gtk::HBox ());
hb111->pack_start (*dmlab2, Gtk::PACK_SHRINK, 4);
hb111->pack_start (*dmethodBatch);
dmethodBatch->append_text ("EAHD");
dmethodBatch->append_text ("HPHD");
dmethodBatch->append_text ("VNG-4");
//dmethod->append_text ("PPG");
dmethodBatch->append_text ("AMaZE");//Emil's code for AMaZE
dmethodBatch->append_text ("DCB");
dmethodBatch->append_text ("AHD");
dmethodBatch->append_text ("Bilinear");
Gtk::Label* cclab = Gtk::manage (new Gtk::Label (M("PREFERENCES_FALSECOLOR")+":"));
ccSteps = Gtk::manage (new Gtk::SpinButton ());
ccSteps->set_digits (0);
@@ -316,6 +332,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
fdb->pack_start (*hb11, Gtk::PACK_SHRINK, 4);
fdb->pack_start (*hb111, Gtk::PACK_SHRINK, 4);
fdb->pack_start (*hb12, Gtk::PACK_SHRINK, 4);
fdb->pack_start (*hb13, Gtk::PACK_SHRINK, 4);
fdb->pack_start (*dcbEnhance, Gtk::PACK_SHRINK, 4);
@@ -338,6 +355,7 @@ Gtk::Widget* Preferences::getProcParamsPanel () {
}
dmconn = dmethod->signal_changed().connect( sigc::mem_fun(*this, &Preferences::dmethodChanged) );
dmconnBatch = dmethod->signal_changed().connect( sigc::mem_fun(*this, &Preferences::dmethodBatchChanged) );
return mvbpp;
}
@@ -751,6 +769,21 @@ void Preferences::storePreferences () {
moptions.rtSettings.demosaicMethod = "ahd";
else if (dmethod->get_active_row_number()==6)
moptions.rtSettings.demosaicMethod = "bilinear";
if (dmethodBatch->get_active_row_number()==0)
moptions.rtSettings.demosaicMethodBatch = "eahd";
else if (dmethodBatch->get_active_row_number()==1)
moptions.rtSettings.demosaicMethodBatch = "hphd";
else if (dmethodBatch->get_active_row_number()==2)
moptions.rtSettings.demosaicMethodBatch = "vng4";
else if (dmethodBatch->get_active_row_number()==3)
moptions.rtSettings.demosaicMethodBatch = "amaze";
else if (dmethodBatch->get_active_row_number()==4)
moptions.rtSettings.demosaicMethodBatch = "dcb";
else if (dmethodBatch->get_active_row_number()==5)
moptions.rtSettings.demosaicMethodBatch = "ahd";
else if (dmethodBatch->get_active_row_number()==6)
moptions.rtSettings.demosaicMethodBatch = "bilinear";
moptions.rtSettings.dcb_iterations=(int)dcbIterations->get_value();
moptions.rtSettings.dcb_enhance=dcbEnhance->get_active();
moptions.rtSettings.ca_autocorrect=caAutoCorrect->get_active();//Emil's CA correction
@@ -803,6 +836,7 @@ void Preferences::storePreferences () {
void Preferences::fillPreferences () {
dmconn.block (true);
dmconnBatch.block(true);
tconn.block (true);
rprofiles->set_active_text (moptions.defProfRaw);
@@ -853,6 +887,22 @@ void Preferences::fillPreferences () {
dmethod->set_active (5);
else if (moptions.rtSettings.demosaicMethod=="bilinear")
dmethod->set_active (6);
if (moptions.rtSettings.demosaicMethodBatch=="eahd")
dmethodBatch->set_active (0);
else if (moptions.rtSettings.demosaicMethodBatch=="hphd")
dmethodBatch->set_active (1);
else if (moptions.rtSettings.demosaicMethodBatch=="vng4")
dmethodBatch->set_active (2);
else if (moptions.rtSettings.demosaicMethodBatch=="amaze")//Emil's code for AMaZE
dmethodBatch->set_active (3);
else if (moptions.rtSettings.demosaicMethodBatch=="dcb")
dmethodBatch->set_active (4);
else if (moptions.rtSettings.demosaicMethodBatch=="ahd")
dmethodBatch->set_active (5);
else if (moptions.rtSettings.demosaicMethodBatch=="bilinear")
dmethodBatch->set_active (6);
dcbEnhance->set_active(moptions.rtSettings.dcb_enhance);
dcbIterations->set_value(moptions.rtSettings.dcb_iterations);
dcbEnhance->set_sensitive(moptions.rtSettings.demosaicMethod=="dcb");
@@ -914,6 +964,7 @@ void Preferences::fillPreferences () {
setc.block (false);
dmconn.block (false);
dmconnBatch.block(false);
tconn.block (false);
}
@@ -977,6 +1028,26 @@ void Preferences::dmethodChanged () {
}
}
void Preferences::dmethodBatchChanged () {
if (dmethod->get_active_row_number()==0)
ccSteps->set_value (2);
else if (dmethod->get_active_row_number()==1)
ccSteps->set_value (1);
else if (dmethod->get_active_row_number()==2)
ccSteps->set_value (2);
if (dmethod->get_active_row_number()==4) {
dcbEnhance->set_sensitive(true);
dcbIterations->set_sensitive(true);
dcbIterationsLabel->set_sensitive(true);
} else {
dcbEnhance->set_sensitive(false);
dcbIterations->set_sensitive(false);
dcbIterationsLabel->set_sensitive(false);
}
}
void Preferences::aboutPressed () {
Splash* splash = new Splash (-1);

4
rtgui/preferences.h
View File

@@ -53,6 +53,7 @@ class Preferences : public Gtk::Dialog {
Gtk::ComboBoxText* rprofiles;
Gtk::ComboBoxText* iprofiles;
Gtk::ComboBoxText* dmethod;
Gtk::ComboBoxText* dmethodBatch;
Gtk::ComboBoxText* languages;
Gtk::Entry* dateformat;
Gtk::Entry* startupdir;
@@ -110,12 +111,13 @@ class Preferences : public Gtk::Dialog {
Gtk::ComboBoxText* loadParamsPreference;
Options moptions;
sigc::connection dmconn, tconn, addc, setc;
sigc::connection dmconn, dmconnBatch, tconn, addc, setc;
void fillPreferences ();
void storePreferences ();
void parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& items, Glib::ustring ext);
void dmethodChanged ();
void dmethodBatchChanged ();
void themeChanged ();