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

Add override keyword. Thanks @Floessie

Browse Source
This commit is contained in:
heckflosse 2018-11-22 16:19:16 +01:00
parent 6e4e07f8c0
commit 831e18ca45
135 changed files with 1250 additions and 1251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/curves.h
View File

@ -455,11 +455,11 @@ protected:
public: public:
DiagonalCurve (const std::vector<double>& points, int ppn = CURVES_MIN_POLY_POINTS); DiagonalCurve (const std::vector<double>& points, int ppn = CURVES_MIN_POLY_POINTS);
virtual ~DiagonalCurve (); ~DiagonalCurve () override;
double getVal (double t) const; double getVal (double t) const override;
void getVal (const std::vector<double>& t, std::vector<double>& res) const; void getVal (const std::vector<double>& t, std::vector<double>& res) const override;
bool isIdentity () const bool isIdentity () const override
{ {
return kind == DCT_Empty; return kind == DCT_Empty;
}; };
@ -480,12 +480,12 @@ private:
public: public:
FlatCurve (const std::vector<double>& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS); FlatCurve (const std::vector<double>& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS);
virtual ~FlatCurve (); ~FlatCurve () override;
double getVal (double t) const; double getVal (double t) const override;
void getVal (const std::vector<double>& t, std::vector<double>& res) const; void getVal (const std::vector<double>& t, std::vector<double>& res) const override;
bool setIdentityValue (double iVal); bool setIdentityValue (double iVal);
bool isIdentity () const bool isIdentity () const override
{ {
return kind == FCT_Empty; return kind == FCT_Empty;
}; };

2
rtengine/dcraw.cc
View File

@ -6068,7 +6068,7 @@ int CLASS parse_tiff_ifd (int base)
char software[64], *cbuf, *cp; char software[64], *cbuf, *cp;
uchar cfa_pat[16], cfa_pc[] = { 0,1,2,3 }, tab[256]; uchar cfa_pat[16], cfa_pc[] = { 0,1,2,3 }, tab[256];
double cc[2][4][4]; double cc[2][4][4];
double cm[2][4][3] = {NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN,NAN}; double cm[2][4][3] = {{{NAN,NAN,NAN},{NAN,NAN,NAN},{NAN,NAN,NAN},{NAN,NAN,NAN}},{{NAN,NAN,NAN},{NAN,NAN,NAN},{NAN,NAN,NAN},{NAN,NAN,NAN}}};
double cam_xyz[4][3], num; double cam_xyz[4][3], num;
double ab[]={ 1,1,1,1 }, asn[] = { 0,0,0,0 }, xyz[] = { 1,1,1 }; double ab[]={ 1,1,1,1 }, asn[] = { 0,0,0,0 }, xyz[] = { 1,1,1 };
unsigned sony_curve[] = { 0,0,0,0,0,4095 }; unsigned sony_curve[] = { 0,0,0,0,0,4095 };

3
rtengine/dcraw.h
View File

