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

filecatalog/filebrowser: further optimizations

Browse Source
This commit is contained in:
Ingo Weyrich 2019-07-19 23:45:02 +02:00
parent 0840b3ee00
commit d9c93e77ae
9 changed files with 89 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/batchqueueentry.cc
View File

@ -148,7 +148,7 @@ void BatchQueueEntry::removeButtonSet ()
buttonSet = nullptr; buttonSet = nullptr;
} }
std::vector<Glib::RefPtr<Gdk::Pixbuf> > BatchQueueEntry::getIconsOnImageArea () std::vector<Glib::RefPtr<Gdk::Pixbuf>> BatchQueueEntry::getIconsOnImageArea ()
{ {
std::vector<Glib::RefPtr<Gdk::Pixbuf> > ret; std::vector<Glib::RefPtr<Gdk::Pixbuf> > ret;
@ -160,7 +160,7 @@ std::vector<Glib::RefPtr<Gdk::Pixbuf> > BatchQueueEntry::getIconsOnImageArea ()
return ret; return ret;
} }
void BatchQueueEntry::getIconSize (int& w, int& h) void BatchQueueEntry::getIconSize (int& w, int& h) const
{ {
w = savedAsIcon->get_width (); w = savedAsIcon->get_width ();
@ -168,7 +168,7 @@ void BatchQueueEntry::getIconSize (int& w, int& h)
} }
Glib::ustring BatchQueueEntry::getToolTip (int x, int y) Glib::ustring BatchQueueEntry::getToolTip (int x, int y) const
{ {
// get the parent class' tooltip first // get the parent class' tooltip first
Glib::ustring tooltip = ThumbBrowserEntryBase::getToolTip(x, y); Glib::ustring tooltip = ThumbBrowserEntryBase::getToolTip(x, y);

6
rtgui/batchqueueentry.h
View File

@ -68,9 +68,9 @@ public:
void removeButtonSet (); void removeButtonSet ();
std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea () override; std::vector<Glib::RefPtr<Gdk::Pixbuf>> getIconsOnImageArea () override;
void getIconSize (int& w, int& h) override; void getIconSize (int& w, int& h) const override;
Glib::ustring getToolTip (int x, int y) override; Glib::ustring getToolTip (int x, int y) const override;
// bqentryupdatelistener interface // bqentryupdatelistener interface
void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview) override; void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview) override;

47
rtgui/filebrowserentry.cc
View File

