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

Support for Fuji X-Trans-Sensor, Issue 2415 (thanks to Hombre for the changes to gui); Clip Control for Flat Field correction, Issue 2441; Update to dcraw 9.22 1.467

Browse Source
This commit is contained in:
Ingo
2014-07-10 00:33:33 +02:00
parent 3cf0da217a
commit 617b888fa0
65 changed files with 3832 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
rtgui/flatfield.cc
View File

@@ -29,14 +29,15 @@ using namespace rtengine::procparams;
FlatField::FlatField () : FoldableToolPanel(this)
{
hbff = Gtk::manage(new Gtk::HBox());
hbff->set_spacing(2);
flatFieldFile = Gtk::manage(new MyFileChooserButton(M("TP_FLATFIELD_LABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
flatFieldFilePersister.reset(new FileChooserLastFolderPersister(flatFieldFile, options.lastFlatfieldDir));
ffLabel = Gtk::manage(new Gtk::Label(M("GENERAL_FILE")));
flatFieldFileReset = Gtk::manage(new Gtk::Button());
flatFieldFileReset->set_image (*Gtk::manage(new RTImage ("gtk-cancel.png")));
hbff->pack_start(*ffLabel, Gtk::PACK_SHRINK, 4);
hbff->pack_start(*ffLabel, Gtk::PACK_SHRINK, 0);
hbff->pack_start(*flatFieldFile);
hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 4);
hbff->pack_start(*flatFieldFileReset, Gtk::PACK_SHRINK, 0);
flatFieldAutoSelect = Gtk::manage(new Gtk::CheckButton((M("TP_FLATFIELD_AUTOSELECT"))));
ffInfo = Gtk::manage(new Gtk::Label(""));
ffInfo->set_alignment(0,0); //left align
@@ -46,7 +47,8 @@ FlatField::FlatField () : FoldableToolPanel(this)
flatFieldBlurRadius->show();
Gtk::HBox* hbffbt = Gtk::manage (new Gtk::HBox ());
hbffbt->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_FLATFIELD_BLURTYPE") +": ")));
hbffbt->pack_start (*Gtk::manage (new Gtk::Label ( M("TP_FLATFIELD_BLURTYPE") +":")));
hbffbt->set_spacing(4);
flatFieldBlurType = Gtk::manage (new MyComboBoxText ());
flatFieldBlurType->append_text(M("TP_FLATFIELD_BT_AREA"));
flatFieldBlurType->append_text(M("TP_FLATFIELD_BT_VERTICAL"));
@@ -55,11 +57,19 @@ FlatField::FlatField () : FoldableToolPanel(this)
flatFieldBlurType->set_active(0);
hbffbt->pack_end (*flatFieldBlurType);
pack_start( *hbff, Gtk::PACK_SHRINK, 4);
pack_start( *flatFieldAutoSelect, Gtk::PACK_SHRINK, 4);
pack_start( *ffInfo, Gtk::PACK_SHRINK, 4);
pack_start( *hbffbt, Gtk::PACK_SHRINK, 4);
pack_start( *flatFieldBlurRadius, Gtk::PACK_SHRINK, 4);
flatFieldClipControl = Gtk::manage (new Adjuster(M("TP_FLATFIELD_CLIPCONTROL"), 0., 100., 1., 0.));
flatFieldClipControl->setAdjusterListener(this);
flatFieldClipControl->addAutoButton("");
if (flatFieldClipControl->delay < 1000) flatFieldClipControl->delay = 1000;
flatFieldClipControl->show();
flatFieldClipControl->set_tooltip_markup (M("TP_FLATFIELD_CLIPCONTROL_TOOLTIP"));
pack_start( *hbff, Gtk::PACK_SHRINK, 0);
pack_start( *flatFieldAutoSelect, Gtk::PACK_SHRINK, 0);
pack_start( *ffInfo, Gtk::PACK_SHRINK, 0);
pack_start( *hbffbt, Gtk::PACK_SHRINK, 0);
pack_start( *flatFieldBlurRadius, Gtk::PACK_SHRINK, 0);
pack_start( *flatFieldClipControl, Gtk::PACK_SHRINK, 0);
flatFieldFileconn = flatFieldFile->signal_file_set().connect ( sigc::mem_fun(*this, &FlatField::flatFieldFileChanged), true);
flatFieldFileReset->signal_clicked().connect( sigc::mem_fun(*this, &FlatField::flatFieldFile_Reset), true );
@@ -74,9 +84,28 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
flatFieldAutoSelectconn.block (true);
flatFieldBlurTypeconn.block (true);
//flatFieldBlurType
for( size_t i=0; i< procparams::RAWParams::numFlatFileBlurTypes;i++)
if( pp->raw.ff_BlurType == procparams::RAWParams::ff_BlurTypestring[i]){
flatFieldBlurType->set_active(i);
break;
}
if (multiImage || pp->raw.ff_BlurType == procparams::RAWParams::ff_BlurTypestring[procparams::RAWParams::area_ff])
flatFieldClipControl->show();
else
flatFieldClipControl->hide();
flatFieldAutoSelect->set_active (pp->raw.ff_AutoSelect);
flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
flatFieldClipControl->setValue (pp->raw.ff_clipControl);
flatFieldClipControl->setAutoValue (pp->raw.ff_AutoClipControl);
if(pedited ){
flatFieldAutoSelect->set_inconsistent (!pedited->raw.ff_AutoSelect);
flatFieldBlurRadius->setEditedState( pedited->raw.ff_BlurRadius ? Edited : UnEdited );
flatFieldClipControl->setEditedState( pedited->raw.ff_clipControl ? Edited : UnEdited );
flatFieldClipControl->setAutoInconsistent(multiImage && !pedited->raw.ff_AutoClipControl);
if( !pedited->raw.ff_BlurType )
flatFieldBlurType->set_active(procparams::RAWParams::numFlatFileBlurTypes); // No name
}
@@ -87,6 +116,8 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
hbff->set_sensitive( !pp->raw.ff_AutoSelect );
lastFFAutoSelect = pp->raw.ff_AutoSelect;
lastFFAutoClipCtrl = pp->raw.ff_AutoClipControl;
if( pp->raw.ff_AutoSelect && ffp && !batchMode){
// retrieve the auto-selected ff filename
rtengine::RawImage *img = ffp->getFF();
@@ -98,20 +129,6 @@ void FlatField::read(const rtengine::procparams::ProcParams* pp, const ParamsEdi
}
else ffInfo->set_text("");
flatFieldAutoSelect ->set_active(pp->raw.ff_AutoSelect);
flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
flatFieldBlurType->set_active(procparams::RAWParams::numFlatFileBlurTypes);
//flatFieldBlurType
for( size_t i=0; i< procparams::RAWParams::numFlatFileBlurTypes;i++)
if( pp->raw.ff_BlurType == procparams::RAWParams::ff_BlurTypestring[i]){
flatFieldBlurType->set_active(i);
break;
}
flatFieldAutoSelect->set_active (pp->raw.ff_AutoSelect);
flatFieldBlurRadius->setValue (pp->raw.ff_BlurRadius);
ffChanged = false;
flatFieldAutoSelectconn.block (false);
@@ -124,6 +141,8 @@ void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedit
pp->raw.ff_file = flatFieldFile->get_filename();
pp->raw.ff_AutoSelect = flatFieldAutoSelect->get_active();
pp->raw.ff_BlurRadius = flatFieldBlurRadius->getIntValue();
pp->raw.ff_clipControl = flatFieldClipControl->getIntValue();
pp->raw.ff_AutoClipControl = flatFieldClipControl->getAutoValue();
int currentRow = flatFieldBlurType->get_active_row_number();
if( currentRow>=0 && currentRow < procparams::RAWParams::numFlatFileBlurTypes)
@@ -133,6 +152,8 @@ void FlatField::write( rtengine::procparams::ProcParams* pp, ParamsEdited* pedit
pedited->raw.ff_file = ffChanged;
pedited->raw.ff_AutoSelect = !flatFieldAutoSelect->get_inconsistent();
pedited->raw.ff_BlurRadius = flatFieldBlurRadius->getEditedState ();
pedited->raw.ff_clipControl = flatFieldClipControl->getEditedState ();
pedited->raw.ff_AutoClipControl = !flatFieldClipControl->getAutoInconsistent();
pedited->raw.ff_BlurType = flatFieldBlurType->get_active_row_number() != procparams::RAWParams::numFlatFileBlurTypes;
}
@@ -144,7 +165,36 @@ void FlatField::adjusterChanged (Adjuster* a, double newval)
Glib::ustring value = a->getTextValue();
listener->panelChanged (EvFlatFieldBlurRadius, value );
if (a==flatFieldBlurRadius)
listener->panelChanged (EvFlatFieldBlurRadius, value);
else if (a==flatFieldClipControl)
listener->panelChanged (EvFlatFieldClipControl, value);
}
}
void FlatField::adjusterAutoToggled (Adjuster* a, bool newval) {
if (multiImage) {
if (flatFieldClipControl->getAutoInconsistent()) {
flatFieldClipControl->setAutoInconsistent(false);
flatFieldClipControl->setAutoValue(false);
}
else if (lastFFAutoClipCtrl)
flatFieldClipControl->setAutoInconsistent(true);
lastFFAutoClipCtrl = flatFieldClipControl->getAutoValue();
}
if (listener) {
if(a==flatFieldClipControl) {
if (flatFieldClipControl->getAutoInconsistent())
listener->panelChanged (EvFlatFieldAutoClipControl, M("GENERAL_UNCHANGED"));
else if (flatFieldClipControl->getAutoValue())
listener->panelChanged (EvFlatFieldAutoClipControl, M("GENERAL_ENABLED"));
else
listener->panelChanged (EvFlatFieldAutoClipControl, M("GENERAL_DISABLED"));
}
}
}
@@ -152,16 +202,28 @@ void FlatField::setBatchMode(bool batchMode)
{
ToolPanel::setBatchMode (batchMode);
flatFieldBlurRadius->showEditedCB ();
flatFieldClipControl->showEditedCB ();
}
void FlatField::setAdjusterBehavior (bool clipctrladd) {
flatFieldClipControl->setAddMode(clipctrladd);
}
void FlatField::trimValues (rtengine::procparams::ProcParams* pp) {
flatFieldClipControl->trimValue(pp->raw.ff_clipControl);
}
void FlatField::setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited)
{
flatFieldBlurRadius->setDefault( defParams->raw.ff_BlurRadius);
flatFieldClipControl->setDefault( defParams->raw.ff_clipControl);
if (pedited) {
flatFieldBlurRadius->setDefaultEditedState( pedited->raw.ff_BlurRadius ? Edited : UnEdited);
flatFieldClipControl->setDefaultEditedState( pedited->raw.ff_clipControl ? Edited : UnEdited);
} else {
flatFieldBlurRadius->setDefaultEditedState( Irrelevant );
flatFieldClipControl->setDefaultEditedState( Irrelevant );
}
}
@@ -198,6 +260,11 @@ void FlatField::flatFieldBlurTypeChanged ()
if( curSelection>=0 && curSelection < procparams::RAWParams::numFlatFileBlurTypes)
s = flatFieldBlurType->get_active_text();
if (multiImage || curSelection == procparams::RAWParams::area_ff)
flatFieldClipControl->show();
else
flatFieldClipControl->hide();
if (listener)
listener->panelChanged (EvFlatFieldBlurType, s);
}