@ -261,7 +261,7 @@ getbithuff_t getbithuff;
class nikbithuff_t class nikbithuff_t
{ {
public: public:
nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){} explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
void operator()() {bitbuf = vbits = 0;}; void operator()() {bitbuf = vbits = 0;};
unsigned operator()(int nbits, ushort *huff); unsigned operator()(int nbits, ushort *huff);
unsigned errorCount() { return errors; } unsigned errorCount() { return errors; }
@ -428,6 +428,7 @@ void kodak_thumb_load_raw();
// sony_decrypt(unsigned *data, int len, int start, int key); // sony_decrypt(unsigned *data, int len, int start, int key);
class sony_decrypt_t{ class sony_decrypt_t{
public: public:
explicit sony_decrypt_t() : p(0) {}
void operator()(unsigned *data, int len, int start, int key); void operator()(unsigned *data, int len, int start, int key);
private: private:
unsigned pad[128], p; unsigned pad[128], p;

12
rtengine/dcrop.h
View File

@ -71,12 +71,12 @@ protected:
public: public:
Crop (ImProcCoordinator* parent, EditDataProvider *editDataProvider, bool isDetailWindow); Crop (ImProcCoordinator* parent, EditDataProvider *editDataProvider, bool isDetailWindow);
virtual ~Crop (); ~Crop () override;
void setEditSubscriber(EditSubscriber* newSubscriber); void setEditSubscriber(EditSubscriber* newSubscriber);
bool hasListener(); bool hasListener();
void update (int todo); void update (int todo);
void setWindow (int cropX, int cropY, int cropW, int cropH, int skip) void setWindow (int cropX, int cropY, int cropW, int cropH, int skip) override
{ {
setCropSizes (cropX, cropY, cropW, cropH, skip, false); setCropSizes (cropX, cropY, cropW, cropH, skip, false);
} }
@ -84,12 +84,12 @@ public:
/** @brief Synchronously look out if a full update is necessary /** @brief Synchronously look out if a full update is necessary
* First try, only make fullUpdate if this returns false * First try, only make fullUpdate if this returns false
*/ */
bool tryUpdate (); bool tryUpdate () override;
/** @brief Asynchronously reprocess the detailed crop */ /** @brief Asynchronously reprocess the detailed crop */
void fullUpdate (); // called via thread void fullUpdate () override; // called via thread
void setListener (DetailedCropListener* il); void setListener (DetailedCropListener* il) override;
void destroy (); void destroy () override;
int get_skip(); int get_skip();
int getLeftBorder(); int getLeftBorder();
int getUpperBorder(); int getUpperBorder();

2
rtengine/histmatching.cc
View File

@ -114,7 +114,7 @@ public:
spline_cubic_set(); spline_cubic_set();
} }
double getVal(double t) const double getVal(double t) const override
{ {
// values under and over the first and last point // values under and over the first and last point
if (t > x[N - 1]) { if (t > x[N - 1]) {

2
rtengine/iccstore.cc
View File

@ -623,7 +623,7 @@ private:
struct PMatrix { struct PMatrix {
double matrix[3][3]; double matrix[3][3];
PMatrix(): matrix{} {} PMatrix(): matrix{} {}
PMatrix(const CMatrix &m) explicit PMatrix(const CMatrix &m)
{ {
set(m); set(m);
} }

46
rtengine/iimage.h
View File

@ -257,7 +257,7 @@ public:
/* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed /* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
* Can be safely used to reallocate an existing image */ * Can be safely used to reallocate an existing image */
void allocate (int W, int H) void allocate (int W, int H) override
{ {
if (W == width && H == height) { if (W == width && H == height) {
@ -327,7 +327,7 @@ public:
} }
} }
void rotate (int deg) void rotate (int deg) override
{ {
if (deg == 90) { if (deg == 90) {
@ -446,7 +446,7 @@ public:
} }
} }
void hflip () void hflip () override
{ {
int width2 = width / 2; int width2 = width / 2;
@ -470,7 +470,7 @@ public:
#endif #endif
} }
void vflip () void vflip () override
{ {
int height2 = height / 2; int height2 = height / 2;
@ -648,7 +648,7 @@ public:
/* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed /* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
* Can be safely used to reallocate an existing image */ * Can be safely used to reallocate an existing image */
void allocate (int W, int H) void allocate (int W, int H) override
{ {
if (W == width && H == height) { if (W == width && H == height) {
@ -736,7 +736,7 @@ public:
} }
} }
void rotate (int deg) void rotate (int deg) override
{ {
if (deg == 90) { if (deg == 90) {
@ -863,7 +863,7 @@ public:
} }
} }
void hflip () void hflip () override
{ {
int width2 = width / 2; int width2 = width / 2;
@ -895,7 +895,7 @@ public:
#endif #endif
} }
void vflip () void vflip () override
{ {
int height2 = height / 2; int height2 = height / 2;
@ -961,7 +961,7 @@ public:
} }
} }
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override
{ {
histogram.clear(); histogram.clear();
avg_r = avg_g = avg_b = 0.; avg_r = avg_g = avg_b = 0.;
@ -993,7 +993,7 @@ public:
} }
} }
void getAutoWBMultipliers (double &rm, double &gm, double &bm) const void getAutoWBMultipliers (double &rm, double &gm, double &bm) const override
{ {
double avg_r = 0.; double avg_r = 0.;
@ -1067,9 +1067,9 @@ public:
} }
} }
virtual void getSpotWBData (double &reds, double &greens, double &blues, int &rn, int &gn, int &bn, void getSpotWBData (double &reds, double &greens, double &blues, int &rn, int &gn, int &bn,
std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue,
int tran) const int tran) const override
{ {
int x; int x;
int y; int y;
@ -1297,7 +1297,7 @@ public:
* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed * If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
* Can be safely used to reallocate an existing image or to free up it's memory with "allocate (0,0);" * Can be safely used to reallocate an existing image or to free up it's memory with "allocate (0,0);"
*/ */
void allocate (int W, int H) void allocate (int W, int H) override
{ {
if (W == width && H == height) { if (W == width && H == height) {
@ -1351,7 +1351,7 @@ public:
memcpy (dest->data, data, 3 * width * height * sizeof(T)); memcpy (dest->data, data, 3 * width * height * sizeof(T));
} }
void rotate (int deg) void rotate (int deg) override
{ {
if (deg == 90) { if (deg == 90) {
@ -1485,7 +1485,7 @@ public:
} }
} }
void hflip () void hflip () override
{ {
int width2 = width / 2; int width2 = width / 2;
@ -1521,7 +1521,7 @@ public:
} }
} }
void vflip () void vflip () override
{ {
AlignedBuffer<T> lBuffer(3 * width); AlignedBuffer<T> lBuffer(3 * width);
@ -1570,7 +1570,7 @@ public:
} }
} }
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override
{ {
histogram.clear(); histogram.clear();
avg_r = avg_g = avg_b = 0.; avg_r = avg_g = avg_b = 0.;
@ -1602,7 +1602,7 @@ public:
} }
} }
void getAutoWBMultipliers (double &rm, double &gm, double &bm) const void getAutoWBMultipliers (double &rm, double &gm, double &bm) const override
{ {
double avg_r = 0.; double avg_r = 0.;
@ -1676,9 +1676,9 @@ public:
} }
} }
virtual void getSpotWBData (double &reds, double &greens, double &blues, int &rn, int &gn, int &bn, void getSpotWBData (double &reds, double &greens, double &blues, int &rn, int &gn, int &bn,
std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue,
int tran) const int tran) const override
{ {
int x; int x;
int y; int y;
@ -1782,14 +1782,14 @@ public:
class IImagefloat : public IImage, public PlanarRGBData<float> class IImagefloat : public IImage, public PlanarRGBData<float>
{ {
public: public:
virtual ~IImagefloat() {} ~IImagefloat() override {}
}; };
/** @brief This class represents an image having a classical 8 bits/pixel representation */ /** @brief This class represents an image having a classical 8 bits/pixel representation */
class IImage8 : public IImage, public ChunkyRGBData<unsigned char> class IImage8 : public IImage, public ChunkyRGBData<unsigned char>
{ {
public: public:
virtual ~IImage8() {} ~IImage8() override {}
}; };
/** @brief This class represents an image having a 16 bits/pixel planar representation. /** @brief This class represents an image having a 16 bits/pixel planar representation.
@ -1797,7 +1797,7 @@ public:
class IImage16 : public IImage, public PlanarRGBData<unsigned short> class IImage16 : public IImage, public PlanarRGBData<unsigned short>
{ {
public: public:
virtual ~IImage16() {} ~IImage16() override {}
}; };
} }

2
rtengine/image16.h
View File

@ -38,7 +38,7 @@ public:
Image16(); Image16();
Image16(int width, int height); Image16(int width, int height);
~Image16(); ~Image16() override;
Image16* copy() const; Image16* copy() const;

2
rtengine/image8.h
View File

@ -36,7 +36,7 @@ public:
Image8 (); Image8 ();
Image8 (int width, int height); Image8 (int width, int height);
~Image8 (); ~Image8 () override;
Image8* copy () const; Image8* copy () const;

52
rtengine/imagedata.h
View File

@ -98,35 +98,35 @@ private:
public: public:
FramesData (const Glib::ustring& fname, std::unique_ptr<RawMetaDataLocation> rml = nullptr, bool firstFrameOnly = false); FramesData (const Glib::ustring& fname, std::unique_ptr<RawMetaDataLocation> rml = nullptr, bool firstFrameOnly = false);
~FramesData (); ~FramesData () override;
void setDCRawFrameCount (unsigned int frameCount); void setDCRawFrameCount (unsigned int frameCount);
unsigned int getRootCount () const; unsigned int getRootCount () const override;
unsigned int getFrameCount () const; unsigned int getFrameCount () const override;
bool getPixelShift () const; bool getPixelShift () const override;
bool getHDR (unsigned int frame = 0) const; bool getHDR (unsigned int frame = 0) const override;
std::string getImageType (unsigned int frame) const; std::string getImageType (unsigned int frame) const override;
IIOSampleFormat getSampleFormat (unsigned int frame = 0) const; IIOSampleFormat getSampleFormat (unsigned int frame = 0) const override;
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const; rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const override;
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const; rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const override;
rtexif::TagDirectory* getBestExifData (ImageSource *imgSource, procparams::RAWParams *rawParams) const; rtexif::TagDirectory* getBestExifData (ImageSource *imgSource, procparams::RAWParams *rawParams) const override;
procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const; procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const override;
bool hasExif (unsigned int frame = 0) const; bool hasExif (unsigned int frame = 0) const override;
bool hasIPTC (unsigned int frame = 0) const; bool hasIPTC (unsigned int frame = 0) const override;
tm getDateTime (unsigned int frame = 0) const; tm getDateTime (unsigned int frame = 0) const override;
time_t getDateTimeAsTS (unsigned int frame = 0) const; time_t getDateTimeAsTS (unsigned int frame = 0) const override;
int getISOSpeed (unsigned int frame = 0) const; int getISOSpeed (unsigned int frame = 0) const override;
double getFNumber (unsigned int frame = 0) const; double getFNumber (unsigned int frame = 0) const override;
double getFocalLen (unsigned int frame = 0) const; double getFocalLen (unsigned int frame = 0) const override;
double getFocalLen35mm (unsigned int frame = 0) const; double getFocalLen35mm (unsigned int frame = 0) const override;
float getFocusDist (unsigned int frame = 0) const; float getFocusDist (unsigned int frame = 0) const override;
double getShutterSpeed (unsigned int frame = 0) const; double getShutterSpeed (unsigned int frame = 0) const override;
double getExpComp (unsigned int frame = 0) const; double getExpComp (unsigned int frame = 0) const override;
std::string getMake (unsigned int frame = 0) const; std::string getMake (unsigned int frame = 0) const override;
std::string getModel (unsigned int frame = 0) const; std::string getModel (unsigned int frame = 0) const override;
std::string getLens (unsigned int frame = 0) const; std::string getLens (unsigned int frame = 0) const override;
std::string getSerialNumber (unsigned int frame = 0) const; std::string getSerialNumber (unsigned int frame = 0) const;
std::string getOrientation (unsigned int frame = 0) const; std::string getOrientation (unsigned int frame = 0) const override;
}; };

2
rtengine/imagefloat.h
View File

@ -42,7 +42,7 @@ public:
Imagefloat (); Imagefloat ();
Imagefloat (int width, int height); Imagefloat (int width, int height);
~Imagefloat (); ~Imagefloat () override;
Imagefloat* copy () const; Imagefloat* copy () const;

2
rtengine/imageio.h
View File

@ -72,7 +72,7 @@ public:
loadedProfileLength(0), iptc(nullptr), exifRoot (nullptr), sampleFormat(IIOSF_UNKNOWN), loadedProfileLength(0), iptc(nullptr), exifRoot (nullptr), sampleFormat(IIOSF_UNKNOWN),
sampleArrangement(IIOSA_UNKNOWN) {} sampleArrangement(IIOSA_UNKNOWN) {}
virtual ~ImageIO (); ~ImageIO () override;
void setProgressListener (ProgressListener* l); void setProgressListener (ProgressListener* l);
void setSampleFormat(IIOSampleFormat sFormat); void setSampleFormat(IIOSampleFormat sFormat);

14
rtengine/imagesource.h
View File

@ -65,7 +65,7 @@ public:
ImageSource () : references (1), redAWBMul(-1.), greenAWBMul(-1.), blueAWBMul(-1.), ImageSource () : references (1), redAWBMul(-1.), greenAWBMul(-1.), blueAWBMul(-1.),
embProfile(nullptr), idata(nullptr), dirpyrdenoiseExpComp(INFINITY) {} embProfile(nullptr), idata(nullptr), dirpyrdenoiseExpComp(INFINITY) {}
virtual ~ImageSource () {} ~ImageSource () override {}
virtual int load (const Glib::ustring &fname) = 0; virtual int load (const Glib::ustring &fname) = 0;
virtual void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true) {}; virtual void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true) {};
virtual void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold) {}; virtual void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold) {};
@ -119,11 +119,11 @@ public:
virtual void setProgressListener (ProgressListener* pl) {} virtual void setProgressListener (ProgressListener* pl) {}
void increaseRef () void increaseRef () override
{ {
references++; references++;
} }
void decreaseRef () void decreaseRef () override
{ {
references--; references--;
@ -151,19 +151,19 @@ public:
return dirpyrdenoiseExpComp; return dirpyrdenoiseExpComp;
} }
// functions inherited from the InitialImage interface // functions inherited from the InitialImage interface
virtual Glib::ustring getFileName () Glib::ustring getFileName () override
{ {
return fileName; return fileName;
} }
virtual cmsHPROFILE getEmbeddedProfile () cmsHPROFILE getEmbeddedProfile () override
{ {
return embProfile; return embProfile;
} }
virtual const FramesMetaData* getMetaData () const FramesMetaData* getMetaData () override
{ {
return idata; return idata;
} }
virtual ImageSource* getImageSource () ImageSource* getImageSource () override
{ {
return this; return this;
} }

94
rtengine/improccoordinator.h
View File

@ -219,85 +219,85 @@ protected:
public: public:
ImProcCoordinator (); ImProcCoordinator ();
~ImProcCoordinator (); ~ImProcCoordinator () override;
void assign (ImageSource* imgsrc); void assign (ImageSource* imgsrc);
void getParams (procparams::ProcParams* dst) void getParams (procparams::ProcParams* dst) override
{ {
*dst = params; *dst = params;
} }
void startProcessing (int changeCode); void startProcessing (int changeCode) override;
ProcParams* beginUpdateParams (); ProcParams* beginUpdateParams () override;
void endUpdateParams (ProcEvent change); // must be called after beginUpdateParams, triggers update void endUpdateParams (ProcEvent change) override; // must be called after beginUpdateParams, triggers update
void endUpdateParams (int changeFlags); void endUpdateParams (int changeFlags) override;
void stopProcessing (); void stopProcessing () override;
void setPreviewScale (int scale) void setPreviewScale (int scale) override
{ {
setScale (scale); setScale (scale);
} }
int getPreviewScale () int getPreviewScale () override
{ {
return scale; return scale;
} }
//void fullUpdatePreviewImage (); //void fullUpdatePreviewImage ();
int getFullWidth () int getFullWidth () override
{ {
return fullw; return fullw;
} }
int getFullHeight () int getFullHeight () override
{ {
return fullh; return fullh;
} }
int getPreviewWidth () int getPreviewWidth () override
{ {
return pW; return pW;
} }
int getPreviewHeight () int getPreviewHeight () override
{ {
return pH; return pH;
} }
DetailedCrop* createCrop (::EditDataProvider *editDataProvider, bool isDetailWindow); DetailedCrop* createCrop (::EditDataProvider *editDataProvider, bool isDetailWindow) override;
bool getAutoWB (double& temp, double& green, double equal, double tempBias); bool getAutoWB (double& temp, double& green, double equal, double tempBias) override;
void getCamWB (double& temp, double& green); void getCamWB (double& temp, double& green) override;
void getSpotWB (int x, int y, int rectSize, double& temp, double& green); void getSpotWB (int x, int y, int rectSize, double& temp, double& green) override;
void getAutoCrop (double ratio, int &x, int &y, int &w, int &h); void getAutoCrop (double ratio, int &x, int &y, int &w, int &h) override;
bool getHighQualComputed(); bool getHighQualComputed() override;
void setHighQualComputed(); void setHighQualComputed() override;
void setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent); void setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent) override;
void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const; void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const override;
void setSoftProofing (bool softProof, bool gamutCheck); void setSoftProofing (bool softProof, bool gamutCheck) override;
void getSoftProofing (bool &softProof, bool &gamutCheck); void getSoftProofing (bool &softProof, bool &gamutCheck) override;
void setSharpMask (bool sharpMask); void setSharpMask (bool sharpMask) override;
bool updateTryLock () bool updateTryLock () override
{ {
return updaterThreadStart.trylock(); return updaterThreadStart.trylock();
} }
void updateUnLock () void updateUnLock () override
{ {
updaterThreadStart.unlock(); updaterThreadStart.unlock();
} }
void setProgressListener (ProgressListener* pl) void setProgressListener (ProgressListener* pl) override
{ {
plistener = pl; plistener = pl;
} }
void setPreviewImageListener (PreviewImageListener* il) void setPreviewImageListener (PreviewImageListener* il) override
{ {
imageListener = il; imageListener = il;
} }
void setSizeListener (SizeListener* il) void setSizeListener (SizeListener* il) override
{ {
sizeListeners.push_back (il); sizeListeners.push_back (il);
} }
void delSizeListener (SizeListener* il) void delSizeListener (SizeListener* il) override
{ {
std::vector<SizeListener*>::iterator it = std::find (sizeListeners.begin(), sizeListeners.end(), il); std::vector<SizeListener*>::iterator it = std::find (sizeListeners.begin(), sizeListeners.end(), il);
@ -305,70 +305,70 @@ public:
sizeListeners.erase (it); sizeListeners.erase (it);
} }
} }
void setAutoExpListener (AutoExpListener* ael) void setAutoExpListener (AutoExpListener* ael) override
{ {
aeListener = ael; aeListener = ael;
} }
void setHistogramListener (HistogramListener *h) void setHistogramListener (HistogramListener *h) override
{ {
hListener = h; hListener = h;
} }
void setAutoCamListener (AutoCamListener* acl) void setAutoCamListener (AutoCamListener* acl) override
{ {
acListener = acl; acListener = acl;
} }
void setAutoBWListener (AutoBWListener* abw) void setAutoBWListener (AutoBWListener* abw) override
{ {
abwListener = abw; abwListener = abw;
} }
void setAutoWBListener (AutoWBListener* awb) void setAutoWBListener (AutoWBListener* awb) override
{ {
awbListener = awb; awbListener = awb;
} }
void setAutoColorTonListener (AutoColorTonListener* bwct) void setAutoColorTonListener (AutoColorTonListener* bwct) override
{ {
actListener = bwct; actListener = bwct;
} }
void setAutoChromaListener (AutoChromaListener* adn) void setAutoChromaListener (AutoChromaListener* adn) override
{ {
adnListener = adn; adnListener = adn;
} }
void setRetinexListener (RetinexListener* adh) void setRetinexListener (RetinexListener* adh) override
{ {
dehaListener = adh; dehaListener = adh;
} }
void setWaveletListener (WaveletListener* awa) void setWaveletListener (WaveletListener* awa) override
{ {
awavListener = awa; awavListener = awa;
} }
void setFrameCountListener (FrameCountListener* fcl) void setFrameCountListener (FrameCountListener* fcl) override
{ {
frameCountListener = fcl; frameCountListener = fcl;
} }
void setFlatFieldAutoClipListener (FlatFieldAutoClipListener* ffacl) void setFlatFieldAutoClipListener (FlatFieldAutoClipListener* ffacl) override
{ {
flatFieldAutoClipListener = ffacl; flatFieldAutoClipListener = ffacl;
} }
void setBayerAutoContrastListener (AutoContrastListener* acl) void setBayerAutoContrastListener (AutoContrastListener* acl) override
{ {
bayerAutoContrastListener = acl; bayerAutoContrastListener = acl;
} }
void setXtransAutoContrastListener (AutoContrastListener* acl) void setXtransAutoContrastListener (AutoContrastListener* acl) override
{ {
xtransAutoContrastListener = acl; xtransAutoContrastListener = acl;
} }
void setImageTypeListener (ImageTypeListener* itl) void setImageTypeListener (ImageTypeListener* itl) override
{ {
imageTypeListener = itl; imageTypeListener = itl;
} }
void saveInputICCReference (const Glib::ustring& fname, bool apply_wb); void saveInputICCReference (const Glib::ustring& fname, bool apply_wb) override;
InitialImage* getInitialImage () InitialImage* getInitialImage () override
{ {
return imgsrc; return imgsrc;
} }

10
rtengine/lcp.h
View File

@ -190,11 +190,11 @@ public:
); );
void correctDistortion(double &x, double &y, int cx, int cy, double scale) const; // MUST be the first stage void correctDistortion(double &x, double &y, int cx, int cy, double scale) const override; // MUST be the first stage
bool isCACorrectionAvailable() const; bool isCACorrectionAvailable() const override;
void correctCA(double& x, double& y, int cx, int cy, int channel) const; void correctCA(double& x, double& y, int cx, int cy, int channel) const override;
void processVignetteLine(int width, int y, float* line) const; void processVignetteLine(int width, int y, float* line) const override;
void processVignetteLine3Channels(int width, int y, float* line) const; void processVignetteLine3Channels(int width, int y, float* line) const override;
private: private:
bool enableCA; // is the mapper capable if CA correction? bool enableCA; // is the mapper capable if CA correction?

4
rtengine/pdaflinesfilter.cc
View File

@ -62,7 +62,7 @@ public:
++r[col / TILE_SIZE]; ++r[col / TILE_SIZE];
} }
float operator()(int row, int col) const float operator()(int row, int col) const override
{ {
int y = row / TILE_SIZE; int y = row / TILE_SIZE;
int x = col / TILE_SIZE; int x = col / TILE_SIZE;
@ -136,7 +136,7 @@ public:
offset_(offset) offset_(offset)
{} {}
float operator()(int row) const float operator()(int row) const override
{ {
static constexpr float BORDER[] = { 1.f, 1.f, 0.8f, 0.5f, 0.2f }; static constexpr float BORDER[] = { 1.f, 1.f, 0.8f, 0.5f, 0.2f };
static constexpr int BORDER_WIDTH = sizeof(BORDER)/sizeof(float) - 1; static constexpr int BORDER_WIDTH = sizeof(BORDER)/sizeof(float) - 1;

4
rtengine/processingjob.h
View File

@ -43,14 +43,14 @@ public:
iImage->increaseRef(); iImage->increaseRef();
} }
~ProcessingJobImpl () ~ProcessingJobImpl () override
{ {
if (initialImage) { if (initialImage) {
initialImage->decreaseRef(); initialImage->decreaseRef();
} }
} }
bool fastPipeline() const { return fast; } bool fastPipeline() const override { return fast; }
}; };
} }

2
rtengine/procparams.h
View File

@ -26,8 +26,6 @@
#include <glibmm.h> #include <glibmm.h>
#include <lcms2.h> #include <lcms2.h>
#include "coord.h"
#include "LUT.h"
#include "noncopyable.h" #include "noncopyable.h"
class ParamsEdited; class ParamsEdited;

72
rtengine/rawimagesource.h
View File

@ -111,22 +111,22 @@ protected:
public: public:
RawImageSource (); RawImageSource ();
~RawImageSource (); ~RawImageSource () override;
int load(const Glib::ustring &fname) { return load(fname, false); } int load(const Glib::ustring &fname) override { return load(fname, false); }
int load(const Glib::ustring &fname, bool firstFrameOnly); int load(const Glib::ustring &fname, bool firstFrameOnly);
void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true); void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true) override;
void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold); void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold) override;
void retinex (const ColorManagementParams& cmp, const RetinexParams &deh, const ToneCurveParams& Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D<float, 4> &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI); void retinex (const ColorManagementParams& cmp, const RetinexParams &deh, const ToneCurveParams& Tc, LUTf & cdcurve, LUTf & mapcurve, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, multi_array2D<float, 4> &conversionBuffer, bool dehacontlutili, bool mapcontlutili, bool useHsl, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax, LUTu &histLRETI) override;
void retinexPrepareCurves (const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI); void retinexPrepareCurves (const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI) override;
void retinexPrepareBuffers (const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D<float, 4> &conversionBuffer, LUTu &lhist16RETI); void retinexPrepareBuffers (const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D<float, 4> &conversionBuffer, LUTu &lhist16RETI) override;
void flushRawData (); void flushRawData () override;
void flushRGB (); void flushRGB () override;
void HLRecovery_Global (const ToneCurveParams &hrp); void HLRecovery_Global (const ToneCurveParams &hrp) override;
void refinement_lassus (int PassCount); void refinement_lassus (int PassCount);
void refinement(int PassCount); void refinement(int PassCount);
void setBorder(unsigned int rawBorder) {border = rawBorder;} void setBorder(unsigned int rawBorder) override {border = rawBorder;}
bool isRGBSourceModified() const bool isRGBSourceModified() const override
{ {
return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified return rgbSourceModified; // tracks whether cached rgb output of demosaic has been modified
} }
@ -136,57 +136,57 @@ public:
void cfaboxblur (RawImage *riFlatFile, float* cfablur, int boxH, int boxW); void cfaboxblur (RawImage *riFlatFile, float* cfablur, int boxH, int boxW);
void scaleColors (int winx, int winy, int winw, int winh, const RAWParams &raw, array2D<float> &rawData); // raw for cblack void scaleColors (int winx, int winy, int winw, int winh, const RAWParams &raw, array2D<float> &rawData); // raw for cblack
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw); void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw) override;
eSensorType getSensorType () const eSensorType getSensorType () const override
{ {
return ri != nullptr ? ri->getSensorType() : ST_NONE; return ri != nullptr ? ri->getSensorType() : ST_NONE;
} }
bool isMono () const bool isMono () const override
{ {
return ri->get_colors() == 1; return ri->get_colors() == 1;
} }
ColorTemp getWB () const ColorTemp getWB () const override
{ {
return camera_wb; return camera_wb;
} }
void getAutoWBMultipliers (double &rm, double &gm, double &bm); void getAutoWBMultipliers (double &rm, double &gm, double &bm) override;
ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal); ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal) override;
bool isWBProviderReady () bool isWBProviderReady () override
{ {
return rawData; return rawData;
} }
double getDefGain () const double getDefGain () const override
{ {
return defGain; return defGain;
} }
void getFullSize (int& w, int& h, int tr = TR_NONE); void getFullSize (int& w, int& h, int tr = TR_NONE) override;
void getSize (const PreviewProps &pp, int& w, int& h); void getSize (const PreviewProps &pp, int& w, int& h) override;
int getRotateDegree() const int getRotateDegree() const override
{ {
return ri->get_rotateDegree(); return ri->get_rotateDegree();
} }
ImageMatrices* getImageMatrices () ImageMatrices* getImageMatrices () override
{ {
return &imatrices; return &imatrices;
} }
bool isRAW() const bool isRAW() const override
{ {
return true; return true;
} }
void setProgressListener (ProgressListener* pl) void setProgressListener (ProgressListener* pl) override
{ {
plistener = pl; plistener = pl;
} }
void getAutoExpHistogram (LUTu & histogram, int& histcompr); void getAutoExpHistogram (LUTu & histogram, int& histcompr) override;
void getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw); void getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw) override;
void getAutoMatchedToneCurve(const ColorManagementParams &cp, std::vector<double> &outCurve); void getAutoMatchedToneCurve(const ColorManagementParams &cp, std::vector<double> &outCurve) override;
DCPProfile *getDCP(const ColorManagementParams &cmp, DCPProfile::ApplyState &as); DCPProfile *getDCP(const ColorManagementParams &cmp, DCPProfile::ApplyState &as) override;
void convertColorSpace(Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb); void convertColorSpace(Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb) override;
static bool findInputProfile(Glib::ustring inProfile, cmsHPROFILE embedded, std::string camName, DCPProfile **dcpProf, cmsHPROFILE& in); static bool findInputProfile(Glib::ustring inProfile, cmsHPROFILE embedded, std::string camName, DCPProfile **dcpProf, cmsHPROFILE& in);
static void colorSpaceConversion (Imagefloat* im, const ColorManagementParams& cmp, const ColorTemp &wb, double pre_mul[3], cmsHPROFILE embedded, cmsHPROFILE camprofile, double cam[3][3], const std::string &camName) static void colorSpaceConversion (Imagefloat* im, const ColorManagementParams& cmp, const ColorTemp &wb, double pre_mul[3], cmsHPROFILE embedded, cmsHPROFILE camprofile, double cam[3][3], const std::string &camName)
{ {
@ -197,18 +197,18 @@ public:
void boxblur2(float** src, float** dst, float** temp, int H, int W, int box ); void boxblur2(float** src, float** dst, float** temp, int H, int W, int box );
void boxblur_resamp(float **src, float **dst, float** temp, int H, int W, int box, int samp ); void boxblur_resamp(float **src, float **dst, float** temp, int H, int W, int box, int samp );
void MSR(float** luminance, float **originalLuminance, float **exLuminance, LUTf & mapcurve, bool &mapcontlutili, int width, int height, const RetinexParams &deh, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax); void MSR(float** luminance, float **originalLuminance, float **exLuminance, LUTf & mapcurve, bool &mapcontlutili, int width, int height, const RetinexParams &deh, const RetinextransmissionCurve & dehatransmissionCurve, const RetinexgaintransmissionCurve & dehagaintransmissionCurve, float &minCD, float &maxCD, float &mini, float &maxi, float &Tmean, float &Tsigma, float &Tmin, float &Tmax);
void HLRecovery_inpaint (float** red, float** green, float** blue); void HLRecovery_inpaint (float** red, float** green, float** blue) override;
static void HLRecovery_Luminance (float* rin, float* gin, float* bin, float* rout, float* gout, float* bout, int width, float maxval); static void HLRecovery_Luminance (float* rin, float* gin, float* bin, float* rout, float* gout, float* bout, int width, float maxval);
static void HLRecovery_CIELab (float* rin, float* gin, float* bin, float* rout, float* gout, float* bout, int width, float maxval, double cam[3][3], double icam[3][3]); static void HLRecovery_CIELab (float* rin, float* gin, float* bin, float* rout, float* gout, float* bout, int width, float maxval, double cam[3][3], double icam[3][3]);
static void HLRecovery_blend (float* rin, float* gin, float* bin, int width, float maxval, float* hlmax); static void HLRecovery_blend (float* rin, float* gin, float* bin, int width, float maxval, float* hlmax);
static void init (); static void init ();
static void cleanup (); static void cleanup ();
void setCurrentFrame(unsigned int frameNum) { void setCurrentFrame(unsigned int frameNum) override {
currFrame = std::min(numFrames - 1, frameNum); currFrame = std::min(numFrames - 1, frameNum);
ri = riFrames[currFrame]; ri = riFrames[currFrame];
} }
int getFrameCount() {return numFrames;} int getFrameCount() override {return numFrames;}
int getFlatFieldAutoClipValue() {return flatFieldAutoClipValue;} int getFlatFieldAutoClipValue() override {return flatFieldAutoClipValue;}
class GreenEqulibrateThreshold { class GreenEqulibrateThreshold {
public: public:
@ -299,7 +299,7 @@ protected:
void pixelshift(int winx, int winy, int winw, int winh, const RAWParams &rawParams, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection); void pixelshift(int winx, int winy, int winw, int winh, const RAWParams &rawParams, unsigned int frame, const std::string &make, const std::string &model, float rawWpCorrection);
void hflip (Imagefloat* im); void hflip (Imagefloat* im);
void vflip (Imagefloat* im); void vflip (Imagefloat* im);
void getRawValues(int x, int y, int rotate, int &R, int &G, int &B); void getRawValues(int x, int y, int rotate, int &R, int &G, int &B) override;
}; };
} }

2
rtengine/rawmetadatalocation.h
View File

@ -30,7 +30,7 @@ public:
int ciffLength; int ciffLength;
RawMetaDataLocation () : exifBase(-1), ciffBase(-1), ciffLength(-1) {} RawMetaDataLocation () : exifBase(-1), ciffBase(-1), ciffLength(-1) {}
RawMetaDataLocation (int exifBase) : exifBase(exifBase), ciffBase(-1), ciffLength(-1) {} explicit RawMetaDataLocation (int exifBase) : exifBase(exifBase), ciffBase(-1), ciffLength(-1) {}
RawMetaDataLocation (int ciffBase, int ciffLength) : exifBase(-1), ciffBase(ciffBase), ciffLength(ciffLength) {} RawMetaDataLocation (int ciffBase, int ciffLength) : exifBase(-1), ciffBase(ciffBase), ciffLength(ciffLength) {}
RawMetaDataLocation (int exifBase, int ciffBase, int ciffLength) : exifBase(exifBase), ciffBase(ciffBase), ciffLength(ciffLength) {} RawMetaDataLocation (int exifBase, int ciffBase, int ciffLength) : exifBase(exifBase), ciffBase(ciffBase), ciffLength(ciffLength) {}
}; };

2
rtengine/rtlensfun.h
View File

@ -38,7 +38,7 @@ class LFModifier final :
public NonCopyable public NonCopyable
{ {
public: public:
~LFModifier(); ~LFModifier() override;
explicit operator bool() const; explicit operator bool() const;

44
rtengine/stdimagesource.h
View File

@ -40,66 +40,66 @@ protected:
public: public:
StdImageSource (); StdImageSource ();
~StdImageSource (); ~StdImageSource () override;
int load (const Glib::ustring &fname); int load (const Glib::ustring &fname) override;
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw); void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw) override;
ColorTemp getWB () const ColorTemp getWB () const override
{ {
return wb; return wb;
} }
void getAutoWBMultipliers (double &rm, double &gm, double &bm); void getAutoWBMultipliers (double &rm, double &gm, double &bm) override;
ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal); ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal) override;
eSensorType getSensorType() const {return ST_NONE;} eSensorType getSensorType() const override {return ST_NONE;}
bool isMono() const {return false;} bool isMono() const override {return false;}
bool isWBProviderReady () bool isWBProviderReady () override
{ {
return true; return true;
}; };
void getAutoExpHistogram (LUTu &histogram, int& histcompr); void getAutoExpHistogram (LUTu &histogram, int& histcompr) override;
double getDefGain () const double getDefGain () const override
{ {
return 0.0; return 0.0;
} }
void getFullSize (int& w, int& h, int tr = TR_NONE); void getFullSize (int& w, int& h, int tr = TR_NONE) override;
void getSize (const PreviewProps &pp, int& w, int& h); void getSize (const PreviewProps &pp, int& w, int& h) override;
ImageIO* getImageIO () ImageIO* getImageIO ()
{ {
return img; return img;
} }
ImageMatrices* getImageMatrices () ImageMatrices* getImageMatrices () override
{ {
return (ImageMatrices*)nullptr; return (ImageMatrices*)nullptr;
} }
bool isRAW() const bool isRAW() const override
{ {
return false; return false;
} }
void setProgressListener (ProgressListener* pl) void setProgressListener (ProgressListener* pl) override
{ {
plistener = pl; plistener = pl;
} }
void convertColorSpace(Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb);// RAWParams raw will not be used for non-raw files (see imagesource.h) void convertColorSpace(Imagefloat* image, const ColorManagementParams &cmp, const ColorTemp &wb) override;// RAWParams raw will not be used for non-raw files (see imagesource.h)
static void colorSpaceConversion (Imagefloat* im, const ColorManagementParams &cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat); static void colorSpaceConversion (Imagefloat* im, const ColorManagementParams &cmp, cmsHPROFILE embedded, IIOSampleFormat sampleFormat);
bool isRGBSourceModified() const bool isRGBSourceModified() const override
{ {
return rgbSourceModified; return rgbSourceModified;
} }
void setCurrentFrame(unsigned int frameNum) {} void setCurrentFrame(unsigned int frameNum) override {}
int getFrameCount() {return 1;} int getFrameCount() override {return 1;}
int getFlatFieldAutoClipValue() {return 0;} int getFlatFieldAutoClipValue() override {return 0;}
void getRawValues(int x, int y, int rotate, int &R, int &G, int &B) { R = G = B = 0;} void getRawValues(int x, int y, int rotate, int &R, int &G, int &B) override { R = G = B = 0;}
}; };

34
rtexif/canonattribs.cc
View File

@ -32,7 +32,7 @@ namespace rtexif
class CAOnOffInterpreter : public Interpreter class CAOnOffInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int n = t->toInt(); int n = t->toInt();
@ -51,7 +51,7 @@ class CAIntSerNumInterpreter : public Interpreter
{ {
public: public:
CAIntSerNumInterpreter () {} CAIntSerNumInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
return ""; return "";
} }
@ -63,7 +63,7 @@ class CAApertureInterpreter : public Interpreter
{ {
public: public:
CAApertureInterpreter () {} CAApertureInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double v = pow (2.0, t->toDouble() / 64.0); double v = pow (2.0, t->toDouble() / 64.0);
@ -92,7 +92,7 @@ CAMacroModeInterpreter caMacroModeInterpreter;
class CASelfTimerInterpreter : public Interpreter class CASelfTimerInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int sec = t->toInt (0, SHORT); int sec = t->toInt (0, SHORT);
@ -385,7 +385,7 @@ CAExposureModeInterpreter caExposureModeInterpreter;
class CAFlashBitsInterpreter : public Interpreter class CAFlashBitsInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream s; std::ostringstream s;
unsigned bits = t->toInt (0, SHORT); unsigned bits = t->toInt (0, SHORT);
@ -533,7 +533,7 @@ CARAWQualityInterpreter caRAWQualityInterpreter;
class CAFocalInterpreter : public Interpreter class CAFocalInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
Tag *unitTag = t->getParent()->getRoot()->findTag ("FocalUnits"); Tag *unitTag = t->getParent()->getRoot()->findTag ("FocalUnits");
double v = unitTag ? unitTag->toDouble() : 1.; double v = unitTag ? unitTag->toDouble() : 1.;
@ -956,7 +956,7 @@ public:
}; };
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int lensID = t->toInt(); int lensID = t->toInt();
@ -1108,7 +1108,7 @@ CAFocalTypeInterpreter caFocalTypeInterpreter;
class CAFocalPlaneInterpreter : public Interpreter class CAFocalPlaneInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int val = t->toInt(); int val = t->toInt();
@ -1126,7 +1126,7 @@ CAFocalPlaneInterpreter caFocalPlaneInterpreter;
class CAExposureTimeInterpreter : public Interpreter class CAExposureTimeInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double d = pow (2, - t->toInt() / 32.0); double d = pow (2, - t->toInt() / 32.0);
@ -1138,7 +1138,7 @@ CAExposureTimeInterpreter caExposureTimeInterpreter;
class CAEVInterpreter : public Interpreter class CAEVInterpreter : public Interpreter
{ {
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%.1f", t->toDouble() / 32.0 ); sprintf (buffer, "%.1f", t->toDouble() / 32.0 );
@ -1150,14 +1150,14 @@ CAEVInterpreter caEVInterpreter;
class CABaseISOInterpreter : public Interpreter class CABaseISOInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
int a = t->toInt(); int a = t->toInt();
sprintf (buffer, "%d", a); sprintf (buffer, "%d", a);
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = Interpreter::toInt (t, ofs); int a = Interpreter::toInt (t, ofs);
@ -1168,7 +1168,7 @@ public:
return 0.; return 0.;
} }
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
int a = Interpreter::toInt (t, ofs, astype); int a = Interpreter::toInt (t, ofs, astype);
@ -1287,7 +1287,7 @@ CASlowShutterInterpreter caSlowShutterInterpreter;
class CAFlashGuideNumberInterpreter : public Interpreter class CAFlashGuideNumberInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int n = t->toInt(); int n = t->toInt();
@ -1348,7 +1348,7 @@ CAControModeInterpreter caControModeInterpreter;
class CAFocusDistanceInterpreter : public Interpreter class CAFocusDistanceInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%.2f", t->toDouble() / 100 ); sprintf (buffer, "%.2f", t->toDouble() / 100 );
@ -1360,7 +1360,7 @@ CAFocusDistanceInterpreter caFocusDistanceInterpreter;
class CAMeasuredEVInterpreter : public Interpreter class CAMeasuredEVInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%.1f", t->toDouble() / 8 - 6 ); sprintf (buffer, "%.1f", t->toDouble() / 8 - 6 );
@ -1495,7 +1495,7 @@ CAToningEffectInterpreter caToningEffectInterpreter;
class CAFileNumberInterpreter : public Interpreter class CAFileNumberInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
unsigned long val = t->toInt (0, LONG); unsigned long val = t->toInt (0, LONG);
char buffer[32]; char buffer[32];

18
rtexif/nikonattribs.cc
View File

@ -34,7 +34,7 @@ class NAISOInterpreter : public Interpreter
{ {
public: public:
NAISOInterpreter () {} NAISOInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%d", t->toInt (2)); sprintf (buffer, "%d", t->toInt (2));
@ -47,14 +47,14 @@ class NAISOInfoISOInterpreter : public Interpreter
{ {
public: public:
NAISOInfoISOInterpreter () {} NAISOInfoISOInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
int a = t->toInt(); int a = t->toInt();
sprintf (buffer, "%d", a); sprintf (buffer, "%d", a);
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->getValue()[ofs]; int a = t->getValue()[ofs];
@ -65,7 +65,7 @@ public:
return 0.; return 0.;
} }
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
int a = t->getValue()[ofs]; int a = t->getValue()[ofs];
@ -83,7 +83,7 @@ class NAISOExpansionInterpreter : public Interpreter
{ {
public: public:
NAISOExpansionInterpreter () {} NAISOExpansionInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt(); int a = t->toInt();
@ -142,7 +142,7 @@ class NALensTypeInterpreter : public Interpreter
{ {
public: public:
NALensTypeInterpreter () {} NALensTypeInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt(); int a = t->toInt();
std::ostringstream str; std::ostringstream str;
@ -191,7 +191,7 @@ class NAShootingModeInterpreter : public Interpreter
{ {
public: public:
NAShootingModeInterpreter () {} NAShootingModeInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt(); int a = t->toInt();
std::ostringstream str; std::ostringstream str;
@ -234,7 +234,7 @@ public:
afpchoices[0x9] = "Far Left"; afpchoices[0x9] = "Far Left";
afpchoices[0xa] = "Far Right"; afpchoices[0xa] = "Far Right";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int am = t->toInt (0, BYTE); int am = t->toInt (0, BYTE);
int afp = t->toInt (1, BYTE); int afp = t->toInt (1, BYTE);
@ -314,7 +314,7 @@ class NALensDataInterpreter : public Interpreter
static const std::map<std::string, std::string> lenses; static const std::map<std::string, std::string> lenses;
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
static const unsigned char xlat[2][256] = { static const unsigned char xlat[2][256] = {

14
rtexif/olympusattribs.cc
View File

@ -33,7 +33,7 @@ class OLOnOffInterpreter : public Interpreter
{ {
public: public:
OLOnOffInterpreter () {} OLOnOffInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
if (t->toInt() == 0) { if (t->toInt() == 0) {
return "Off"; return "Off";
@ -48,7 +48,7 @@ class OLYesNoInterpreter : public Interpreter
{ {
public: public:
OLYesNoInterpreter () {} OLYesNoInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
if (t->toInt() == 0) { if (t->toInt() == 0) {
return "No"; return "No";
@ -63,7 +63,7 @@ class OLApertureInterpreter : public Interpreter
{ {
public: public:
OLApertureInterpreter () {} OLApertureInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
str.precision (2); str.precision (2);
@ -194,7 +194,7 @@ public:
lenses["03 02 00"] = "Leica D Summilux 25mm f/1.4 Asph."; lenses["03 02 00"] = "Leica D Summilux 25mm f/1.4 Asph.";
lenses["05 01 10"] = "Tamron 14-150mm f/3.5-5.8 Di III"; lenses["05 01 10"] = "Tamron 14-150mm f/3.5-5.8 Di III";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream lid; std::ostringstream lid;
lid.setf (std::ios_base::hex, std::ios_base::basefield); lid.setf (std::ios_base::hex, std::ios_base::basefield);
@ -465,7 +465,7 @@ class OLNoiseFilterInterpreter : public Interpreter
{ {
public: public:
OLNoiseFilterInterpreter () {} OLNoiseFilterInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0); int a = t->toInt (0);
int b = t->toInt (2); int b = t->toInt (2);
@ -490,7 +490,7 @@ class OLFlashModeInterpreter : public Interpreter
{ {
public: public:
OLFlashModeInterpreter () {} OLFlashModeInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
int a = t->toInt (); int a = t->toInt ();
@ -509,7 +509,7 @@ class OLNoiseReductionInterpreter : public Interpreter
{ {
public: public:
OLNoiseReductionInterpreter () {} OLNoiseReductionInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
int a = t->toInt (); int a = t->toInt ();

86
rtexif/pentaxattribs.cc
View File

@ -415,7 +415,7 @@ class PAFNumberInterpreter: public Interpreter
{ {
public: public:
PAFNumberInterpreter () {} PAFNumberInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double v = t->toDouble() / 10; double v = t->toDouble() / 10;
@ -610,7 +610,7 @@ public:
choices[256 * 255 + 0] = "Video (Auto Aperture)"; choices[256 * 255 + 0] = "Video (Auto Aperture)";
choices[256 * 255 + 4] = "Video (4)"; choices[256 * 255 + 4] = "Video (4)";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int c = 256 * t->toInt (0, BYTE) + t->toInt (1, BYTE); int c = 256 * t->toInt (0, BYTE) + t->toInt (1, BYTE);
std::map<int, std::string>::iterator r = choices.find (c); std::map<int, std::string>::iterator r = choices.find (c);
@ -669,7 +669,7 @@ public:
choices3[224] = "HDR Auto"; choices3[224] = "HDR Auto";
choices3[255] = "Video"; choices3[255] = "Video";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE));
std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE)); std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE));
@ -993,7 +993,7 @@ public:
choices.insert (p_t (256 * 22 + 4, "04 Toy Lens Wide 6.3mm f/7.1")); choices.insert (p_t (256 * 22 + 4, "04 Toy Lens Wide 6.3mm f/7.1"));
choices.insert (p_t (256 * 22 + 5, "05 Toy Lens Telephoto 18mm f/8")); choices.insert (p_t (256 * 22 + 5, "05 Toy Lens Telephoto 18mm f/8"));
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
double *liArray = nullptr; double *liArray = nullptr;
double maxApertureAtFocal = 0.; double maxApertureAtFocal = 0.;
@ -1061,7 +1061,7 @@ class PASRResultInterpreter: public Interpreter
{ {
public: public:
PASRResultInterpreter() { } PASRResultInterpreter() { }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
int b = t->toInt (0, BYTE); int b = t->toInt (0, BYTE);
@ -1146,7 +1146,7 @@ public:
choices[ 2 << 8 | 4 ] = "Auto"; choices[ 2 << 8 | 4 ] = "Auto";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int idx = 0; int idx = 0;
@ -1173,7 +1173,7 @@ public:
choices[2] = "Standard"; choices[2] = "Standard";
choices[3] = "Fast"; choices[3] = "Fast";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE));
std::ostringstream s; std::ostringstream s;
@ -1211,7 +1211,7 @@ public:
choices[2] = "Medium"; choices[2] = "Medium";
choices[3] = "High"; choices[3] = "High";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE));
std::ostringstream s; std::ostringstream s;
@ -1243,7 +1243,7 @@ public:
choices2[8] = "2 EV"; choices2[8] = "2 EV";
choices2[12] = "3 EV"; choices2[12] = "3 EV";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE)); std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE));
std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE)); std::map<int, std::string>::iterator r1 = choices1.find (t->toInt (1, BYTE));
@ -1290,7 +1290,7 @@ class PALensModelQInterpreter: public Interpreter
{ {
public: public:
PALensModelQInterpreter() {} PALensModelQInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[31]; char buffer[31];
buffer[0] = 0; // buffer[0] = 0; //
@ -1308,7 +1308,7 @@ class PALensInfoQInterpreter: public Interpreter
{ {
public: public:
PALensInfoQInterpreter() {} PALensInfoQInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[21]; char buffer[21];
buffer[0] = 0; buffer[0] = 0;
@ -1326,7 +1326,7 @@ class PAFlashExposureCompInterpreter: public Interpreter
{ {
public: public:
PAFlashExposureCompInterpreter() {} PAFlashExposureCompInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a; int a;
@ -1340,7 +1340,7 @@ public:
sprintf (buffer, "%d", a ); sprintf (buffer, "%d", a );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a; int a;
@ -1359,7 +1359,7 @@ class PAFocalLengthInterpreter: public Interpreter
{ {
public: public:
PAFocalLengthInterpreter() {} PAFocalLengthInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
double a = double (t->toInt (0, LONG)); double a = double (t->toInt (0, LONG));
@ -1371,7 +1371,7 @@ public:
return "n/a"; return "n/a";
} }
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
double a = double (t->toInt (0, LONG)); double a = double (t->toInt (0, LONG));
@ -1388,7 +1388,7 @@ class PALensDataFocalLengthInterpreter: public Interpreter
{ {
public: public:
PALensDataFocalLengthInterpreter() {} PALensDataFocalLengthInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
float b = float (10 * int (a >> 2)) * pow (4.f, float (int (a & 0x03) - 2)); float b = float (10 * int (a >> 2)) * pow (4.f, float (int (a & 0x03) - 2));
@ -1401,7 +1401,7 @@ public:
return "n/a"; return "n/a";
} }
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (ofs, BYTE); int a = t->toInt (ofs, BYTE);
float b = float (10 * int (a >> 2)) * pow (4.f, float (int (a & 0x03) - 2)); float b = float (10 * int (a >> 2)) * pow (4.f, float (int (a & 0x03) - 2));
@ -1419,7 +1419,7 @@ class PAISOfInterpreter: public Interpreter
{ {
public: public:
PAISOfInterpreter() {} PAISOfInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
char buffer[32]; char buffer[32];
@ -1427,7 +1427,7 @@ public:
sprintf (buffer, "%.1f", v ); sprintf (buffer, "%.1f", v );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
return 100.*exp (double (a - 32) * log (2.) / 8.); return 100.*exp (double (a - 32) * log (2.) / 8.);
@ -1439,7 +1439,7 @@ class PAMaxApertureInterpreter: public Interpreter
{ {
public: public:
PAMaxApertureInterpreter() {} PAMaxApertureInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
a &= 0x7F; a &= 0x7F;
@ -1458,7 +1458,7 @@ public:
return "n/a"; return "n/a";
} }
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
a &= 0x7F; a &= 0x7F;
@ -1476,7 +1476,7 @@ class PAAEXvInterpreter: public Interpreter
{ {
public: public:
PAAEXvInterpreter() {} PAAEXvInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
char buffer[32]; char buffer[32];
@ -1484,7 +1484,7 @@ public:
sprintf (buffer, "%.1f", v ); sprintf (buffer, "%.1f", v );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
return double (a - 64) / 8.; return double (a - 64) / 8.;
@ -1496,7 +1496,7 @@ class PAAEBXvInterpreter: public Interpreter
{ {
public: public:
PAAEBXvInterpreter() {} PAAEBXvInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, SBYTE); int a = t->toInt (0, SBYTE);
char buffer[32]; char buffer[32];
@ -1504,7 +1504,7 @@ public:
sprintf (buffer, "%.1f", v ); sprintf (buffer, "%.1f", v );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, SBYTE); int a = t->toInt (0, SBYTE);
return double (a) / 8.; return double (a) / 8.;
@ -1516,7 +1516,7 @@ class PAApertureInterpreter: public Interpreter
{ {
public: public:
PAApertureInterpreter() {} PAApertureInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
char buffer[32]; char buffer[32];
@ -1524,7 +1524,7 @@ public:
sprintf (buffer, "%.1f", v ); sprintf (buffer, "%.1f", v );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
return exp ((double (a) - 68.) * log (2.) / 16.); return exp ((double (a) - 68.) * log (2.) / 16.);
@ -1536,7 +1536,7 @@ class PAExposureTimeInterpreter: public Interpreter
{ {
public: public:
PAExposureTimeInterpreter() {} PAExposureTimeInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
char buffer[32]; char buffer[32];
@ -1544,7 +1544,7 @@ public:
sprintf (buffer, "%.6f", v ); sprintf (buffer, "%.6f", v );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
return 24.*exp (- (double (a) - 32.) * log (2.) / 8.); return 24.*exp (- (double (a) - 32.) * log (2.) / 8.);
@ -1556,7 +1556,7 @@ class PANominalMinApertureInterpreter: public Interpreter
{ {
public: public:
PANominalMinApertureInterpreter() {} PANominalMinApertureInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
@ -1564,7 +1564,7 @@ public:
sprintf (buffer, "%.1f", double (int (pow (2.0, double (mina + 10) / 4.0) + 0.2))); sprintf (buffer, "%.1f", double (int (pow (2.0, double (mina + 10) / 4.0) + 0.2)));
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = t->toInt (0, BYTE) & 0x0F; int a = t->toInt (0, BYTE) & 0x0F;
return double (int (pow (2.0, double (a + 10) / 4.0) + 0.2)); return double (int (pow (2.0, double (a + 10) / 4.0) + 0.2));
@ -1576,7 +1576,7 @@ class PANominalMaxApertureInterpreter: public Interpreter
{ {
public: public:
PANominalMaxApertureInterpreter() {} PANominalMaxApertureInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
int a = t->toInt (0, BYTE); int a = t->toInt (0, BYTE);
@ -1584,7 +1584,7 @@ public:
sprintf (buffer, "%.1f", double (int (pow (2.0, double (maxa) / 4.0) + 0.2)) ); sprintf (buffer, "%.1f", double (int (pow (2.0, double (maxa) / 4.0) + 0.2)) );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
int a = ( t->toInt (0, BYTE) & 0xF0) >> 4; int a = ( t->toInt (0, BYTE) & 0xF0) >> 4;
return double (int (pow (2.0, double (a) / 4.0) + 0.2)); return double (int (pow (2.0, double (a) / 4.0) + 0.2));
@ -1694,7 +1694,7 @@ class PAExternalFlashGNInterpreter: public Interpreter
{ {
public: public:
PAExternalFlashGNInterpreter() {} PAExternalFlashGNInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
int b = t->toInt (0, BYTE) & 0x1F; int b = t->toInt (0, BYTE) & 0x1F;
@ -1708,7 +1708,7 @@ class PAEVStepsInterpreter: public Interpreter
{ {
public: public:
PAEVStepsInterpreter() {} PAEVStepsInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
@ -1727,7 +1727,7 @@ class PAEDialinInterpreter: public Interpreter
{ {
public: public:
PAEDialinInterpreter() {} PAEDialinInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
@ -1746,7 +1746,7 @@ class PAApertureRingUseInterpreter: public Interpreter
{ {
public: public:
PAApertureRingUseInterpreter() {} PAApertureRingUseInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
@ -1776,7 +1776,7 @@ public:
choices[9] = "Slow-sync, Red-eye reduction"; choices[9] = "Slow-sync, Red-eye reduction";
choices[10] = "Trailing-curtain Sync"; choices[10] = "Trailing-curtain Sync";
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE) >> 4); std::map<int, std::string>::iterator r = choices.find (t->toInt (0, BYTE) >> 4);
@ -1795,7 +1795,7 @@ class PAMeteringMode2Interpreter: public Interpreter
{ {
public: public:
PAMeteringMode2Interpreter() {} PAMeteringMode2Interpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
int v = (t->toInt (0, BYTE) & 0xF); int v = (t->toInt (0, BYTE) & 0xF);
@ -1859,7 +1859,7 @@ class PAProgramLineInterpreter: public Interpreter
{ {
public: public:
PAProgramLineInterpreter() {} PAProgramLineInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::ostringstream str; std::ostringstream str;
int c = t->toInt (0, BYTE); int c = t->toInt (0, BYTE);
@ -1899,7 +1899,7 @@ class PAAFModeInterpreter: public Interpreter
{ {
public: public:
PAAFModeInterpreter() {} PAAFModeInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
switch (t->toInt (0, BYTE) & 0x3) { switch (t->toInt (0, BYTE) & 0x3) {
case 0: case 0:
@ -1925,7 +1925,7 @@ class PAAFPointSelectedInterpreter: public Interpreter
{ {
public: public:
PAAFPointSelectedInterpreter() {} PAAFPointSelectedInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int c = t->toInt (0, SHORT); int c = t->toInt (0, SHORT);
@ -1949,7 +1949,7 @@ class PADriveMode2Interpreter: public Interpreter
{ {
public: public:
PADriveMode2Interpreter() {} PADriveMode2Interpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int c = t->toInt (0, BYTE); int c = t->toInt (0, BYTE);

10
rtexif/rtexif.h
View File

@ -191,10 +191,10 @@ public:
TagDirectoryTable(); TagDirectoryTable();
TagDirectoryTable (TagDirectory* p, unsigned char *v, int memsize, int offs, TagType type, const TagAttrib* ta, ByteOrder border); TagDirectoryTable (TagDirectory* p, unsigned char *v, int memsize, int offs, TagType type, const TagAttrib* ta, ByteOrder border);
TagDirectoryTable (TagDirectory* p, FILE* f, int memsize, int offset, TagType type, const TagAttrib* ta, ByteOrder border); TagDirectoryTable (TagDirectory* p, FILE* f, int memsize, int offset, TagType type, const TagAttrib* ta, ByteOrder border);
virtual ~TagDirectoryTable(); ~TagDirectoryTable() override;
virtual int calculateSize (); int calculateSize () override;
virtual int write (int start, unsigned char* buffer); int write (int start, unsigned char* buffer) override;
virtual TagDirectory* clone (TagDirectory* parent); TagDirectory* clone (TagDirectory* parent) override;
}; };
// a class representing a single tag // a class representing a single tag
@ -488,7 +488,7 @@ protected:
std::map<int, std::string> choices; std::map<int, std::string> choices;
public: public:
ChoiceInterpreter () {}; ChoiceInterpreter () {};
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::map<int, std::string>::iterator r = choices.find (t->toInt()); std::map<int, std::string>::iterator r = choices.find (t->toInt());

42
rtexif/sonyminoltaattribs.cc
View File

@ -1150,7 +1150,7 @@ public:
}; };
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int lensID = t->toInt(); int lensID = t->toInt();
Tag *lensInfoTag = t->getParent()->getRoot()->findTag ("LensInfo"); Tag *lensInfoTag = t->getParent()->getRoot()->findTag ("LensInfo");
@ -1297,7 +1297,7 @@ public:
choices.insert (p_t (51507, "Samyang AF 35mm f/1.4")); choices.insert (p_t (51507, "Samyang AF 35mm f/1.4"));
} }
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int lensID = t->toInt(); int lensID = t->toInt();
Tag *lensInfoTag = t->getParent()->getRoot()->findTag ("LensInfo"); Tag *lensInfoTag = t->getParent()->getRoot()->findTag ("LensInfo");
@ -2091,7 +2091,7 @@ class SAExposureTimeInterpreter : public Interpreter
{ {
public: public:
SAExposureTimeInterpreter () {} SAExposureTimeInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
double a = t->toDouble(); double a = t->toDouble();
@ -2103,7 +2103,7 @@ public:
return "n/a"; return "n/a";
} }
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
// Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT // Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT
TagType astype = t->getType(); TagType astype = t->getType();
@ -2122,7 +2122,7 @@ public:
return 0.; return 0.;
} }
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
// Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT // Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT
int a = 0; int a = 0;
@ -2151,7 +2151,7 @@ class SAFNumberInterpreter : public Interpreter
{ {
public: public:
SAFNumberInterpreter () {} SAFNumberInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
double a = double (t->toDouble()); double a = double (t->toDouble());
@ -2163,7 +2163,7 @@ public:
return "n/a"; return "n/a";
} }
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
// Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT // Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT
TagType astype = t->getType(); TagType astype = t->getType();
@ -2182,7 +2182,7 @@ public:
return 0.; return 0.;
} }
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
// Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT // Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT
int a = 0; int a = 0;
@ -2211,7 +2211,7 @@ class SAISOSettingInterpreter : public Interpreter
{ {
public: public:
SAISOSettingInterpreter () {} SAISOSettingInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->toInt(); int a = t->toInt();
@ -2223,7 +2223,7 @@ public:
return "Auto"; return "Auto";
} }
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
// Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT // Get the value; Depending on the camera model, this parameter can be a BYTE or a SHORT
int a = 0; int a = 0;
@ -2252,14 +2252,14 @@ class SAExposureCompSetInterpreter : public Interpreter
{ {
public: public:
SAExposureCompSetInterpreter () {} SAExposureCompSetInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
double a = t->toDouble(); double a = t->toDouble();
char buffer[32]; char buffer[32];
sprintf (buffer, "%.2f", a ); sprintf (buffer, "%.2f", a );
return buffer; return buffer;
} }
virtual double toDouble (const Tag* t, int ofs) double toDouble (const Tag* t, int ofs) override
{ {
// Get the value // Get the value
int a = t->getValue()[ofs]; int a = t->getValue()[ofs];
@ -2273,13 +2273,13 @@ class SAAFMicroAdjValueInterpreter : public Interpreter
{ {
public: public:
SAAFMicroAdjValueInterpreter() {} SAAFMicroAdjValueInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%d", t->getValue()[0] - 20); sprintf (buffer, "%d", t->getValue()[0] - 20);
return buffer; return buffer;
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
return t->getValue()[0] - 20; return t->getValue()[0] - 20;
} }
@ -2290,7 +2290,7 @@ class SAAFMicroAdjModeInterpreter : public Interpreter
{ {
public: public:
SAAFMicroAdjModeInterpreter() {} SAAFMicroAdjModeInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int a = t->getValue()[0] & 0x80; int a = t->getValue()[0] & 0x80;
@ -2300,7 +2300,7 @@ public:
return "Off"; return "Off";
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
return (t->getValue()[0] & 0x80) == 0x80 ? 1 : 0; return (t->getValue()[0] & 0x80) == 0x80 ? 1 : 0;
} }
@ -2312,13 +2312,13 @@ class SAAFMicroAdjRegisteredLensesInterpreter : public Interpreter
{ {
public: public:
SAAFMicroAdjRegisteredLensesInterpreter() {} SAAFMicroAdjRegisteredLensesInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%d", t->getValue()[0] & 0x7f); sprintf (buffer, "%d", t->getValue()[0] & 0x7f);
return buffer; return buffer;
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
return t->getValue()[0] & 0x7f; return t->getValue()[0] & 0x7f;
} }
@ -2329,7 +2329,7 @@ class SAFocusStatusInterpreter : public Interpreter
{ {
public: public:
SAFocusStatusInterpreter () {} SAFocusStatusInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
std::string retval; std::string retval;
int a = t->toInt(); int a = t->toInt();
@ -2368,13 +2368,13 @@ class SAColorTemperatureSettingInterpreter : public Interpreter
{ {
public: public:
SAColorTemperatureSettingInterpreter () {} SAColorTemperatureSettingInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
sprintf (buffer, "%d", t->toInt()); sprintf (buffer, "%d", t->toInt());
return buffer; return buffer;
} }
virtual int toInt (const Tag* t, int ofs, TagType astype) int toInt (const Tag* t, int ofs, TagType astype) override
{ {
int a = 0; int a = 0;

20
rtexif/stdattribs.cc
View File

@ -327,7 +327,7 @@ class FNumberInterpreter : public Interpreter
{ {
public: public:
FNumberInterpreter () {} FNumberInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double v = t->toDouble(); double v = t->toDouble();
@ -346,7 +346,7 @@ class ApertureInterpreter : public Interpreter
{ {
public: public:
ApertureInterpreter () {} ApertureInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double v = pow (2.0, t->toDouble() / 2.0); double v = pow (2.0, t->toDouble() / 2.0);
@ -365,7 +365,7 @@ class ExposureBiasInterpreter : public Interpreter
{ {
public: public:
ExposureBiasInterpreter () {} ExposureBiasInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double v = t->toDouble(); double v = t->toDouble();
@ -384,7 +384,7 @@ class ShutterSpeedInterpreter : public Interpreter
{ {
public: public:
ShutterSpeedInterpreter () {} ShutterSpeedInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double d = pow (2.0, -t->toDouble()); double d = pow (2.0, -t->toDouble());
@ -404,7 +404,7 @@ class ExposureTimeInterpreter : public Interpreter
{ {
public: public:
ExposureTimeInterpreter () {} ExposureTimeInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double d = t->toDouble(); double d = t->toDouble();
@ -424,7 +424,7 @@ class FocalLengthInterpreter : public Interpreter
{ {
public: public:
FocalLengthInterpreter () {} FocalLengthInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char buffer[32]; char buffer[32];
double v = t->toDouble(); double v = t->toDouble();
@ -443,7 +443,7 @@ class UserCommentInterpreter : public Interpreter
{ {
public: public:
UserCommentInterpreter () {} UserCommentInterpreter () {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int count = t->getCount(); int count = t->getCount();
@ -563,7 +563,7 @@ public:
delete [] buffer; delete [] buffer;
return retVal; return retVal;
} }
virtual void fromString (Tag* t, const std::string& value) void fromString (Tag* t, const std::string& value) override
{ {
Glib::ustring tmpStr(value); Glib::ustring tmpStr(value);
t->userCommentFromString (tmpStr); t->userCommentFromString (tmpStr);
@ -575,7 +575,7 @@ class CFAInterpreter : public Interpreter
{ {
public: public:
CFAInterpreter() {} CFAInterpreter() {}
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
char colors[] = "RGB"; char colors[] = "RGB";
char buffer[1024]; char buffer[1024];
@ -632,7 +632,7 @@ UTF8BinInterpreter utf8BinInterpreter;
class RawImageSegmentationInterpreter : public Interpreter class RawImageSegmentationInterpreter : public Interpreter
{ {
public: public:
virtual std::string toString (Tag* t) std::string toString (Tag* t) override
{ {
int segmentNumber = t->toInt(0, SHORT); int segmentNumber = t->toInt(0, SHORT);
int segmentWidth = t->toInt(2, SHORT); int segmentWidth = t->toInt(2, SHORT);

2
rtgui/adjuster.h
View File

@ -87,7 +87,7 @@ public:
int delay; int delay;
Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon1 = nullptr, Gtk::Image *imgIcon2 = nullptr, double2double_fun slider2value = nullptr, double2double_fun value2slider = nullptr); Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon1 = nullptr, Gtk::Image *imgIcon2 = nullptr, double2double_fun slider2value = nullptr, double2double_fun value2slider = nullptr);
virtual ~Adjuster (); ~Adjuster () override;
// Add an "Automatic" checkbox next to the reset button. // Add an "Automatic" checkbox next to the reset button.
void addAutoButton(Glib::ustring tooltip = ""); void addAutoButton(Glib::ustring tooltip = "");

28
rtgui/batchqueue.h
View File

@ -44,7 +44,7 @@ class BatchQueue final :
{ {
public: public:
explicit BatchQueue (FileCatalog* aFileCatalog); explicit BatchQueue (FileCatalog* aFileCatalog);
~BatchQueue (); ~BatchQueue () override;
void addEntries (const std::vector<BatchQueueEntry*>& entries, bool head = false, bool save = true); void addEntries (const std::vector<BatchQueueEntry*>& entries, bool head = false, bool save = true);
void cancelItems (const std::vector<ThumbBrowserEntryBase*>& items); void cancelItems (const std::vector<ThumbBrowserEntryBase*>& items);
@ -62,17 +62,17 @@ public:
return (!fd.empty()); return (!fd.empty());
} }
void setProgress(double p); void setProgress(double p) override;
void setProgressStr(const Glib::ustring& str); void setProgressStr(const Glib::ustring& str) override;
void setProgressState(bool inProcessing); void setProgressState(bool inProcessing) override;
void error(const Glib::ustring& descr); void error(const Glib::ustring& descr) override;
rtengine::ProcessingJob* imageReady(rtengine::IImagefloat* img); rtengine::ProcessingJob* imageReady(rtengine::IImagefloat* img) override;
void rightClicked (ThumbBrowserEntryBase* entry); void rightClicked (ThumbBrowserEntryBase* entry) override;
void doubleClicked (ThumbBrowserEntryBase* entry); void doubleClicked (ThumbBrowserEntryBase* entry) override;
bool keyPressed (GdkEventKey* event); bool keyPressed (GdkEventKey* event) override;
void buttonPressed (LWButton* button, int actionCode, void* actionData); void buttonPressed (LWButton* button, int actionCode, void* actionData) override;
void redrawNeeded (LWButton* button); void redrawNeeded (LWButton* button) override;
void setBatchQueueListener (BatchQueueListener* l) void setBatchQueueListener (BatchQueueListener* l)
{ {
@ -86,9 +86,9 @@ public:
static int calcMaxThumbnailHeight(); static int calcMaxThumbnailHeight();
protected: protected:
int getMaxThumbnailHeight() const; int getMaxThumbnailHeight() const override;
void saveThumbnailHeight (int height); void saveThumbnailHeight (int height) override;
int getThumbnailHeight (); int getThumbnailHeight () override;
Glib::ustring autoCompleteFileName (const Glib::ustring& fileName, const Glib::ustring& format); Glib::ustring autoCompleteFileName (const Glib::ustring& fileName, const Glib::ustring& format);
Glib::ustring getTempFilenameForParams( const Glib::ustring &filename ); Glib::ustring getTempFilenameForParams( const Glib::ustring &filename );

16
rtgui/batchqueueentry.h
View File

@ -56,21 +56,21 @@ public:
bool fast_pipeline; bool fast_pipeline;
BatchQueueEntry (rtengine::ProcessingJob* job, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm = nullptr); BatchQueueEntry (rtengine::ProcessingJob* job, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm = nullptr);
~BatchQueueEntry (); ~BatchQueueEntry () override;
void refreshThumbnailImage (); void refreshThumbnailImage () override;
void calcThumbnailSize (); void calcThumbnailSize () override;
void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h); void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) override;
void removeButtonSet (); void removeButtonSet ();
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea (); std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea () override;
virtual void getIconSize (int& w, int& h); void getIconSize (int& w, int& h) override;
virtual Glib::ustring getToolTip (int x, int y); Glib::ustring getToolTip (int x, int y) override;
// bqentryupdatelistener interface // bqentryupdatelistener interface
void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview); void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview) override;
void _updateImage (guint8* img, int w, int h); // inside gtk thread void _updateImage (guint8* img, int w, int h); // inside gtk thread
}; };

2
rtgui/batchqueuepanel.h
View File

@ -59,7 +59,7 @@ class BatchQueuePanel : public Gtk::VBox,
public: public:
explicit BatchQueuePanel (FileCatalog* aFileCatalog); explicit BatchQueuePanel (FileCatalog* aFileCatalog);
~BatchQueuePanel(); ~BatchQueuePanel() override;
void init (RTWindow* parent); void init (RTWindow* parent);

14
rtgui/bayerpreprocess.h
View File

@ -41,17 +41,17 @@ public:
BayerPreProcess (); BayerPreProcess ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void hotDeadPixelChanged(); void hotDeadPixelChanged();
void setAdjusterBehavior (bool linedenoiseadd, bool greenequiladd); void setAdjusterBehavior (bool linedenoiseadd, bool greenequiladd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void lineDenoiseDirectionChanged(); void lineDenoiseDirectionChanged();
void pdafLinesFilterChanged(); void pdafLinesFilterChanged();
}; };

22
rtgui/bayerprocess.h
View File

@ -70,24 +70,24 @@ protected:
public: public:
BayerProcess (); BayerProcess ();
~BayerProcess (); ~BayerProcess () override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setAdjusterBehavior(bool falsecoloradd, bool iteradd, bool dualdemozecontrastadd, bool pssigmaadd, bool pssmoothadd, bool pseperisoadd); void setAdjusterBehavior(bool falsecoloradd, bool iteradd, bool dualdemozecontrastadd, bool pssigmaadd, bool pssmoothadd, bool pseperisoadd);
void trimValues(rtengine::procparams::ProcParams* pp); void trimValues(rtengine::procparams::ProcParams* pp) override;
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void methodChanged(); void methodChanged();
void imageNumberChanged(); void imageNumberChanged();
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
void checkBoxToggled(CheckBox* c, CheckValue newval); void checkBoxToggled(CheckBox* c, CheckValue newval) override;
void pixelShiftMotionMethodChanged(); void pixelShiftMotionMethodChanged();
void pixelShiftDemosaicMethodChanged(); void pixelShiftDemosaicMethodChanged();
void autoContrastChanged (double autoContrast); void autoContrastChanged (double autoContrast) override;
void FrameCountChanged(int n, int frameNum); void FrameCountChanged(int n, int frameNum) override;
}; };
#endif #endif

16
rtgui/bayerrawexposure.h
View File

@ -38,15 +38,15 @@ public:
BayerRAWExposure (); BayerRAWExposure ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
void checkBoxToggled (CheckBox* c, CheckValue newval); void checkBoxToggled (CheckBox* c, CheckValue newval) override;
void setAdjusterBehavior (bool pexblackadd); void setAdjusterBehavior (bool pexblackadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
}; };
#endif #endif

28
rtgui/blackwhite.h
View File

@ -39,32 +39,32 @@ class BlackWhite final :
public: public:
BlackWhite (); BlackWhite ();
~BlackWhite (); ~BlackWhite () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void autoOpenCurve (); void autoOpenCurve () override;
void setEditProvider (EditDataProvider *provider); void setEditProvider (EditDataProvider *provider) override;
void autoch_toggled (); void autoch_toggled ();
void neutral_pressed (); void neutral_pressed ();
void updateRGBLabel (); void updateRGBLabel ();
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
void setAdjusterBehavior (bool bwadd, bool bwgadd); void setAdjusterBehavior (bool bwadd, bool bwgadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void enabledcc_toggled (); void enabledcc_toggled ();
void enabledChanged (); void enabledChanged () override;
void methodChanged (); void methodChanged ();
void filterChanged (); void filterChanged ();
void settingChanged (); void settingChanged ();
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void BWChanged (double redbw, double greenbw, double bluebw); void BWChanged (double redbw, double greenbw, double bluebw) override;
bool BWComputed_ (); bool BWComputed_ ();
void curveChanged (CurveEditor* ce); void curveChanged (CurveEditor* ce) override;
void curveMode1Changed (); void curveMode1Changed ();
bool curveMode1Changed_ (); bool curveMode1Changed_ ();
void curveMode1Changed2 (); void curveMode1Changed2 ();

50
rtgui/cacheimagedata.h
View File

@ -87,30 +87,30 @@ public:
// FramesMetaData interface // FramesMetaData interface
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
unsigned int getRootCount () const { return -1; } unsigned int getRootCount () const override { return -1; }
unsigned int getFrameCount () const { return frameCount; } unsigned int getFrameCount () const override { return frameCount; }
bool hasExif (unsigned int frame = 0) const { return false; } bool hasExif (unsigned int frame = 0) const override { return false; }
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const { return nullptr; } rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const override { return nullptr; }
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const { return nullptr; } rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const override { return nullptr; }
rtexif::TagDirectory* getBestExifData (rtengine::ImageSource *imgSource, rtengine::procparams::RAWParams *rawParams) const { return nullptr; } rtexif::TagDirectory* getBestExifData (rtengine::ImageSource *imgSource, rtengine::procparams::RAWParams *rawParams) const override { return nullptr; }
bool hasIPTC (unsigned int frame = 0) const { return false; } bool hasIPTC (unsigned int frame = 0) const override { return false; }
rtengine::procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const { return rtengine::procparams::IPTCPairs(); } rtengine::procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const override { return rtengine::procparams::IPTCPairs(); }
tm getDateTime (unsigned int frame = 0) const { return tm{}; } tm getDateTime (unsigned int frame = 0) const override { return tm{}; }
time_t getDateTimeAsTS(unsigned int frame = 0) const { return time_t(-1); } time_t getDateTimeAsTS(unsigned int frame = 0) const override { return time_t(-1); }
int getISOSpeed (unsigned int frame = 0) const { return iso; } int getISOSpeed (unsigned int frame = 0) const override { return iso; }
double getFNumber (unsigned int frame = 0) const { return fnumber; } double getFNumber (unsigned int frame = 0) const override { return fnumber; }
double getFocalLen (unsigned int frame = 0) const { return focalLen; } double getFocalLen (unsigned int frame = 0) const override { return focalLen; }
double getFocalLen35mm (unsigned int frame = 0) const { return focalLen35mm; } double getFocalLen35mm (unsigned int frame = 0) const override { return focalLen35mm; }
float getFocusDist (unsigned int frame = 0) const { return focusDist; } float getFocusDist (unsigned int frame = 0) const override { return focusDist; }
double getShutterSpeed (unsigned int frame = 0) const { return shutter; } double getShutterSpeed (unsigned int frame = 0) const override { return shutter; }
double getExpComp (unsigned int frame = 0) const { return atof(expcomp.c_str()); } double getExpComp (unsigned int frame = 0) const override { return atof(expcomp.c_str()); }
std::string getMake (unsigned int frame = 0) const { return camMake; } std::string getMake (unsigned int frame = 0) const override { return camMake; }
std::string getModel (unsigned int frame = 0) const { return camModel; } std::string getModel (unsigned int frame = 0) const override { return camModel; }
std::string getLens (unsigned int frame = 0) const { return lens; } std::string getLens (unsigned int frame = 0) const override { return lens; }
std::string getOrientation (unsigned int frame = 0) const { return ""; } // TODO std::string getOrientation (unsigned int frame = 0) const override { return ""; } // TODO
bool getPixelShift () const { return isPixelShift; } bool getPixelShift () const override { return isPixelShift; }
bool getHDR (unsigned int frame = 0) const { return isHDR; } bool getHDR (unsigned int frame = 0) const override { return isHDR; }
std::string getImageType (unsigned int frame) const { return isPixelShift ? "PS" : isHDR ? "HDR" : "STD"; } std::string getImageType (unsigned int frame) const override { return isPixelShift ? "PS" : isHDR ? "HDR" : "STD"; }
rtengine::IIOSampleFormat getSampleFormat (unsigned int frame = 0) const { return sampleFormat; } rtengine::IIOSampleFormat getSampleFormat (unsigned int frame = 0) const override { return sampleFormat; }
}; };
#endif #endif

14
rtgui/cacorrection.h
View File

@ -34,15 +34,15 @@ public:
CACorrection (); CACorrection ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void setAdjusterBehavior (bool badd); void setAdjusterBehavior (bool badd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
}; };
#endif #endif

16
rtgui/chmixer.h
View File

@ -36,16 +36,16 @@ public:
ChMixer (); ChMixer ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void setAdjusterBehavior (bool rgbadd); void setAdjusterBehavior (bool rgbadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void enabledChanged(); void enabledChanged() override;
}; };
#endif #endif

4
rtgui/coarsepanel.h
View File

@ -37,8 +37,8 @@ public:
CoarsePanel (); CoarsePanel ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void initBatchBehavior (); void initBatchBehavior ();
void rotateLeft (); void rotateLeft ();

30
rtgui/colorappearance.h
View File

@ -38,16 +38,16 @@ class ColorAppearance final :
{ {
public: public:
ColorAppearance (); ColorAppearance ();
~ColorAppearance (); ~ColorAppearance () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
// void adjusterAdapToggled (Adjuster* a, bool newval); // void adjusterAdapToggled (Adjuster* a, bool newval);
void enabledChanged (); void enabledChanged () override;
void surroundChanged (); void surroundChanged ();
void surrsrcChanged (); void surrsrcChanged ();
void wbmodelChanged (); void wbmodelChanged ();
@ -58,14 +58,14 @@ public:
void datacie_toggled (); void datacie_toggled ();
void tonecie_toggled (); void tonecie_toggled ();
// void sharpcie_toggled (); // void sharpcie_toggled ();
void autoCamChanged (double ccam, double ccamout); void autoCamChanged (double ccam, double ccamout) override;
bool autoCamComputed_ (); bool autoCamComputed_ ();
void adapCamChanged (double cadap); void adapCamChanged (double cadap) override;
bool adapCamComputed_ (); bool adapCamComputed_ ();
void ybCamChanged (int yb); void ybCamChanged (int yb) override;
bool ybCamComputed_ (); bool ybCamComputed_ ();
void curveChanged (CurveEditor* ce); void curveChanged (CurveEditor* ce) override;
void curveMode1Changed (); void curveMode1Changed ();
bool curveMode1Changed_ (); bool curveMode1Changed_ ();
void curveMode2Changed (); void curveMode2Changed ();
@ -76,10 +76,10 @@ public:
void expandCurve (bool isExpanded); void expandCurve (bool isExpanded);
bool isCurveExpanded (); bool isCurveExpanded ();
void autoOpenCurve (); void autoOpenCurve () override;
void setAdjusterBehavior (bool degreeadd, bool adapscenadd, bool adaplumadd, bool badpixsladd, bool jlightadd, bool chromaadd, bool contrastadd, bool rstprotectionadd, bool qbrightadd, bool qcontrastadd, bool schromaadd, bool mchromaadd, bool colorhadd); void setAdjusterBehavior (bool degreeadd, bool adapscenadd, bool adaplumadd, bool badpixsladd, bool jlightadd, bool chromaadd, bool contrastadd, bool rstprotectionadd, bool qbrightadd, bool qcontrastadd, bool schromaadd, bool mchromaadd, bool colorhadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void updateCurveBackgroundHistogram( void updateCurveBackgroundHistogram(
const LUTu& histToneCurve, const LUTu& histToneCurve,
const LUTu& histLCurve, const LUTu& histLCurve,
@ -92,7 +92,7 @@ public:
const LUTu& histLuma, const LUTu& histLuma,
const LUTu& histLRETI const LUTu& histLRETI
); );
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller *caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller *caller) override;
void updateToolState (std::vector<int> &tpOpen); void updateToolState (std::vector<int> &tpOpen);
void writeOptions (std::vector<int> &tpOpen); void writeOptions (std::vector<int> &tpOpen);

42
rtgui/colortoning.h
View File

@ -25,41 +25,41 @@ class ColorToning final :
{ {
public: public:
ColorToning (); ColorToning ();
~ColorToning(); ~ColorToning() override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
void setAdjusterBehavior (bool splitAdd, bool satThresholdAdd, bool satOpacityAdd, bool strprotectAdd, bool balanceAdd); void setAdjusterBehavior (bool splitAdd, bool satThresholdAdd, bool satOpacityAdd, bool strprotectAdd, bool balanceAdd);
void neutral_pressed (); void neutral_pressed ();
//void neutralCurves_pressed (); //void neutralCurves_pressed ();
void autoColorTonChanged (int bwct, int satthres, int satprot); void autoColorTonChanged (int bwct, int satthres, int satprot) override;
bool CTComp_ (); bool CTComp_ ();
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop); void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight); void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override;
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop); void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override;
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight); void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) override;
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR); void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
void enabledChanged (); void enabledChanged () override;
void curveChanged (CurveEditor* ce); void curveChanged (CurveEditor* ce) override;
void autosatChanged (); void autosatChanged ();
void autoOpenCurve (); void autoOpenCurve () override;
void methodChanged (); void methodChanged ();
void twocolorChanged (bool changedbymethod); void twocolorChanged (bool changedbymethod);
void twoColorChangedByGui (); void twoColorChangedByGui ();
void lumamodeChanged (); void lumamodeChanged ();
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void setListener(ToolPanelListener *tpl); void setListener(ToolPanelListener *tpl) override;
void setEditProvider(EditDataProvider *provider); void setEditProvider(EditDataProvider *provider) override;
float blendPipetteValues(CurveEditor *ce, float chan1, float chan2, float chan3); float blendPipetteValues(CurveEditor *ce, float chan1, float chan2, float chan3) override;
private: private:
void onLabRegionSelectionChanged(); void onLabRegionSelectionChanged();

2
rtgui/coordinateadjuster.h
View File

@ -136,7 +136,7 @@ public:
/// For more complex adjuster /// For more complex adjuster
CoordinateAdjuster(CoordinateProvider *provider, CurveEditorSubGroup *parent, const std::vector<Axis> &axis); CoordinateAdjuster(CoordinateProvider *provider, CurveEditorSubGroup *parent, const std::vector<Axis> &axis);
virtual ~CoordinateAdjuster(); ~CoordinateAdjuster() override;
// Update the Axis list, e.g. on Curve change, but MUST have the same axis count // Update the Axis list, e.g. on Curve change, but MUST have the same axis count
void setAxis(const std::vector<Axis> &axis); void setAxis(const std::vector<Axis> &axis);

40
rtgui/crop.h
View File

@ -41,42 +41,42 @@ class Crop final :
{ {
public: public:
Crop(); Crop();
~Crop(); ~Crop() override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void ratioChanged (); void ratioChanged ();
void ratioFixedChanged (); // The toggle button void ratioFixedChanged (); // The toggle button
void refreshSize (); void refreshSize ();
void selectPressed (); void selectPressed ();
void setDimensions (int mw, int mh); void setDimensions (int mw, int mh);
void enabledChanged (); void enabledChanged () override;
void positionChanged (); void positionChanged ();
void widthChanged (); void widthChanged ();
void heightChanged (); void heightChanged ();
bool refreshSpins (bool notify = false); bool refreshSpins (bool notify = false);
void notifyListener (); void notifyListener ();
void sizeChanged (int w, int h, int ow, int oh); void sizeChanged (int w, int h, int ow, int oh) override;
void trim (rtengine::procparams::ProcParams* pp, int ow, int oh); void trim (rtengine::procparams::ProcParams* pp, int ow, int oh);
void readOptions (); void readOptions ();
void writeOptions (); void writeOptions ();
void cropMoved (int &x, int &y, int &w, int &h); void cropMoved (int &x, int &y, int &w, int &h) override;
void cropWidth1Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropWidth1Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropWidth2Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropWidth2Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropHeight1Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropHeight1Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropHeight2Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropHeight2Resized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropTopLeftResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropTopLeftResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropTopRightResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropTopRightResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropBottomLeftResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropBottomLeftResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropBottomRightResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f); void cropBottomRightResized (int &x, int &y, int &w, int &h, float custom_ratio=0.f) override;
void cropInit (int &x, int &y, int &w, int &h); void cropInit (int &x, int &y, int &w, int &h) override;
void cropResized (int &x, int &y, int& x2, int& y2); void cropResized (int &x, int &y, int& x2, int& y2) override;
void cropManipReady (); void cropManipReady () override;
bool inImageArea (int x, int y); bool inImageArea (int x, int y) override;
double getRatio () const; double getRatio () const override;
void setCropPanelListener (CropPanelListener* cl) void setCropPanelListener (CropPanelListener* cl)
{ {

8
rtgui/crophandler.h
View File

@ -51,7 +51,7 @@ class CropHandler final :
{ {
public: public:
CropHandler (); CropHandler ();
~CropHandler (); ~CropHandler () override;
void setDisplayHandler (CropDisplayHandler* l) void setDisplayHandler (CropDisplayHandler* l)
{ {
@ -96,11 +96,11 @@ public:
int cw, int cw,
int ch, int ch,
int skip int skip
); ) override;
void getWindow(int& cwx, int& cwy, int& cww, int& cwh, int& cskip); void getWindow(int& cwx, int& cwy, int& cww, int& cwh, int& cskip) override;
// SizeListener interface // SizeListener interface
void sizeChanged (int w, int h, int ow, int oh); void sizeChanged (int w, int h, int ow, int oh) override;
void update (); void update ();

38
rtgui/cropwindow.h
View File

@ -134,7 +134,7 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
public: public:
CropHandler cropHandler; CropHandler cropHandler;
CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDetailWindow); CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDetailWindow);
~CropWindow (); ~CropWindow () override;
void setDecorated (bool decorated) void setDecorated (bool decorated)
{ {
@ -150,19 +150,19 @@ public:
} }
void deleteColorPickers (); void deleteColorPickers ();
void screenCoordToCropBuffer (int phyx, int phyy, int& cropx, int& cropy); void screenCoordToCropBuffer (int phyx, int phyy, int& cropx, int& cropy) override;
void screenCoordToImage (int phyx, int phyy, int& imgx, int& imgy); void screenCoordToImage (int phyx, int phyy, int& imgx, int& imgy) override;
void screenCoordToCropCanvas (int phyx, int phyy, int& prevx, int& prevy); void screenCoordToCropCanvas (int phyx, int phyy, int& prevx, int& prevy);
void imageCoordToCropCanvas (int imgx, int imgy, int& phyx, int& phyy); void imageCoordToCropCanvas (int imgx, int imgy, int& phyx, int& phyy) override;
void imageCoordToScreen (int imgx, int imgy, int& phyx, int& phyy); void imageCoordToScreen (int imgx, int imgy, int& phyx, int& phyy) override;
void imageCoordToCropBuffer (int imgx, int imgy, int& phyx, int& phyy); void imageCoordToCropBuffer (int imgx, int imgy, int& phyx, int& phyy) override;
void imageCoordToCropImage (int imgx, int imgy, int& phyx, int& phyy); void imageCoordToCropImage (int imgx, int imgy, int& phyx, int& phyy) override;
int scaleValueToImage (int value); int scaleValueToImage (int value) override;
float scaleValueToImage (float value); float scaleValueToImage (float value) override;
double scaleValueToImage (double value); double scaleValueToImage (double value) override;
int scaleValueToCanvas (int value); int scaleValueToCanvas (int value) override;
float scaleValueToCanvas (float value); float scaleValueToCanvas (float value) override;
double scaleValueToCanvas (double value); double scaleValueToCanvas (double value) override;
double getZoomFitVal (); double getZoomFitVal ();
void setPosition (int x, int y); void setPosition (int x, int y);
void getPosition (int& x, int& y); void getPosition (int& x, int& y);
@ -197,8 +197,8 @@ public:
void setEditSubscriber (EditSubscriber* newSubscriber); void setEditSubscriber (EditSubscriber* newSubscriber);
// interface lwbuttonlistener // interface lwbuttonlistener
void buttonPressed (LWButton* button, int actionCode, void* actionData); void buttonPressed (LWButton* button, int actionCode, void* actionData) override;
void redrawNeeded (LWButton* button); void redrawNeeded (LWButton* button) override;
// crop handling // crop handling
void getCropRectangle (int& x, int& y, int& w, int& h); void getCropRectangle (int& x, int& y, int& w, int& h);
@ -220,10 +220,10 @@ public:
void delCropWindowListener (CropWindowListener* l); void delCropWindowListener (CropWindowListener* l);
// crophandlerlistener interface // crophandlerlistener interface
void cropImageUpdated (); void cropImageUpdated () override;
void cropWindowChanged (); void cropWindowChanged () override;
void initialImageArrived (); void initialImageArrived () override;
void setDisplayPosition (int x, int y); void setDisplayPosition (int x, int y) override;
void remoteMove (int deltaX, int deltaY); void remoteMove (int deltaX, int deltaY);
void remoteMoveReady (); void remoteMoveReady ();

22
rtgui/curveeditor.h
View File

@ -88,7 +88,7 @@ protected:
public: public:
CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup); CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup);
virtual ~CurveEditor (); ~CurveEditor () override;
void typeSelectionChanged (int n); void typeSelectionChanged (int n);
void curveTypeToggled(); void curveTypeToggled();
bool isUnChanged (); bool isUnChanged ();
@ -127,12 +127,12 @@ public:
sigc::signal<void> signal_curvepoint_click(); sigc::signal<void> signal_curvepoint_click();
sigc::signal<void> signal_curvepoint_release(); sigc::signal<void> signal_curvepoint_release();
void switchOffEditMode (); void switchOffEditMode () override;
bool mouseOver(const int modifierKey); bool mouseOver(const int modifierKey) override;
bool button1Pressed(const int modifierKey); bool button1Pressed(const int modifierKey) override;
bool button1Released(); bool button1Released() override;
bool drag1(const int modifierKey); bool drag1(const int modifierKey) override;
CursorShape getCursor(const int objectID); CursorShape getCursor(const int objectID) override;
}; };
@ -161,7 +161,7 @@ protected:
public: public:
DiagonalCurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup); DiagonalCurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup);
std::vector<double> getCurve (); std::vector<double> getCurve () override;
void setRangeLabels(Glib::ustring r1, Glib::ustring r2, Glib::ustring r3, Glib::ustring r4); void setRangeLabels(Glib::ustring r1, Glib::ustring r2, Glib::ustring r3, Glib::ustring r4);
void getRangeLabels(Glib::ustring &r1, Glib::ustring &r2, Glib::ustring &r3, Glib::ustring &r4); void getRangeLabels(Glib::ustring &r1, Glib::ustring &r2, Glib::ustring &r3, Glib::ustring &r4);
void setRangeDefaultMilestones(double m1, double m2, double m3); void setRangeDefaultMilestones(double m1, double m2, double m3);
@ -191,15 +191,15 @@ protected:
public: public:
FlatCurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup, bool isPeriodic = true); FlatCurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup, bool isPeriodic = true);
virtual void setIdentityValue (const double iValue = 0.5) void setIdentityValue (const double iValue = 0.5) override
{ {
identityValue = iValue; identityValue = iValue;
} }
virtual double getIdentityValue () double getIdentityValue () override
{ {
return identityValue; return identityValue;
}; };
std::vector<double> getCurve (); std::vector<double> getCurve () override;
// set the reset curve for a given curve type. This is optional; all curve type have a default reset curve // set the reset curve for a given curve type. This is optional; all curve type have a default reset curve
void setResetCurve(FlatCurveType cType, const std::vector<double> &resetCurve); void setResetCurve(FlatCurveType cType, const std::vector<double> &resetCurve);

6
rtgui/curveeditorgroup.h
View File

@ -71,7 +71,7 @@ public:
*/ */
CurveEditorGroup(Glib::ustring& curveDir, Glib::ustring groupLabel = ""); CurveEditorGroup(Glib::ustring& curveDir, Glib::ustring groupLabel = "");
~CurveEditorGroup(); ~CurveEditorGroup() override;
void newLine(); void newLine();
void curveListComplete(); void curveListComplete();
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode);
@ -97,8 +97,8 @@ protected:
void hideCurrentCurve (); void hideCurrentCurve ();
void updateGUI (CurveEditor* ce); void updateGUI (CurveEditor* ce);
void curveResetPressed (); void curveResetPressed ();
void curveChanged (); void curveChanged () override;
float blendPipetteValues(CurveEditor* ce, float chan1, float chan2, float chan3); float blendPipetteValues(CurveEditor* ce, float chan1, float chan2, float chan3) override;
void setUnChanged (bool uc, CurveEditor* ce); void setUnChanged (bool uc, CurveEditor* ce);
}; };