@ -119,39 +119,37 @@ void FileBrowserEntry::calcThumbnailSize ()
} }
} }
std::vector<Glib::RefPtr<Gdk::Pixbuf> > FileBrowserEntry::getIconsOnImageArea () std::vector<Glib::RefPtr<Gdk::Pixbuf>> FileBrowserEntry::getIconsOnImageArea ()
{ {
std::vector<Glib::RefPtr<Gdk::Pixbuf> > ret;
if (!thumbnail) { if (!thumbnail) {
return ret; return {};
} }
std::vector<Glib::RefPtr<Gdk::Pixbuf>> ret;
if (thumbnail->hasProcParams() && editedIcon) { if (thumbnail->hasProcParams() && editedIcon) {
ret.push_back (editedIcon); ret.push_back(editedIcon);
} }
if (thumbnail->isRecentlySaved() && recentlySavedIcon) { if (thumbnail->isRecentlySaved() && recentlySavedIcon) {
ret.push_back (recentlySavedIcon); ret.push_back(recentlySavedIcon);
} }
if (thumbnail->isEnqueued () && enqueuedIcon) { if (thumbnail->isEnqueued () && enqueuedIcon) {
ret.push_back (enqueuedIcon); ret.push_back(enqueuedIcon);
} }
return ret; return ret;
} }
std::vector<Glib::RefPtr<Gdk::Pixbuf> > FileBrowserEntry::getSpecificityIconsOnImageArea () std::vector<Glib::RefPtr<Gdk::Pixbuf>> FileBrowserEntry::getSpecificityIconsOnImageArea ()
{ {
std::vector<Glib::RefPtr<Gdk::Pixbuf> > ret;
if (!thumbnail) { if (!thumbnail) {
return ret; return {};
} }
std::vector<Glib::RefPtr<Gdk::Pixbuf>> ret;
if (thumbnail->isHDR() && hdr) { if (thumbnail->isHDR() && hdr) {
ret.push_back (hdr); ret.push_back (hdr);
} }
@ -188,7 +186,7 @@ void FileBrowserEntry::customBackBufferUpdate (Cairo::RefPtr<Cairo::Context> c)
} }
} }
void FileBrowserEntry::getIconSize (int& w, int& h) void FileBrowserEntry::getIconSize (int& w, int& h) const
{ {
w = editedIcon->get_width (); w = editedIcon->get_width ();
@ -286,34 +284,29 @@ void FileBrowserEntry::_updateImage(rtengine::IImage8* img, double s, const rten
bool FileBrowserEntry::motionNotify (int x, int y) bool FileBrowserEntry::motionNotify (int x, int y)
{ {
bool b = ThumbBrowserEntryBase::motionNotify (x, y); const bool b = ThumbBrowserEntryBase::motionNotify(x, y);
int ix = x - startx - ofsX; const int ix = x - startx - ofsX;
int iy = y - starty - ofsY; const int iy = y - starty - ofsY;
Inspector* inspector = parent->getInspector(); Inspector* inspector = parent->getInspector();
if (inspector && inspector->isActive() && !parent->isInTabMode()) { if (inspector && inspector->isActive() && !parent->isInTabMode()) {
rtengine::Coord2D coord(-1., -1.); const rtengine::Coord2D coord(getPosInImgSpace(x, y));
getPosInImgSpace(x, y, coord);
if (coord.x != -1.) { if (coord.x != -1.) {
if (!wasInside) { if (!wasInside) {
inspector->switchImage(filename); inspector->switchImage(filename);
wasInside = true;
} }
wasInside = true;
inspector->mouseMove(coord, 0); inspector->mouseMove(coord, 0);
} else { } else {
if (wasInside) { wasInside = false;
wasInside = false;
rtengine::Coord2D coord(-1, -1);
}
} }
} }
if (inside (x, y)) { if (inside(x, y)) {
updateCursor (ix, iy); updateCursor(ix, iy);
} }
if (state == SRotateSelecting) { if (state == SRotateSelecting) {

6
rtgui/filebrowserentry.h
View File

@ -93,9 +93,9 @@ public:
void refreshQuickThumbnailImage () override; void refreshQuickThumbnailImage () override;
void calcThumbnailSize () override; void calcThumbnailSize () override;
std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea () override; std::vector<Glib::RefPtr<Gdk::Pixbuf>> getIconsOnImageArea () override;
std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea () override; std::vector<Glib::RefPtr<Gdk::Pixbuf>> getSpecificityIconsOnImageArea () override;
void getIconSize (int& w, int& h) override; void getIconSize (int& w, int& h) const override;
// thumbnaillistener interface // thumbnaillistener interface
void procParamsChanged (Thumbnail* thm, int whoChangedIt) override; void procParamsChanged (Thumbnail* thm, int whoChangedIt) override;

11
rtgui/filecatalog.cc
View File

@ -37,9 +37,6 @@
#include "batchqueue.h" #include "batchqueue.h"
#include "placesbrowser.h" #include "placesbrowser.h"
#define BENCHMARK
#include "../rtengine/StopWatch.h"
using namespace std; using namespace std;
#define CHECKTIME 2000 #define CHECKTIME 2000
@ -568,7 +565,7 @@ void FileCatalog::closeDir ()
std::vector<Glib::ustring> FileCatalog::getFileList() std::vector<Glib::ustring> FileCatalog::getFileList()
{ {
BENCHFUN
std::vector<Glib::ustring> names; std::vector<Glib::ustring> names;
const std::set<std::string>& extensions = options.parsedExtensionsSet; const std::set<std::string>& extensions = options.parsedExtensionsSet;
@ -626,9 +623,9 @@ std::vector<Glib::ustring> FileCatalog::getFileList()
void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile) void FileCatalog::dirSelected (const Glib::ustring& dirname, const Glib::ustring& openfile)
{ {
BENCHFUN
try { try {
Glib::RefPtr<Gio::File> dir = Gio::File::create_for_path (dirname); const Glib::RefPtr<Gio::File> dir = Gio::File::create_for_path(dirname);
if (!dir) { if (!dir) {
return; return;
@ -1681,7 +1678,7 @@ void FileCatalog::filterChanged ()
void FileCatalog::reparseDirectory () void FileCatalog::reparseDirectory ()
{ {
BENCHFUN
if (selectedDirectory.empty()) { if (selectedDirectory.empty()) {
return; return;
} }

2
rtgui/inspector.h
View File

@ -87,7 +87,7 @@ public:
/** @brief Get the on/off state /** @brief Get the on/off state
*/ */
bool isActive() bool isActive() const
{ {
return active; return active;
}; };

3
rtgui/rtimage.cc
View File

@ -197,8 +197,7 @@ void RTImage::updateImages()
Glib::RefPtr<Gdk::Pixbuf> RTImage::createPixbufFromFile (const Glib::ustring& fileName) Glib::RefPtr<Gdk::Pixbuf> RTImage::createPixbufFromFile (const Glib::ustring& fileName)
{ {
Cairo::RefPtr<Cairo::ImageSurface> imgSurf = createImgSurfFromFile(fileName); Cairo::RefPtr<Cairo::ImageSurface> imgSurf = createImgSurfFromFile(fileName);
Glib::RefPtr<Gdk::Pixbuf> pixbuf = Gdk::Pixbuf::create(imgSurf, 0, 0, imgSurf->get_width(), imgSurf->get_height()); return Gdk::Pixbuf::create(imgSurf, 0, 0, imgSurf->get_width(), imgSurf->get_height());
return pixbuf;
} }
Cairo::RefPtr<Cairo::ImageSurface> RTImage::createImgSurfFromFile (const Glib::ustring& fileName) Cairo::RefPtr<Cairo::ImageSurface> RTImage::createImgSurfFromFile (const Glib::ustring& fileName)

34
rtgui/thumbbrowserentrybase.cc
View File

@ -157,9 +157,6 @@ ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) :
collate_name(getPaddedName(dispname).casefold_collate_key()), collate_name(getPaddedName(dispname).casefold_collate_key()),
thumbnail(nullptr), thumbnail(nullptr),
filename(fname), filename(fname),
shortname(dispname),
exifline(""),
datetimeline(""),
selected(false), selected(false),
drawable(false), drawable(false),
filtered(false), filtered(false),
@ -439,7 +436,6 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh)
Gtk::Widget* w = parent->getDrawingArea (); Gtk::Widget* w = parent->getDrawingArea ();
// calculate dimensions of the text based fields // calculate dimensions of the text based fields
dispname = shortname;
Glib::RefPtr<Pango::Context> context = w->get_pango_context () ; Glib::RefPtr<Pango::Context> context = w->get_pango_context () ;
context->set_font_description (w->get_style_context()->get_font()); context->set_font_description (w->get_style_context()->get_font());
@ -449,7 +445,7 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh)
Pango::FontDescription fontd = context->get_font_description (); Pango::FontDescription fontd = context->get_font_description ();
fontd.set_weight (Pango::WEIGHT_BOLD); fontd.set_weight (Pango::WEIGHT_BOLD);
context->set_font_description (fontd); context->set_font_description (fontd);
Glib::RefPtr<Pango::Layout> fn = w->create_pango_layout(shortname); Glib::RefPtr<Pango::Layout> fn = w->create_pango_layout(dispname);
fn->get_pixel_size (fnlabw, fnlabh); fn->get_pixel_size (fnlabw, fnlabh);
// calculate cummulated height of all info fields // calculate cummulated height of all info fields
@ -672,16 +668,15 @@ void ThumbBrowserEntryBase::setOffset (int x, int y)
} }
} }
bool ThumbBrowserEntryBase::inside (int x, int y) bool ThumbBrowserEntryBase::inside (int x, int y) const
{ {
return x > ofsX + startx && x < ofsX + startx + exp_width && y > ofsY + starty && y < ofsY + starty + exp_height; return x > ofsX + startx && x < ofsX + startx + exp_width && y > ofsY + starty && y < ofsY + starty + exp_height;
} }
void ThumbBrowserEntryBase::getPosInImgSpace (int x, int y, rtengine::Coord2D &coord) rtengine::Coord2D ThumbBrowserEntryBase::getPosInImgSpace (int x, int y) const
{ {
rtengine::Coord2D coord(-1., -1.);
coord.x = coord.y = -1.;
if (preview) { if (preview) {
x -= ofsX + startx; x -= ofsX + startx;
@ -692,15 +687,16 @@ void ThumbBrowserEntryBase::getPosInImgSpace (int x, int y, rtengine::Coord2D &c
coord.y = double(y - prey) / double(preh); coord.y = double(y - prey) / double(preh);
} }
} }
return coord;
} }
bool ThumbBrowserEntryBase::insideWindow (int x, int y, int w, int h) bool ThumbBrowserEntryBase::insideWindow (int x, int y, int w, int h) const
{ {
return !(ofsX + startx > x + w || ofsX + startx + exp_width < x || ofsY + starty > y + h || ofsY + starty + exp_height < y); return !(ofsX + startx > x + w || ofsX + startx + exp_width < x || ofsY + starty > y + h || ofsY + starty + exp_height < y);
} }
std::vector<Glib::RefPtr<Gdk::Pixbuf> > ThumbBrowserEntryBase::getIconsOnImageArea() std::vector<Glib::RefPtr<Gdk::Pixbuf>> ThumbBrowserEntryBase::getIconsOnImageArea()
{ {
return std::vector<Glib::RefPtr<Gdk::Pixbuf> >(); return std::vector<Glib::RefPtr<Gdk::Pixbuf> >();
} }
@ -710,12 +706,6 @@ std::vector<Glib::RefPtr<Gdk::Pixbuf> > ThumbBrowserEntryBase::getSpecificityIco
return std::vector<Glib::RefPtr<Gdk::Pixbuf> >(); return std::vector<Glib::RefPtr<Gdk::Pixbuf> >();
} }
void ThumbBrowserEntryBase::getIconSize(int& w, int& h)
{
w = 0;
h = 0;
}
bool ThumbBrowserEntryBase::motionNotify (int x, int y) bool ThumbBrowserEntryBase::motionNotify (int x, int y)
{ {
@ -734,12 +724,12 @@ bool ThumbBrowserEntryBase::releaseNotify (int button, int type, int bstate, int
return buttonSet ? buttonSet->releaseNotify (x, y) : false; return buttonSet ? buttonSet->releaseNotify (x, y) : false;
} }
Glib::ustring ThumbBrowserEntryBase::getToolTip (int x, int y) Glib::ustring ThumbBrowserEntryBase::getToolTip (int x, int y) const
{ {
Glib::ustring tooltip = ""; Glib::ustring tooltip;
if (buttonSet) { if (buttonSet) {
tooltip = buttonSet->getToolTip (x, y); tooltip = buttonSet->getToolTip(x, y);
} }
// Always show the filename in the tooltip since the filename in the thumbnail could be truncated. // Always show the filename in the tooltip since the filename in the thumbnail could be truncated.
@ -748,11 +738,11 @@ Glib::ustring ThumbBrowserEntryBase::getToolTip (int x, int y)
tooltip = dispname; tooltip = dispname;
if (withFilename < WFNAME_FULL) { if (withFilename < WFNAME_FULL) {
if (options.fbShowDateTime && datetimeline != "") { if (options.fbShowDateTime && !datetimeline.empty()) {
tooltip += Glib::ustring("\n") + datetimeline; tooltip += Glib::ustring("\n") + datetimeline;
} }
if (options.fbShowBasicExif && exifline != "") { if (options.fbShowBasicExif && !exifline.empty()) {
tooltip += Glib::ustring("\n") + exifline; tooltip += Glib::ustring("\n") + exifline;
} }
} }

90
rtgui/thumbbrowserentrybase.h
View File

@ -16,8 +16,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _THUMBNAILBROWSERENTRYBASE_ #pragma once
#define _THUMBNAILBROWSERENTRYBASE_
#include <atomic> #include <atomic>
@ -82,8 +81,8 @@ protected:
Glib::RefPtr<BackBuffer> backBuffer; Glib::RefPtr<BackBuffer> backBuffer;
bool bbSelected, bbFramed; bool bbSelected, bbFramed;
guint8* bbPreview; guint8* bbPreview;
std::vector<Glib::RefPtr<Gdk::Pixbuf> > bbIcons; std::vector<Glib::RefPtr<Gdk::Pixbuf>> bbIcons;
std::vector<Glib::RefPtr<Gdk::Pixbuf> > bbSpecificityIcons; std::vector<Glib::RefPtr<Gdk::Pixbuf>> bbSpecificityIcons;
CursorShape cursor_type; CursorShape cursor_type;
void drawFrame (Cairo::RefPtr<Cairo::Context> cr, const Gdk::RGBA& bg, const Gdk::RGBA& fg); void drawFrame (Cairo::RefPtr<Cairo::Context> cr, const Gdk::RGBA& bg, const Gdk::RGBA& fg);
@ -101,7 +100,6 @@ public:
// thumbnail preview properties: // thumbnail preview properties:
Glib::ustring filename; Glib::ustring filename;
Glib::ustring shortname;
Glib::ustring exifline; Glib::ustring exifline;
Glib::ustring datetimeline; Glib::ustring datetimeline;
@ -117,61 +115,61 @@ public:
bool updatepriority; bool updatepriority;
eWithFilename withFilename; eWithFilename withFilename;
explicit ThumbBrowserEntryBase (const Glib::ustring& fname); explicit ThumbBrowserEntryBase (const Glib::ustring& fname);
virtual ~ThumbBrowserEntryBase (); virtual ~ThumbBrowserEntryBase ();
void setParent (ThumbBrowserBase* l) void setParent (ThumbBrowserBase* l)
{ {
parent = l; parent = l;
} }
void updateBackBuffer (); void updateBackBuffer ();
void resize (int h); void resize (int h);
virtual void draw (Cairo::RefPtr<Cairo::Context> cc); virtual void draw (Cairo::RefPtr<Cairo::Context> cc);
void addButtonSet (LWButtonSet* bs); void addButtonSet (LWButtonSet* bs);
int getMinimalHeight () int getMinimalHeight () const
{ {
return height; return height;
} }
int getMinimalWidth () int getMinimalWidth () const
{ {
return width; return width;
} }
int getEffectiveWidth () const int getEffectiveWidth () const
{ {
return exp_width; return exp_width;
} }
int getEffectiveHeight () const int getEffectiveHeight () const
{ {
return exp_height; return exp_height;
} }
int getPreviewHeight () const int getPreviewHeight () const
{ {
return preh; return preh;
} }
int getStartX () const int getStartX () const
{ {
return startx; return startx;
} }
int getStartY () const int getStartY () const
{ {
return starty; return starty;
} }
int getX () const int getX () const
{ {
return ofsX + startx; return ofsX + startx;
} }
int getY () const int getY () const
{ {
return ofsY + starty; return ofsY + starty;
} }
bool inside (int x, int y); bool inside (int x, int y) const;
void getPosInImgSpace (int x, int y, rtengine::Coord2D &coord); rtengine::Coord2D getPosInImgSpace (int x, int y) const;
bool insideWindow (int x, int y, int w, int h); bool insideWindow (int x, int y, int w, int h) const;
void setPosition (int x, int y, int w, int h); void setPosition (int x, int y, int w, int h);
void setOffset (int x, int y); void setOffset (int x, int y);
bool operator <(const ThumbBrowserEntryBase& other) const bool operator <(const ThumbBrowserEntryBase& other) const
@ -179,33 +177,29 @@ public:
return collate_name < other.collate_name; return collate_name < other.collate_name;
} }
ThumbBrowserEntryBase* getOriginal () const; virtual void refreshThumbnailImage () = 0;
void setOriginal (ThumbBrowserEntryBase* original);
virtual void refreshThumbnailImage () {}
virtual void refreshQuickThumbnailImage () {} virtual void refreshQuickThumbnailImage () {}
virtual void calcThumbnailSize () {} virtual void calcThumbnailSize () = 0;
virtual void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) {} virtual void drawProgressBar (Glib::RefPtr<Gdk::Window> win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) {}
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getIconsOnImageArea (); virtual std::vector<Glib::RefPtr<Gdk::Pixbuf>> getIconsOnImageArea ();
virtual std::vector<Glib::RefPtr<Gdk::Pixbuf> > getSpecificityIconsOnImageArea (); virtual std::vector<Glib::RefPtr<Gdk::Pixbuf>> getSpecificityIconsOnImageArea ();
virtual void getIconSize (int& w, int& h); virtual void getIconSize (int& w, int& h) const = 0;
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);
virtual Glib::ustring getToolTip (int x, int y) const;
inline ThumbBrowserEntryBase* getOriginal() const
{
return original;
}
inline void setOriginal(ThumbBrowserEntryBase* original)
{
this->original = original;
}
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);
virtual Glib::ustring getToolTip (int x, int y);
}; };
inline ThumbBrowserEntryBase* ThumbBrowserEntryBase::getOriginal() const
{
return original;
}
inline void ThumbBrowserEntryBase::setOriginal(ThumbBrowserEntryBase* original)
{
this->original = original;
}
#endif