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

fixes for Dark Frame and Flat Field autoselect

Browse Source
This commit is contained in:
michael
2011-02-04 16:47:58 -05:00
parent c86a788843
commit 93fa7e25ae
7 changed files with 66 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/preprocess.cc
View File

@@ -181,7 +181,7 @@ void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
rtengine::RawImage *img = dfp->getDF();
if( img ){
std::ostringstream s;
s << Glib::path_get_basename(img->get_filename()) << ":" <<img->get_ISOspeed() << "ISO " << img->get_shutter() << "s";
s << Glib::path_get_basename(img->get_filename()) << ": " <<img->get_ISOspeed() << "ISO " << img->get_shutter() << "s";
dfInfo->set_text( s.str() );
}else{
dfInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
@@ -195,7 +195,7 @@ void PreProcess::read(const rtengine::procparams::ProcParams* pp, const ParamsEd
rtengine::RawImage *img = ffp->getFF();
if( img ){
std::ostringstream s;
s << Glib::path_get_basename(img->get_filename()) << ":" <<img->get_ISOspeed() << "ISO f/" << img->get_aperture();
s << Glib::path_get_basename(img->get_filename()) << ": " << "f/" << img->get_aperture(); // !!! need to add focallength in mm and format aperture to ##.#
ffInfo->set_text( s.str() );
}else{
ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
@@ -375,7 +375,7 @@ void PreProcess::dfAutoChanged()
rtengine::RawImage *img = dfp->getDF();
if( img ){
std::ostringstream s;
s << Glib::path_get_basename(img->get_filename()) << ":" <<img->get_ISOspeed() << "ISO " << img->get_shutter() << "s";
s << Glib::path_get_basename(img->get_filename()) << ": " <<img->get_ISOspeed() << "ISO " << img->get_shutter() << "s";
dfInfo->set_text( s.str() );
}else{
dfInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));
@@ -483,7 +483,7 @@ void PreProcess::flatFieldAutoSelectChanged()
rtengine::RawImage *img = ffp->getFF();
if( img ){
std::ostringstream s;
s << Glib::path_get_basename(img->get_filename()) << ":" <<img->get_ISOspeed() << "ISO " << img->get_shutter() << "s";
s << Glib::path_get_basename(img->get_filename()) << ": " << "f/" << img->get_aperture(); // !!! need to add focallength in mm and format aperture to ##.#
ffInfo->set_text( s.str() );
}else{
ffInfo->set_text(Glib::ustring(M("TP_PREPROCESS_NO_FOUND")));

4
rtgui/toolpanelcoord.cc
View File

@@ -424,11 +424,13 @@ rtengine::RawImage* ToolPanelCoordinator::getFF()
int iso = imd->getISOSpeed();
double shutter = imd->getShutterSpeed();
double aperture = imd->getFNumber();
double focallength = imd->getFocalLen();
std::string maker( imd->getMake() );
std::string model( imd->getModel() );
std::string lens( imd->getLens() );
time_t timestamp = imd->getDateTimeAsTS();
return rtengine::ffm.searchFlatField( maker,model,iso,shutter,aperture,timestamp);
return rtengine::ffm.searchFlatField( maker,model,lens,focallength,aperture,timestamp);
}
return NULL;
}