4
rtgui/darkframe.h
View File

@ -55,8 +55,8 @@ public:
DarkFrame (); DarkFrame ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void darkFrameChanged (); void darkFrameChanged ();
void darkFrameReset (); void darkFrameReset ();

22
rtgui/defringe.h
View File

@ -41,18 +41,18 @@ protected:
public: public:
Defringe (); Defringe ();
~Defringe (); ~Defringe () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void autoOpenCurve (); void autoOpenCurve () override;
void curveChanged (); void curveChanged () override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
}; };

14
rtgui/dehaze.h
View File

@ -39,15 +39,15 @@ public:
Dehaze(); Dehaze();
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr); void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr) override;
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr); void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr); void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr) override;
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode) override;
void adjusterChanged(Adjuster *a, double newval); void adjusterChanged(Adjuster *a, double newval) override;
void enabledChanged(); void enabledChanged() override;
void showDepthMapChanged(); void showDepthMapChanged();
void setAdjusterBehavior(bool strengthAdd); void setAdjusterBehavior(bool strengthAdd);
void adjusterAutoToggled(Adjuster* a, bool newval) {} void adjusterAutoToggled(Adjuster* a, bool newval) override {}
}; };

40
rtgui/diagonalcurveeditorsubgroup.h
View File

@ -75,37 +75,37 @@ protected:
public: public:
DiagonalCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir); DiagonalCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir);
virtual ~DiagonalCurveEditorSubGroup(); ~DiagonalCurveEditorSubGroup() override;
DiagonalCurveEditor* addCurve(Glib::ustring curveLabel = ""); DiagonalCurveEditor* addCurve(Glib::ustring curveLabel = "");
virtual void updateBackgroundHistogram (CurveEditor* ce); void updateBackgroundHistogram (CurveEditor* ce) override;
void switchGUI(); void switchGUI() override;
void refresh(CurveEditor *curveToRefresh); void refresh(CurveEditor *curveToRefresh) override;
void editModeSwitchedOff (); void editModeSwitchedOff () override;
void pipetteMouseOver(EditDataProvider *provider, int modifierKey); void pipetteMouseOver(EditDataProvider *provider, int modifierKey) override;
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey); bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
void pipetteButton1Released(EditDataProvider *provider); void pipetteButton1Released(EditDataProvider *provider) override;
void pipetteDrag(EditDataProvider *provider, int modifierKey); void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
void showCoordinateAdjuster(CoordinateProvider *provider); void showCoordinateAdjuster(CoordinateProvider *provider) override;
void stopNumericalAdjustment(); void stopNumericalAdjustment() override;
bool curveReset (CurveEditor *ce); bool curveReset (CurveEditor *ce) override;
protected: protected:
void storeCurveValues (CurveEditor* ce, const std::vector<double>& p); void storeCurveValues (CurveEditor* ce, const std::vector<double>& p) override;
void storeDisplayedCurve (); void storeDisplayedCurve () override;
void restoreDisplayedHistogram (); void restoreDisplayedHistogram () override;
void savePressed (); void savePressed ();
void loadPressed (); void loadPressed ();
void copyPressed (); void copyPressed ();
void pastePressed (); void pastePressed ();
void editPointToggled(Gtk::ToggleButton *button); void editPointToggled(Gtk::ToggleButton *button);
void editToggled (Gtk::ToggleButton *button); void editToggled (Gtk::ToggleButton *button);
void removeEditor (); void removeEditor () override;
const std::vector<double> getCurveFromGUI (int type); const std::vector<double> getCurveFromGUI (int type) override;
void shcChanged (); void shcChanged () override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
bool adjusterEntered (GdkEventCrossing* ev, int ac); bool adjusterEntered (GdkEventCrossing* ev, int ac);
bool adjusterLeft (GdkEventCrossing* ev, int ac); bool adjusterLeft (GdkEventCrossing* ev, int ac);
void setSubGroupRangeLabels(Glib::ustring r1, Glib::ustring r2, Glib::ustring r3, Glib::ustring r4); void setSubGroupRangeLabels(Glib::ustring r1, Glib::ustring r2, Glib::ustring r3, Glib::ustring r4);

