Add override keyword. Thanks @Floessie
This commit is contained in:
heckflosse
parent
6e4e07f8c0
commit
831e18ca45
@ -455,11 +455,11 @@ protected:
|
||||
|
||||
public:
|
||||
DiagonalCurve (const std::vector<double>& points, int ppn = CURVES_MIN_POLY_POINTS);
|
||||
virtual ~DiagonalCurve ();
|
||||
~DiagonalCurve () override;
|
||||
|
||||
double getVal (double t) const;
|
||||
void getVal (const std::vector<double>& t, std::vector<double>& res) const;
|
||||
bool isIdentity () const
|
||||
double getVal (double t) const override;
|
||||
void getVal (const std::vector<double>& t, std::vector<double>& res) const override;
|
||||
bool isIdentity () const override
|
||||
{
|
||||
return kind == DCT_Empty;
|
||||
};
|
||||
@ -480,12 +480,12 @@ private:
|
||||
public:
|
||||
|
||||
FlatCurve (const std::vector<double>& points, bool isPeriodic = true, int ppn = CURVES_MIN_POLY_POINTS);
|
||||
virtual ~FlatCurve ();
|
||||
~FlatCurve () override;
|
||||
|
||||
double getVal (double t) const;
|
||||
void getVal (const std::vector<double>& t, std::vector<double>& res) const;
|
||||
double getVal (double t) const override;
|
||||
void getVal (const std::vector<double>& t, std::vector<double>& res) const override;
|
||||
bool setIdentityValue (double iVal);
|
||||
bool isIdentity () const
|
||||
bool isIdentity () const override
|
||||
{
|
||||
return kind == FCT_Empty;
|
||||
};
|
||||
|
||||
@ -6068,7 +6068,7 @@ int CLASS parse_tiff_ifd (int base)
|
||||
char software[64], *cbuf, *cp;
|
||||
uchar cfa_pat[16], cfa_pc[] = { 0,1,2,3 }, tab[256];
|
||||
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 ab[]={ 1,1,1,1 }, asn[] = { 0,0,0,0 }, xyz[] = { 1,1,1 };
|
||||
unsigned sony_curve[] = { 0,0,0,0,0,4095 };
|
||||
|
||||
@ -261,7 +261,7 @@ getbithuff_t getbithuff;
|
||||
class nikbithuff_t
|
||||
{
|
||||
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;};
|
||||
unsigned operator()(int nbits, ushort *huff);
|
||||
unsigned errorCount() { return errors; }
|
||||
@ -428,6 +428,7 @@ void kodak_thumb_load_raw();
|
||||
// sony_decrypt(unsigned *data, int len, int start, int key);
|
||||
class sony_decrypt_t{
|
||||
public:
|
||||
explicit sony_decrypt_t() : p(0) {}
|
||||
void operator()(unsigned *data, int len, int start, int key);
|
||||
private:
|
||||
unsigned pad[128], p;
|
||||
|
||||
@ -71,12 +71,12 @@ protected:
|
||||
|
||||
public:
|
||||
Crop (ImProcCoordinator* parent, EditDataProvider *editDataProvider, bool isDetailWindow);
|
||||
virtual ~Crop ();
|
||||
~Crop () override;
|
||||
|
||||
void setEditSubscriber(EditSubscriber* newSubscriber);
|
||||
bool hasListener();
|
||||
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);
|
||||
}
|
||||
@ -84,12 +84,12 @@ public:
|
||||
/** @brief Synchronously look out if a full update is necessary
|
||||
* First try, only make fullUpdate if this returns false
|
||||
*/
|
||||
bool tryUpdate ();
|
||||
bool tryUpdate () override;
|
||||
/** @brief Asynchronously reprocess the detailed crop */
|
||||
void fullUpdate (); // called via thread
|
||||
void fullUpdate () override; // called via thread
|
||||
|
||||
void setListener (DetailedCropListener* il);
|
||||
void destroy ();
|
||||
void setListener (DetailedCropListener* il) override;
|
||||
void destroy () override;
|
||||
int get_skip();
|
||||
int getLeftBorder();
|
||||
int getUpperBorder();
|
||||
|
||||
@ -114,7 +114,7 @@ public:
|
||||
spline_cubic_set();
|
||||
}
|
||||
|
||||
double getVal(double t) const
|
||||
double getVal(double t) const override
|
||||
{
|
||||
// values under and over the first and last point
|
||||
if (t > x[N - 1]) {
|
||||
|
||||
@ -623,7 +623,7 @@ private:
|
||||
struct PMatrix {
|
||||
double matrix[3][3];
|
||||
PMatrix(): matrix{} {}
|
||||
PMatrix(const CMatrix &m)
|
||||
explicit PMatrix(const CMatrix &m)
|
||||
{
|
||||
set(m);
|
||||
}
|
||||
|
||||
@ -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
|
||||
* 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) {
|
||||
@ -327,7 +327,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void rotate (int deg)
|
||||
void rotate (int deg) override
|
||||
{
|
||||
|
||||
if (deg == 90) {
|
||||
@ -446,7 +446,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void hflip ()
|
||||
void hflip () override
|
||||
{
|
||||
int width2 = width / 2;
|
||||
|
||||
@ -470,7 +470,7 @@ public:
|
||||
#endif
|
||||
}
|
||||
|
||||
void vflip ()
|
||||
void vflip () override
|
||||
{
|
||||
|
||||
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
|
||||
* 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) {
|
||||
@ -736,7 +736,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void rotate (int deg)
|
||||
void rotate (int deg) override
|
||||
{
|
||||
|
||||
if (deg == 90) {
|
||||
@ -863,7 +863,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void hflip ()
|
||||
void hflip () override
|
||||
{
|
||||
int width2 = width / 2;
|
||||
|
||||
@ -895,7 +895,7 @@ public:
|
||||
#endif
|
||||
}
|
||||
|
||||
void vflip ()
|
||||
void vflip () override
|
||||
{
|
||||
|
||||
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();
|
||||
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.;
|
||||
@ -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,
|
||||
int tran) const
|
||||
int tran) const override
|
||||
{
|
||||
int x;
|
||||
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
|
||||
* 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) {
|
||||
@ -1351,7 +1351,7 @@ public:
|
||||
memcpy (dest->data, data, 3 * width * height * sizeof(T));
|
||||
}
|
||||
|
||||
void rotate (int deg)
|
||||
void rotate (int deg) override
|
||||
{
|
||||
|
||||
if (deg == 90) {
|
||||
@ -1485,7 +1485,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void hflip ()
|
||||
void hflip () override
|
||||
{
|
||||
int width2 = width / 2;
|
||||
|
||||
@ -1521,7 +1521,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void vflip ()
|
||||
void vflip () override
|
||||
{
|
||||
|
||||
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();
|
||||
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.;
|
||||
@ -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,
|
||||
int tran) const
|
||||
int tran) const override
|
||||
{
|
||||
int x;
|
||||
int y;
|
||||
@ -1782,14 +1782,14 @@ public:
|
||||
class IImagefloat : public IImage, public PlanarRGBData<float>
|
||||
{
|
||||
public:
|
||||
virtual ~IImagefloat() {}
|
||||
~IImagefloat() override {}
|
||||
};
|
||||
|
||||
/** @brief This class represents an image having a classical 8 bits/pixel representation */
|
||||
class IImage8 : public IImage, public ChunkyRGBData<unsigned char>
|
||||
{
|
||||
public:
|
||||
virtual ~IImage8() {}
|
||||
~IImage8() override {}
|
||||
};
|
||||
|
||||
/** @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>
|
||||
{
|
||||
public:
|
||||
virtual ~IImage16() {}
|
||||
~IImage16() override {}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ public:
|
||||
|
||||
Image16();
|
||||
Image16(int width, int height);
|
||||
~Image16();
|
||||
~Image16() override;
|
||||
|
||||
Image16* copy() const;
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ public:
|
||||
|
||||
Image8 ();
|
||||
Image8 (int width, int height);
|
||||
~Image8 ();
|
||||
~Image8 () override;
|
||||
|
||||
Image8* copy () const;
|
||||
|
||||
|
||||
@ -98,35 +98,35 @@ private:
|
||||
|
||||
public:
|
||||
FramesData (const Glib::ustring& fname, std::unique_ptr<RawMetaDataLocation> rml = nullptr, bool firstFrameOnly = false);
|
||||
~FramesData ();
|
||||
~FramesData () override;
|
||||
|
||||
void setDCRawFrameCount (unsigned int frameCount);
|
||||
unsigned int getRootCount () const;
|
||||
unsigned int getFrameCount () const;
|
||||
bool getPixelShift () const;
|
||||
bool getHDR (unsigned int frame = 0) const;
|
||||
std::string getImageType (unsigned int frame) const;
|
||||
IIOSampleFormat getSampleFormat (unsigned int frame = 0) const;
|
||||
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const;
|
||||
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const;
|
||||
rtexif::TagDirectory* getBestExifData (ImageSource *imgSource, procparams::RAWParams *rawParams) const;
|
||||
procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const;
|
||||
bool hasExif (unsigned int frame = 0) const;
|
||||
bool hasIPTC (unsigned int frame = 0) const;
|
||||
tm getDateTime (unsigned int frame = 0) const;
|
||||
time_t getDateTimeAsTS (unsigned int frame = 0) const;
|
||||
int getISOSpeed (unsigned int frame = 0) const;
|
||||
double getFNumber (unsigned int frame = 0) const;
|
||||
double getFocalLen (unsigned int frame = 0) const;
|
||||
double getFocalLen35mm (unsigned int frame = 0) const;
|
||||
float getFocusDist (unsigned int frame = 0) const;
|
||||
double getShutterSpeed (unsigned int frame = 0) const;
|
||||
double getExpComp (unsigned int frame = 0) const;
|
||||
std::string getMake (unsigned int frame = 0) const;
|
||||
std::string getModel (unsigned int frame = 0) const;
|
||||
std::string getLens (unsigned int frame = 0) const;
|
||||
unsigned int getRootCount () const override;
|
||||
unsigned int getFrameCount () const override;
|
||||
bool getPixelShift () const override;
|
||||
bool getHDR (unsigned int frame = 0) const override;
|
||||
std::string getImageType (unsigned int frame) const override;
|
||||
IIOSampleFormat getSampleFormat (unsigned int frame = 0) const override;
|
||||
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const override;
|
||||
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const override;
|
||||
rtexif::TagDirectory* getBestExifData (ImageSource *imgSource, procparams::RAWParams *rawParams) const override;
|
||||
procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const override;
|
||||
bool hasExif (unsigned int frame = 0) const override;
|
||||
bool hasIPTC (unsigned int frame = 0) const override;
|
||||
tm getDateTime (unsigned int frame = 0) const override;
|
||||
time_t getDateTimeAsTS (unsigned int frame = 0) const override;
|
||||
int getISOSpeed (unsigned int frame = 0) const override;
|
||||
double getFNumber (unsigned int frame = 0) const override;
|
||||
double getFocalLen (unsigned int frame = 0) const override;
|
||||
double getFocalLen35mm (unsigned int frame = 0) const override;
|
||||
float getFocusDist (unsigned int frame = 0) const override;
|
||||
double getShutterSpeed (unsigned int frame = 0) const override;
|
||||
double getExpComp (unsigned int frame = 0) const override;
|
||||
std::string getMake (unsigned int frame = 0) const override;
|
||||
std::string getModel (unsigned int frame = 0) const override;
|
||||
std::string getLens (unsigned int frame = 0) const override;
|
||||
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;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ public:
|
||||
|
||||
Imagefloat ();
|
||||
Imagefloat (int width, int height);
|
||||
~Imagefloat ();
|
||||
~Imagefloat () override;
|
||||
|
||||
Imagefloat* copy () const;
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ public:
|
||||
loadedProfileLength(0), iptc(nullptr), exifRoot (nullptr), sampleFormat(IIOSF_UNKNOWN),
|
||||
sampleArrangement(IIOSA_UNKNOWN) {}
|
||||
|
||||
virtual ~ImageIO ();
|
||||
~ImageIO () override;
|
||||
|
||||
void setProgressListener (ProgressListener* l);
|
||||
void setSampleFormat(IIOSampleFormat sFormat);
|
||||
|
||||
@ -65,7 +65,7 @@ public:
|
||||
ImageSource () : references (1), redAWBMul(-1.), greenAWBMul(-1.), blueAWBMul(-1.),
|
||||
embProfile(nullptr), idata(nullptr), dirpyrdenoiseExpComp(INFINITY) {}
|
||||
|
||||
virtual ~ImageSource () {}
|
||||
~ImageSource () override {}
|
||||
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 demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold) {};
|
||||
@ -119,11 +119,11 @@ public:
|
||||
|
||||
virtual void setProgressListener (ProgressListener* pl) {}
|
||||
|
||||
void increaseRef ()
|
||||
void increaseRef () override
|
||||
{
|
||||
references++;
|
||||
}
|
||||
void decreaseRef ()
|
||||
void decreaseRef () override
|
||||
{
|
||||
references--;
|
||||
|
||||
@ -151,19 +151,19 @@ public:
|
||||
return dirpyrdenoiseExpComp;
|
||||
}
|
||||
// functions inherited from the InitialImage interface
|
||||
virtual Glib::ustring getFileName ()
|
||||
Glib::ustring getFileName () override
|
||||
{
|
||||
return fileName;
|
||||
}
|
||||
virtual cmsHPROFILE getEmbeddedProfile ()
|
||||
cmsHPROFILE getEmbeddedProfile () override
|
||||
{
|
||||
return embProfile;
|
||||
}
|
||||
virtual const FramesMetaData* getMetaData ()
|
||||
const FramesMetaData* getMetaData () override
|
||||
{
|
||||
return idata;
|
||||
}
|
||||
virtual ImageSource* getImageSource ()
|
||||
ImageSource* getImageSource () override
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -219,85 +219,85 @@ protected:
|
||||
public:
|
||||
|
||||
ImProcCoordinator ();
|
||||
~ImProcCoordinator ();
|
||||
~ImProcCoordinator () override;
|
||||
void assign (ImageSource* imgsrc);
|
||||
|
||||
void getParams (procparams::ProcParams* dst)
|
||||
void getParams (procparams::ProcParams* dst) override
|
||||
{
|
||||
*dst = params;
|
||||
}
|
||||
|
||||
void startProcessing (int changeCode);
|
||||
ProcParams* beginUpdateParams ();
|
||||
void endUpdateParams (ProcEvent change); // must be called after beginUpdateParams, triggers update
|
||||
void endUpdateParams (int changeFlags);
|
||||
void stopProcessing ();
|
||||
void startProcessing (int changeCode) override;
|
||||
ProcParams* beginUpdateParams () override;
|
||||
void endUpdateParams (ProcEvent change) override; // must be called after beginUpdateParams, triggers update
|
||||
void endUpdateParams (int changeFlags) override;
|
||||
void stopProcessing () override;
|
||||
|
||||
|
||||
void setPreviewScale (int scale)
|
||||
void setPreviewScale (int scale) override
|
||||
{
|
||||
setScale (scale);
|
||||
}
|
||||
int getPreviewScale ()
|
||||
int getPreviewScale () override
|
||||
{
|
||||
return scale;
|
||||
}
|
||||
|
||||
//void fullUpdatePreviewImage ();
|
||||
|
||||
int getFullWidth ()
|
||||
int getFullWidth () override
|
||||
{
|
||||
return fullw;
|
||||
}
|
||||
int getFullHeight ()
|
||||
int getFullHeight () override
|
||||
{
|
||||
return fullh;
|
||||
}
|
||||
|
||||
int getPreviewWidth ()
|
||||
int getPreviewWidth () override
|
||||
{
|
||||
return pW;
|
||||
}
|
||||
int getPreviewHeight ()
|
||||
int getPreviewHeight () override
|
||||
{
|
||||
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);
|
||||
void getCamWB (double& temp, double& green);
|
||||
void getSpotWB (int x, int y, int rectSize, double& temp, double& green);
|
||||
void getAutoCrop (double ratio, int &x, int &y, int &w, int &h);
|
||||
bool getHighQualComputed();
|
||||
void setHighQualComputed();
|
||||
void setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent);
|
||||
void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const;
|
||||
void setSoftProofing (bool softProof, bool gamutCheck);
|
||||
void getSoftProofing (bool &softProof, bool &gamutCheck);
|
||||
void setSharpMask (bool sharpMask);
|
||||
bool updateTryLock ()
|
||||
bool getAutoWB (double& temp, double& green, double equal, double tempBias) override;
|
||||
void getCamWB (double& temp, double& green) override;
|
||||
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) override;
|
||||
bool getHighQualComputed() override;
|
||||
void setHighQualComputed() override;
|
||||
void setMonitorProfile (const Glib::ustring& profile, RenderingIntent intent) override;
|
||||
void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const override;
|
||||
void setSoftProofing (bool softProof, bool gamutCheck) override;
|
||||
void getSoftProofing (bool &softProof, bool &gamutCheck) override;
|
||||
void setSharpMask (bool sharpMask) override;
|
||||
bool updateTryLock () override
|
||||
{
|
||||
return updaterThreadStart.trylock();
|
||||
}
|
||||
void updateUnLock ()
|
||||
void updateUnLock () override
|
||||
{
|
||||
updaterThreadStart.unlock();
|
||||
}
|
||||
|
||||
void setProgressListener (ProgressListener* pl)
|
||||
void setProgressListener (ProgressListener* pl) override
|
||||
{
|
||||
plistener = pl;
|
||||
}
|
||||
void setPreviewImageListener (PreviewImageListener* il)
|
||||
void setPreviewImageListener (PreviewImageListener* il) override
|
||||
{
|
||||
imageListener = il;
|
||||
}
|
||||
void setSizeListener (SizeListener* il)
|
||||
void setSizeListener (SizeListener* il) override
|
||||
{
|
||||
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);
|
||||
|
||||
@ -305,70 +305,70 @@ public:
|
||||
sizeListeners.erase (it);
|
||||
}
|
||||
}
|
||||
void setAutoExpListener (AutoExpListener* ael)
|
||||
void setAutoExpListener (AutoExpListener* ael) override
|
||||
{
|
||||
aeListener = ael;
|
||||
}
|
||||
void setHistogramListener (HistogramListener *h)
|
||||
void setHistogramListener (HistogramListener *h) override
|
||||
{
|
||||
hListener = h;
|
||||
}
|
||||
void setAutoCamListener (AutoCamListener* acl)
|
||||
void setAutoCamListener (AutoCamListener* acl) override
|
||||
{
|
||||
acListener = acl;
|
||||
}
|
||||
void setAutoBWListener (AutoBWListener* abw)
|
||||
void setAutoBWListener (AutoBWListener* abw) override
|
||||
{
|
||||
abwListener = abw;
|
||||
}
|
||||
void setAutoWBListener (AutoWBListener* awb)
|
||||
void setAutoWBListener (AutoWBListener* awb) override
|
||||
{
|
||||
awbListener = awb;
|
||||
}
|
||||
void setAutoColorTonListener (AutoColorTonListener* bwct)
|
||||
void setAutoColorTonListener (AutoColorTonListener* bwct) override
|
||||
{
|
||||
actListener = bwct;
|
||||
}
|
||||
void setAutoChromaListener (AutoChromaListener* adn)
|
||||
void setAutoChromaListener (AutoChromaListener* adn) override
|
||||
{
|
||||
adnListener = adn;
|
||||
}
|
||||
void setRetinexListener (RetinexListener* adh)
|
||||
void setRetinexListener (RetinexListener* adh) override
|
||||
{
|
||||
dehaListener = adh;
|
||||
}
|
||||
void setWaveletListener (WaveletListener* awa)
|
||||
void setWaveletListener (WaveletListener* awa) override
|
||||
{
|
||||
awavListener = awa;
|
||||
}
|
||||
|
||||
void setFrameCountListener (FrameCountListener* fcl)
|
||||
void setFrameCountListener (FrameCountListener* fcl) override
|
||||
{
|
||||
frameCountListener = fcl;
|
||||
}
|
||||
|
||||
void setFlatFieldAutoClipListener (FlatFieldAutoClipListener* ffacl)
|
||||
void setFlatFieldAutoClipListener (FlatFieldAutoClipListener* ffacl) override
|
||||
{
|
||||
flatFieldAutoClipListener = ffacl;
|
||||
}
|
||||
void setBayerAutoContrastListener (AutoContrastListener* acl)
|
||||
void setBayerAutoContrastListener (AutoContrastListener* acl) override
|
||||
{
|
||||
bayerAutoContrastListener = acl;
|
||||
}
|
||||
|
||||
void setXtransAutoContrastListener (AutoContrastListener* acl)
|
||||
void setXtransAutoContrastListener (AutoContrastListener* acl) override
|
||||
{
|
||||
xtransAutoContrastListener = acl;
|
||||
}
|
||||
|
||||
void setImageTypeListener (ImageTypeListener* itl)
|
||||
void setImageTypeListener (ImageTypeListener* itl) override
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
@ -190,11 +190,11 @@ public:
|
||||
);
|
||||
|
||||
|
||||
void correctDistortion(double &x, double &y, int cx, int cy, double scale) const; // MUST be the first stage
|
||||
bool isCACorrectionAvailable() const;
|
||||
void correctCA(double& x, double& y, int cx, int cy, int channel) const;
|
||||
void processVignetteLine(int width, int y, float* line) const;
|
||||
void processVignetteLine3Channels(int width, int y, float* line) const;
|
||||
void correctDistortion(double &x, double &y, int cx, int cy, double scale) const override; // MUST be the first stage
|
||||
bool isCACorrectionAvailable() const override;
|
||||
void correctCA(double& x, double& y, int cx, int cy, int channel) const override;
|
||||
void processVignetteLine(int width, int y, float* line) const override;
|
||||
void processVignetteLine3Channels(int width, int y, float* line) const override;
|
||||
|
||||
private:
|
||||
bool enableCA; // is the mapper capable if CA correction?
|
||||
|
||||
@ -62,7 +62,7 @@ public:
|
||||
++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 x = col / TILE_SIZE;
|
||||
@ -136,7 +136,7 @@ public:
|
||||
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 int BORDER_WIDTH = sizeof(BORDER)/sizeof(float) - 1;
|
||||
|
||||
@ -43,14 +43,14 @@ public:
|
||||
iImage->increaseRef();
|
||||
}
|
||||
|
||||
~ProcessingJobImpl ()
|
||||
~ProcessingJobImpl () override
|
||||
{
|
||||
if (initialImage) {
|
||||
initialImage->decreaseRef();
|
||||
}
|
||||
}
|
||||
|
||||
bool fastPipeline() const { return fast; }
|
||||
bool fastPipeline() const override { return fast; }
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -26,8 +26,6 @@
|
||||
#include <glibmm.h>
|
||||
#include <lcms2.h>
|
||||
|
||||
#include "coord.h"
|
||||
#include "LUT.h"
|
||||
#include "noncopyable.h"
|
||||
|
||||
class ParamsEdited;
|
||||
|
||||
@ -111,22 +111,22 @@ protected:
|
||||
|
||||
public:
|
||||
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);
|
||||
void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true);
|
||||
void demosaic (const RAWParams &raw, bool autoContrast, double &contrastThreshold);
|
||||
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 retinexPrepareCurves (const RetinexParams &retinexParams, LUTf &cdcurve, LUTf &mapcurve, RetinextransmissionCurve &retinextransmissionCurve, RetinexgaintransmissionCurve &retinexgaintransmissionCurve, bool &retinexcontlutili, bool &mapcontlutili, bool &useHsl, LUTu & lhist16RETI, LUTu & histLRETI);
|
||||
void retinexPrepareBuffers (const ColorManagementParams& cmp, const RetinexParams &retinexParams, multi_array2D<float, 4> &conversionBuffer, LUTu &lhist16RETI);
|
||||
void flushRawData ();
|
||||
void flushRGB ();
|
||||
void HLRecovery_Global (const ToneCurveParams &hrp);
|
||||
void preprocess (const RAWParams &raw, const LensProfParams &lensProf, const CoarseTransformParams& coarse, bool prepareDenoise = true) override;
|
||||
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) override;
|
||||
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) override;
|
||||
void flushRawData () override;
|
||||
void flushRGB () override;
|
||||
void HLRecovery_Global (const ToneCurveParams &hrp) override;
|
||||
void refinement_lassus (int PassCount);
|
||||
void refinement(int PassCount);
|
||||
void setBorder(unsigned int rawBorder) {border = rawBorder;}
|
||||
bool isRGBSourceModified() const
|
||||
void setBorder(unsigned int rawBorder) override {border = rawBorder;}
|
||||
bool isRGBSourceModified() const override
|
||||
{
|
||||
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 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);
|
||||
eSensorType getSensorType () const
|
||||
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw) override;
|
||||
eSensorType getSensorType () const override
|
||||
{
|
||||
return ri != nullptr ? ri->getSensorType() : ST_NONE;
|
||||
}
|
||||
bool isMono () const
|
||||
bool isMono () const override
|
||||
{
|
||||
return ri->get_colors() == 1;
|
||||
}
|
||||
ColorTemp getWB () const
|
||||
ColorTemp getWB () const override
|
||||
{
|
||||
return camera_wb;
|
||||
}
|
||||
void getAutoWBMultipliers (double &rm, double &gm, double &bm);
|
||||
ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal);
|
||||
bool isWBProviderReady ()
|
||||
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) override;
|
||||
bool isWBProviderReady () override
|
||||
{
|
||||
return rawData;
|
||||
}
|
||||
|
||||
double getDefGain () const
|
||||
double getDefGain () const override
|
||||
{
|
||||
return defGain;
|
||||
}
|
||||
|
||||
void getFullSize (int& w, int& h, int tr = TR_NONE);
|
||||
void getSize (const PreviewProps &pp, int& w, int& h);
|
||||
int getRotateDegree() const
|
||||
void getFullSize (int& w, int& h, int tr = TR_NONE) override;
|
||||
void getSize (const PreviewProps &pp, int& w, int& h) override;
|
||||
int getRotateDegree() const override
|
||||
{
|
||||
return ri->get_rotateDegree();
|
||||
}
|
||||
|
||||
ImageMatrices* getImageMatrices ()
|
||||
ImageMatrices* getImageMatrices () override
|
||||
{
|
||||
return &imatrices;
|
||||
}
|
||||
bool isRAW() const
|
||||
bool isRAW() const override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void setProgressListener (ProgressListener* pl)
|
||||
void setProgressListener (ProgressListener* pl) override
|
||||
{
|
||||
plistener = pl;
|
||||
}
|
||||
void getAutoExpHistogram (LUTu & histogram, int& histcompr);
|
||||
void getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw);
|
||||
void getAutoMatchedToneCurve(const ColorManagementParams &cp, std::vector<double> &outCurve);
|
||||
DCPProfile *getDCP(const ColorManagementParams &cmp, DCPProfile::ApplyState &as);
|
||||
void getAutoExpHistogram (LUTu & histogram, int& histcompr) override;
|
||||
void getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw) override;
|
||||
void getAutoMatchedToneCurve(const ColorManagementParams &cp, std::vector<double> &outCurve) override;
|
||||
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 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 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 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_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 init ();
|
||||
static void cleanup ();
|
||||
void setCurrentFrame(unsigned int frameNum) {
|
||||
void setCurrentFrame(unsigned int frameNum) override {
|
||||
currFrame = std::min(numFrames - 1, frameNum);
|
||||
ri = riFrames[currFrame];
|
||||
}
|
||||
int getFrameCount() {return numFrames;}
|
||||
int getFlatFieldAutoClipValue() {return flatFieldAutoClipValue;}
|
||||
int getFrameCount() override {return numFrames;}
|
||||
int getFlatFieldAutoClipValue() override {return flatFieldAutoClipValue;}
|
||||
|
||||
class GreenEqulibrateThreshold {
|
||||
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 hflip (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;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ public:
|
||||
int ciffLength;
|
||||
|
||||
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 exifBase, int ciffBase, int ciffLength) : exifBase(exifBase), ciffBase(ciffBase), ciffLength(ciffLength) {}
|
||||
};
|
||||
|
||||
@ -38,7 +38,7 @@ class LFModifier final :
|
||||
public NonCopyable
|
||||
{
|
||||
public:
|
||||
~LFModifier();
|
||||
~LFModifier() override;
|
||||
|
||||
explicit operator bool() const;
|
||||
|
||||
|
||||
@ -40,66 +40,66 @@ protected:
|
||||
|
||||
public:
|
||||
StdImageSource ();
|
||||
~StdImageSource ();
|
||||
~StdImageSource () override;
|
||||
|
||||
int load (const Glib::ustring &fname);
|
||||
void getImage (const ColorTemp &ctemp, int tran, Imagefloat* image, const PreviewProps &pp, const ToneCurveParams &hrp, const RAWParams &raw);
|
||||
ColorTemp getWB () const
|
||||
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) override;
|
||||
ColorTemp getWB () const override
|
||||
{
|
||||
return wb;
|
||||
}
|
||||
void getAutoWBMultipliers (double &rm, double &gm, double &bm);
|
||||
ColorTemp getSpotWB (std::vector<Coord2D> &red, std::vector<Coord2D> &green, std::vector<Coord2D> &blue, int tran, double equal);
|
||||
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) override;
|
||||
|
||||
eSensorType getSensorType() const {return ST_NONE;}
|
||||
bool isMono() const {return false;}
|
||||
eSensorType getSensorType() const override {return ST_NONE;}
|
||||
bool isMono() const override {return false;}
|
||||
|
||||
bool isWBProviderReady ()
|
||||
bool isWBProviderReady () override
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
void getFullSize (int& w, int& h, int tr = TR_NONE);
|
||||
void getSize (const PreviewProps &pp, int& w, int& h);
|
||||
void getFullSize (int& w, int& h, int tr = TR_NONE) override;
|
||||
void getSize (const PreviewProps &pp, int& w, int& h) override;
|
||||
|
||||
ImageIO* getImageIO ()
|
||||
{
|
||||
return img;
|
||||
}
|
||||
ImageMatrices* getImageMatrices ()
|
||||
ImageMatrices* getImageMatrices () override
|
||||
{
|
||||
return (ImageMatrices*)nullptr;
|
||||
}
|
||||
bool isRAW() const
|
||||
bool isRAW() const override
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void setProgressListener (ProgressListener* pl)
|
||||
void setProgressListener (ProgressListener* pl) override
|
||||
{
|
||||
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);
|
||||
|
||||
bool isRGBSourceModified() const
|
||||
bool isRGBSourceModified() const override
|
||||
{
|
||||
return rgbSourceModified;
|
||||
}
|
||||
void setCurrentFrame(unsigned int frameNum) {}
|
||||
int getFrameCount() {return 1;}
|
||||
int getFlatFieldAutoClipValue() {return 0;}
|
||||
void setCurrentFrame(unsigned int frameNum) override {}
|
||||
int getFrameCount() override {return 1;}
|
||||
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;}
|
||||
|
||||
|
||||
};
|
||||
|
||||
@ -32,7 +32,7 @@ namespace rtexif
|
||||
class CAOnOffInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int n = t->toInt();
|
||||
|
||||
@ -51,7 +51,7 @@ class CAIntSerNumInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
CAIntSerNumInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
return "";
|
||||
}
|
||||
@ -63,7 +63,7 @@ class CAApertureInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
CAApertureInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double v = pow (2.0, t->toDouble() / 64.0);
|
||||
@ -92,7 +92,7 @@ CAMacroModeInterpreter caMacroModeInterpreter;
|
||||
class CASelfTimerInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int sec = t->toInt (0, SHORT);
|
||||
|
||||
@ -385,7 +385,7 @@ CAExposureModeInterpreter caExposureModeInterpreter;
|
||||
class CAFlashBitsInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream s;
|
||||
unsigned bits = t->toInt (0, SHORT);
|
||||
@ -533,7 +533,7 @@ CARAWQualityInterpreter caRAWQualityInterpreter;
|
||||
class CAFocalInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
Tag *unitTag = t->getParent()->getRoot()->findTag ("FocalUnits");
|
||||
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();
|
||||
|
||||
@ -1108,7 +1108,7 @@ CAFocalTypeInterpreter caFocalTypeInterpreter;
|
||||
class CAFocalPlaneInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int val = t->toInt();
|
||||
|
||||
@ -1126,7 +1126,7 @@ CAFocalPlaneInterpreter caFocalPlaneInterpreter;
|
||||
class CAExposureTimeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double d = pow (2, - t->toInt() / 32.0);
|
||||
@ -1138,7 +1138,7 @@ CAExposureTimeInterpreter caExposureTimeInterpreter;
|
||||
|
||||
class CAEVInterpreter : public Interpreter
|
||||
{
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%.1f", t->toDouble() / 32.0 );
|
||||
@ -1150,14 +1150,14 @@ CAEVInterpreter caEVInterpreter;
|
||||
class CABaseISOInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
int a = t->toInt();
|
||||
sprintf (buffer, "%d", a);
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = Interpreter::toInt (t, ofs);
|
||||
|
||||
@ -1168,7 +1168,7 @@ public:
|
||||
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);
|
||||
|
||||
@ -1287,7 +1287,7 @@ CASlowShutterInterpreter caSlowShutterInterpreter;
|
||||
class CAFlashGuideNumberInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int n = t->toInt();
|
||||
|
||||
@ -1348,7 +1348,7 @@ CAControModeInterpreter caControModeInterpreter;
|
||||
class CAFocusDistanceInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%.2f", t->toDouble() / 100 );
|
||||
@ -1360,7 +1360,7 @@ CAFocusDistanceInterpreter caFocusDistanceInterpreter;
|
||||
class CAMeasuredEVInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%.1f", t->toDouble() / 8 - 6 );
|
||||
@ -1495,7 +1495,7 @@ CAToningEffectInterpreter caToningEffectInterpreter;
|
||||
class CAFileNumberInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
unsigned long val = t->toInt (0, LONG);
|
||||
char buffer[32];
|
||||
|
||||
@ -34,7 +34,7 @@ class NAISOInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
NAISOInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%d", t->toInt (2));
|
||||
@ -47,14 +47,14 @@ class NAISOInfoISOInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
NAISOInfoISOInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
int a = t->toInt();
|
||||
sprintf (buffer, "%d", a);
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = t->getValue()[ofs];
|
||||
|
||||
@ -65,7 +65,7 @@ public:
|
||||
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];
|
||||
|
||||
@ -83,7 +83,7 @@ class NAISOExpansionInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
NAISOExpansionInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt();
|
||||
|
||||
@ -142,7 +142,7 @@ class NALensTypeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
NALensTypeInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt();
|
||||
std::ostringstream str;
|
||||
@ -191,7 +191,7 @@ class NAShootingModeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
NAShootingModeInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt();
|
||||
std::ostringstream str;
|
||||
@ -234,7 +234,7 @@ public:
|
||||
afpchoices[0x9] = "Far Left";
|
||||
afpchoices[0xa] = "Far Right";
|
||||
}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int am = t->toInt (0, BYTE);
|
||||
int afp = t->toInt (1, BYTE);
|
||||
@ -314,7 +314,7 @@ class NALensDataInterpreter : public Interpreter
|
||||
static const std::map<std::string, std::string> lenses;
|
||||
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
|
||||
static const unsigned char xlat[2][256] = {
|
||||
|
||||
@ -33,7 +33,7 @@ class OLOnOffInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
OLOnOffInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
if (t->toInt() == 0) {
|
||||
return "Off";
|
||||
@ -48,7 +48,7 @@ class OLYesNoInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
OLYesNoInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
if (t->toInt() == 0) {
|
||||
return "No";
|
||||
@ -63,7 +63,7 @@ class OLApertureInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
OLApertureInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
str.precision (2);
|
||||
@ -194,7 +194,7 @@ public:
|
||||
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";
|
||||
}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream lid;
|
||||
lid.setf (std::ios_base::hex, std::ios_base::basefield);
|
||||
@ -465,7 +465,7 @@ class OLNoiseFilterInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
OLNoiseFilterInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0);
|
||||
int b = t->toInt (2);
|
||||
@ -490,7 +490,7 @@ class OLFlashModeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
OLFlashModeInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
int a = t->toInt ();
|
||||
@ -509,7 +509,7 @@ class OLNoiseReductionInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
OLNoiseReductionInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
int a = t->toInt ();
|
||||
|
||||
@ -415,7 +415,7 @@ class PAFNumberInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAFNumberInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double v = t->toDouble() / 10;
|
||||
@ -610,7 +610,7 @@ public:
|
||||
choices[256 * 255 + 0] = "Video (Auto Aperture)";
|
||||
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);
|
||||
std::map<int, std::string>::iterator r = choices.find (c);
|
||||
@ -669,7 +669,7 @@ public:
|
||||
choices3[224] = "HDR Auto";
|
||||
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 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 + 5, "05 Toy Lens Telephoto 18mm f/8"));
|
||||
}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
double *liArray = nullptr;
|
||||
double maxApertureAtFocal = 0.;
|
||||
@ -1061,7 +1061,7 @@ class PASRResultInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PASRResultInterpreter() { }
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
int b = t->toInt (0, BYTE);
|
||||
@ -1146,7 +1146,7 @@ public:
|
||||
choices[ 2 << 8 | 4 ] = "Auto";
|
||||
}
|
||||
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int idx = 0;
|
||||
|
||||
@ -1173,7 +1173,7 @@ public:
|
||||
choices[2] = "Standard";
|
||||
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::ostringstream s;
|
||||
@ -1211,7 +1211,7 @@ public:
|
||||
choices[2] = "Medium";
|
||||
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::ostringstream s;
|
||||
@ -1243,7 +1243,7 @@ public:
|
||||
choices2[8] = "2 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 r1 = choices1.find (t->toInt (1, BYTE));
|
||||
@ -1290,7 +1290,7 @@ class PALensModelQInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PALensModelQInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[31];
|
||||
buffer[0] = 0; //
|
||||
@ -1308,7 +1308,7 @@ class PALensInfoQInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PALensInfoQInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[21];
|
||||
buffer[0] = 0;
|
||||
@ -1326,7 +1326,7 @@ class PAFlashExposureCompInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAFlashExposureCompInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a;
|
||||
|
||||
@ -1340,7 +1340,7 @@ public:
|
||||
sprintf (buffer, "%d", a );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a;
|
||||
|
||||
@ -1359,7 +1359,7 @@ class PAFocalLengthInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAFocalLengthInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
double a = double (t->toInt (0, LONG));
|
||||
|
||||
@ -1371,7 +1371,7 @@ public:
|
||||
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));
|
||||
|
||||
@ -1388,7 +1388,7 @@ class PALensDataFocalLengthInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PALensDataFocalLengthInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
float b = float (10 * int (a >> 2)) * pow (4.f, float (int (a & 0x03) - 2));
|
||||
@ -1401,7 +1401,7 @@ public:
|
||||
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);
|
||||
float b = float (10 * int (a >> 2)) * pow (4.f, float (int (a & 0x03) - 2));
|
||||
@ -1419,7 +1419,7 @@ class PAISOfInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAISOfInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
char buffer[32];
|
||||
@ -1427,7 +1427,7 @@ public:
|
||||
sprintf (buffer, "%.1f", v );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
return 100.*exp (double (a - 32) * log (2.) / 8.);
|
||||
@ -1439,7 +1439,7 @@ class PAMaxApertureInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAMaxApertureInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
a &= 0x7F;
|
||||
@ -1458,7 +1458,7 @@ public:
|
||||
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);
|
||||
a &= 0x7F;
|
||||
@ -1476,7 +1476,7 @@ class PAAEXvInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAAEXvInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
char buffer[32];
|
||||
@ -1484,7 +1484,7 @@ public:
|
||||
sprintf (buffer, "%.1f", v );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
return double (a - 64) / 8.;
|
||||
@ -1496,7 +1496,7 @@ class PAAEBXvInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAAEBXvInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, SBYTE);
|
||||
char buffer[32];
|
||||
@ -1504,7 +1504,7 @@ public:
|
||||
sprintf (buffer, "%.1f", v );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = t->toInt (0, SBYTE);
|
||||
return double (a) / 8.;
|
||||
@ -1516,7 +1516,7 @@ class PAApertureInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAApertureInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
char buffer[32];
|
||||
@ -1524,7 +1524,7 @@ public:
|
||||
sprintf (buffer, "%.1f", v );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
return exp ((double (a) - 68.) * log (2.) / 16.);
|
||||
@ -1536,7 +1536,7 @@ class PAExposureTimeInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAExposureTimeInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
char buffer[32];
|
||||
@ -1544,7 +1544,7 @@ public:
|
||||
sprintf (buffer, "%.6f", v );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
int a = t->toInt (0, BYTE);
|
||||
return 24.*exp (- (double (a) - 32.) * log (2.) / 8.);
|
||||
@ -1556,7 +1556,7 @@ class PANominalMinApertureInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PANominalMinApertureInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
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)));
|
||||
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;
|
||||
return double (int (pow (2.0, double (a + 10) / 4.0) + 0.2));
|
||||
@ -1576,7 +1576,7 @@ class PANominalMaxApertureInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PANominalMaxApertureInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
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)) );
|
||||
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;
|
||||
return double (int (pow (2.0, double (a) / 4.0) + 0.2));
|
||||
@ -1694,7 +1694,7 @@ class PAExternalFlashGNInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAExternalFlashGNInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
int b = t->toInt (0, BYTE) & 0x1F;
|
||||
@ -1708,7 +1708,7 @@ class PAEVStepsInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAEVStepsInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
|
||||
@ -1727,7 +1727,7 @@ class PAEDialinInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAEDialinInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
|
||||
@ -1746,7 +1746,7 @@ class PAApertureRingUseInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAApertureRingUseInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
|
||||
@ -1776,7 +1776,7 @@ public:
|
||||
choices[9] = "Slow-sync, Red-eye reduction";
|
||||
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);
|
||||
|
||||
@ -1795,7 +1795,7 @@ class PAMeteringMode2Interpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAMeteringMode2Interpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
int v = (t->toInt (0, BYTE) & 0xF);
|
||||
@ -1859,7 +1859,7 @@ class PAProgramLineInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAProgramLineInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::ostringstream str;
|
||||
int c = t->toInt (0, BYTE);
|
||||
@ -1899,7 +1899,7 @@ class PAAFModeInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAAFModeInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
switch (t->toInt (0, BYTE) & 0x3) {
|
||||
case 0:
|
||||
@ -1925,7 +1925,7 @@ class PAAFPointSelectedInterpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PAAFPointSelectedInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int c = t->toInt (0, SHORT);
|
||||
|
||||
@ -1949,7 +1949,7 @@ class PADriveMode2Interpreter: public Interpreter
|
||||
{
|
||||
public:
|
||||
PADriveMode2Interpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int c = t->toInt (0, BYTE);
|
||||
|
||||
|
||||
@ -191,10 +191,10 @@ public:
|
||||
TagDirectoryTable();
|
||||
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);
|
||||
virtual ~TagDirectoryTable();
|
||||
virtual int calculateSize ();
|
||||
virtual int write (int start, unsigned char* buffer);
|
||||
virtual TagDirectory* clone (TagDirectory* parent);
|
||||
~TagDirectoryTable() override;
|
||||
int calculateSize () override;
|
||||
int write (int start, unsigned char* buffer) override;
|
||||
TagDirectory* clone (TagDirectory* parent) override;
|
||||
};
|
||||
|
||||
// a class representing a single tag
|
||||
@ -488,7 +488,7 @@ protected:
|
||||
std::map<int, std::string> choices;
|
||||
public:
|
||||
ChoiceInterpreter () {};
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::map<int, std::string>::iterator r = choices.find (t->toInt());
|
||||
|
||||
|
||||
@ -1150,7 +1150,7 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int lensID = t->toInt();
|
||||
Tag *lensInfoTag = t->getParent()->getRoot()->findTag ("LensInfo");
|
||||
@ -1297,7 +1297,7 @@ public:
|
||||
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();
|
||||
Tag *lensInfoTag = t->getParent()->getRoot()->findTag ("LensInfo");
|
||||
@ -2091,7 +2091,7 @@ class SAExposureTimeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAExposureTimeInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
double a = t->toDouble();
|
||||
|
||||
@ -2103,7 +2103,7 @@ public:
|
||||
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
|
||||
TagType astype = t->getType();
|
||||
@ -2122,7 +2122,7 @@ public:
|
||||
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
|
||||
int a = 0;
|
||||
@ -2151,7 +2151,7 @@ class SAFNumberInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAFNumberInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
double a = double (t->toDouble());
|
||||
|
||||
@ -2163,7 +2163,7 @@ public:
|
||||
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
|
||||
TagType astype = t->getType();
|
||||
@ -2182,7 +2182,7 @@ public:
|
||||
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
|
||||
int a = 0;
|
||||
@ -2211,7 +2211,7 @@ class SAISOSettingInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAISOSettingInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->toInt();
|
||||
|
||||
@ -2223,7 +2223,7 @@ public:
|
||||
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
|
||||
int a = 0;
|
||||
@ -2252,14 +2252,14 @@ class SAExposureCompSetInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAExposureCompSetInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
double a = t->toDouble();
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%.2f", a );
|
||||
return buffer;
|
||||
}
|
||||
virtual double toDouble (const Tag* t, int ofs)
|
||||
double toDouble (const Tag* t, int ofs) override
|
||||
{
|
||||
// Get the value
|
||||
int a = t->getValue()[ofs];
|
||||
@ -2273,13 +2273,13 @@ class SAAFMicroAdjValueInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAAFMicroAdjValueInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%d", t->getValue()[0] - 20);
|
||||
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;
|
||||
}
|
||||
@ -2290,7 +2290,7 @@ class SAAFMicroAdjModeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAAFMicroAdjModeInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int a = t->getValue()[0] & 0x80;
|
||||
|
||||
@ -2300,7 +2300,7 @@ public:
|
||||
|
||||
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;
|
||||
}
|
||||
@ -2312,13 +2312,13 @@ class SAAFMicroAdjRegisteredLensesInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAAFMicroAdjRegisteredLensesInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%d", t->getValue()[0] & 0x7f);
|
||||
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;
|
||||
}
|
||||
@ -2329,7 +2329,7 @@ class SAFocusStatusInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAFocusStatusInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
std::string retval;
|
||||
int a = t->toInt();
|
||||
@ -2368,13 +2368,13 @@ class SAColorTemperatureSettingInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
SAColorTemperatureSettingInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf (buffer, "%d", t->toInt());
|
||||
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;
|
||||
|
||||
|
||||
@ -327,7 +327,7 @@ class FNumberInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
FNumberInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double v = t->toDouble();
|
||||
@ -346,7 +346,7 @@ class ApertureInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
ApertureInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double v = pow (2.0, t->toDouble() / 2.0);
|
||||
@ -365,7 +365,7 @@ class ExposureBiasInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
ExposureBiasInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double v = t->toDouble();
|
||||
@ -384,7 +384,7 @@ class ShutterSpeedInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
ShutterSpeedInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double d = pow (2.0, -t->toDouble());
|
||||
@ -404,7 +404,7 @@ class ExposureTimeInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
ExposureTimeInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double d = t->toDouble();
|
||||
@ -424,7 +424,7 @@ class FocalLengthInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
FocalLengthInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char buffer[32];
|
||||
double v = t->toDouble();
|
||||
@ -443,7 +443,7 @@ class UserCommentInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
UserCommentInterpreter () {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int count = t->getCount();
|
||||
|
||||
@ -563,7 +563,7 @@ public:
|
||||
delete [] buffer;
|
||||
return retVal;
|
||||
}
|
||||
virtual void fromString (Tag* t, const std::string& value)
|
||||
void fromString (Tag* t, const std::string& value) override
|
||||
{
|
||||
Glib::ustring tmpStr(value);
|
||||
t->userCommentFromString (tmpStr);
|
||||
@ -575,7 +575,7 @@ class CFAInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
CFAInterpreter() {}
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
char colors[] = "RGB";
|
||||
char buffer[1024];
|
||||
@ -632,7 +632,7 @@ UTF8BinInterpreter utf8BinInterpreter;
|
||||
class RawImageSegmentationInterpreter : public Interpreter
|
||||
{
|
||||
public:
|
||||
virtual std::string toString (Tag* t)
|
||||
std::string toString (Tag* t) override
|
||||
{
|
||||
int segmentNumber = t->toInt(0, SHORT);
|
||||
int segmentWidth = t->toInt(2, SHORT);
|
||||
|
||||
@ -87,7 +87,7 @@ public:
|
||||
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);
|
||||
virtual ~Adjuster ();
|
||||
~Adjuster () override;
|
||||
|
||||
// Add an "Automatic" checkbox next to the reset button.
|
||||
void addAutoButton(Glib::ustring tooltip = "");
|
||||
|
||||
@ -44,7 +44,7 @@ class BatchQueue final :
|
||||
{
|
||||
public:
|
||||
explicit BatchQueue (FileCatalog* aFileCatalog);
|
||||
~BatchQueue ();
|
||||
~BatchQueue () override;
|
||||
|
||||
void addEntries (const std::vector<BatchQueueEntry*>& entries, bool head = false, bool save = true);
|
||||
void cancelItems (const std::vector<ThumbBrowserEntryBase*>& items);
|
||||
@ -62,17 +62,17 @@ public:
|
||||
return (!fd.empty());
|
||||
}
|
||||
|
||||
void setProgress(double p);
|
||||
void setProgressStr(const Glib::ustring& str);
|
||||
void setProgressState(bool inProcessing);
|
||||
void error(const Glib::ustring& descr);
|
||||
rtengine::ProcessingJob* imageReady(rtengine::IImagefloat* img);
|
||||
void setProgress(double p) override;
|
||||
void setProgressStr(const Glib::ustring& str) override;
|
||||
void setProgressState(bool inProcessing) override;
|
||||
void error(const Glib::ustring& descr) override;
|
||||
rtengine::ProcessingJob* imageReady(rtengine::IImagefloat* img) override;
|
||||
|
||||
void rightClicked (ThumbBrowserEntryBase* entry);
|
||||
void doubleClicked (ThumbBrowserEntryBase* entry);
|
||||
bool keyPressed (GdkEventKey* event);
|
||||
void buttonPressed (LWButton* button, int actionCode, void* actionData);
|
||||
void redrawNeeded (LWButton* button);
|
||||
void rightClicked (ThumbBrowserEntryBase* entry) override;
|
||||
void doubleClicked (ThumbBrowserEntryBase* entry) override;
|
||||
bool keyPressed (GdkEventKey* event) override;
|
||||
void buttonPressed (LWButton* button, int actionCode, void* actionData) override;
|
||||
void redrawNeeded (LWButton* button) override;
|
||||
|
||||
void setBatchQueueListener (BatchQueueListener* l)
|
||||
{
|
||||
@ -86,9 +86,9 @@ public:
|
||||
static int calcMaxThumbnailHeight();
|
||||
|
||||
protected:
|
||||
int getMaxThumbnailHeight() const;
|
||||
void saveThumbnailHeight (int height);
|
||||
int getThumbnailHeight ();
|
||||
int getMaxThumbnailHeight() const override;
|
||||
void saveThumbnailHeight (int height) override;
|
||||
int getThumbnailHeight () override;
|
||||
|
||||
Glib::ustring autoCompleteFileName (const Glib::ustring& fileName, const Glib::ustring& format);
|
||||
Glib::ustring getTempFilenameForParams( const Glib::ustring &filename );
|
||||
|
||||
@ -56,21 +56,21 @@ public:
|
||||
bool fast_pipeline;
|
||||
|
||||
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 calcThumbnailSize ();
|
||||
void refreshThumbnailImage () override;
|
||||
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 ();
|
||||
|
||||
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea ();
|
||||
virtual void getIconSize (int& w, int& h);
|
||||
virtual Glib::ustring getToolTip (int x, int y);
|
||||
std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea () override;
|
||||
void getIconSize (int& w, int& h) override;
|
||||
Glib::ustring getToolTip (int x, int y) override;
|
||||
|
||||
// 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
|
||||
};
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ class BatchQueuePanel : public Gtk::VBox,
|
||||
|
||||
public:
|
||||
explicit BatchQueuePanel (FileCatalog* aFileCatalog);
|
||||
~BatchQueuePanel();
|
||||
~BatchQueuePanel() override;
|
||||
|
||||
void init (RTWindow* parent);
|
||||
|
||||
|
||||
@ -41,17 +41,17 @@ public:
|
||||
|
||||
BayerPreProcess ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, 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) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void adjusterChanged(Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
|
||||
void hotDeadPixelChanged();
|
||||
void setAdjusterBehavior (bool linedenoiseadd, bool greenequiladd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void lineDenoiseDirectionChanged();
|
||||
void pdafLinesFilterChanged();
|
||||
};
|
||||
|
||||
@ -70,24 +70,24 @@ protected:
|
||||
public:
|
||||
|
||||
BayerProcess ();
|
||||
~BayerProcess ();
|
||||
~BayerProcess () override;
|
||||
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
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 trimValues(rtengine::procparams::ProcParams* pp);
|
||||
void setBatchMode(bool batchMode);
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void trimValues(rtengine::procparams::ProcParams* pp) override;
|
||||
void setBatchMode(bool batchMode) override;
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void methodChanged();
|
||||
void imageNumberChanged();
|
||||
void adjusterChanged(Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
void checkBoxToggled(CheckBox* c, CheckValue newval);
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
void checkBoxToggled(CheckBox* c, CheckValue newval) override;
|
||||
void pixelShiftMotionMethodChanged();
|
||||
void pixelShiftDemosaicMethodChanged();
|
||||
void autoContrastChanged (double autoContrast);
|
||||
void FrameCountChanged(int n, int frameNum);
|
||||
void autoContrastChanged (double autoContrast) override;
|
||||
void FrameCountChanged(int n, int frameNum) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -38,15 +38,15 @@ public:
|
||||
|
||||
BayerRAWExposure ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
void checkBoxToggled (CheckBox* c, CheckValue newval);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
void checkBoxToggled (CheckBox* c, CheckValue newval) override;
|
||||
void setAdjusterBehavior (bool pexblackadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -39,32 +39,32 @@ class BlackWhite final :
|
||||
public:
|
||||
|
||||
BlackWhite ();
|
||||
~BlackWhite ();
|
||||
~BlackWhite () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void autoOpenCurve ();
|
||||
void setEditProvider (EditDataProvider *provider);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void autoOpenCurve () override;
|
||||
void setEditProvider (EditDataProvider *provider) override;
|
||||
|
||||
void autoch_toggled ();
|
||||
void neutral_pressed ();
|
||||
|
||||
void updateRGBLabel ();
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
void setAdjusterBehavior (bool bwadd, bool bwgadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void enabledcc_toggled ();
|
||||
void enabledChanged ();
|
||||
void enabledChanged () override;
|
||||
void methodChanged ();
|
||||
void filterChanged ();
|
||||
void settingChanged ();
|
||||
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
|
||||
void BWChanged (double redbw, double greenbw, double bluebw);
|
||||
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
|
||||
void BWChanged (double redbw, double greenbw, double bluebw) override;
|
||||
bool BWComputed_ ();
|
||||
void curveChanged (CurveEditor* ce);
|
||||
void curveChanged (CurveEditor* ce) override;
|
||||
void curveMode1Changed ();
|
||||
bool curveMode1Changed_ ();
|
||||
void curveMode1Changed2 ();
|
||||
|
||||
@ -87,30 +87,30 @@ public:
|
||||
// FramesMetaData interface
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
unsigned int getRootCount () const { return -1; }
|
||||
unsigned int getFrameCount () const { return frameCount; }
|
||||
bool hasExif (unsigned int frame = 0) const { return false; }
|
||||
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const { return nullptr; }
|
||||
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const { return nullptr; }
|
||||
rtexif::TagDirectory* getBestExifData (rtengine::ImageSource *imgSource, rtengine::procparams::RAWParams *rawParams) const { return nullptr; }
|
||||
bool hasIPTC (unsigned int frame = 0) const { return false; }
|
||||
rtengine::procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const { return rtengine::procparams::IPTCPairs(); }
|
||||
tm getDateTime (unsigned int frame = 0) const { return tm{}; }
|
||||
time_t getDateTimeAsTS(unsigned int frame = 0) const { return time_t(-1); }
|
||||
int getISOSpeed (unsigned int frame = 0) const { return iso; }
|
||||
double getFNumber (unsigned int frame = 0) const { return fnumber; }
|
||||
double getFocalLen (unsigned int frame = 0) const { return focalLen; }
|
||||
double getFocalLen35mm (unsigned int frame = 0) const { return focalLen35mm; }
|
||||
float getFocusDist (unsigned int frame = 0) const { return focusDist; }
|
||||
double getShutterSpeed (unsigned int frame = 0) const { return shutter; }
|
||||
double getExpComp (unsigned int frame = 0) const { return atof(expcomp.c_str()); }
|
||||
std::string getMake (unsigned int frame = 0) const { return camMake; }
|
||||
std::string getModel (unsigned int frame = 0) const { return camModel; }
|
||||
std::string getLens (unsigned int frame = 0) const { return lens; }
|
||||
std::string getOrientation (unsigned int frame = 0) const { return ""; } // TODO
|
||||
bool getPixelShift () const { return isPixelShift; }
|
||||
bool getHDR (unsigned int frame = 0) const { return isHDR; }
|
||||
std::string getImageType (unsigned int frame) const { return isPixelShift ? "PS" : isHDR ? "HDR" : "STD"; }
|
||||
rtengine::IIOSampleFormat getSampleFormat (unsigned int frame = 0) const { return sampleFormat; }
|
||||
unsigned int getRootCount () const override { return -1; }
|
||||
unsigned int getFrameCount () const override { return frameCount; }
|
||||
bool hasExif (unsigned int frame = 0) const override { return false; }
|
||||
rtexif::TagDirectory* getRootExifData (unsigned int root = 0) const override { return nullptr; }
|
||||
rtexif::TagDirectory* getFrameExifData (unsigned int frame = 0) const override { return nullptr; }
|
||||
rtexif::TagDirectory* getBestExifData (rtengine::ImageSource *imgSource, rtengine::procparams::RAWParams *rawParams) const override { return nullptr; }
|
||||
bool hasIPTC (unsigned int frame = 0) const override { return false; }
|
||||
rtengine::procparams::IPTCPairs getIPTCData (unsigned int frame = 0) const override { return rtengine::procparams::IPTCPairs(); }
|
||||
tm getDateTime (unsigned int frame = 0) const override { return tm{}; }
|
||||
time_t getDateTimeAsTS(unsigned int frame = 0) const override { return time_t(-1); }
|
||||
int getISOSpeed (unsigned int frame = 0) const override { return iso; }
|
||||
double getFNumber (unsigned int frame = 0) const override { return fnumber; }
|
||||
double getFocalLen (unsigned int frame = 0) const override { return focalLen; }
|
||||
double getFocalLen35mm (unsigned int frame = 0) const override { return focalLen35mm; }
|
||||
float getFocusDist (unsigned int frame = 0) const override { return focusDist; }
|
||||
double getShutterSpeed (unsigned int frame = 0) const override { return shutter; }
|
||||
double getExpComp (unsigned int frame = 0) const override { return atof(expcomp.c_str()); }
|
||||
std::string getMake (unsigned int frame = 0) const override { return camMake; }
|
||||
std::string getModel (unsigned int frame = 0) const override { return camModel; }
|
||||
std::string getLens (unsigned int frame = 0) const override { return lens; }
|
||||
std::string getOrientation (unsigned int frame = 0) const override { return ""; } // TODO
|
||||
bool getPixelShift () const override { return isPixelShift; }
|
||||
bool getHDR (unsigned int frame = 0) const override { return isHDR; }
|
||||
std::string getImageType (unsigned int frame) const override { return isPixelShift ? "PS" : isHDR ? "HDR" : "STD"; }
|
||||
rtengine::IIOSampleFormat getSampleFormat (unsigned int frame = 0) const override { return sampleFormat; }
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -34,15 +34,15 @@ public:
|
||||
|
||||
CACorrection ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void setAdjusterBehavior (bool badd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -36,16 +36,16 @@ public:
|
||||
|
||||
ChMixer ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void setAdjusterBehavior (bool rgbadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void enabledChanged();
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void enabledChanged() override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -37,8 +37,8 @@ public:
|
||||
|
||||
CoarsePanel ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void initBatchBehavior ();
|
||||
|
||||
void rotateLeft ();
|
||||
|
||||
@ -38,16 +38,16 @@ class ColorAppearance final :
|
||||
{
|
||||
public:
|
||||
ColorAppearance ();
|
||||
~ColorAppearance ();
|
||||
~ColorAppearance () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
// void adjusterAdapToggled (Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void enabledChanged () override;
|
||||
void surroundChanged ();
|
||||
void surrsrcChanged ();
|
||||
void wbmodelChanged ();
|
||||
@ -58,14 +58,14 @@ public:
|
||||
void datacie_toggled ();
|
||||
void tonecie_toggled ();
|
||||
// void sharpcie_toggled ();
|
||||
void autoCamChanged (double ccam, double ccamout);
|
||||
void autoCamChanged (double ccam, double ccamout) override;
|
||||
bool autoCamComputed_ ();
|
||||
void adapCamChanged (double cadap);
|
||||
void adapCamChanged (double cadap) override;
|
||||
bool adapCamComputed_ ();
|
||||
void ybCamChanged (int yb);
|
||||
void ybCamChanged (int yb) override;
|
||||
bool ybCamComputed_ ();
|
||||
|
||||
void curveChanged (CurveEditor* ce);
|
||||
void curveChanged (CurveEditor* ce) override;
|
||||
void curveMode1Changed ();
|
||||
bool curveMode1Changed_ ();
|
||||
void curveMode2Changed ();
|
||||
@ -76,10 +76,10 @@ public:
|
||||
|
||||
void expandCurve (bool isExpanded);
|
||||
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 trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void updateCurveBackgroundHistogram(
|
||||
const LUTu& histToneCurve,
|
||||
const LUTu& histLCurve,
|
||||
@ -92,7 +92,7 @@ public:
|
||||
const LUTu& histLuma,
|
||||
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 writeOptions (std::vector<int> &tpOpen);
|
||||
|
||||
|
||||
@ -25,41 +25,41 @@ class ColorToning final :
|
||||
{
|
||||
public:
|
||||
ColorToning ();
|
||||
~ColorToning();
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
~ColorToning() override;
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
void setAdjusterBehavior (bool splitAdd, bool satThresholdAdd, bool satOpacityAdd, bool strprotectAdd, bool balanceAdd);
|
||||
void neutral_pressed ();
|
||||
//void neutralCurves_pressed ();
|
||||
void autoColorTonChanged (int bwct, int satthres, int satprot);
|
||||
void autoColorTonChanged (int bwct, int satthres, int satprot) override;
|
||||
bool CTComp_ ();
|
||||
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop);
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight);
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop);
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight);
|
||||
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR);
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override;
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override;
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override;
|
||||
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) override;
|
||||
|
||||
void enabledChanged ();
|
||||
void curveChanged (CurveEditor* ce);
|
||||
void enabledChanged () override;
|
||||
void curveChanged (CurveEditor* ce) override;
|
||||
void autosatChanged ();
|
||||
void autoOpenCurve ();
|
||||
void autoOpenCurve () override;
|
||||
void methodChanged ();
|
||||
void twocolorChanged (bool changedbymethod);
|
||||
void twoColorChangedByGui ();
|
||||
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);
|
||||
float blendPipetteValues(CurveEditor *ce, float chan1, float chan2, float chan3);
|
||||
void setEditProvider(EditDataProvider *provider) override;
|
||||
float blendPipetteValues(CurveEditor *ce, float chan1, float chan2, float chan3) override;
|
||||
|
||||
private:
|
||||
void onLabRegionSelectionChanged();
|
||||
|
||||
@ -136,7 +136,7 @@ public:
|
||||
/// For more complex adjuster
|
||||
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
|
||||
void setAxis(const std::vector<Axis> &axis);
|
||||
|
||||
40
rtgui/crop.h
40
rtgui/crop.h
@ -41,42 +41,42 @@ class Crop final :
|
||||
{
|
||||
public:
|
||||
Crop();
|
||||
~Crop();
|
||||
~Crop() override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void ratioChanged ();
|
||||
void ratioFixedChanged (); // The toggle button
|
||||
void refreshSize ();
|
||||
void selectPressed ();
|
||||
void setDimensions (int mw, int mh);
|
||||
void enabledChanged ();
|
||||
void enabledChanged () override;
|
||||
void positionChanged ();
|
||||
void widthChanged ();
|
||||
void heightChanged ();
|
||||
bool refreshSpins (bool notify = false);
|
||||
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 readOptions ();
|
||||
void writeOptions ();
|
||||
|
||||
void cropMoved (int &x, int &y, int &w, int &h);
|
||||
void cropWidth1Resized (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);
|
||||
void cropHeight1Resized (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);
|
||||
void cropTopLeftResized (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);
|
||||
void cropBottomLeftResized (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);
|
||||
void cropInit (int &x, int &y, int &w, int &h);
|
||||
void cropResized (int &x, int &y, int& x2, int& y2);
|
||||
void cropManipReady ();
|
||||
bool inImageArea (int x, int y);
|
||||
double getRatio () const;
|
||||
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) override;
|
||||
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) override;
|
||||
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) override;
|
||||
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) override;
|
||||
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) override;
|
||||
void cropResized (int &x, int &y, int& x2, int& y2) override;
|
||||
void cropManipReady () override;
|
||||
bool inImageArea (int x, int y) override;
|
||||
double getRatio () const override;
|
||||
|
||||
void setCropPanelListener (CropPanelListener* cl)
|
||||
{
|
||||
|
||||
@ -51,7 +51,7 @@ class CropHandler final :
|
||||
{
|
||||
public:
|
||||
CropHandler ();
|
||||
~CropHandler ();
|
||||
~CropHandler () override;
|
||||
|
||||
void setDisplayHandler (CropDisplayHandler* l)
|
||||
{
|
||||
@ -96,11 +96,11 @@ public:
|
||||
int cw,
|
||||
int ch,
|
||||
int skip
|
||||
);
|
||||
void getWindow(int& cwx, int& cwy, int& cww, int& cwh, int& cskip);
|
||||
) override;
|
||||
void getWindow(int& cwx, int& cwy, int& cww, int& cwh, int& cskip) override;
|
||||
|
||||
// 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 ();
|
||||
|
||||
|
||||
@ -134,7 +134,7 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
|
||||
public:
|
||||
CropHandler cropHandler;
|
||||
CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDetailWindow);
|
||||
~CropWindow ();
|
||||
~CropWindow () override;
|
||||
|
||||
void setDecorated (bool decorated)
|
||||
{
|
||||
@ -150,19 +150,19 @@ public:
|
||||
}
|
||||
void deleteColorPickers ();
|
||||
|
||||
void screenCoordToCropBuffer (int phyx, int phyy, int& cropx, int& cropy);
|
||||
void screenCoordToImage (int phyx, int phyy, int& imgx, int& imgy);
|
||||
void screenCoordToCropBuffer (int phyx, int phyy, int& cropx, int& cropy) override;
|
||||
void screenCoordToImage (int phyx, int phyy, int& imgx, int& imgy) override;
|
||||
void screenCoordToCropCanvas (int phyx, int phyy, int& prevx, int& prevy);
|
||||
void imageCoordToCropCanvas (int imgx, int imgy, int& phyx, int& phyy);
|
||||
void imageCoordToScreen (int imgx, int imgy, int& phyx, int& phyy);
|
||||
void imageCoordToCropBuffer (int imgx, int imgy, int& phyx, int& phyy);
|
||||
void imageCoordToCropImage (int imgx, int imgy, int& phyx, int& phyy);
|
||||
int scaleValueToImage (int value);
|
||||
float scaleValueToImage (float value);
|
||||
double scaleValueToImage (double value);
|
||||
int scaleValueToCanvas (int value);
|
||||
float scaleValueToCanvas (float value);
|
||||
double scaleValueToCanvas (double value);
|
||||
void imageCoordToCropCanvas (int imgx, int imgy, int& phyx, int& phyy) override;
|
||||
void imageCoordToScreen (int imgx, int imgy, int& phyx, int& phyy) override;
|
||||
void imageCoordToCropBuffer (int imgx, int imgy, int& phyx, int& phyy) override;
|
||||
void imageCoordToCropImage (int imgx, int imgy, int& phyx, int& phyy) override;
|
||||
int scaleValueToImage (int value) override;
|
||||
float scaleValueToImage (float value) override;
|
||||
double scaleValueToImage (double value) override;
|
||||
int scaleValueToCanvas (int value) override;
|
||||
float scaleValueToCanvas (float value) override;
|
||||
double scaleValueToCanvas (double value) override;
|
||||
double getZoomFitVal ();
|
||||
void setPosition (int x, int y);
|
||||
void getPosition (int& x, int& y);
|
||||
@ -197,8 +197,8 @@ public:
|
||||
void setEditSubscriber (EditSubscriber* newSubscriber);
|
||||
|
||||
// interface lwbuttonlistener
|
||||
void buttonPressed (LWButton* button, int actionCode, void* actionData);
|
||||
void redrawNeeded (LWButton* button);
|
||||
void buttonPressed (LWButton* button, int actionCode, void* actionData) override;
|
||||
void redrawNeeded (LWButton* button) override;
|
||||
|
||||
// crop handling
|
||||
void getCropRectangle (int& x, int& y, int& w, int& h);
|
||||
@ -220,10 +220,10 @@ public:
|
||||
void delCropWindowListener (CropWindowListener* l);
|
||||
|
||||
// crophandlerlistener interface
|
||||
void cropImageUpdated ();
|
||||
void cropWindowChanged ();
|
||||
void initialImageArrived ();
|
||||
void setDisplayPosition (int x, int y);
|
||||
void cropImageUpdated () override;
|
||||
void cropWindowChanged () override;
|
||||
void initialImageArrived () override;
|
||||
void setDisplayPosition (int x, int y) override;
|
||||
|
||||
void remoteMove (int deltaX, int deltaY);
|
||||
void remoteMoveReady ();
|
||||
|
||||
@ -88,7 +88,7 @@ protected:
|
||||
public:
|
||||
|
||||
CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEditorSubGroup* ceSubGroup);
|
||||
virtual ~CurveEditor ();
|
||||
~CurveEditor () override;
|
||||
void typeSelectionChanged (int n);
|
||||
void curveTypeToggled();
|
||||
bool isUnChanged ();
|
||||
@ -127,12 +127,12 @@ public:
|
||||
sigc::signal<void> signal_curvepoint_click();
|
||||
sigc::signal<void> signal_curvepoint_release();
|
||||
|
||||
void switchOffEditMode ();
|
||||
bool mouseOver(const int modifierKey);
|
||||
bool button1Pressed(const int modifierKey);
|
||||
bool button1Released();
|
||||
bool drag1(const int modifierKey);
|
||||
CursorShape getCursor(const int objectID);
|
||||
void switchOffEditMode () override;
|
||||
bool mouseOver(const int modifierKey) override;
|
||||
bool button1Pressed(const int modifierKey) override;
|
||||
bool button1Released() override;
|
||||
bool drag1(const int modifierKey) override;
|
||||
CursorShape getCursor(const int objectID) override;
|
||||
|
||||
|
||||
};
|
||||
@ -161,7 +161,7 @@ protected:
|
||||
|
||||
public:
|
||||
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 getRangeLabels(Glib::ustring &r1, Glib::ustring &r2, Glib::ustring &r3, Glib::ustring &r4);
|
||||
void setRangeDefaultMilestones(double m1, double m2, double m3);
|
||||
@ -191,15 +191,15 @@ protected:
|
||||
|
||||
public:
|
||||
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;
|
||||
}
|
||||
virtual double getIdentityValue ()
|
||||
double getIdentityValue () override
|
||||
{
|
||||
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
|
||||
void setResetCurve(FlatCurveType cType, const std::vector<double> &resetCurve);
|
||||
|
||||
@ -71,7 +71,7 @@ public:
|
||||
*/
|
||||
|
||||
CurveEditorGroup(Glib::ustring& curveDir, Glib::ustring groupLabel = "");
|
||||
~CurveEditorGroup();
|
||||
~CurveEditorGroup() override;
|
||||
void newLine();
|
||||
void curveListComplete();
|
||||
void setBatchMode (bool batchMode);
|
||||
@ -97,8 +97,8 @@ protected:
|
||||
void hideCurrentCurve ();
|
||||
void updateGUI (CurveEditor* ce);
|
||||
void curveResetPressed ();
|
||||
void curveChanged ();
|
||||
float blendPipetteValues(CurveEditor* ce, float chan1, float chan2, float chan3);
|
||||
void curveChanged () override;
|
||||
float blendPipetteValues(CurveEditor* ce, float chan1, float chan2, float chan3) override;
|
||||
void setUnChanged (bool uc, CurveEditor* ce);
|
||||
};
|
||||
|
||||
|
||||
@ -55,8 +55,8 @@ public:
|
||||
|
||||
DarkFrame ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void darkFrameChanged ();
|
||||
void darkFrameReset ();
|
||||
|
||||
@ -41,18 +41,18 @@ protected:
|
||||
public:
|
||||
|
||||
Defringe ();
|
||||
~Defringe ();
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void autoOpenCurve ();
|
||||
void curveChanged ();
|
||||
~Defringe () override;
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void autoOpenCurve () override;
|
||||
void curveChanged () override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -39,15 +39,15 @@ public:
|
||||
|
||||
Dehaze();
|
||||
|
||||
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr);
|
||||
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr);
|
||||
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr);
|
||||
void setBatchMode(bool batchMode);
|
||||
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr) override;
|
||||
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr) override;
|
||||
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr) override;
|
||||
void setBatchMode(bool batchMode) override;
|
||||
|
||||
void adjusterChanged(Adjuster *a, double newval);
|
||||
void enabledChanged();
|
||||
void adjusterChanged(Adjuster *a, double newval) override;
|
||||
void enabledChanged() override;
|
||||
void showDepthMapChanged();
|
||||
void setAdjusterBehavior(bool strengthAdd);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) {}
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override {}
|
||||
};
|
||||
|
||||
|
||||
@ -75,37 +75,37 @@ protected:
|
||||
|
||||
public:
|
||||
DiagonalCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir);
|
||||
virtual ~DiagonalCurveEditorSubGroup();
|
||||
~DiagonalCurveEditorSubGroup() override;
|
||||
|
||||
DiagonalCurveEditor* addCurve(Glib::ustring curveLabel = "");
|
||||
virtual void updateBackgroundHistogram (CurveEditor* ce);
|
||||
void switchGUI();
|
||||
void refresh(CurveEditor *curveToRefresh);
|
||||
void editModeSwitchedOff ();
|
||||
void pipetteMouseOver(EditDataProvider *provider, int modifierKey);
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey);
|
||||
void pipetteButton1Released(EditDataProvider *provider);
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey);
|
||||
void showCoordinateAdjuster(CoordinateProvider *provider);
|
||||
void stopNumericalAdjustment();
|
||||
void updateBackgroundHistogram (CurveEditor* ce) override;
|
||||
void switchGUI() override;
|
||||
void refresh(CurveEditor *curveToRefresh) override;
|
||||
void editModeSwitchedOff () override;
|
||||
void pipetteMouseOver(EditDataProvider *provider, int modifierKey) override;
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
|
||||
void pipetteButton1Released(EditDataProvider *provider) override;
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
|
||||
void showCoordinateAdjuster(CoordinateProvider *provider) override;
|
||||
void stopNumericalAdjustment() override;
|
||||
|
||||
bool curveReset (CurveEditor *ce);
|
||||
bool curveReset (CurveEditor *ce) override;
|
||||
|
||||
protected:
|
||||
void storeCurveValues (CurveEditor* ce, const std::vector<double>& p);
|
||||
void storeDisplayedCurve ();
|
||||
void restoreDisplayedHistogram ();
|
||||
void storeCurveValues (CurveEditor* ce, const std::vector<double>& p) override;
|
||||
void storeDisplayedCurve () override;
|
||||
void restoreDisplayedHistogram () override;
|
||||
void savePressed ();
|
||||
void loadPressed ();
|
||||
void copyPressed ();
|
||||
void pastePressed ();
|
||||
void editPointToggled(Gtk::ToggleButton *button);
|
||||
void editToggled (Gtk::ToggleButton *button);
|
||||
void removeEditor ();
|
||||
const std::vector<double> getCurveFromGUI (int type);
|
||||
void shcChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void removeEditor () override;
|
||||
const std::vector<double> getCurveFromGUI (int type) override;
|
||||
void shcChanged () override;
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
bool adjusterEntered (GdkEventCrossing* ev, int ac);
|
||||
bool adjusterLeft (GdkEventCrossing* ev, int ac);
|
||||
void setSubGroupRangeLabels(Glib::ustring r1, Glib::ustring r2, Glib::ustring r3, Glib::ustring r4);
|
||||
|
||||
@ -101,7 +101,7 @@ private:
|
||||
|
||||
public:
|
||||
DirBrowser ();
|
||||
~DirBrowser();
|
||||
~DirBrowser() override;
|
||||
|
||||
void fillDirTree ();
|
||||
void on_sort_column_changed() const;
|
||||
|
||||
@ -38,25 +38,25 @@ class DirPyrDenoise final :
|
||||
{
|
||||
public:
|
||||
DirPyrDenoise ();
|
||||
~DirPyrDenoise ();
|
||||
~DirPyrDenoise () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void curveChanged (CurveEditor* ce);
|
||||
void setEditProvider (EditDataProvider *provider);
|
||||
void autoOpenCurve ();
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void curveChanged (CurveEditor* ce) override;
|
||||
void setEditProvider (EditDataProvider *provider) override;
|
||||
void autoOpenCurve () override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
void medianChanged ();
|
||||
void chromaChanged (double autchroma, double autred, double autblue);
|
||||
void chromaChanged (double autchroma, double autred, double autblue) override;
|
||||
bool chromaComputed_ ();
|
||||
void noiseChanged (double nresid, double highresid);
|
||||
void noiseChanged (double nresid, double highresid) override;
|
||||
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_ ();
|
||||
|
||||
// void perform_toggled ();
|
||||
@ -72,10 +72,10 @@ public:
|
||||
void methodmedChanged ();
|
||||
void rgbmethodChanged ();
|
||||
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 trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
Glib::ustring getSettingString ();
|
||||
|
||||
private:
|
||||
|
||||
@ -55,28 +55,28 @@ protected:
|
||||
public:
|
||||
|
||||
DirPyrEqualizer ();
|
||||
virtual ~DirPyrEqualizer ();
|
||||
~DirPyrEqualizer () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void setAdjusterBehavior (bool multiplieradd, bool thresholdadd, bool skinadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void cbdlMethodChanged();
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged() override;
|
||||
void gamutlabToggled ();
|
||||
void lumaneutralPressed ();
|
||||
void lumacontrastPlusPressed ();
|
||||
void lumacontrastMinusPressed ();
|
||||
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop);
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight);
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop);
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight);
|
||||
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR);
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop) override;
|
||||
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight) override;
|
||||
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop) override;
|
||||
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) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -37,15 +37,15 @@ public:
|
||||
|
||||
Distortion ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
void setAdjusterBehavior (bool vadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void idPressed ();
|
||||
void setLensGeomListener (LensGeomListener* l)
|
||||
{
|
||||
|
||||
30
rtgui/edit.h
30
rtgui/edit.h
@ -348,9 +348,9 @@ public:
|
||||
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);
|
||||
|
||||
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, 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) override;
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
|
||||
};
|
||||
|
||||
class Line : public Geometry
|
||||
@ -363,9 +363,9 @@ public:
|
||||
Line (rtengine::Coord& begin, rtengine::Coord& end);
|
||||
Line (int beginX, int beginY, int endX, int endY);
|
||||
|
||||
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, 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) override;
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
|
||||
};
|
||||
|
||||
class Polyline : public Geometry
|
||||
@ -376,9 +376,9 @@ public:
|
||||
|
||||
Polyline ();
|
||||
|
||||
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, 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) override;
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
|
||||
};
|
||||
|
||||
class Rectangle : public Geometry
|
||||
@ -394,9 +394,9 @@ public:
|
||||
void setXYXY(int left, int top, int right, int bottom);
|
||||
void setXYWH(rtengine::Coord topLeft, rtengine::Coord widthHeight);
|
||||
void setXYXY(rtengine::Coord topLeft, rtengine::Coord bottomRight);
|
||||
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, 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) override;
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
|
||||
};
|
||||
|
||||
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> getDraggedImg();
|
||||
const Cairo::RefPtr<Cairo::ImageSurface> getInsensitiveImg();
|
||||
void drawOuterGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawInnerGeometry (Cairo::RefPtr<Cairo::Context> &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem);
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, 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) override;
|
||||
void drawToMOChannel (Cairo::RefPtr<Cairo::Context> &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) override;
|
||||
};
|
||||
|
||||
class OPAdjuster : public Geometry // OP stands for "On Preview"
|
||||
|
||||
@ -56,11 +56,11 @@ class EditorPanel final :
|
||||
{
|
||||
public:
|
||||
explicit EditorPanel (FilePanel* filePanel = nullptr);
|
||||
~EditorPanel ();
|
||||
~EditorPanel () override;
|
||||
|
||||
void open (Thumbnail* tmb, rtengine::InitialImage* isrc);
|
||||
void setAspect ();
|
||||
void on_realize ();
|
||||
void on_realize () override;
|
||||
void leftPaneButtonReleased (GdkEventButton *event);
|
||||
void rightPaneButtonReleased (GdkEventButton *event);
|
||||
|
||||
@ -83,10 +83,10 @@ public:
|
||||
return realized;
|
||||
}
|
||||
// ProgressListener interface
|
||||
void setProgress(double p);
|
||||
void setProgressStr(const Glib::ustring& str);
|
||||
void setProgressState(bool inProcessing);
|
||||
void error(const Glib::ustring& descr);
|
||||
void setProgress(double p) override;
|
||||
void setProgressStr(const Glib::ustring& str) override;
|
||||
void setProgressState(bool inProcessing) override;
|
||||
void error(const Glib::ustring& descr) override;
|
||||
|
||||
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
|
||||
@ -98,14 +98,14 @@ public:
|
||||
const rtengine::ProcEvent& ev,
|
||||
const Glib::ustring& descr,
|
||||
const ParamsEdited* paramsEdited = nullptr
|
||||
);
|
||||
void clearParamChanges();
|
||||
) override;
|
||||
void clearParamChanges() override;
|
||||
|
||||
// thumbnaillistener interface
|
||||
void procParamsChanged (Thumbnail* thm, int whoChangedIt);
|
||||
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;
|
||||
|
||||
// HistoryBeforeLineListener
|
||||
void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params);
|
||||
void historyBeforeLineChanged (const rtengine::procparams::ProcParams& params) override;
|
||||
|
||||
// HistogramListener
|
||||
void histogramChanged(
|
||||
@ -123,7 +123,7 @@ public:
|
||||
const LUTu& histBlueRaw,
|
||||
const LUTu& histChroma,
|
||||
const LUTu& histLRETI
|
||||
);
|
||||
) override;
|
||||
|
||||
// event handlers
|
||||
void info_toggled ();
|
||||
|
||||
@ -55,12 +55,12 @@ public:
|
||||
|
||||
void toFront();
|
||||
bool keyPressed (GdkEventKey* event);
|
||||
bool on_configure_event(GdkEventConfigure* event);
|
||||
bool on_delete_event(GdkEventAny* event);
|
||||
bool on_configure_event(GdkEventConfigure* event) override;
|
||||
bool on_delete_event(GdkEventAny* event) override;
|
||||
//bool on_window_state_event(GdkEventWindowState* event);
|
||||
void on_mainNB_switch_page(Gtk::Widget* page, guint page_num);
|
||||
void set_title_decorated(Glib::ustring fname);
|
||||
void on_realize ();
|
||||
void on_realize () override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
14
rtgui/epd.h
14
rtgui/epd.h
@ -36,14 +36,14 @@ public:
|
||||
|
||||
EdgePreservingDecompositionUI();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
void setAdjusterBehavior (bool stAdd, bool gAdd, bool esAdd, bool scAdd, bool rAdd);
|
||||
};
|
||||
|
||||
|
||||
@ -97,11 +97,11 @@ private:
|
||||
|
||||
public:
|
||||
ExifPanel ();
|
||||
virtual ~ExifPanel();
|
||||
~ExifPanel() override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, 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) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void setImageData (const rtengine::FramesMetaData* id);
|
||||
|
||||
|
||||
@ -36,14 +36,14 @@ public:
|
||||
|
||||
FattalToneMapping();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
void setAdjusterBehavior(bool amountAdd, bool thresholdAdd, bool anchorAdd);
|
||||
};
|
||||
|
||||
|
||||
@ -136,7 +136,7 @@ protected:
|
||||
|
||||
public:
|
||||
FileBrowser ();
|
||||
~FileBrowser ();
|
||||
~FileBrowser () override;
|
||||
|
||||
void addEntry (FileBrowserEntry* entry); // can be called from any thread
|
||||
void addEntry_ (FileBrowserEntry* entry); // this must be executed inside the gtk thread
|
||||
@ -164,17 +164,17 @@ public:
|
||||
return numFiltered;
|
||||
}
|
||||
|
||||
void buttonPressed (LWButton* button, int actionCode, void* actionData);
|
||||
void redrawNeeded (LWButton* button);
|
||||
bool checkFilter (ThumbBrowserEntryBase* entry);
|
||||
void rightClicked (ThumbBrowserEntryBase* entry);
|
||||
void doubleClicked (ThumbBrowserEntryBase* entry);
|
||||
bool keyPressed (GdkEventKey* event);
|
||||
void buttonPressed (LWButton* button, int actionCode, void* actionData) override;
|
||||
void redrawNeeded (LWButton* button) override;
|
||||
bool checkFilter (ThumbBrowserEntryBase* entry) override;
|
||||
void rightClicked (ThumbBrowserEntryBase* entry) override;
|
||||
void doubleClicked (ThumbBrowserEntryBase* entry) override;
|
||||
bool keyPressed (GdkEventKey* event) override;
|
||||
|
||||
void saveThumbnailHeight (int height);
|
||||
int getThumbnailHeight ();
|
||||
void saveThumbnailHeight (int height) override;
|
||||
int getThumbnailHeight () override;
|
||||
|
||||
bool isInTabMode()
|
||||
bool isInTabMode() override
|
||||
{
|
||||
return tbl ? tbl->isInTabMode() : false;
|
||||
}
|
||||
@ -191,18 +191,18 @@ public:
|
||||
void openDefaultViewer (int destination);
|
||||
#endif
|
||||
|
||||
void thumbRearrangementNeeded ();
|
||||
void thumbRearrangementNeeded () override;
|
||||
void _thumbRearrangementNeeded ();
|
||||
|
||||
void selectionChanged ();
|
||||
void selectionChanged () override;
|
||||
|
||||
void setExportPanel (ExportPanel* expanel);
|
||||
// exportpanel interface
|
||||
void exportRequested();
|
||||
void exportRequested() override;
|
||||
|
||||
void storeCurrentValue();
|
||||
void updateProfileList();
|
||||
void restoreValue();
|
||||
void storeCurrentValue() override;
|
||||
void updateProfileList() override;
|
||||
void restoreValue() override;
|
||||
|
||||
type_trash_changed trash_changed();
|
||||
};
|
||||
|
||||
@ -67,7 +67,7 @@ class FileBrowserEntry : public ThumbBrowserEntryBase,
|
||||
bool onArea (CursorArea a, int x, int y);
|
||||
void updateCursor (int x, int y);
|
||||
void drawStraightenGuide (Cairo::RefPtr<Cairo::Context> c);
|
||||
void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c);
|
||||
void customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c) override;
|
||||
|
||||
public:
|
||||
|
||||
@ -78,8 +78,8 @@ public:
|
||||
static Glib::RefPtr<Gdk::Pixbuf> ps;
|
||||
|
||||
FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname);
|
||||
~FileBrowserEntry ();
|
||||
void draw (Cairo::RefPtr<Cairo::Context> cc);
|
||||
~FileBrowserEntry () override;
|
||||
void draw (Cairo::RefPtr<Cairo::Context> cc) override;
|
||||
|
||||
void setImageAreaToolListener (ImageAreaToolListener* l)
|
||||
{
|
||||
@ -88,23 +88,23 @@ public:
|
||||
|
||||
FileThumbnailButtonSet* getThumbButtonSet ();
|
||||
|
||||
void refreshThumbnailImage ();
|
||||
void refreshQuickThumbnailImage ();
|
||||
void calcThumbnailSize ();
|
||||
void refreshThumbnailImage () override;
|
||||
void refreshQuickThumbnailImage () override;
|
||||
void calcThumbnailSize () override;
|
||||
|
||||
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea ();
|
||||
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea ();
|
||||
virtual void getIconSize (int& w, int& h);
|
||||
std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea () override;
|
||||
std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea () override;
|
||||
void getIconSize (int& w, int& h) override;
|
||||
|
||||
// thumbnaillistener interface
|
||||
void procParamsChanged (Thumbnail* thm, int whoChangedIt);
|
||||
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;
|
||||
// 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
|
||||
|
||||
virtual bool motionNotify (int x, int y);
|
||||
virtual bool pressNotify (int button, int type, int bstate, int x, int y);
|
||||
virtual bool releaseNotify (int button, int type, int bstate, int x, int y);
|
||||
bool motionNotify (int x, int y) override;
|
||||
bool pressNotify (int button, int type, int bstate, int x, int y) override;
|
||||
bool releaseNotify (int button, int type, int bstate, int x, int y) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -164,14 +164,14 @@ public:
|
||||
ToolBar* toolBar;
|
||||
|
||||
FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel);
|
||||
~FileCatalog();
|
||||
~FileCatalog() override;
|
||||
void dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile);
|
||||
void closeDir ();
|
||||
void refreshEditedState (const std::set<Glib::ustring>& efiles);
|
||||
|
||||
// previewloaderlistener interface
|
||||
void previewReady (int dir_id, FileBrowserEntry* fdn);
|
||||
void previewsFinished (int dir_id);
|
||||
void previewReady (int dir_id, FileBrowserEntry* fdn) override;
|
||||
void previewsFinished (int dir_id) override;
|
||||
void previewsFinishedUI ();
|
||||
void _refreshProgressBar ();
|
||||
|
||||
@ -195,10 +195,10 @@ public:
|
||||
}
|
||||
|
||||
// filterpanel interface
|
||||
void exifFilterChanged ();
|
||||
void exifFilterChanged () override;
|
||||
|
||||
// exportpanel interface
|
||||
void exportRequested();
|
||||
void exportRequested() override;
|
||||
|
||||
Glib::ustring lastSelectedDir ()
|
||||
{
|
||||
@ -212,15 +212,15 @@ public:
|
||||
void refreshThumbImages ();
|
||||
void refreshHeight ();
|
||||
|
||||
void filterApplied();
|
||||
void openRequested(const std::vector<Thumbnail*>& tbe);
|
||||
void deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed);
|
||||
void copyMoveRequested(const std::vector<FileBrowserEntry*>& tbe, bool moveRequested);
|
||||
void developRequested(const std::vector<FileBrowserEntry*>& tbe, bool fastmode);
|
||||
void renameRequested(const std::vector<FileBrowserEntry*>& tbe);
|
||||
void selectionChanged(const std::vector<Thumbnail*>& tbe);
|
||||
void clearFromCacheRequested(const std::vector<FileBrowserEntry*>& tbe, bool leavenotrace);
|
||||
bool isInTabMode() const;
|
||||
void filterApplied() override;
|
||||
void openRequested(const std::vector<Thumbnail*>& tbe) override;
|
||||
void deleteRequested(const std::vector<FileBrowserEntry*>& tbe, bool inclBatchProcessed) override;
|
||||
void copyMoveRequested(const std::vector<FileBrowserEntry*>& tbe, bool moveRequested) override;
|
||||
void developRequested(const std::vector<FileBrowserEntry*>& tbe, bool fastmode) override;
|
||||
void renameRequested(const std::vector<FileBrowserEntry*>& tbe) override;
|
||||
void selectionChanged(const std::vector<Thumbnail*>& tbe) override;
|
||||
void clearFromCacheRequested(const std::vector<FileBrowserEntry*>& tbe, bool leavenotrace) override;
|
||||
bool isInTabMode() const override;
|
||||
|
||||
void emptyTrash ();
|
||||
bool trashIsEmpty ();
|
||||
@ -247,7 +247,7 @@ public:
|
||||
void filterChanged ();
|
||||
void runFilterDialog ();
|
||||
|
||||
void on_realize();
|
||||
void on_realize() override;
|
||||
void reparseDirectory ();
|
||||
void _openImage (std::vector<Thumbnail*> tmb);
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ class FilePanel final :
|
||||
{
|
||||
public:
|
||||
FilePanel ();
|
||||
~FilePanel ();
|
||||
~FilePanel () override;
|
||||
|
||||
Gtk::Paned* placespaned;
|
||||
Gtk::HPaned* dirpaned;
|
||||
@ -58,7 +58,7 @@ public:
|
||||
parent = p;
|
||||
}
|
||||
void init (); // don't call it directly, the constructor calls it as idle source
|
||||
void on_realize ();
|
||||
void on_realize () override;
|
||||
void setAspect();
|
||||
void open (const Glib::ustring& d); // open a file or a directory
|
||||
void refreshEditedState (const std::set<Glib::ustring>& efiles)
|
||||
@ -71,8 +71,8 @@ public:
|
||||
void saveOptions ();
|
||||
|
||||
// interface fileselectionlistener
|
||||
bool fileSelected(Thumbnail* thm);
|
||||
bool addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries);
|
||||
bool fileSelected(Thumbnail* thm) override;
|
||||
bool addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries) override;
|
||||
|
||||
void optionsChanged ();
|
||||
bool imageLoaded( Thumbnail* thm, ProgressConnector<rtengine::InitialImage*> * );
|
||||
|
||||
@ -53,17 +53,17 @@ class FilmSimulation : public ToolParamBlock, public AdjusterListener, public Fo
|
||||
public:
|
||||
FilmSimulation();
|
||||
|
||||
void adjusterChanged(Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void setBatchMode(bool batchMode);
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void setBatchMode(bool batchMode) override;
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setAdjusterBehavior(bool strength);
|
||||
void trimValues(rtengine::procparams::ProcParams* pp);
|
||||
void trimValues(rtengine::procparams::ProcParams* pp) override;
|
||||
|
||||
private:
|
||||
void onClutSelected();
|
||||
void enabledChanged();
|
||||
void enabledChanged() override;
|
||||
|
||||
void updateDisable( bool value );
|
||||
|
||||
|
||||
@ -46,32 +46,32 @@ protected:
|
||||
|
||||
public:
|
||||
FlatCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir);
|
||||
virtual ~FlatCurveEditorSubGroup();
|
||||
~FlatCurveEditorSubGroup() override;
|
||||
|
||||
FlatCurveEditor* addCurve(Glib::ustring curveLabel = "", bool periodic = true);
|
||||
//virtual void updateBackgroundHistogram (CurveEditor* ce);
|
||||
void switchGUI();
|
||||
void refresh(CurveEditor *curveToRefresh);
|
||||
void editModeSwitchedOff();
|
||||
void pipetteMouseOver(EditDataProvider *provider, int modifierKey);
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey);
|
||||
void pipetteButton1Released(EditDataProvider *provider);
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey);
|
||||
void showCoordinateAdjuster(CoordinateProvider *provider);
|
||||
void stopNumericalAdjustment();
|
||||
void switchGUI() override;
|
||||
void refresh(CurveEditor *curveToRefresh) override;
|
||||
void editModeSwitchedOff() override;
|
||||
void pipetteMouseOver(EditDataProvider *provider, int modifierKey) override;
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
|
||||
void pipetteButton1Released(EditDataProvider *provider) override;
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
|
||||
void showCoordinateAdjuster(CoordinateProvider *provider) override;
|
||||
void stopNumericalAdjustment() override;
|
||||
|
||||
bool curveReset (CurveEditor *ce);
|
||||
bool curveReset (CurveEditor *ce) override;
|
||||
|
||||
protected:
|
||||
void storeCurveValues (CurveEditor* ce, const std::vector<double>& p);
|
||||
void storeDisplayedCurve ();
|
||||
void restoreDisplayedHistogram ();
|
||||
void storeCurveValues (CurveEditor* ce, const std::vector<double>& p) override;
|
||||
void storeDisplayedCurve () override;
|
||||
void restoreDisplayedHistogram () override;
|
||||
void savePressed ();
|
||||
void loadPressed ();
|
||||
void copyPressed ();
|
||||
void pastePressed ();
|
||||
void removeEditor ();
|
||||
const std::vector<double> getCurveFromGUI (int type);
|
||||
void removeEditor () override;
|
||||
const std::vector<double> getCurveFromGUI (int type) override;
|
||||
void editPointToggled(Gtk::ToggleButton *button);
|
||||
void editToggled (Gtk::ToggleButton *button);
|
||||
};
|
||||
|
||||
@ -62,17 +62,17 @@ protected:
|
||||
public:
|
||||
|
||||
FlatField ();
|
||||
~FlatField ();
|
||||
~FlatField () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void setAdjusterBehavior (bool clipctrladd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled (Adjuster* a, bool newval) override;
|
||||
void flatFieldFileChanged ();
|
||||
void flatFieldFile_Reset ();
|
||||
void flatFieldAutoSelectChanged ();
|
||||
@ -82,7 +82,7 @@ public:
|
||||
{
|
||||
ffp = p;
|
||||
};
|
||||
void flatFieldAutoClipValueChanged(int n = 0);
|
||||
void flatFieldAutoClipValueChanged(int n = 0) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -35,29 +35,29 @@ protected:
|
||||
public:
|
||||
|
||||
Gradient ();
|
||||
~Gradient ();
|
||||
~Gradient () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
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 setEditProvider (EditDataProvider* provider);
|
||||
void setEditProvider (EditDataProvider* provider) override;
|
||||
|
||||
// EditSubscriber interface
|
||||
CursorShape getCursor(const int objectID);
|
||||
bool mouseOver(const int modifierKey);
|
||||
bool button1Pressed(const int modifierKey);
|
||||
bool button1Released();
|
||||
bool drag1(const int modifierKey);
|
||||
void switchOffEditMode ();
|
||||
CursorShape getCursor(const int objectID) override;
|
||||
bool mouseOver(const int modifierKey) override;
|
||||
bool button1Pressed(const int modifierKey) override;
|
||||
bool button1Released() override;
|
||||
bool drag1(const int modifierKey) override;
|
||||
void switchOffEditMode () override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -149,7 +149,7 @@ private:
|
||||
|
||||
public:
|
||||
explicit ExpanderBox( Gtk::Container *p);
|
||||
~ExpanderBox( )
|
||||
~ExpanderBox( ) override
|
||||
{
|
||||
delete pC;
|
||||
}
|
||||
@ -285,9 +285,9 @@ public:
|
||||
class MyScrolledWindow : public Gtk::ScrolledWindow
|
||||
{
|
||||
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
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 override;
|
||||
|
||||
public:
|
||||
MyScrolledWindow();
|
||||
@ -299,7 +299,7 @@ public:
|
||||
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);
|
||||
|
||||
public:
|
||||
@ -313,9 +313,9 @@ class MyComboBox : public Gtk::ComboBox
|
||||
{
|
||||
int naturalWidth, minimumWidth;
|
||||
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
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 override;
|
||||
|
||||
public:
|
||||
MyComboBox ();
|
||||
@ -331,9 +331,9 @@ class MyComboBoxText : public Gtk::ComboBoxText
|
||||
int naturalWidth, minimumWidth;
|
||||
sigc::connection myConnection;
|
||||
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
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 override;
|
||||
|
||||
public:
|
||||
explicit MyComboBoxText (bool has_entry = false);
|
||||
@ -350,8 +350,8 @@ class MySpinButton : public Gtk::SpinButton
|
||||
{
|
||||
|
||||
protected:
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
bool on_key_press_event (GdkEventKey* event);
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
bool on_key_press_event (GdkEventKey* event) override;
|
||||
|
||||
public:
|
||||
MySpinButton ();
|
||||
@ -364,8 +364,8 @@ public:
|
||||
class MyHScale : public Gtk::HScale
|
||||
{
|
||||
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
bool on_key_press_event (GdkEventKey* event);
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
bool on_key_press_event (GdkEventKey* event) override;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -388,9 +388,9 @@ private:
|
||||
sigc::signal<void> selection_changed_;
|
||||
|
||||
protected:
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
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 override;
|
||||
|
||||
void set_none();
|
||||
|
||||
@ -484,8 +484,8 @@ class MyProgressBar : public Gtk::ProgressBar
|
||||
private:
|
||||
int w;
|
||||
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, 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 override;
|
||||
|
||||
public:
|
||||
explicit MyProgressBar(int width);
|
||||
|
||||
@ -81,7 +81,7 @@ protected:
|
||||
|
||||
public:
|
||||
HistogramRGBArea();
|
||||
~HistogramRGBArea();
|
||||
~HistogramRGBArea() override;
|
||||
|
||||
void updateBackBuffer (int r, int g, int b, const Glib::ustring &profile = "", const Glib::ustring &profileW = "");
|
||||
bool getShow ();
|
||||
@ -93,17 +93,17 @@ public:
|
||||
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 on_realize();
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
|
||||
bool on_button_press_event (GdkEventButton* event);
|
||||
void on_realize() override;
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||
bool on_button_press_event (GdkEventButton* event) override;
|
||||
void factorChanged (double newFactor);
|
||||
|
||||
private:
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const;
|
||||
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const;
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
void get_preferred_width_for_height_vfunc (int h, int &minimum_width, int &natural_width) const;
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||
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 override;
|
||||
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 override;
|
||||
|
||||
};
|
||||
|
||||
@ -141,7 +141,7 @@ protected:
|
||||
|
||||
public:
|
||||
explicit HistogramArea(DrawModeListener *fml = nullptr);
|
||||
~HistogramArea();
|
||||
~HistogramArea() override;
|
||||
|
||||
void updateBackBuffer ();
|
||||
void update(
|
||||
@ -155,21 +155,21 @@ public:
|
||||
const LUTu& histBlueRaw
|
||||
);
|
||||
void updateOptions (bool r, bool g, bool b, bool l, bool c, bool raw, int mode);
|
||||
void on_realize();
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
|
||||
bool on_button_press_event (GdkEventButton* event);
|
||||
bool on_button_release_event (GdkEventButton* event);
|
||||
bool on_motion_notify_event (GdkEventMotion* event);
|
||||
void on_realize() override;
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||
bool on_button_press_event (GdkEventButton* event) override;
|
||||
bool on_button_release_event (GdkEventButton* event) override;
|
||||
bool on_motion_notify_event (GdkEventMotion* event) override;
|
||||
type_signal_factor_changed signal_factor_changed();
|
||||
|
||||
private:
|
||||
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);
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const;
|
||||
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const;
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||
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 override;
|
||||
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 override;
|
||||
};
|
||||
|
||||
class HistogramPanel : public Gtk::Grid, public PointerMotionListener, public DrawModeListener
|
||||
@ -216,7 +216,7 @@ protected:
|
||||
public:
|
||||
|
||||
HistogramPanel ();
|
||||
~HistogramPanel ();
|
||||
~HistogramPanel () override;
|
||||
|
||||
void histogramChanged(
|
||||
const LUTu& histRed,
|
||||
@ -231,7 +231,7 @@ public:
|
||||
histogramArea->update(histRed, histGreen, histBlue, histLuma, histChroma, histRedRaw, histGreenRaw, histBlueRaw);
|
||||
}
|
||||
// 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
|
||||
void setHistRGBInvalid ();
|
||||
@ -249,7 +249,7 @@ public:
|
||||
void resized (Gtk::Allocation& req);
|
||||
|
||||
// drawModeListener interface
|
||||
void toggleButtonMode ();
|
||||
void toggleButtonMode () override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -111,8 +111,8 @@ public:
|
||||
const rtengine::ProcEvent& ev,
|
||||
const Glib::ustring& descr,
|
||||
const ParamsEdited* paramsEdited = nullptr
|
||||
);
|
||||
void clearParamChanges ();
|
||||
) override;
|
||||
void clearParamChanges () override;
|
||||
|
||||
void historySelectionChanged ();
|
||||
void bookmarkSelectionChanged ();
|
||||
|
||||
@ -42,19 +42,19 @@ protected:
|
||||
public:
|
||||
|
||||
HSVEqualizer ();
|
||||
virtual ~HSVEqualizer ();
|
||||
~HSVEqualizer () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void curveChanged (CurveEditor* ce);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void curveChanged (CurveEditor* ce) override;
|
||||
//void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
|
||||
void setBatchMode (bool batchMode);
|
||||
void setEditProvider (EditDataProvider *provider);
|
||||
void autoOpenCurve ();
|
||||
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void setEditProvider (EditDataProvider *provider) override;
|
||||
void autoOpenCurve () override;
|
||||
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
|
||||
|
||||
//void adjusterChanged (Adjuster* a, double newval);
|
||||
void enabledChanged();
|
||||
void enabledChanged() override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -91,8 +91,8 @@ private:
|
||||
void primariesChanged();
|
||||
void illuminantChanged();
|
||||
void trcPresetsChanged();
|
||||
void adjusterChanged(Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
static std::vector<Glib::ustring> getGamma();
|
||||
Glib::ustring getPrimariesPresetName(const Glib::ustring &preset);
|
||||
void getPrimaries(const Glib::ustring &preset, double *p, ColorTemp &temp);
|
||||
|
||||
@ -121,12 +121,12 @@ private:
|
||||
public:
|
||||
ICMPanel();
|
||||
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode(bool batchMode);
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void adjusterChanged(Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode(bool batchMode) override;
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void adjusterChanged(Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
|
||||
void wpChanged();
|
||||
void wtrcinChanged();
|
||||
|
||||
@ -28,9 +28,9 @@ class ILabel : public Gtk::DrawingArea
|
||||
|
||||
public:
|
||||
explicit ILabel (const Glib::ustring &lab);
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
|
||||
void on_realize();
|
||||
void on_style_updated ();
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||
void on_realize() override;
|
||||
void on_style_updated () override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -59,11 +59,11 @@ protected:
|
||||
ImageAreaToolListener* listener;
|
||||
|
||||
CropWindow* getCropWindow (int x, int y);
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const;
|
||||
void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const;
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||
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 override;
|
||||
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 override;
|
||||
|
||||
int fullImageWidth, fullImageHeight;
|
||||
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
|
||||
|
||||
explicit ImageArea (ImageAreaPanel* p);
|
||||
~ImageArea ();
|
||||
~ImageArea () override;
|
||||
|
||||
rtengine::StagedImageProcessor* getImProcCoordinator() const;
|
||||
void setImProcCoordinator(rtengine::StagedImageProcessor* ipc_);
|
||||
@ -97,15 +97,15 @@ public:
|
||||
void infoEnabled (bool e);
|
||||
|
||||
// widget base events
|
||||
void on_realize ();
|
||||
bool on_draw (const ::Cairo::RefPtr< Cairo::Context> &cr);
|
||||
bool on_motion_notify_event (GdkEventMotion* event);
|
||||
bool on_button_press_event (GdkEventButton* event);
|
||||
bool on_button_release_event (GdkEventButton* event);
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
bool on_leave_notify_event (GdkEventCrossing* event);
|
||||
void on_realize () override;
|
||||
bool on_draw (const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||
bool on_motion_notify_event (GdkEventMotion* event) override;
|
||||
bool on_button_press_event (GdkEventButton* event) override;
|
||||
bool on_button_release_event (GdkEventButton* event) override;
|
||||
bool on_scroll_event (GdkEventScroll* event) override;
|
||||
bool on_leave_notify_event (GdkEventCrossing* event) override;
|
||||
void on_resized (Gtk::Allocation& req);
|
||||
void on_style_updated ();
|
||||
void on_style_updated () override;
|
||||
void syncBeforeAfterViews ();
|
||||
|
||||
void setCropGUIListener (CropGUIListener* l);
|
||||
@ -140,18 +140,18 @@ public:
|
||||
void setZoom (double zoom);
|
||||
|
||||
// EditDataProvider interface
|
||||
void subscribe(EditSubscriber *subscriber);
|
||||
void unsubscribe();
|
||||
void getImageSize (int &w, int&h);
|
||||
void subscribe(EditSubscriber *subscriber) override;
|
||||
void unsubscribe() override;
|
||||
void getImageSize (int &w, int&h) override;
|
||||
|
||||
// CropWindowListener interface
|
||||
void cropPositionChanged (CropWindow* cw);
|
||||
void cropWindowSizeChanged (CropWindow* cw);
|
||||
void cropZoomChanged (CropWindow* cw);
|
||||
void initialImageArrived ();
|
||||
void cropPositionChanged (CropWindow* cw) override;
|
||||
void cropWindowSizeChanged (CropWindow* cw) override;
|
||||
void cropZoomChanged (CropWindow* cw) override;
|
||||
void initialImageArrived () override;
|
||||
|
||||
// LockablePickerToolListener interface
|
||||
void switchPickerVisibility (bool isVisible);
|
||||
void switchPickerVisibility (bool isVisible) override;
|
||||
|
||||
CropWindow* getMainCropWindow ()
|
||||
{
|
||||
|
||||
@ -35,7 +35,7 @@ public:
|
||||
ImageArea* imageArea;
|
||||
|
||||
ImageAreaPanel ();
|
||||
~ImageAreaPanel ();
|
||||
~ImageAreaPanel () override;
|
||||
|
||||
void zoomChanged ();
|
||||
|
||||
|
||||
@ -34,17 +34,17 @@ public:
|
||||
|
||||
ImpulseDenoise ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
|
||||
void setAdjusterBehavior (bool threshadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -35,7 +35,7 @@ protected:
|
||||
|
||||
public:
|
||||
explicit IndicateClippedPanel(ImageArea* ia);
|
||||
~IndicateClippedPanel();
|
||||
~IndicateClippedPanel() override;
|
||||
|
||||
void buttonToggled(Gtk::ToggleButton* tb);
|
||||
void toggleClipped(bool highlights); // inverts a toggle programmatically
|
||||
|
||||
@ -51,14 +51,14 @@ private:
|
||||
sigc::connection delayconn;
|
||||
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();
|
||||
|
||||
bool doSwitchImage();
|
||||
|
||||
public:
|
||||
Inspector();
|
||||
~Inspector();
|
||||
~Inspector() override;
|
||||
|
||||
/** @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
|
||||
@ -92,11 +92,11 @@ public:
|
||||
return active;
|
||||
};
|
||||
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const;
|
||||
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const;
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||
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 override;
|
||||
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 override;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -71,9 +71,9 @@ private:
|
||||
public:
|
||||
IPTCPanel ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, 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) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void setImageData (const rtengine::FramesMetaData* id);
|
||||
|
||||
|
||||
@ -62,20 +62,20 @@ protected:
|
||||
public:
|
||||
|
||||
LCurve ();
|
||||
~LCurve ();
|
||||
~LCurve () override;
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void autoOpenCurve ();
|
||||
void setEditProvider (EditDataProvider *provider);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
void autoOpenCurve () override;
|
||||
void setEditProvider (EditDataProvider *provider) override;
|
||||
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 adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void curveChanged (CurveEditor* ce) override;
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void avoidcolorshift_toggled ();
|
||||
void lcredsk_toggled();
|
||||
|
||||
@ -92,9 +92,9 @@ public:
|
||||
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
|
||||
|
||||
@ -85,14 +85,14 @@ public:
|
||||
bool lowEnabled() const;
|
||||
void setLowEnabled(bool yes);
|
||||
|
||||
bool on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf);
|
||||
void on_style_updated ();
|
||||
bool on_button_press_event(GdkEventButton *event);
|
||||
bool on_button_release_event(GdkEventButton *event);
|
||||
bool on_motion_notify_event(GdkEventMotion *event);
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc() const;
|
||||
void get_preferred_width_vfunc(int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
bool on_draw(const ::Cairo::RefPtr<Cairo::Context> &crf) override;
|
||||
void on_style_updated () override;
|
||||
bool on_button_press_event(GdkEventButton *event) override;
|
||||
bool on_button_release_event(GdkEventButton *event) override;
|
||||
bool on_motion_notify_event(GdkEventMotion *event) override;
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc() const override;
|
||||
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 override;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -37,16 +37,16 @@ protected:
|
||||
public:
|
||||
|
||||
LensGeometry ();
|
||||
~LensGeometry ();
|
||||
~LensGeometry () override;
|
||||
|
||||
Gtk::Box* getPackBox ()
|
||||
{
|
||||
return packBox;
|
||||
}
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void fillPressed ();
|
||||
void autoCropPressed ();
|
||||
|
||||
@ -31,8 +31,8 @@ class LensProfilePanel final :
|
||||
public:
|
||||
LensProfilePanel();
|
||||
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setRawMeta(bool raw, const rtengine::FramesMetaData* pMeta);
|
||||
|
||||
void onLCPFileChanged();
|
||||
@ -40,7 +40,7 @@ public:
|
||||
void onUseVignChanged();
|
||||
void onUseCAChanged();
|
||||
|
||||
void setBatchMode(bool yes);
|
||||
void setBatchMode(bool yes) override;
|
||||
|
||||
void onLensfunCameraChanged();
|
||||
void onLensfunLensChanged();
|
||||
|
||||
@ -41,14 +41,14 @@ public:
|
||||
|
||||
LocalContrast();
|
||||
|
||||
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr);
|
||||
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr);
|
||||
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr);
|
||||
void setBatchMode(bool batchMode);
|
||||
void read(const rtengine::procparams::ProcParams *pp, const ParamsEdited *pedited=nullptr) override;
|
||||
void write(rtengine::procparams::ProcParams *pp, ParamsEdited *pedited=nullptr) override;
|
||||
void setDefaults(const rtengine::procparams::ProcParams *defParams, const ParamsEdited *pedited=nullptr) override;
|
||||
void setBatchMode(bool batchMode) override;
|
||||
|
||||
void adjusterChanged(Adjuster *a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged();
|
||||
void adjusterChanged(Adjuster *a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged() override;
|
||||
void setAdjusterBehavior(bool radiusAdd, bool amountAdd, bool darknessAdd, bool lightnessAdd);
|
||||
};
|
||||
|
||||
|
||||
@ -358,7 +358,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
~RTApplication()
|
||||
~RTApplication() override
|
||||
{
|
||||
if (rtWindow) {
|
||||
delete rtWindow;
|
||||
|
||||
@ -36,14 +36,14 @@ private:
|
||||
|
||||
public:
|
||||
MetaDataPanel();
|
||||
~MetaDataPanel();
|
||||
~MetaDataPanel() override;
|
||||
|
||||
void setBatchMode(bool batchMode);
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode(bool batchMode) override;
|
||||
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write(rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults(const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
|
||||
void setImageData(const rtengine::FramesMetaData* id);
|
||||
void setListener(ToolPanelListener *tpl);
|
||||
void setListener(ToolPanelListener *tpl) override;
|
||||
};
|
||||
|
||||
|
||||
@ -109,7 +109,7 @@ protected:
|
||||
|
||||
public:
|
||||
MyCurve ();
|
||||
~MyCurve ();
|
||||
~MyCurve () override;
|
||||
|
||||
void setCurveListener (CurveListener* cl)
|
||||
{
|
||||
@ -126,10 +126,10 @@ public:
|
||||
{
|
||||
curveIsDirty = true;
|
||||
}
|
||||
void on_style_updated ();
|
||||
void on_style_updated () override;
|
||||
virtual std::vector<double> getPoints () = 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 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 pipetteDrag(EditDataProvider *provider, int modifierKey) = 0;
|
||||
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const;
|
||||
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const;
|
||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
|
||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
|
||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
|
||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||
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 override;
|
||||
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 override;
|
||||
};
|
||||
|
||||
class MyCurveIdleHelper
|
||||
|
||||
@ -72,7 +72,7 @@ protected:
|
||||
void interpolate ();
|
||||
void findClosestPoint();
|
||||
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);
|
||||
// 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);
|
||||
@ -82,23 +82,23 @@ protected:
|
||||
|
||||
public:
|
||||
MyDiagonalCurve ();
|
||||
~MyDiagonalCurve ();
|
||||
std::vector<double> getPoints ();
|
||||
void setPoints (const std::vector<double>& p);
|
||||
~MyDiagonalCurve () override;
|
||||
std::vector<double> getPoints () override;
|
||||
void setPoints (const std::vector<double>& p) override;
|
||||
void setType (DiagonalCurveType t);
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
|
||||
bool handleEvents (GdkEvent* event);
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||
bool handleEvents (GdkEvent* event) override;
|
||||
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 pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey);
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey);
|
||||
void pipetteButton1Released(EditDataProvider *provider);
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey);
|
||||
void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey) override;
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
|
||||
void pipetteButton1Released(EditDataProvider *provider) override;
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
|
||||
|
||||
virtual void setPos(double pos, int chanIdx);
|
||||
virtual void stopNumericalAdjustment();
|
||||
void setPos(double pos, int chanIdx) override;
|
||||
void stopNumericalAdjustment() override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -112,31 +112,31 @@ protected:
|
||||
void getMouseOverArea ();
|
||||
bool getHandles(int n);
|
||||
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);
|
||||
|
||||
public:
|
||||
MyFlatCurve ();
|
||||
//~MyFlatCurve ();
|
||||
std::vector<double> getPoints ();
|
||||
std::vector<double> getPoints () override;
|
||||
void setPeriodicity (bool isPeriodic)
|
||||
{
|
||||
periodic = isPeriodic;
|
||||
};
|
||||
void setPoints (const std::vector<double>& p);
|
||||
void setPoints (const std::vector<double>& p) override;
|
||||
void setType (FlatCurveType t);
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
|
||||
bool handleEvents (GdkEvent* event);
|
||||
void reset (const std::vector<double> &resetCurve, double identityValue = 0.5);
|
||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||
bool handleEvents (GdkEvent* event) override;
|
||||
void reset (const std::vector<double> &resetCurve, double identityValue = 0.5) override;
|
||||
//void updateBackgroundHistogram (unsigned int* hist);
|
||||
|
||||
void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey);
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey);
|
||||
void pipetteButton1Released(EditDataProvider *provider);
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey);
|
||||
void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey) override;
|
||||
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey) override;
|
||||
void pipetteButton1Released(EditDataProvider *provider) override;
|
||||
void pipetteDrag(EditDataProvider *provider, int modifierKey) override;
|
||||
|
||||
void setPos(double pos, int chanIdx);
|
||||
virtual void stopNumericalAdjustment();
|
||||
void setPos(double pos, int chanIdx) override;
|
||||
void stopNumericalAdjustment() override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -55,12 +55,12 @@ public:
|
||||
|
||||
// pointermotionlistener interface
|
||||
// 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 getRGBText (int r, int g, int b, Glib::ustring &sR, Glib::ustring &sG, Glib::ustring &sB, bool isRaw = false);
|
||||
void getHSVText (float h, float s, float v, Glib::ustring &sH, Glib::ustring &sS, Glib::ustring &sV);
|
||||
void getLABText (float l, float a, float b, Glib::ustring &sL, Glib::ustring &sA, Glib::ustring &sB);
|
||||
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) override;
|
||||
void getLABText (float l, float a, float b, Glib::ustring &sL, Glib::ustring &sA, Glib::ustring &sB) override;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -108,8 +108,8 @@ public:
|
||||
class Error: public std::exception
|
||||
{
|
||||
public:
|
||||
Error (const Glib::ustring &msg): msg_ (msg) {}
|
||||
const char *what() const throw()
|
||||
explicit Error (const Glib::ustring &msg): msg_ (msg) {}
|
||||
const char *what() const throw() override
|
||||
{
|
||||
return msg_.c_str();
|
||||
}
|
||||
|
||||
@ -20,16 +20,16 @@ public:
|
||||
|
||||
PCVignette ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void enabledChanged ();
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void enabledChanged () override;
|
||||
void setAdjusterBehavior (bool strengthadd, bool featheradd, bool roundnessadd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -34,15 +34,15 @@ public:
|
||||
|
||||
PerspCorrection ();
|
||||
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr);
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr);
|
||||
void setBatchMode (bool batchMode);
|
||||
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
|
||||
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = nullptr) override;
|
||||
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = nullptr) override;
|
||||
void setBatchMode (bool batchMode) override;
|
||||
|
||||
void adjusterChanged (Adjuster* a, double newval);
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval);
|
||||
void adjusterChanged (Adjuster* a, double newval) override;
|
||||
void adjusterAutoToggled(Adjuster* a, bool newval) override;
|
||||
void setAdjusterBehavior (bool badd);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp);
|
||||
void trimValues (rtengine::procparams::ProcParams* pp) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -34,7 +34,7 @@ public:
|
||||
void set_sensitive (bool isSensitive=true);
|
||||
|
||||
protected:
|
||||
bool on_button_release_event (GdkEventButton* event);
|
||||
bool on_button_release_event (GdkEventButton* event) override;
|
||||
|
||||
private:
|
||||
bool nextOnClicked;
|
||||
|
||||
@ -258,7 +258,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
|
||||
|
||||
public:
|
||||
explicit Preferences (RTWindow *rtwindow);
|
||||
~Preferences ();
|
||||
~Preferences () override;
|
||||
|
||||
void savePressed ();
|
||||
void loadPressed ();
|
||||
@ -288,9 +288,9 @@ public:
|
||||
void behAddAllPressed ();
|
||||
void behSetAllPressed ();
|
||||
|
||||
virtual void storeCurrentValue();
|
||||
virtual void updateProfileList();
|
||||
virtual void restoreValue();
|
||||
void storeCurrentValue() override;
|
||||
void updateProfileList() override;
|
||||
void restoreValue() override;
|
||||
|
||||
// void selectICCProfileDir ();
|
||||
// void selectMonitorProfile ();
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user