reduce updates to preview, panning background, navigator and thumbs, fixes #4834

This commit is contained in:
heckflosse
2018-09-27 18:16:29 +02:00
parent 080033765c
commit 095cb010e5
6 changed files with 824 additions and 764 deletions

View File

@@ -49,7 +49,6 @@ class Thumbnail
rtengine::procparams::ProcParams pparams;
bool pparamsValid;
bool needsReProcessing;
bool imageLoading;
// these are the data of the result image of the last getthumbnailimage call (for caching purposes)
@@ -81,7 +80,7 @@ public:
Thumbnail (CacheManager* cm, const Glib::ustring& fname, const std::string& md5);
~Thumbnail ();
bool hasProcParams ();
bool hasProcParams () const;
const rtengine::procparams::ProcParams& getProcParams ();
const rtengine::procparams::ProcParams& getProcParamsU (); // Unprotected version
@@ -94,21 +93,21 @@ public:
void notifylisterners_procParamsChanged(int whoChangedIt);
bool isQuick()
bool isQuick() const
{
return cfs.thumbImgType == CacheImageData::QUICK_THUMBNAIL;
}
bool isPParamsValid()
bool isPParamsValid() const
{
return pparamsValid;
}
bool isRecentlySaved ();
bool isRecentlySaved () const;
void imageDeveloped ();
void imageEnqueued ();
void imageRemovedFromQueue ();
bool isEnqueued ();
bool isPixelShift ();
bool isHDR ();
bool isEnqueued () const;
bool isPixelShift () const;
bool isHDR () const;
// unsigned char* getThumbnailImage (int &w, int &h, int fixwh=1); // fixwh = 0: fix w and calculate h, =1: fix h and calculate w
rtengine::IImage8* processThumbImage (const rtengine::procparams::ProcParams& pparams, int h, double& scale);
@@ -116,9 +115,9 @@ public:
void getThumbnailSize (int &w, int &h, const rtengine::procparams::ProcParams *pparams = nullptr);
void getFinalSize (const rtengine::procparams::ProcParams& pparams, int& w, int& h);
const Glib::ustring& getExifString ();
const Glib::ustring& getDateTimeString ();
void getCamWB (double& temp, double& green)
const Glib::ustring& getExifString () const;
const Glib::ustring& getDateTimeString () const;
void getCamWB (double& temp, double& green) const
{
if (tpp) {
tpp->getCamWB (temp, green);
@@ -143,7 +142,7 @@ public:
}
ThFileType getType ();
Glib::ustring getFileName ()
Glib::ustring getFileName () const
{
return fname;
}
@@ -155,12 +154,12 @@ public:
{
return &cfs;
}
std::string getMD5 ()
std::string getMD5 () const
{
return cfs.md5;
}
int getRank ()
int getRank () const
{
return pparams.rank;
}
@@ -172,7 +171,7 @@ public:
}
}
int getColorLabel ()
int getColorLabel () const
{
return pparams.colorlabel;
}
@@ -184,7 +183,7 @@ public:
}
}
int getStage ()
int getStage () const
{
return pparams.inTrash;
}