2
rtgui/dirbrowser.h
View File

@ -101,7 +101,7 @@ private:
public: public:
DirBrowser (); DirBrowser ();
~DirBrowser(); ~DirBrowser() override;
void fillDirTree (); void fillDirTree ();
void on_sort_column_changed() const; void on_sort_column_changed() const;

32
rtgui/dirpyrdenoise.h
View File

@ -38,25 +38,25 @@ class DirPyrDenoise final :
{ {
public: public:
DirPyrDenoise (); DirPyrDenoise ();
~DirPyrDenoise (); ~DirPyrDenoise () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void curveChanged (CurveEditor* ce); void curveChanged (CurveEditor* ce) override;
void setEditProvider (EditDataProvider *provider); void setEditProvider (EditDataProvider *provider) override;
void autoOpenCurve (); void autoOpenCurve () override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
void medianChanged (); void medianChanged ();
void chromaChanged (double autchroma, double autred, double autblue); void chromaChanged (double autchroma, double autred, double autblue) override;
bool chromaComputed_ (); bool chromaComputed_ ();
void noiseChanged (double nresid, double highresid); void noiseChanged (double nresid, double highresid) override;
bool noiseComputed_ (); bool noiseComputed_ ();
void noiseTilePrev (int tileX, int tileY, int prevX, int prevY, int sizeT, int sizeP); void noiseTilePrev (int tileX, int tileY, int prevX, int prevY, int sizeT, int sizeP) override;
bool TilePrevComputed_ (); bool TilePrevComputed_ ();
// void perform_toggled (); // void perform_toggled ();
@ -72,10 +72,10 @@ public:
void methodmedChanged (); void methodmedChanged ();
void rgbmethodChanged (); void rgbmethodChanged ();
void smethodChanged (); void smethodChanged ();
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void setAdjusterBehavior (bool lumaadd, bool lumdetadd, bool chromaadd, bool chromaredadd, bool chromablueadd, bool gammaadd, bool passesadd); void setAdjusterBehavior (bool lumaadd, bool lumdetadd, bool chromaadd, bool chromaredadd, bool chromablueadd, bool gammaadd, bool passesadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
Glib::ustring getSettingString (); Glib::ustring getSettingString ();
private: private:

28
rtgui/dirpyrequalizer.h
View File

@ -55,28 +55,28 @@ protected:
public: public:
DirPyrEqualizer (); DirPyrEqualizer ();
virtual ~DirPyrEqualizer (); ~DirPyrEqualizer () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool skinadd); void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool skinadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void cbdlMethodChanged(); void cbdlMethodChanged();
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged(); void enabledChanged() override;
void gamutlabToggled (); void gamutlabToggled ();
void lumaneutralPressed (); void lumaneutralPressed ();
void lumacontrastPlusPressed (); void lumacontrastPlusPressed ();
void lumacontrastMinusPressed (); void lumacontrastMinusPressed ();
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop); void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override;
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight); void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override;
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop); void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override;
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight); void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) override;
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR); void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
}; };
#endif #endif

