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

Solving issue 1760: "ALLEnhance=false added to saved PP3 processing profiles"

Browse Source
This commit is contained in:
natureh 510
2013-03-10 11:57:24 +01:00
parent edeae689a6
commit b038720e37
12 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/improccoordinator.cc
View File

@@ -130,7 +130,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
rp.ca_autocorrect = false; rp.ca_autocorrect = false;
rp.hotdeadpix_filt = false; rp.hotdeadpix_filt = false;
rp.ccSteps = 0; rp.ccSteps = 0;
rp.all_enhance = false; //rp.all_enhance = false;
} }
progress ("Applying white balance, color correction & sRGB conversion...",100*readyphase/numofphases); progress ("Applying white balance, color correction & sRGB conversion...",100*readyphase/numofphases);

2
rtengine/procevents.h
View File

@@ -171,7 +171,7 @@ enum ProcEvent {
EvSharpenEdgeThreechannels=146, EvSharpenEdgeThreechannels=146,
EvSharpenMicroEnabled=147, EvSharpenMicroEnabled=147,
EvSharpenMicroMatrix=148, EvSharpenMicroMatrix=148,
EvDemosaicALLEnhanced=149, EvDemosaicALLEnhanced=149, // Disabled but not removed for now, may be reintroduced some day
EvVibranceEnabled=150, EvVibranceEnabled=150,
EvVibrancePastels=151, EvVibrancePastels=151,
EvVibranceSaturated=152, EvVibranceSaturated=152,

6
rtengine/procparams.cc
View File

@@ -373,7 +373,7 @@ void ProcParams::setDefaults () {
raw.dmethod = RAWParams::methodstring[RAWParams::hphd];; raw.dmethod = RAWParams::methodstring[RAWParams::hphd];;
raw.dcb_iterations=2; raw.dcb_iterations=2;
raw.dcb_enhance=false; raw.dcb_enhance=false;
raw.all_enhance=false; //raw.all_enhance=false;
// exposure before interpolation // exposure before interpolation
raw.expos=1.0; raw.expos=1.0;
@@ -836,7 +836,7 @@ int ProcParams::save (Glib::ustring fname, Glib::ustring fname2, ParamsEdited* p
if (!pedited || pedited->raw.dmethod) keyFile.set_string ("RAW", "Method", raw.dmethod ); if (!pedited || pedited->raw.dmethod) keyFile.set_string ("RAW", "Method", raw.dmethod );
if (!pedited || pedited->raw.dcbIterations) keyFile.set_integer ("RAW", "DCBIterations", raw.dcb_iterations ); if (!pedited || pedited->raw.dcbIterations) keyFile.set_integer ("RAW", "DCBIterations", raw.dcb_iterations );
if (!pedited || pedited->raw.dcbEnhance) keyFile.set_boolean ("RAW", "DCBEnhance", raw.dcb_enhance ); if (!pedited || pedited->raw.dcbEnhance) keyFile.set_boolean ("RAW", "DCBEnhance", raw.dcb_enhance );
if (!pedited || pedited->raw.allEnhance) keyFile.set_boolean ("RAW", "ALLEnhance", raw.all_enhance ); //if (!pedited || pedited->raw.allEnhance) keyFile.set_boolean ("RAW", "ALLEnhance", raw.all_enhance );
// save raw exposition // save raw exposition
if (!pedited || pedited->raw.exPos) keyFile.set_double ("RAW", "PreExposure", raw.expos ); if (!pedited || pedited->raw.exPos) keyFile.set_double ("RAW", "PreExposure", raw.expos );
@@ -1367,7 +1367,7 @@ if (keyFile.has_group ("RAW")) {
if (keyFile.has_key ("RAW", "Method")) { raw.dmethod = keyFile.get_string ("RAW", "Method"); if (pedited) pedited->raw.dmethod = true; } if (keyFile.has_key ("RAW", "Method")) { raw.dmethod = keyFile.get_string ("RAW", "Method"); if (pedited) pedited->raw.dmethod = true; }
if (keyFile.has_key ("RAW", "DCBIterations")) { raw.dcb_iterations = keyFile.get_integer("RAW", "DCBIterations"); if (pedited) pedited->raw.dcbIterations = true; } if (keyFile.has_key ("RAW", "DCBIterations")) { raw.dcb_iterations = keyFile.get_integer("RAW", "DCBIterations"); if (pedited) pedited->raw.dcbIterations = true; }
if (keyFile.has_key ("RAW", "DCBEnhance")) { raw.dcb_enhance =keyFile.get_boolean("RAW", "DCBEnhance"); if (pedited) pedited->raw.dcbEnhance = true; } if (keyFile.has_key ("RAW", "DCBEnhance")) { raw.dcb_enhance =keyFile.get_boolean("RAW", "DCBEnhance"); if (pedited) pedited->raw.dcbEnhance = true; }
if (keyFile.has_key ("RAW", "ALLEnhance")) { raw.all_enhance =keyFile.get_boolean("RAW", "ALLEnhance"); if (pedited) pedited->raw.allEnhance = true; } //if (keyFile.has_key ("RAW", "ALLEnhance")) { raw.all_enhance =keyFile.get_boolean("RAW", "ALLEnhance"); if (pedited) pedited->raw.allEnhance = true; }
if (keyFile.has_key ("RAW", "PreExposure")) { raw.expos =keyFile.get_double("RAW", "PreExposure"); if (pedited) pedited->raw.exPos = true; } if (keyFile.has_key ("RAW", "PreExposure")) { raw.expos =keyFile.get_double("RAW", "PreExposure"); if (pedited) pedited->raw.exPos = true; }
if (keyFile.has_key ("RAW", "PrePreserv")) { raw.preser =keyFile.get_double("RAW", "PrePreserv"); if (pedited) pedited->raw.exPreser = true; } if (keyFile.has_key ("RAW", "PrePreserv")) { raw.preser =keyFile.get_double("RAW", "PrePreserv"); if (pedited) pedited->raw.exPreser = true; }

3
rtengine/procparams.h
View File

@@ -729,8 +729,7 @@ class RAWParams {
Glib::ustring dmethod; Glib::ustring dmethod;
int dcb_iterations; int dcb_iterations;
bool dcb_enhance; bool dcb_enhance;
bool all_enhance; //bool all_enhance;
}; };
/** /**

2
rtengine/refreshmap.cc
View File

@@ -169,7 +169,7 @@ SHARPENING, // EvSharpenEdgeEnabled
SHARPENING, // EvSharpenEdgeThreechannels SHARPENING, // EvSharpenEdgeThreechannels
SHARPENING, // EvSharpenMicroEnabled SHARPENING, // EvSharpenMicroEnabled
SHARPENING, // EvSharpenMicroMatrix SHARPENING, // EvSharpenMicroMatrix
DEMOSAIC, // EvDemosaicALLEnhanced DEMOSAIC, // EvDemosaicALLEnhanced // Disabled but not removed for now, may be reintroduced some day
RGBCURVE, // EvVibranceEnabled RGBCURVE, // EvVibranceEnabled
RGBCURVE, // EvVibrancePastels RGBCURVE, // EvVibrancePastels
RGBCURVE, // EvVibranceSaturated RGBCURVE, // EvVibranceSaturated

16
rtgui/exportpanel.cc
View File

@@ -56,7 +56,7 @@ ExportPanel::ExportPanel () : listener (NULL) {
bypass_dirpyrDenoise = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_DIRPYRDENOISE"))); bypass_dirpyrDenoise = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_DIRPYRDENOISE")));
bypass_sh_hq = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_SH_HQ"))); bypass_sh_hq = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_SH_HQ")));
bypass_dirpyrequalizer = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_DIRPYREQUALIZER"))); bypass_dirpyrequalizer = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_DIRPYREQUALIZER")));
bypass_raw_all_enhance = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_ALL_ENHANCE"))); //bypass_raw_all_enhance = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_ALL_ENHANCE")));
bypass_raw_ccSteps = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_CCSTEPS"))); bypass_raw_ccSteps = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_CCSTEPS")));
bypass_raw_linenoise = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_LINENOISE"))); bypass_raw_linenoise = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_LINENOISE")));
bypass_raw_greenthresh = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_GREENTHRESH"))); bypass_raw_greenthresh = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_BYPASS_RAW_GREENTHRESH")));
@@ -89,7 +89,7 @@ ExportPanel::ExportPanel () : listener (NULL) {
pack_start(*bypass_dirpyrequalizer , Gtk::PACK_SHRINK, 4); pack_start(*bypass_dirpyrequalizer , Gtk::PACK_SHRINK, 4);
pack_start(*hb_raw_dmethod , Gtk::PACK_SHRINK, 4); pack_start(*hb_raw_dmethod , Gtk::PACK_SHRINK, 4);
pack_start(*bypass_raw_all_enhance , Gtk::PACK_SHRINK, 4); //pack_start(*bypass_raw_all_enhance , Gtk::PACK_SHRINK, 4);
pack_start(*bypass_raw_ccSteps , Gtk::PACK_SHRINK, 4); pack_start(*bypass_raw_ccSteps , Gtk::PACK_SHRINK, 4);
pack_start(*bypass_raw_dcb_iterations, Gtk::PACK_SHRINK, 4); pack_start(*bypass_raw_dcb_iterations, Gtk::PACK_SHRINK, 4);
pack_start(*bypass_raw_dcb_enhance , Gtk::PACK_SHRINK, 4); pack_start(*bypass_raw_dcb_enhance , Gtk::PACK_SHRINK, 4);
@@ -168,7 +168,7 @@ ExportPanel::ExportPanel () : listener (NULL) {
bypass_dirpyrDenoiseConn = bypass_dirpyrDenoise->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); bypass_dirpyrDenoiseConn = bypass_dirpyrDenoise->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
bypass_sh_hqConn = bypass_sh_hq->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); bypass_sh_hqConn = bypass_sh_hq->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
bypass_dirpyrequalizerConn = bypass_dirpyrequalizer->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); bypass_dirpyrequalizerConn = bypass_dirpyrequalizer->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
bypass_raw_all_enhanceConn = bypass_raw_all_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); //bypass_raw_all_enhanceConn = bypass_raw_all_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
bypass_raw_ccStepsConn = bypass_raw_ccSteps->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); bypass_raw_ccStepsConn = bypass_raw_ccSteps->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
bypass_raw_dcb_iterationsConn = bypass_raw_dcb_iterations->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); bypass_raw_dcb_iterationsConn = bypass_raw_dcb_iterations->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
bypass_raw_dcb_enhanceConn = bypass_raw_dcb_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true)); bypass_raw_dcb_enhanceConn = bypass_raw_dcb_enhance->signal_toggled().connect (sigc::bind (sigc::mem_fun(*bypass_ALL, &Gtk::CheckButton::set_inconsistent), true));
@@ -207,7 +207,7 @@ void ExportPanel::SaveSettingsAsDefault(){
options.fastexport_bypass_dirpyrDenoise = bypass_dirpyrDenoise->get_active (); options.fastexport_bypass_dirpyrDenoise = bypass_dirpyrDenoise->get_active ();
options.fastexport_bypass_sh_hq = bypass_sh_hq->get_active (); options.fastexport_bypass_sh_hq = bypass_sh_hq->get_active ();
options.fastexport_bypass_dirpyrequalizer = bypass_dirpyrequalizer->get_active (); options.fastexport_bypass_dirpyrequalizer = bypass_dirpyrequalizer->get_active ();
options.fastexport_bypass_raw_all_enhance = bypass_raw_all_enhance->get_active (); //options.fastexport_bypass_raw_all_enhance = bypass_raw_all_enhance->get_active ();
options.fastexport_bypass_raw_ccSteps = bypass_raw_ccSteps->get_active (); options.fastexport_bypass_raw_ccSteps = bypass_raw_ccSteps->get_active ();
options.fastexport_bypass_raw_dcb_iterations = bypass_raw_dcb_iterations->get_active(); options.fastexport_bypass_raw_dcb_iterations = bypass_raw_dcb_iterations->get_active();
options.fastexport_bypass_raw_dcb_enhance = bypass_raw_dcb_enhance->get_active (); options.fastexport_bypass_raw_dcb_enhance = bypass_raw_dcb_enhance->get_active ();
@@ -260,7 +260,7 @@ void ExportPanel::LoadDefaultSettings(){
bypass_dirpyrDenoise->set_active (options.fastexport_bypass_dirpyrDenoise ); bypass_dirpyrDenoise->set_active (options.fastexport_bypass_dirpyrDenoise );
bypass_sh_hq->set_active (options.fastexport_bypass_sh_hq ); bypass_sh_hq->set_active (options.fastexport_bypass_sh_hq );
bypass_dirpyrequalizer->set_active (options.fastexport_bypass_dirpyrequalizer ); bypass_dirpyrequalizer->set_active (options.fastexport_bypass_dirpyrequalizer );
bypass_raw_all_enhance->set_active (options.fastexport_bypass_raw_all_enhance ); //bypass_raw_all_enhance->set_active (options.fastexport_bypass_raw_all_enhance );
bypass_raw_ccSteps->set_active (options.fastexport_bypass_raw_ccSteps ); bypass_raw_ccSteps->set_active (options.fastexport_bypass_raw_ccSteps );
bypass_raw_dcb_iterations->set_active(options.fastexport_bypass_raw_dcb_iterations ); bypass_raw_dcb_iterations->set_active(options.fastexport_bypass_raw_dcb_iterations );
bypass_raw_dcb_enhance->set_active (options.fastexport_bypass_raw_dcb_enhance ); bypass_raw_dcb_enhance->set_active (options.fastexport_bypass_raw_dcb_enhance );
@@ -329,7 +329,7 @@ void ExportPanel::bypassALL_Toggled(){
bypass_dirpyrDenoiseConn.block (true); bypass_dirpyrDenoiseConn.block (true);
bypass_sh_hqConn.block (true); bypass_sh_hqConn.block (true);
bypass_dirpyrequalizerConn.block (true); bypass_dirpyrequalizerConn.block (true);
bypass_raw_all_enhanceConn.block (true); //bypass_raw_all_enhanceConn.block (true);
bypass_raw_ccStepsConn.block (true); bypass_raw_ccStepsConn.block (true);
bypass_raw_dcb_iterationsConn.block (true); bypass_raw_dcb_iterationsConn.block (true);
bypass_raw_dcb_enhanceConn.block (true); bypass_raw_dcb_enhanceConn.block (true);
@@ -350,7 +350,7 @@ void ExportPanel::bypassALL_Toggled(){
bypass_dirpyrDenoise->set_active(bypass_ALL->get_active()); bypass_dirpyrDenoise->set_active(bypass_ALL->get_active());
bypass_sh_hq->set_active(bypass_ALL->get_active()); bypass_sh_hq->set_active(bypass_ALL->get_active());
bypass_dirpyrequalizer->set_active(bypass_ALL->get_active()); bypass_dirpyrequalizer->set_active(bypass_ALL->get_active());
bypass_raw_all_enhance->set_active(bypass_ALL->get_active()); //bypass_raw_all_enhance->set_active(bypass_ALL->get_active());
bypass_raw_ccSteps->set_active(bypass_ALL->get_active()); bypass_raw_ccSteps->set_active(bypass_ALL->get_active());
bypass_raw_dcb_iterations->set_active(bypass_ALL->get_active()); bypass_raw_dcb_iterations->set_active(bypass_ALL->get_active());
bypass_raw_dcb_enhance->set_active(bypass_ALL->get_active()); bypass_raw_dcb_enhance->set_active(bypass_ALL->get_active());
@@ -369,7 +369,7 @@ void ExportPanel::bypassALL_Toggled(){
bypass_dirpyrDenoiseConn.block (false); bypass_dirpyrDenoiseConn.block (false);
bypass_sh_hqConn.block (false); bypass_sh_hqConn.block (false);
bypass_dirpyrequalizerConn.block (false); bypass_dirpyrequalizerConn.block (false);
bypass_raw_all_enhanceConn.block (false); //bypass_raw_all_enhanceConn.block (false);
bypass_raw_ccStepsConn.block (false); bypass_raw_ccStepsConn.block (false);
bypass_raw_dcb_iterationsConn.block (false); bypass_raw_dcb_iterationsConn.block (false);
bypass_raw_dcb_enhanceConn.block (false); bypass_raw_dcb_enhanceConn.block (false);

4
rtgui/exportpanel.h
View File

@@ -51,7 +51,7 @@ class ExportPanel : public Gtk::VBox {
icm_gamma = "default"; icm_gamma = "default";
*/ */
Gtk::CheckButton* bypass_dirpyrequalizer; // also could leave untouched but disable only small radius adjustments Gtk::CheckButton* bypass_dirpyrequalizer; // also could leave untouched but disable only small radius adjustments
Gtk::CheckButton* bypass_raw_all_enhance; //Gtk::CheckButton* bypass_raw_all_enhance;
Gtk::CheckButton* bypass_raw_ca; // wraps raw.cared, raw.cablue, raw.ca_autocorrect Gtk::CheckButton* bypass_raw_ca; // wraps raw.cared, raw.cablue, raw.ca_autocorrect
Gtk::CheckButton* bypass_raw_df; //wraps raw.dark_frame, raw.df_AutoSelect Gtk::CheckButton* bypass_raw_df; //wraps raw.dark_frame, raw.df_AutoSelect
@@ -83,7 +83,7 @@ class ExportPanel : public Gtk::VBox {
sigc::connection bypass_dirpyrDenoiseConn ; sigc::connection bypass_dirpyrDenoiseConn ;
sigc::connection bypass_sh_hqConn ; sigc::connection bypass_sh_hqConn ;
sigc::connection bypass_dirpyrequalizerConn ; sigc::connection bypass_dirpyrequalizerConn ;
sigc::connection bypass_raw_all_enhanceConn ; //sigc::connection bypass_raw_all_enhanceConn ;
sigc::connection bypass_raw_ccStepsConn ; sigc::connection bypass_raw_ccStepsConn ;
sigc::connection bypass_raw_dcb_iterationsConn; sigc::connection bypass_raw_dcb_iterationsConn;
sigc::connection bypass_raw_dcb_enhanceConn ; sigc::connection bypass_raw_dcb_enhanceConn ;

2
rtgui/filecatalog.cc
View File

@@ -881,7 +881,7 @@ void FileCatalog::developRequested (std::vector<FileBrowserEntry*> tbe, bool fas
if (options.fastexport_bypass_dirpyrDenoise ) params.dirpyrDenoise.enabled = false; if (options.fastexport_bypass_dirpyrDenoise ) params.dirpyrDenoise.enabled = false;
if (options.fastexport_bypass_sh_hq ) params.sh.hq = false; if (options.fastexport_bypass_sh_hq ) params.sh.hq = false;
if (options.fastexport_bypass_dirpyrequalizer ) params.dirpyrequalizer.enabled = false; if (options.fastexport_bypass_dirpyrequalizer ) params.dirpyrequalizer.enabled = false;
if (options.fastexport_bypass_raw_all_enhance ) params.raw.all_enhance = false; //if (options.fastexport_bypass_raw_all_enhance ) params.raw.all_enhance = false;
if (options.fastexport_bypass_raw_ccSteps ) params.raw.ccSteps = 0; if (options.fastexport_bypass_raw_ccSteps ) params.raw.ccSteps = 0;
if (options.fastexport_bypass_raw_dcb_iterations ) params.raw.dcb_iterations = 0; if (options.fastexport_bypass_raw_dcb_iterations ) params.raw.dcb_iterations = 0;
if (options.fastexport_bypass_raw_dcb_enhance ) params.raw.dcb_enhance = false; if (options.fastexport_bypass_raw_dcb_enhance ) params.raw.dcb_enhance = false;

6
rtgui/options.cc
View File

@@ -327,7 +327,7 @@ void Options::setDefaults () {
fastexport_bypass_dirpyrDenoise = true; fastexport_bypass_dirpyrDenoise = true;
fastexport_bypass_sh_hq = true; fastexport_bypass_sh_hq = true;
fastexport_bypass_dirpyrequalizer = true; fastexport_bypass_dirpyrequalizer = true;
fastexport_bypass_raw_all_enhance = true; //fastexport_bypass_raw_all_enhance = true;
fastexport_bypass_raw_ccSteps = true; fastexport_bypass_raw_ccSteps = true;
fastexport_bypass_raw_dcb_iterations = true; fastexport_bypass_raw_dcb_iterations = true;
fastexport_bypass_raw_dcb_enhance = true; fastexport_bypass_raw_dcb_enhance = true;
@@ -710,7 +710,7 @@ if (keyFile.has_group ("Fast Export")) {
if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrDenoise" )) fastexport_bypass_dirpyrDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise" ); if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrDenoise" )) fastexport_bypass_dirpyrDenoise = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise" );
if (keyFile.has_key ("Fast Export", "fastexport_bypass_sh_hq" )) fastexport_bypass_sh_hq = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sh_hq" ); if (keyFile.has_key ("Fast Export", "fastexport_bypass_sh_hq" )) fastexport_bypass_sh_hq = keyFile.get_boolean ("Fast Export", "fastexport_bypass_sh_hq" );
if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrequalizer" )) fastexport_bypass_dirpyrequalizer = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer" ); if (keyFile.has_key ("Fast Export", "fastexport_bypass_dirpyrequalizer" )) fastexport_bypass_dirpyrequalizer = keyFile.get_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer" );
if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_all_enhance" )) fastexport_bypass_raw_all_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" ); //if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_all_enhance" )) fastexport_bypass_raw_all_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" );
if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ccSteps" )) fastexport_bypass_raw_ccSteps = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps" ); if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_ccSteps" )) fastexport_bypass_raw_ccSteps = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps" );
if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_iterations")) fastexport_bypass_raw_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations"); if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_iterations")) fastexport_bypass_raw_dcb_iterations = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations");
if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_enhance" )) fastexport_bypass_raw_dcb_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_enhance" ); if (keyFile.has_key ("Fast Export", "fastexport_bypass_raw_dcb_enhance" )) fastexport_bypass_raw_dcb_enhance = keyFile.get_boolean ("Fast Export", "fastexport_bypass_raw_dcb_enhance" );
@@ -956,7 +956,7 @@ int Options::saveToFile (Glib::ustring fname) {
keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise" , fastexport_bypass_dirpyrDenoise ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrDenoise" , fastexport_bypass_dirpyrDenoise );
keyFile.set_boolean ("Fast Export", "fastexport_bypass_sh_hq" , fastexport_bypass_sh_hq ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_sh_hq" , fastexport_bypass_sh_hq );
keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer" , fastexport_bypass_dirpyrequalizer ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_dirpyrequalizer" , fastexport_bypass_dirpyrequalizer );
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" , fastexport_bypass_raw_all_enhance ); //keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_all_enhance" , fastexport_bypass_raw_all_enhance );
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps" , fastexport_bypass_raw_ccSteps ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_ccSteps" , fastexport_bypass_raw_ccSteps );
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations" , fastexport_bypass_raw_dcb_iterations); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_dcb_iterations" , fastexport_bypass_raw_dcb_iterations);
keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_dcb_enhance" , fastexport_bypass_raw_dcb_enhance ); keyFile.set_boolean ("Fast Export", "fastexport_bypass_raw_dcb_enhance" , fastexport_bypass_raw_dcb_enhance );

