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

Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

Browse Source
This commit is contained in:
DrSlony
2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
rtengine/ffmanager.h
View File

@@ -7,7 +7,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -22,66 +22,78 @@
#include <cmath>
#include "rawimage.h"
namespace rtengine{
namespace rtengine
{
class ffInfo
{
public:
Glib::ustring pathname; // filename of flat field
std::list<Glib::ustring> pathNames; // other similar dark frames, used for average
std::string maker; ///< manufacturer
std::string model; ///< model
std::string lens; ///< lens
int iso; ///< ISO (gain)
double shutter; ///< shutter or exposure time in sec
double aperture; ///< aperture in stops
double focallength; ///< focal length in mm
time_t timestamp; ///< seconds since 1 Jan 1970
Glib::ustring pathname; // filename of flat field
std::list<Glib::ustring> pathNames; // other similar dark frames, used for average
std::string maker; ///< manufacturer
std::string model; ///< model
std::string lens; ///< lens
int iso; ///< ISO (gain)
double shutter; ///< shutter or exposure time in sec
double aperture; ///< aperture in stops
double focallength; ///< focal length in mm
time_t timestamp; ///< seconds since 1 Jan 1970
ffInfo(const Glib::ustring &name, const std::string &mak, const std::string &mod,const std::string & len,double focal,double apert,time_t t)
:pathname(name),maker(mak),model(mod),lens(len),aperture(apert),focallength(focal),timestamp(t),ri(NULL){}
ffInfo(const Glib::ustring &name, const std::string &mak, const std::string &mod, const std::string & len, double focal, double apert, time_t t)
: pathname(name), maker(mak), model(mod), lens(len), aperture(apert), focallength(focal), timestamp(t), ri(NULL) {}
ffInfo( const ffInfo &o)
:pathname(o.pathname),maker(o.maker),model(o.model),lens(o.lens),aperture(o.aperture),focallength(o.focallength),timestamp(o.timestamp),ri(NULL){}
~ffInfo() { if( ri ) delete ri; }
ffInfo( const ffInfo &o)
: pathname(o.pathname), maker(o.maker), model(o.model), lens(o.lens), aperture(o.aperture), focallength(o.focallength), timestamp(o.timestamp), ri(NULL) {}
~ffInfo()
{
if( ri ) {
delete ri;
}
}
ffInfo &operator =(const ffInfo &o);
bool operator <(const ffInfo &e2) const;
// Calculate virtual distance between two shots; different model return infinite
double distance(const std::string &mak, const std::string &mod, const std::string &lens, double focallength, double aperture) const;
ffInfo &operator =(const ffInfo &o);
bool operator <(const ffInfo &e2) const;
static std::string key(const std::string &mak, const std::string &mod, const std::string &len, double focal, double apert );
std::string key(){ return key( maker,model,lens,focallength,aperture); }
// Calculate virtual distance between two shots; different model return infinite
double distance(const std::string &mak, const std::string &mod, const std::string &lens, double focallength, double aperture) const;
RawImage *getRawImage();
static std::string key(const std::string &mak, const std::string &mod, const std::string &len, double focal, double apert );
std::string key()
{
return key( maker, model, lens, focallength, aperture);
}
RawImage *getRawImage();
protected:
RawImage *ri; ///< Flat Field raw data
RawImage *ri; ///< Flat Field raw data
void updateRawImage();
void updateRawImage();
};
class FFManager
{
public:
void init( Glib::ustring pathname );
Glib::ustring getPathname(){ return currentPath; };
void getStat( int &totFiles, int &totTemplate);
RawImage *searchFlatField( const std::string &mak, const std::string &mod, const std::string &len, double focallength, double apert, time_t t );
RawImage *searchFlatField( const Glib::ustring filename );
void init( Glib::ustring pathname );
Glib::ustring getPathname()
{
return currentPath;
};
void getStat( int &totFiles, int &totTemplate);
RawImage *searchFlatField( const std::string &mak, const std::string &mod, const std::string &len, double focallength, double apert, time_t t );
RawImage *searchFlatField( const Glib::ustring filename );
protected:
typedef std::multimap<std::string,ffInfo> ffList_t;
typedef std::map<std::string, std::list<badPix> > bpList_t;
ffList_t ffList;
bool initialized;
Glib::ustring currentPath;
ffInfo *addFileInfo(const Glib::ustring &filename, bool pool=true );
ffInfo *find( const std::string &mak, const std::string &mod, const std::string &len, double focal, double apert, time_t t );
typedef std::multimap<std::string, ffInfo> ffList_t;
typedef std::map<std::string, std::list<badPix> > bpList_t;
ffList_t ffList;
bool initialized;
Glib::ustring currentPath;
ffInfo *addFileInfo(const Glib::ustring &filename, bool pool = true );
ffInfo *find( const std::string &mak, const std::string &mod, const std::string &len, double focal, double apert, time_t t );
};
extern FFManager ffm;