14
rtgui/distortion.h
View File

@ -37,15 +37,15 @@ public:
Distortion (); Distortion ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
void setAdjusterBehavior (bool vadd); void setAdjusterBehavior (bool vadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void idPressed (); void idPressed ();
void setLensGeomListener (LensGeomListener* l) void setLensGeomListener (LensGeomListener* l)
{ {

30
rtgui/edit.h
View File

@ -348,9 +348,9 @@ public:
Circle (rtengine::Coord& center, int radius, bool filled = false, bool radiusInImageSpace = false); Circle (rtengine::Coord& center, int radius, bool filled = false, bool radiusInImageSpace = false);
Circle (int centerX, int centerY, int radius, bool filled = false, bool radiusInImageSpace = false); Circle (int centerX, int centerY, int radius, bool filled = false, bool radiusInImageSpace = false);
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
}; };
class Line : public Geometry class Line : public Geometry
@ -363,9 +363,9 @@ public:
Line (rtengine::Coord& begin, rtengine::Coord& end); Line (rtengine::Coord& begin, rtengine::Coord& end);
Line (int beginX, int beginY, int endX, int endY); Line (int beginX, int beginY, int endX, int endY);
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
}; };
class Polyline : public Geometry class Polyline : public Geometry
@ -376,9 +376,9 @@ public:
Polyline (); Polyline ();
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
}; };
class Rectangle : public Geometry class Rectangle : public Geometry
@ -394,9 +394,9 @@ public:
void setXYXY(int left, int top, int right, int bottom); void setXYXY(int left, int top, int right, int bottom);
void setXYWH(rtengine::Coord topLeft, rtengine::Coord widthHeight); void setXYWH(rtengine::Coord topLeft, rtengine::Coord widthHeight);
void setXYXY(rtengine::Coord topLeft, rtengine::Coord bottomRight); void setXYXY(rtengine::Coord topLeft, rtengine::Coord bottomRight);
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
}; };
class OPIcon : public Geometry // OP stands for "On Preview" class OPIcon : public Geometry // OP stands for "On Preview"
@ -431,9 +431,9 @@ public:
const Cairo::RefPtr<Cairo::ImageSurface> getActiveImg(); const Cairo::RefPtr<Cairo::ImageSurface> getActiveImg();
const Cairo::RefPtr<Cairo::ImageSurface> getDraggedImg(); const Cairo::RefPtr<Cairo::ImageSurface> getDraggedImg();
const Cairo::RefPtr<Cairo::ImageSurface> getInsensitiveImg(); const Cairo::RefPtr<Cairo::ImageSurface> getInsensitiveImg();
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
}; };
class OPAdjuster : public Geometry // OP stands for "On Preview" class OPAdjuster : public Geometry // OP stands for "On Preview"