2
rtgui/options.h
View File

@@ -213,7 +213,7 @@ class Options {
bool fastexport_bypass_dirpyrDenoise; bool fastexport_bypass_dirpyrDenoise;
bool fastexport_bypass_sh_hq; bool fastexport_bypass_sh_hq;
bool fastexport_bypass_dirpyrequalizer; bool fastexport_bypass_dirpyrequalizer;
bool fastexport_bypass_raw_all_enhance; //bool fastexport_bypass_raw_all_enhance;
bool fastexport_bypass_raw_ccSteps; bool fastexport_bypass_raw_ccSteps;
bool fastexport_bypass_raw_dcb_iterations; bool fastexport_bypass_raw_dcb_iterations;
bool fastexport_bypass_raw_dcb_enhance; bool fastexport_bypass_raw_dcb_enhance;

8
rtgui/paramsedited.cc
View File

@@ -224,7 +224,7 @@ void ParamsEdited::set (bool v) {
raw.dmethod = v; raw.dmethod = v;
raw.dcbIterations = v; raw.dcbIterations = v;
raw.dcbEnhance = v; raw.dcbEnhance = v;
raw.allEnhance = v; //raw.allEnhance = v;
raw.caCorrection = v; raw.caCorrection = v;
raw.caBlue = v; raw.caBlue = v;
raw.caRed = v; raw.caRed = v;
@@ -465,7 +465,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
raw.dmethod = raw.dmethod && p.raw.dmethod == other.raw.dmethod; raw.dmethod = raw.dmethod && p.raw.dmethod == other.raw.dmethod;
raw.dcbIterations = raw.dcbIterations && p.raw.dcb_iterations == other.raw.dcb_iterations; raw.dcbIterations = raw.dcbIterations && p.raw.dcb_iterations == other.raw.dcb_iterations;
raw.dcbEnhance = raw.dcbEnhance && p.raw.dcb_enhance == other.raw.dcb_enhance; raw.dcbEnhance = raw.dcbEnhance && p.raw.dcb_enhance == other.raw.dcb_enhance;
raw.allEnhance = raw.allEnhance && p.raw.all_enhance == other.raw.all_enhance; //raw.allEnhance = raw.allEnhance && p.raw.all_enhance == other.raw.all_enhance;
raw.caCorrection = raw.caCorrection && p.raw.ca_autocorrect == other.raw.ca_autocorrect; raw.caCorrection = raw.caCorrection && p.raw.ca_autocorrect == other.raw.ca_autocorrect;
raw.caRed = raw.caRed && p.raw.cared == other.raw.cared; raw.caRed = raw.caRed && p.raw.cared == other.raw.cared;
raw.caBlue = raw.caBlue && p.raw.cablue == other.raw.cablue; raw.caBlue = raw.caBlue && p.raw.cablue == other.raw.cablue;
@@ -712,7 +712,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (raw.dmethod) toEdit.raw.dmethod = mods.raw.dmethod; if (raw.dmethod) toEdit.raw.dmethod = mods.raw.dmethod;
if (raw.dcbIterations) toEdit.raw.dcb_iterations = mods.raw.dcb_iterations; if (raw.dcbIterations) toEdit.raw.dcb_iterations = mods.raw.dcb_iterations;
if (raw.dcbEnhance) toEdit.raw.dcb_enhance = mods.raw.dcb_enhance; if (raw.dcbEnhance) toEdit.raw.dcb_enhance = mods.raw.dcb_enhance;
if (raw.allEnhance) toEdit.raw.all_enhance = mods.raw.all_enhance; //if (raw.allEnhance) toEdit.raw.all_enhance = mods.raw.all_enhance;
if (raw.caCorrection) toEdit.raw.ca_autocorrect = mods.raw.ca_autocorrect; if (raw.caCorrection) toEdit.raw.ca_autocorrect = mods.raw.ca_autocorrect;
if (raw.caRed) toEdit.raw.cared = dontforceSet && options.baBehav[ADDSET_RAWCACORR] ? toEdit.raw.cared + mods.raw.cared : mods.raw.cared; if (raw.caRed) toEdit.raw.cared = dontforceSet && options.baBehav[ADDSET_RAWCACORR] ? toEdit.raw.cared + mods.raw.cared : mods.raw.cared;
@@ -759,7 +759,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
} }
bool RAWParamsEdited::isUnchanged() const { bool RAWParamsEdited::isUnchanged() const {
return ccSteps && dmethod && dcbIterations && dcbEnhance && allEnhance && caCorrection && caRed && caBlue && greenEq return ccSteps && dmethod && dcbIterations && dcbEnhance /*&& allEnhance*/ && caCorrection && caRed && caBlue && greenEq
&& hotDeadPixelFilter && hotDeadPixelThresh && linenoise && darkFrame && dfAuto && ff_file && ff_AutoSelect && ff_BlurRadius && ff_BlurType && hotDeadPixelFilter && hotDeadPixelThresh && linenoise && darkFrame && dfAuto && ff_file && ff_AutoSelect && ff_BlurRadius && ff_BlurType
&& exPos && exPreser && exBlackzero && exBlackone && exBlacktwo && exBlackthree && exTwoGreen; && exPos && exPreser && exBlackzero && exBlackone && exBlacktwo && exBlackthree && exTwoGreen;
} }

2
rtgui/paramsedited.h
View File

@@ -390,7 +390,7 @@ class RAWParamsEdited {
bool dmethod; bool dmethod;
bool dcbIterations; bool dcbIterations;
bool dcbEnhance; bool dcbEnhance;
bool allEnhance; //bool allEnhance;
bool caCorrection; bool caCorrection;
bool caRed; bool caRed;
bool caBlue; bool caBlue;