22
rtgui/editorpanel.h
View File

@ -56,11 +56,11 @@ class EditorPanel final :
{ {
public: public:
explicit EditorPanel (FilePanel* filePanel = nullptr); explicit EditorPanel (FilePanel* filePanel = nullptr);
~EditorPanel (); ~EditorPanel () override;
void open (Thumbnail* tmb, rtengine::InitialImage* isrc); void open (Thumbnail* tmb, rtengine::InitialImage* isrc);
void setAspect (); void setAspect ();
void on_realize (); void on_realize () override;
void leftPaneButtonReleased (GdkEventButton *event); void leftPaneButtonReleased (GdkEventButton *event);
void rightPaneButtonReleased (GdkEventButton *event); void rightPaneButtonReleased (GdkEventButton *event);
@ -83,10 +83,10 @@ public:
return realized; return realized;
} }
// ProgressListener interface // ProgressListener interface
void setProgress(double p); void setProgress(double p) override;
void setProgressStr(const Glib::ustring& str); void setProgressStr(const Glib::ustring& str) override;
void setProgressState(bool inProcessing); void setProgressState(bool inProcessing) override;
void error(const Glib::ustring& descr); void error(const Glib::ustring& descr) override;
void error(const Glib::ustring& title, const Glib::ustring& descr); void error(const Glib::ustring& title, const Glib::ustring& descr);
void displayError(const Glib::ustring& title, const Glib::ustring& descr); // this is called by error in the gtk thread void displayError(const Glib::ustring& title, const Glib::ustring& descr); // this is called by error in the gtk thread
@ -98,14 +98,14 @@ public:
const rtengine::ProcEvent& ev, const rtengine::ProcEvent& ev,
const Glib::ustring& descr, const Glib::ustring& descr,
const ParamsEdited* paramsEdited = nullptr const ParamsEdited* paramsEdited = nullptr
); ) override;
void clearParamChanges(); void clearParamChanges() override;
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt); void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;
// HistoryBeforeLineListener // HistoryBeforeLineListener
void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params); void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params) override;
// HistogramListener // HistogramListener
void histogramChanged( void histogramChanged(
@ -123,7 +123,7 @@ public:
const LUTu& histBlueRaw, const LUTu& histBlueRaw,
const LUTu& histChroma, const LUTu& histChroma,
const LUTu& histLRETI const LUTu& histLRETI
); ) override;
// event handlers // event handlers
void info_toggled (); void info_toggled ();

6
rtgui/editwindow.h
View File

@ -55,12 +55,12 @@ public:
void toFront(); void toFront();
bool keyPressed (GdkEventKey* event); bool keyPressed (GdkEventKey* event);
bool on_configure_event(GdkEventConfigure* event); bool on_configure_event(GdkEventConfigure* event) override;
bool on_delete_event(GdkEventAny* event); bool on_delete_event(GdkEventAny* event) override;
//bool on_window_state_event(GdkEventWindowState* event); //bool on_window_state_event(GdkEventWindowState* event);
void on_mainNB_switch_page(Gtk::Widget* page, guint page_num); void on_mainNB_switch_page(Gtk::Widget* page, guint page_num);
void set_title_decorated(Glib::ustring fname); void set_title_decorated(Glib::ustring fname);
void on_realize (); void on_realize () override;
}; };
#endif #endif

14
rtgui/epd.h
View File

@ -36,14 +36,14 @@ public:
EdgePreservingDecompositionUI(); EdgePreservingDecompositionUI();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
void setAdjusterBehavior (bool stAdd, bool gAdd, bool esAdd, bool scAdd, bool rAdd); void setAdjusterBehavior (bool stAdd, bool gAdd, bool esAdd, bool scAdd, bool rAdd);
}; };

8
rtgui/exifpanel.h
View File

@ -97,11 +97,11 @@ private:
public: public:
ExifPanel (); ExifPanel ();
virtual ~ExifPanel(); ~ExifPanel() override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setImageData (const rtengine::FramesMetaData* id); void setImageData (const rtengine::FramesMetaData* id);

14
rtgui/fattaltonemap.h
View File

@ -36,14 +36,14 @@ public:
FattalToneMapping(); FattalToneMapping();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
void setAdjusterBehavior(bool amountAdd, bool thresholdAdd, bool anchorAdd); void setAdjusterBehavior(bool amountAdd, bool thresholdAdd, bool anchorAdd);
}; };

32
rtgui/filebrowser.h
View File

@ -136,7 +136,7 @@ protected:
public: public:
FileBrowser (); FileBrowser ();
~FileBrowser (); ~FileBrowser () override;
void addEntry (FileBrowserEntry* entry); // can be called from any thread void addEntry (FileBrowserEntry* entry); // can be called from any thread
void addEntry_ (FileBrowserEntry* entry); // this must be executed inside the gtk thread void addEntry_ (FileBrowserEntry* entry); // this must be executed inside the gtk thread
@ -164,17 +164,17 @@ public:
return numFiltered; return numFiltered;
} }
void buttonPressed (LWButton* button, int actionCode, void* actionData); void buttonPressed (LWButton* button, int actionCode, void* actionData) override;
void redrawNeeded (LWButton* button); void redrawNeeded (LWButton* button) override;
bool checkFilter (ThumbBrowserEntryBase* entry); bool checkFilter (ThumbBrowserEntryBase* entry) override;
void rightClicked (ThumbBrowserEntryBase* entry); void rightClicked (ThumbBrowserEntryBase* entry) override;
void doubleClicked (ThumbBrowserEntryBase* entry); void doubleClicked (ThumbBrowserEntryBase* entry) override;
bool keyPressed (GdkEventKey* event); bool keyPressed (GdkEventKey* event) override;
void saveThumbnailHeight (int height); void saveThumbnailHeight (int height) override;
int getThumbnailHeight (); int getThumbnailHeight () override;
bool isInTabMode() bool isInTabMode() override
{ {
return tbl ? tbl->isInTabMode() : false; return tbl ? tbl->isInTabMode() : false;
} }
@ -191,18 +191,18 @@ public:
void openDefaultViewer (int destination); void openDefaultViewer (int destination);
#endif #endif
void thumbRearrangementNeeded (); void thumbRearrangementNeeded () override;
void _thumbRearrangementNeeded (); void _thumbRearrangementNeeded ();
void selectionChanged (); void selectionChanged () override;
void setExportPanel (ExportPanel* expanel); void setExportPanel (ExportPanel* expanel);
// exportpanel interface // exportpanel interface
void exportRequested(); void exportRequested() override;
void storeCurrentValue(); void storeCurrentValue() override;
void updateProfileList(); void updateProfileList() override;
void restoreValue(); void restoreValue() override;
type_trash_changed trash_changed(); type_trash_changed trash_changed();
}; };

28
rtgui/filebrowserentry.h
View File

@ -67,7 +67,7 @@ class FileBrowserEntry : public ThumbBrowserEntryBase,
bool onArea (CursorArea a, int x, int y); bool onArea (CursorArea a, int x, int y);
void updateCursor (int x, int y); void updateCursor (int x, int y);
void drawStraightenGuide (Cairo::RefPtr<Cairo::Context> c); void drawStraightenGuide (Cairo::RefPtr<Cairo::Context> c);
void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c); void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c) override;
public: public:
@ -78,8 +78,8 @@ public:
static Glib::RefPtr<Gdk::Pixbuf> ps; static Glib::RefPtr<Gdk::Pixbuf> ps;
FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname); FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname);
~FileBrowserEntry (); ~FileBrowserEntry () override;
void draw (Cairo::RefPtr<Cairo::Context> cc); void draw (Cairo::RefPtr<Cairo::Context> cc) override;
void setImageAreaToolListener (ImageAreaToolListener* l) void setImageAreaToolListener (ImageAreaToolListener* l)
{ {
@ -88,23 +88,23 @@ public:
FileThumbnailButtonSet* getThumbButtonSet (); FileThumbnailButtonSet* getThumbButtonSet ();
void refreshThumbnailImage (); void refreshThumbnailImage () override;
void refreshQuickThumbnailImage (); void refreshQuickThumbnailImage () override;
void calcThumbnailSize (); void calcThumbnailSize () override;
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea (); std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea () override;
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea (); std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea () override;
virtual void getIconSize (int& w, int& h); void getIconSize (int& w, int& h) override;
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt); void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;
// thumbimageupdatelistener interface // thumbimageupdatelistener interface
void updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams); void updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams) override;
void _updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams); // inside gtk thread void _updateImage(rtengine::IImage8* img, double scale, const rtengine::procparams::CropParams& cropParams); // inside gtk thread
virtual bool motionNotify (int x, int y); bool motionNotify (int x, int y) override;
virtual bool pressNotify (int button, int type, int bstate, int x, int y); bool pressNotify (int button, int type, int bstate, int x, int y) override;
virtual bool releaseNotify (int button, int type, int bstate, int x, int y); bool releaseNotify (int button, int type, int bstate, int x, int y) override;
}; };
#endif #endif

30
rtgui/filecatalog.h
View File

@ -164,14 +164,14 @@ public:
ToolBar* toolBar; ToolBar* toolBar;
FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel); FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel);
~FileCatalog(); ~FileCatalog() override;
void dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile); void dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile);
void closeDir (); void closeDir ();
void refreshEditedState (const std::set<Glib::ustring>& efiles); void refreshEditedState (const std::set<Glib::ustring>& efiles);
// previewloaderlistener interface // previewloaderlistener interface
void previewReady (int dir_id, FileBrowserEntry* fdn); void previewReady (int dir_id, FileBrowserEntry* fdn) override;
void previewsFinished (int dir_id); void previewsFinished (int dir_id) override;
void previewsFinishedUI (); void previewsFinishedUI ();
void _refreshProgressBar (); void _refreshProgressBar ();
@ -195,10 +195,10 @@ public:
} }
// filterpanel interface // filterpanel interface
void exifFilterChanged (); void exifFilterChanged () override;
// exportpanel interface // exportpanel interface
void exportRequested(); void exportRequested() override;
Glib::ustring lastSelectedDir () Glib::ustring lastSelectedDir ()
{ {
@ -212,15 +212,15 @@ public:
void refreshThumbImages (); void refreshThumbImages ();
void refreshHeight (); void refreshHeight ();
void filterApplied(); void filterApplied() override;
void openRequested(const std::vector<Thumbnail*>& tbe); void openRequested(const std::vector<Thumbnail*>& tbe) override;
void deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed); void deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed) override;
void copyMoveRequested(const std::vector<FileBrowserEntry*>& tbe, bool moveRequested); void copyMoveRequested(const std::vector<FileBrowserEntry*>& tbe, bool moveRequested) override;
void developRequested(const std::vector<FileBrowserEntry*>& tbe, bool fastmode); void developRequested(const std::vector<FileBrowserEntry*>& tbe, bool fastmode) override;
void renameRequested(const std::vector<FileBrowserEntry*>& tbe); void renameRequested(const std::vector<FileBrowserEntry*>& tbe) override;
void selectionChanged(const std::vector<Thumbnail*>& tbe); void selectionChanged(const std::vector<Thumbnail*>& tbe) override;
void clearFromCacheRequested(const std::vector<FileBrowserEntry*>& tbe, bool leavenotrace); void clearFromCacheRequested(const std::vector<FileBrowserEntry*>& tbe, bool leavenotrace) override;
bool isInTabMode() const; bool isInTabMode() const override;
void emptyTrash (); void emptyTrash ();
bool trashIsEmpty (); bool trashIsEmpty ();
@ -247,7 +247,7 @@ public:
void filterChanged (); void filterChanged ();
void runFilterDialog (); void runFilterDialog ();
void on_realize(); void on_realize() override;
void reparseDirectory (); void reparseDirectory ();
void _openImage (std::vector<Thumbnail*> tmb); void _openImage (std::vector<Thumbnail*> tmb);

8
rtgui/filepanel.h
View File

@ -40,7 +40,7 @@ class FilePanel final :
{ {
public: public:
FilePanel (); FilePanel ();
~FilePanel (); ~FilePanel () override;
Gtk::Paned* placespaned; Gtk::Paned* placespaned;
Gtk::HPaned* dirpaned; Gtk::HPaned* dirpaned;
@ -58,7 +58,7 @@ public:
parent = p; parent = p;
} }
void init (); // don't call it directly, the constructor calls it as idle source void init (); // don't call it directly, the constructor calls it as idle source
void on_realize (); void on_realize () override;
void setAspect(); void setAspect();
void open (const Glib::ustring& d); // open a file or a directory void open (const Glib::ustring& d); // open a file or a directory
void refreshEditedState (const std::set<Glib::ustring>& efiles) void refreshEditedState (const std::set<Glib::ustring>& efiles)
@ -71,8 +71,8 @@ public:
void saveOptions (); void saveOptions ();
// interface fileselectionlistener // interface fileselectionlistener
bool fileSelected(Thumbnail* thm); bool fileSelected(Thumbnail* thm) override;
bool addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries); bool addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries) override;
void optionsChanged (); void optionsChanged ();
bool imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::InitialImage*> * ); bool imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::InitialImage*> * );

14
rtgui/filmsimulation.h
View File

@ -53,17 +53,17 @@ class FilmSimulation : public ToolParamBlock, public AdjusterListener, public Fo
public: public:
FilmSimulation(); FilmSimulation();
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode) override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setAdjusterBehavior(bool strength); void setAdjusterBehavior(bool strength);
void trimValues(rtengine::procparams::ProcParams* pp); void trimValues(rtengine::procparams::ProcParams* pp) override;
private: private:
void onClutSelected(); void onClutSelected();
void enabledChanged(); void enabledChanged() override;
void updateDisable( bool value ); void updateDisable( bool value );

32
rtgui/flatcurveeditorsubgroup.h
View File

@ -46,32 +46,32 @@ protected:
public: public:
FlatCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir); FlatCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir);
virtual ~FlatCurveEditorSubGroup(); ~FlatCurveEditorSubGroup() override;
FlatCurveEditor* addCurve(Glib::ustring curveLabel = "", bool periodic = true); FlatCurveEditor* addCurve(Glib::ustring curveLabel = "", bool periodic = true);
//virtual void updateBackgroundHistogram (CurveEditor* ce); //virtual void updateBackgroundHistogram (CurveEditor* ce);
void switchGUI(); void switchGUI() override;
void refresh(CurveEditor *curveToRefresh); void refresh(CurveEditor *curveToRefresh) override;
void editModeSwitchedOff(); void editModeSwitchedOff() override;
void pipetteMouseOver(EditDataProvider *provider, int modifierKey); void pipetteMouseOver(EditDataProvider *provider, int modifierKey) override;
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey); bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
void pipetteButton1Released(EditDataProvider *provider); void pipetteButton1Released(EditDataProvider *provider) override;
void pipetteDrag(EditDataProvider *provider, int modifierKey); void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
void showCoordinateAdjuster(CoordinateProvider *provider); void showCoordinateAdjuster(CoordinateProvider *provider) override;
void stopNumericalAdjustment(); void stopNumericalAdjustment() override;
bool curveReset (CurveEditor *ce); bool curveReset (CurveEditor *ce) override;
protected: protected:
void storeCurveValues (CurveEditor* ce, const std::vector<double>& p); void storeCurveValues (CurveEditor* ce, const std::vector<double>& p) override;
void storeDisplayedCurve (); void storeDisplayedCurve () override;
void restoreDisplayedHistogram (); void restoreDisplayedHistogram () override;
void savePressed (); void savePressed ();
void loadPressed (); void loadPressed ();
void copyPressed (); void copyPressed ();
void pastePressed (); void pastePressed ();
void removeEditor (); void removeEditor () override;
const std::vector<double> getCurveFromGUI (int type); const std::vector<double> getCurveFromGUI (int type) override;
void editPointToggled(Gtk::ToggleButton *button); void editPointToggled(Gtk::ToggleButton *button);
void editToggled (Gtk::ToggleButton *button); void editToggled (Gtk::ToggleButton *button);
}; };

18
rtgui/flatfield.h
View File

@ -62,17 +62,17 @@ protected:
public: public:
FlatField (); FlatField ();
~FlatField (); ~FlatField () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void setAdjusterBehavior (bool clipctrladd); void setAdjusterBehavior (bool clipctrladd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled (Adjuster* a, bool newval); void adjusterAutoToggled (Adjuster* a, bool newval) override;
void flatFieldFileChanged (); void flatFieldFileChanged ();
void flatFieldFile_Reset (); void flatFieldFile_Reset ();
void flatFieldAutoSelectChanged (); void flatFieldAutoSelectChanged ();
@ -82,7 +82,7 @@ public:
{ {
ffp = p; ffp = p;
}; };
void flatFieldAutoClipValueChanged(int n = 0); void flatFieldAutoClipValueChanged(int n = 0) override;
}; };
#endif #endif

32
rtgui/gradient.h
View File

@ -35,29 +35,29 @@ protected:
public: public:
Gradient (); Gradient ();
~Gradient (); ~Gradient () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
void setAdjusterBehavior (bool degreeadd, bool featheradd, bool strengthadd, bool centeradd); void setAdjusterBehavior (bool degreeadd, bool featheradd, bool strengthadd, bool centeradd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void updateGeometry (const int centerX, const int centerY, const double feather, const double degree, const int fullWidth=-1, const int fullHeight=-1); void updateGeometry (const int centerX, const int centerY, const double feather, const double degree, const int fullWidth=-1, const int fullHeight=-1);
void setEditProvider (EditDataProvider* provider); void setEditProvider (EditDataProvider* provider) override;
// EditSubscriber interface // EditSubscriber interface
CursorShape getCursor(const int objectID); CursorShape getCursor(const int objectID) override;
bool mouseOver(const int modifierKey); bool mouseOver(const int modifierKey) override;
bool button1Pressed(const int modifierKey); bool button1Pressed(const int modifierKey) override;
bool button1Released(); bool button1Released() override;
bool drag1(const int modifierKey); bool drag1(const int modifierKey) override;
void switchOffEditMode (); void switchOffEditMode () override;
}; };
#endif #endif

40
rtgui/guiutils.h
View File

@ -149,7 +149,7 @@ private:
public: public:
explicit ExpanderBox( Gtk::Container *p); explicit ExpanderBox( Gtk::Container *p);
~ExpanderBox( ) ~ExpanderBox( ) override
{ {
delete pC; delete pC;
} }
@ -285,9 +285,9 @@ public:
class MyScrolledWindow : public Gtk::ScrolledWindow class MyScrolledWindow : public Gtk::ScrolledWindow
{ {
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const; void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
public: public:
MyScrolledWindow(); MyScrolledWindow();
@ -299,7 +299,7 @@ public:
class MyScrolledToolbar : public Gtk::ScrolledWindow class MyScrolledToolbar : public Gtk::ScrolledWindow
{ {
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
void get_preferred_height (int &minimumHeight, int &naturalHeight); void get_preferred_height (int &minimumHeight, int &naturalHeight);
public: public:
@ -313,9 +313,9 @@ class MyComboBox : public Gtk::ComboBox
{ {
int naturalWidth, minimumWidth; int naturalWidth, minimumWidth;
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
public: public:
MyComboBox (); MyComboBox ();
@ -331,9 +331,9 @@ class MyComboBoxText : public Gtk::ComboBoxText
int naturalWidth, minimumWidth; int naturalWidth, minimumWidth;
sigc::connection myConnection; sigc::connection myConnection;
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
public: public:
explicit MyComboBoxText (bool has_entry = false); explicit MyComboBoxText (bool has_entry = false);
@ -350,8 +350,8 @@ class MySpinButton : public Gtk::SpinButton
{ {
protected: protected:
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
bool on_key_press_event (GdkEventKey* event); bool on_key_press_event (GdkEventKey* event) override;
public: public:
MySpinButton (); MySpinButton ();
@ -364,8 +364,8 @@ public:
class MyHScale : public Gtk::HScale class MyHScale : public Gtk::HScale
{ {
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
bool on_key_press_event (GdkEventKey* event); bool on_key_press_event (GdkEventKey* event) override;
}; };
/** /**
@ -388,9 +388,9 @@ private:
sigc::signal<void> selection_changed_; sigc::signal<void> selection_changed_;
protected: protected:
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
void set_none(); void set_none();
@ -484,8 +484,8 @@ class MyProgressBar : public Gtk::ProgressBar
private: private:
int w; int w;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
public: public:
explicit MyProgressBar(int width); explicit MyProgressBar(int width);

46
rtgui/histogrampanel.h
View File

@ -81,7 +81,7 @@ protected:
public: public:
HistogramRGBArea(); HistogramRGBArea();
~HistogramRGBArea(); ~HistogramRGBArea() override;
void updateBackBuffer (int r, int g, int b, const Glib::ustring &profile = "", const Glib::ustring &profileW = ""); void updateBackBuffer (int r, int g, int b, const Glib::ustring &profile = "", const Glib::ustring &profileW = "");
bool getShow (); bool getShow ();
@ -93,17 +93,17 @@ public:
void update (int val, int rh, int gh, int bh); void update (int val, int rh, int gh, int bh);
void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, bool show); void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, bool show);
void on_realize(); void on_realize() override;
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
bool on_button_press_event (GdkEventButton* event); bool on_button_press_event (GdkEventButton* event) override;
void factorChanged (double newFactor); void factorChanged (double newFactor);
private: private:
Gtk::SizeRequestMode get_request_mode_vfunc () const; Gtk::SizeRequestMode get_request_mode_vfunc () const override;
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const; void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
void get_preferred_width_for_height_vfunc (int h, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int h, int &minimum_width, int &natural_width) const override;
}; };
@ -141,7 +141,7 @@ protected:
public: public:
explicit HistogramArea(DrawModeListener *fml = nullptr); explicit HistogramArea(DrawModeListener *fml = nullptr);
~HistogramArea(); ~HistogramArea() override;
void updateBackBuffer (); void updateBackBuffer ();
void update( void update(
@ -155,21 +155,21 @@ public:
const LUTu& histBlueRaw const LUTu& histBlueRaw
); );
void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, int mode); void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, int mode);
void on_realize(); void on_realize() override;
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
bool on_button_press_event (GdkEventButton* event); bool on_button_press_event (GdkEventButton* event) override;
bool on_button_release_event (GdkEventButton* event); bool on_button_release_event (GdkEventButton* event) override;
bool on_motion_notify_event (GdkEventMotion* event); bool on_motion_notify_event (GdkEventMotion* event) override;
type_signal_factor_changed signal_factor_changed(); type_signal_factor_changed signal_factor_changed();
private: private:
void drawCurve(Cairo::RefPtr<Cairo::Context> &cr, LUTu & data, double scale, int hsize, int vsize); void drawCurve(Cairo::RefPtr<Cairo::Context> &cr, LUTu & data, double scale, int hsize, int vsize);
void drawMarks(Cairo::RefPtr<Cairo::Context> &cr, LUTu & data, double scale, int hsize, int & ui, int & oi); void drawMarks(Cairo::RefPtr<Cairo::Context> &cr, LUTu & data, double scale, int hsize, int & ui, int & oi);
Gtk::SizeRequestMode get_request_mode_vfunc () const; Gtk::SizeRequestMode get_request_mode_vfunc () const override;
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const; void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
}; };
class HistogramPanel : public Gtk::Grid, public PointerMotionListener, public DrawModeListener class HistogramPanel : public Gtk::Grid, public PointerMotionListener, public DrawModeListener
@ -216,7 +216,7 @@ protected:
public: public:
HistogramPanel (); HistogramPanel ();
~HistogramPanel (); ~HistogramPanel () override;
void histogramChanged( void histogramChanged(
const LUTu& histRed, const LUTu& histRed,
@ -231,7 +231,7 @@ public:
histogramArea->update(histRed, histGreen, histBlue, histLuma, histChroma, histRedRaw, histGreenRaw, histBlueRaw); histogramArea->update(histRed, histGreen, histBlue, histLuma, histChroma, histRedRaw, histGreenRaw, histBlueRaw);
} }
// pointermotionlistener interface // pointermotionlistener interface
void pointerMoved (bool validPos, const Glib::ustring &profile, const Glib::ustring &profileW, int x, int y, int r, int g, int b, bool isRaw = false); void pointerMoved (bool validPos, const Glib::ustring &profile, const Glib::ustring &profileW, int x, int y, int r, int g, int b, bool isRaw = false) override;
// TODO should be protected // TODO should be protected
void setHistRGBInvalid (); void setHistRGBInvalid ();
@ -249,7 +249,7 @@ public:
void resized (Gtk::Allocation& req); void resized (Gtk::Allocation& req);
// drawModeListener interface // drawModeListener interface
void toggleButtonMode (); void toggleButtonMode () override;
}; };
#endif #endif

4
rtgui/history.h
View File

@ -111,8 +111,8 @@ public:
const rtengine::ProcEvent& ev, const rtengine::ProcEvent& ev,
const Glib::ustring& descr, const Glib::ustring& descr,
const ParamsEdited* paramsEdited = nullptr const ParamsEdited* paramsEdited = nullptr
); ) override;
void clearParamChanges (); void clearParamChanges () override;
void historySelectionChanged (); void historySelectionChanged ();
void bookmarkSelectionChanged (); void bookmarkSelectionChanged ();

18
rtgui/hsvequalizer.h
View File

@ -42,19 +42,19 @@ protected:
public: public:
HSVEqualizer (); HSVEqualizer ();
virtual ~HSVEqualizer (); ~HSVEqualizer () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void curveChanged (CurveEditor* ce); void curveChanged (CurveEditor* ce) override;
//void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL); //void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void setEditProvider (EditDataProvider *provider); void setEditProvider (EditDataProvider *provider) override;
void autoOpenCurve (); void autoOpenCurve () override;
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
//void adjusterChanged (Adjuster* a, double newval); //void adjusterChanged (Adjuster* a, double newval);
void enabledChanged(); void enabledChanged() override;
}; };
#endif #endif

4
rtgui/iccprofilecreator.h
View File

@ -91,8 +91,8 @@ private:
void primariesChanged(); void primariesChanged();
void illuminantChanged(); void illuminantChanged();
void trcPresetsChanged(); void trcPresetsChanged();
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
static std::vector<Glib::ustring> getGamma(); static std::vector<Glib::ustring> getGamma();
Glib::ustring getPrimariesPresetName(const Glib::ustring &preset); Glib::ustring getPrimariesPresetName(const Glib::ustring &preset);
void getPrimaries(const Glib::ustring &preset, double *p, ColorTemp &temp); void getPrimaries(const Glib::ustring &preset, double *p, ColorTemp &temp);

12
rtgui/icmpanel.h
View File

@ -121,12 +121,12 @@ private:
public: public:
ICMPanel(); ICMPanel();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void adjusterChanged(Adjuster* a, double newval); void adjusterChanged(Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void wpChanged(); void wpChanged();
void wtrcinChanged(); void wtrcinChanged();

6
rtgui/ilabel.h
View File

@ -28,9 +28,9 @@ class ILabel : public Gtk::DrawingArea
public: public:
explicit ILabel (const Glib::ustring &lab); explicit ILabel (const Glib::ustring &lab);
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
void on_realize(); void on_realize() override;
void on_style_updated (); void on_style_updated () override;
}; };
#endif #endif

44
rtgui/imagearea.h
View File

@ -59,11 +59,11 @@ protected:
ImageAreaToolListener* listener; ImageAreaToolListener* listener;
CropWindow* getCropWindow (int x, int y); CropWindow* getCropWindow (int x, int y);
Gtk::SizeRequestMode get_request_mode_vfunc () const; Gtk::SizeRequestMode get_request_mode_vfunc () const override;
void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const; void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
int fullImageWidth, fullImageHeight; int fullImageWidth, fullImageHeight;
public: public:
@ -75,7 +75,7 @@ public:
ImageArea* iLinkedImageArea; // used to set a reference to the Before image area, which is set when before/after view is enabled ImageArea* iLinkedImageArea; // used to set a reference to the Before image area, which is set when before/after view is enabled
explicit ImageArea (ImageAreaPanel* p); explicit ImageArea (ImageAreaPanel* p);
~ImageArea (); ~ImageArea () override;
rtengine::StagedImageProcessor* getImProcCoordinator() const; rtengine::StagedImageProcessor* getImProcCoordinator() const;
void setImProcCoordinator(rtengine::StagedImageProcessor* ipc_); void setImProcCoordinator(rtengine::StagedImageProcessor* ipc_);
@ -97,15 +97,15 @@ public:
void infoEnabled (bool e); void infoEnabled (bool e);
// widget base events // widget base events
void on_realize (); void on_realize () override;
bool on_draw (const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw (const ::Cairo::RefPtr< Cairo::Context> &cr) override;
bool on_motion_notify_event (GdkEventMotion* event); bool on_motion_notify_event (GdkEventMotion* event) override;
bool on_button_press_event (GdkEventButton* event); bool on_button_press_event (GdkEventButton* event) override;
bool on_button_release_event (GdkEventButton* event); bool on_button_release_event (GdkEventButton* event) override;
bool on_scroll_event (GdkEventScroll* event); bool on_scroll_event (GdkEventScroll* event) override;
bool on_leave_notify_event (GdkEventCrossing* event); bool on_leave_notify_event (GdkEventCrossing* event) override;
void on_resized (Gtk::Allocation& req); void on_resized (Gtk::Allocation& req);
void on_style_updated (); void on_style_updated () override;
void syncBeforeAfterViews (); void syncBeforeAfterViews ();
void setCropGUIListener (CropGUIListener* l); void setCropGUIListener (CropGUIListener* l);
@ -140,18 +140,18 @@ public:
void setZoom (double zoom); void setZoom (double zoom);
// EditDataProvider interface // EditDataProvider interface
void subscribe(EditSubscriber *subscriber); void subscribe(EditSubscriber *subscriber) override;
void unsubscribe(); void unsubscribe() override;
void getImageSize (int &w, int&h); void getImageSize (int &w, int&h) override;
// CropWindowListener interface // CropWindowListener interface
void cropPositionChanged (CropWindow* cw); void cropPositionChanged (CropWindow* cw) override;
void cropWindowSizeChanged (CropWindow* cw); void cropWindowSizeChanged (CropWindow* cw) override;
void cropZoomChanged (CropWindow* cw); void cropZoomChanged (CropWindow* cw) override;
void initialImageArrived (); void initialImageArrived () override;
// LockablePickerToolListener interface // LockablePickerToolListener interface
void switchPickerVisibility (bool isVisible); void switchPickerVisibility (bool isVisible) override;
CropWindow* getMainCropWindow () CropWindow* getMainCropWindow ()
{ {

2
rtgui/imageareapanel.h
View File

@ -35,7 +35,7 @@ public:
ImageArea* imageArea; ImageArea* imageArea;
ImageAreaPanel (); ImageAreaPanel ();
~ImageAreaPanel (); ~ImageAreaPanel () override;
void zoomChanged (); void zoomChanged ();

16
rtgui/impulsedenoise.h
View File

@ -34,17 +34,17 @@ public:
ImpulseDenoise (); ImpulseDenoise ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
void setAdjusterBehavior (bool threshadd); void setAdjusterBehavior (bool threshadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
}; };
#endif #endif

2
rtgui/indclippedpanel.h
View File

@ -35,7 +35,7 @@ protected:
public: public:
explicit IndicateClippedPanel(ImageArea* ia); explicit IndicateClippedPanel(ImageArea* ia);
~IndicateClippedPanel(); ~IndicateClippedPanel() override;
void buttonToggled(Gtk::ToggleButton* tb); void buttonToggled(Gtk::ToggleButton* tb);
void toggleClipped(bool highlights); // inverts a toggle programmatically void toggleClipped(bool highlights); // inverts a toggle programmatically

14
rtgui/inspector.h
View File

@ -51,14 +51,14 @@ private:
sigc::connection delayconn; sigc::connection delayconn;
Glib::ustring next_image_path; Glib::ustring next_image_path;
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
void deleteBuffers(); void deleteBuffers();
bool doSwitchImage(); bool doSwitchImage();
public: public:
Inspector(); Inspector();
~Inspector(); ~Inspector() override;
/** @brief Mouse movement to a new position /** @brief Mouse movement to a new position
* @param pos Location of the mouse, in percentage (i.e. [0;1] range) relative to the full size image ; -1,-1 == out of the image * @param pos Location of the mouse, in percentage (i.e. [0;1] range) relative to the full size image ; -1,-1 == out of the image
@ -92,11 +92,11 @@ public:
return active; return active;
}; };
Gtk::SizeRequestMode get_request_mode_vfunc () const; Gtk::SizeRequestMode get_request_mode_vfunc () const override;
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const; void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
}; };

6
rtgui/iptcpanel.h
View File

@ -71,9 +71,9 @@ private:
public: public:
IPTCPanel (); IPTCPanel ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setImageData (const rtengine::FramesMetaData* id); void setImageData (const rtengine::FramesMetaData* id);

26
rtgui/labcurve.h
View File

@ -62,20 +62,20 @@ protected:
public: public:
LCurve (); LCurve ();
~LCurve (); ~LCurve () override;
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void autoOpenCurve (); void autoOpenCurve () override;
void setEditProvider (EditDataProvider *provider); void setEditProvider (EditDataProvider *provider) override;
void setAdjusterBehavior (bool bradd, bool contradd, bool satadd); void setAdjusterBehavior (bool bradd, bool contradd, bool satadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
void curveChanged (CurveEditor* ce); void curveChanged (CurveEditor* ce) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void avoidcolorshift_toggled (); void avoidcolorshift_toggled ();
void lcredsk_toggled(); void lcredsk_toggled();
@ -92,9 +92,9 @@ public:
const LUTu& histLRETI const LUTu& histLRETI
); );
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller); void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
void enabledChanged(); void enabledChanged() override;
}; };
#endif #endif

16
rtgui/labgrid.h
View File

@ -85,14 +85,14 @@ public:
bool lowEnabled() const; bool lowEnabled() const;
void setLowEnabled(bool yes); void setLowEnabled(bool yes);
bool on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf); bool on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf) override;
void on_style_updated (); void on_style_updated () override;
bool on_button_press_event(GdkEventButton *event); bool on_button_press_event(GdkEventButton *event) override;
bool on_button_release_event(GdkEventButton *event); bool on_button_release_event(GdkEventButton *event) override;
bool on_motion_notify_event(GdkEventMotion *event); bool on_motion_notify_event(GdkEventMotion *event) override;
Gtk::SizeRequestMode get_request_mode_vfunc() const; Gtk::SizeRequestMode get_request_mode_vfunc() const override;
void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
}; };

8
rtgui/lensgeom.h
View File

@ -37,16 +37,16 @@ protected:
public: public:
LensGeometry (); LensGeometry ();
~LensGeometry (); ~LensGeometry () override;
Gtk::Box* getPackBox () Gtk::Box* getPackBox ()
{ {
return packBox; return packBox;
} }
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void fillPressed (); void fillPressed ();
void autoCropPressed (); void autoCropPressed ();

6
rtgui/lensprofile.h
View File

@ -31,8 +31,8 @@ class LensProfilePanel final :
public: public:
LensProfilePanel(); LensProfilePanel();
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setRawMeta(bool raw, const rtengine::FramesMetaData* pMeta); void setRawMeta(bool raw, const rtengine::FramesMetaData* pMeta);
void onLCPFileChanged(); void onLCPFileChanged();
@ -40,7 +40,7 @@ public:
void onUseVignChanged(); void onUseVignChanged();
void onUseCAChanged(); void onUseCAChanged();
void setBatchMode(bool yes); void setBatchMode(bool yes) override;
void onLensfunCameraChanged(); void onLensfunCameraChanged();
void onLensfunLensChanged(); void onLensfunLensChanged();

14
rtgui/localcontrast.h
View File

@ -41,14 +41,14 @@ public:
LocalContrast(); LocalContrast();
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr); void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr) override;
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr); void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr); void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr) override;
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode) override;
void adjusterChanged(Adjuster *a, double newval); void adjusterChanged(Adjuster *a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged(); void enabledChanged() override;
void setAdjusterBehavior(bool radiusAdd, bool amountAdd, bool darknessAdd, bool lightnessAdd); void setAdjusterBehavior(bool radiusAdd, bool amountAdd, bool darknessAdd, bool lightnessAdd);
}; };

2
rtgui/main.cc
View File

@ -358,7 +358,7 @@ public:
{ {
} }
~RTApplication() ~RTApplication() override
{ {
if (rtWindow) { if (rtWindow) {
delete rtWindow; delete rtWindow;

12
rtgui/metadatapanel.h
View File

@ -36,14 +36,14 @@ private:
public: public:
MetaDataPanel(); MetaDataPanel();
~MetaDataPanel(); ~MetaDataPanel() override;
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode) override;
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setImageData(const rtengine::FramesMetaData* id); void setImageData(const rtengine::FramesMetaData* id);
void setListener(ToolPanelListener *tpl); void setListener(ToolPanelListener *tpl) override;
}; };

16
rtgui/mycurve.h
View File

@ -109,7 +109,7 @@ protected:
public: public:
MyCurve (); MyCurve ();
~MyCurve (); ~MyCurve () override;
void setCurveListener (CurveListener* cl) void setCurveListener (CurveListener* cl)
{ {
@ -126,10 +126,10 @@ public:
{ {
curveIsDirty = true; curveIsDirty = true;
} }
void on_style_updated (); void on_style_updated () override;
virtual std::vector<double> getPoints () = 0; virtual std::vector<double> getPoints () = 0;
virtual void setPoints (const std::vector<double>& p) = 0; virtual void setPoints (const std::vector<double>& p) = 0;
virtual bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) = 0; bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override = 0;
virtual bool handleEvents (GdkEvent* event) = 0; virtual bool handleEvents (GdkEvent* event) = 0;
virtual void reset (const std::vector<double> &resetCurve, double identityValue = 0.5) = 0; virtual void reset (const std::vector<double> &resetCurve, double identityValue = 0.5) = 0;
@ -138,11 +138,11 @@ public:
virtual void pipetteButton1Released(EditDataProvider *provider) = 0; virtual void pipetteButton1Released(EditDataProvider *provider) = 0;
virtual void pipetteDrag(EditDataProvider *provider, int modifierKey) = 0; virtual void pipetteDrag(EditDataProvider *provider, int modifierKey) = 0;
Gtk::SizeRequestMode get_request_mode_vfunc () const; Gtk::SizeRequestMode get_request_mode_vfunc () const override;
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const; void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const; void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const; void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const; void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
}; };
class MyCurveIdleHelper class MyCurveIdleHelper

26
rtgui/mydiagonalcurve.h
View File

@ -72,7 +72,7 @@ protected:
void interpolate (); void interpolate ();
void findClosestPoint(); void findClosestPoint();
CursorShape motionNotify(CursorShape type, double minDistanceX, double minDistanceY, int num); CursorShape motionNotify(CursorShape type, double minDistanceX, double minDistanceY, int num);
std::vector<double> get_vector (int veclen); std::vector<double> get_vector (int veclen) override;
void get_LUT (LUTf &lut); void get_LUT (LUTf &lut);
// Get the cursor position and unclamped position from the curve given an X value ; BEWARE: can be time consuming, use with care // Get the cursor position and unclamped position from the curve given an X value ; BEWARE: can be time consuming, use with care
void getCursorPositionFromCurve(float x); void getCursorPositionFromCurve(float x);
@ -82,23 +82,23 @@ protected:
public: public:
MyDiagonalCurve (); MyDiagonalCurve ();
~MyDiagonalCurve (); ~MyDiagonalCurve () override;
std::vector<double> getPoints (); std::vector<double> getPoints () override;
void setPoints (const std::vector<double>& p); void setPoints (const std::vector<double>& p) override;
void setType (DiagonalCurveType t); void setType (DiagonalCurveType t);
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
bool handleEvents (GdkEvent* event); bool handleEvents (GdkEvent* event) override;
void setActiveParam (int ac); void setActiveParam (int ac);
void reset (const std::vector<double> &resetCurve, double identityValue = 0.5); void reset (const std::vector<double> &resetCurve, double identityValue = 0.5) override;
void updateBackgroundHistogram (LUTu & hist); void updateBackgroundHistogram (LUTu & hist);
void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey); void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey) override;
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey); bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
void pipetteButton1Released(EditDataProvider *provider); void pipetteButton1Released(EditDataProvider *provider) override;
void pipetteDrag(EditDataProvider *provider, int modifierKey); void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
virtual void setPos(double pos, int chanIdx); void setPos(double pos, int chanIdx) override;
virtual void stopNumericalAdjustment(); void stopNumericalAdjustment() override;
}; };
#endif #endif

24
rtgui/myflatcurve.h
View File

@ -112,31 +112,31 @@ protected:
void getMouseOverArea (); void getMouseOverArea ();
bool getHandles(int n); bool getHandles(int n);
CursorShape motionNotify(CursorShape type, double minDistanceX, double minDistanceY, int num); CursorShape motionNotify(CursorShape type, double minDistanceX, double minDistanceY, int num);
std::vector<double> get_vector (int veclen); std::vector<double> get_vector (int veclen) override;
void get_LUT (LUTf &lut); void get_LUT (LUTf &lut);
public: public:
MyFlatCurve (); MyFlatCurve ();
//~MyFlatCurve (); //~MyFlatCurve ();
std::vector<double> getPoints (); std::vector<double> getPoints () override;
void setPeriodicity (bool isPeriodic) void setPeriodicity (bool isPeriodic)
{ {
periodic = isPeriodic; periodic = isPeriodic;
}; };
void setPoints (const std::vector<double>& p); void setPoints (const std::vector<double>& p) override;
void setType (FlatCurveType t); void setType (FlatCurveType t);
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
bool handleEvents (GdkEvent* event); bool handleEvents (GdkEvent* event) override;
void reset (const std::vector<double> &resetCurve, double identityValue = 0.5); void reset (const std::vector<double> &resetCurve, double identityValue = 0.5) override;
//void updateBackgroundHistogram (unsigned int* hist); //void updateBackgroundHistogram (unsigned int* hist);
void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey); void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey) override;
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey); bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
void pipetteButton1Released(EditDataProvider *provider); void pipetteButton1Released(EditDataProvider *provider) override;
void pipetteDrag(EditDataProvider *provider, int modifierKey); void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
void setPos(double pos, int chanIdx); void setPos(double pos, int chanIdx) override;
virtual void stopNumericalAdjustment(); void stopNumericalAdjustment() override;
}; };
#endif #endif

8
rtgui/navigator.h
View File

@ -55,12 +55,12 @@ public:
// pointermotionlistener interface // pointermotionlistener interface
// void pointerMoved (bool validPos, int x, int y, int r, int g, int b); // void pointerMoved (bool validPos, int x, int y, int r, int g, int b);
void pointerMoved (bool validPos, const Glib::ustring &profile, const Glib::ustring &profileW, int x, int y, int r, int g, int b, bool raw = false); void pointerMoved (bool validPos, const Glib::ustring &profile, const Glib::ustring &profileW, int x, int y, int r, int g, int b, bool raw = false) override;
void setInvalid (int fullWidth = -1, int fullHeight = -1); void setInvalid (int fullWidth = -1, int fullHeight = -1);
void getRGBText (int r, int g, int b, Glib::ustring &sR, Glib::ustring &sG, Glib::ustring &sB, bool isRaw = false); void getRGBText (int r, int g, int b, Glib::ustring &sR, Glib::ustring &sG, Glib::ustring &sB, bool isRaw = false) override;
void getHSVText (float h, float s, float v, Glib::ustring &sH, Glib::ustring &sS, Glib::ustring &sV); void getHSVText (float h, float s, float v, Glib::ustring &sH, Glib::ustring &sS, Glib::ustring &sV) override;
void getLABText (float l, float a, float b, Glib::ustring &sL, Glib::ustring &sA, Glib::ustring &sB); void getLABText (float l, float a, float b, Glib::ustring &sL, Glib::ustring &sA, Glib::ustring &sB) override;
}; };

4
rtgui/options.h
View File

@ -108,8 +108,8 @@ public:
class Error: public std::exception class Error: public std::exception
{ {
public: public:
Error (const Glib::ustring &msg): msg_ (msg) {} explicit Error (const Glib::ustring &msg): msg_ (msg) {}
const char *what() const throw() const char *what() const throw() override
{ {
return msg_.c_str(); return msg_.c_str();
} }

16
rtgui/pcvignette.h
View File

@ -20,16 +20,16 @@ public:
PCVignette (); PCVignette ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void enabledChanged (); void enabledChanged () override;
void setAdjusterBehavior (bool strengthadd, bool featheradd, bool roundnessadd); void setAdjusterBehavior (bool strengthadd, bool featheradd, bool roundnessadd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
}; };
#endif #endif

14
rtgui/perspective.h
View File

@ -34,15 +34,15 @@ public:
PerspCorrection (); PerspCorrection ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr); void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr); void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
void setBatchMode (bool batchMode); void setBatchMode (bool batchMode) override;
void adjusterChanged (Adjuster* a, double newval); void adjusterChanged (Adjuster* a, double newval) override;
void adjusterAutoToggled(Adjuster* a, bool newval); void adjusterAutoToggled(Adjuster* a, bool newval) override;
void setAdjusterBehavior (bool badd); void setAdjusterBehavior (bool badd);
void trimValues (rtengine::procparams::ProcParams* pp); void trimValues (rtengine::procparams::ProcParams* pp) override;
}; };
#endif #endif

2
rtgui/popupbutton.h
View File

@ -34,7 +34,7 @@ public:
void set_sensitive (bool isSensitive=true); void set_sensitive (bool isSensitive=true);
protected: protected:
bool on_button_release_event (GdkEventButton* event); bool on_button_release_event (GdkEventButton* event) override;
private: private:
bool nextOnClicked; bool nextOnClicked;

8
rtgui/preferences.h
View File

@ -258,7 +258,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
public: public:
explicit Preferences (RTWindow *rtwindow); explicit Preferences (RTWindow *rtwindow);
~Preferences (); ~Preferences () override;
void savePressed (); void savePressed ();
void loadPressed (); void loadPressed ();
@ -288,9 +288,9 @@ public:
void behAddAllPressed (); void behAddAllPressed ();
void behSetAllPressed (); void behSetAllPressed ();
virtual void storeCurrentValue(); void storeCurrentValue() override;
virtual void updateProfileList(); void updateProfileList() override;
virtual void restoreValue(); void restoreValue() override;
// void selectICCProfileDir (); // void selectICCProfileDir ();
// void selectMonitorProfile (); // void selectMonitorProfile ();

Some files were not shown because too many files have changed in this diff Show More