[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/kphotoalbum
From: Jesper Pedersen <blackie () blackie ! dk>
Date: 2010-08-16 5:28:22
Message-ID: 20100816052822.1C4CAAC854 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1164152 by blackie:
removed the first level cache with look ahead, as it no longer gave a speed up with \
the new way of loading thumbnails.
M +0 -1 CMakeLists.txt
M +0 -1 ThumbnailView/CellGeometry.cpp
D ThumbnailView/ThumbnailCache.cpp
D ThumbnailView/ThumbnailCache.h
M +0 -9 ThumbnailView/ThumbnailComponent.cpp
M +0 -3 ThumbnailView/ThumbnailComponent.h
M +1 -8 ThumbnailView/ThumbnailFacade.cpp
M +0 -2 ThumbnailView/ThumbnailFacade.h
M +0 -2 ThumbnailView/ThumbnailFactory.h
M +0 -14 ThumbnailView/ThumbnailModel.cpp
M +0 -11 ThumbnailView/ThumbnailRequest.cpp
M +0 -12 ThumbnailView/ThumbnailRequest.h
M +1 -3 ThumbnailView/ThumbnailWidget.cpp
M +0 -4 ThumbnailView/documentation.h
--- trunk/extragear/graphics/kphotoalbum/CMakeLists.txt #1164151:1164152
@@ -99,7 +99,6 @@
${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/ThumbnailRequest.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/ThumbnailToolTip.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/ThumbnailWidget.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/ThumbnailCache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/GridResizeInteraction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/SelectionInteraction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ThumbnailView/MouseTrackingInteraction.cpp
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/CellGeometry.cpp \
#1164151:1164152 @@ -17,7 +17,6 @@
*/
#include "CellGeometry.h"
#include "ThumbnailWidget.h"
-#include "ThumbnailCache.h"
#include "ThumbnailModel.h"
#include "DB/ResultId.h"
#include "Settings/SettingsData.h"
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailComponent.cpp \
#1164151:1164152 @@ -53,12 +53,3 @@
return _factory->widget();
}
-ThumbnailView::ThumbnailCache* ThumbnailView::ThumbnailComponent::cache()
-{
- return _factory->cache();
-}
-
-const ThumbnailView::ThumbnailCache* ThumbnailView::ThumbnailComponent::cache() \
const
-{
- return _factory->cache();
-}
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailComponent.h \
#1164151:1164152 @@ -27,7 +27,6 @@
class ThumbnailWidget;
class CellGeometry;
class ThumbnailModel;
-class ThumbnailCache;
class ThumbnailComponent
{
@@ -43,8 +42,6 @@
ThumbnailWidget* widget();
const ThumbnailWidget* widget() const;
- ThumbnailCache* cache();
- const ThumbnailCache* cache() const;
private:
ThumbnailFactory* _factory;
};
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailFacade.cpp \
#1164151:1164152 @@ -18,7 +18,6 @@
#include "ThumbnailFacade.h"
#include "ImageManager/ThumbnailCache.h"
-#include "ThumbnailCache.h"
#include "Settings/SettingsData.h"
#include "ThumbnailToolTip.h"
#include "ThumbnailModel.h"
@@ -28,11 +27,10 @@
ThumbnailView::ThumbnailFacade* ThumbnailView::ThumbnailFacade::_instance = 0;
ThumbnailView::ThumbnailFacade::ThumbnailFacade()
:_cellGeometry( new CellGeometry(this) ),
- _model( 0 ), _thumbnailCache( 0 ),_widget( 0 ), _toolTip( 0 )
+ _model( 0 ),_widget( 0 ), _toolTip( 0 )
{
// To avoid one of the components references one of the other before it has been \
initialized, we first construct them all with null. _cellGeometry = new \
CellGeometry(this);
- _thumbnailCache = new ThumbnailCache;
_model = new ThumbnailModel(this);
_widget = new ThumbnailWidget(this);
_toolTip = new ThumbnailToolTip( _widget );
@@ -165,11 +163,6 @@
return _instance;
}
-ThumbnailView::ThumbnailCache* ThumbnailView::ThumbnailFacade::cache()
-{
- Q_ASSERT( _thumbnailCache );
- return _thumbnailCache;
-}
void ThumbnailView::ThumbnailFacade::slotRecreateThumbnail()
{
Q_FOREACH( const DB::ResultId& id, widget()->selection() ) {
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailFacade.h \
#1164151:1164152 @@ -67,13 +67,11 @@
OVERRIDE ThumbnailModel* model();
OVERRIDE CellGeometry* cellGeometry();
OVERRIDE ThumbnailWidget* widget();
- OVERRIDE ThumbnailCache* cache();
private:
static ThumbnailFacade* _instance;
CellGeometry* _cellGeometry;
ThumbnailModel* _model;
- ThumbnailCache* _thumbnailCache;
ThumbnailWidget* _widget;
ThumbnailPainter* _painter;
ThumbnailToolTip* _toolTip;
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailFactory.h \
#1164151:1164152 @@ -23,7 +23,6 @@
class ThumbnailWidget;
class CellGeometry;
class ThumbnailModel;
-class ThumbnailCache;
class ThumbnailFactory
{
@@ -32,7 +31,6 @@
virtual ThumbnailModel* model() = 0;
virtual CellGeometry* cellGeometry() = 0;
virtual ThumbnailWidget* widget() = 0;
- virtual ThumbnailCache* cache() = 0;
};
}
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailModel.cpp \
#1164151:1164152 @@ -23,7 +23,6 @@
#include <Q3PointArray>
#include <QPainter>
#include "ThumbnailRequest.h"
-#include "ThumbnailCache.h"
#include "DB/ImageDB.h"
#include "ThumbnailWidget.h"
#include "ImageManager/Manager.h"
@@ -109,8 +108,6 @@
updateIndexCache();
- cache()->setDisplayList(_displayList);
-
emit collapseAllStacksEnabled( _expandedStacks.size() > 0);
emit expandAllStacksEnabled( _allStacks.size() != \
model()->_expandedStacks.size() ); reset();
@@ -221,7 +218,6 @@
Settings::SettingsData::instance()->setShowNewestFirst( direction == NewestFirst \
); _displayList = _displayList.reversed();
updateIndexCache();
- cache()->setDisplayList(_displayList);
_sortDirection = direction;
}
@@ -300,9 +296,6 @@
imageInfo->setSize( fullSize );
}
-#ifdef KDAB_TEMPORARILY_REMOVED
- cache()->insert(id, pixmap);
-#endif //KDAB_TEMPORARILY_REMOVED
emit dataChanged( idToIndex(id), idToIndex(id) );
}
@@ -399,13 +392,6 @@
const DB::ImageInfoPtr imageInfo = mediaId.fetchInfo();
const QString fileName = imageInfo->fileName(DB::AbsolutePath);
-
-#ifdef KDAB_TEMPORARILY_REMOVED
- QPixmap pixmap;
- if (cache()->find(mediaId, &pixmap))
- return pixmap;
-#endif //KDAB_TEMPORARILY_REMOVED
-
if ( ImageManager::ThumbnailCache::instance()->contains( fileName ) )
return ImageManager::ThumbnailCache::instance()->lookup( fileName );
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailRequest.cpp \
#1164151:1164152 @@ -17,7 +17,6 @@
*/
#include "ThumbnailRequest.h"
#include "ThumbnailModel.h"
-#include "ThumbnailCache.h"
ThumbnailView::ThumbnailRequest::ThumbnailRequest( int row, const QString& fileName, \
const QSize& size, int angle, ThumbnailModel* client)
: ImageManager::ImageRequest( fileName, size, angle, client ), _thumbnailModel( \
client ), m_row(row) @@ -29,13 +28,3 @@
{
return _thumbnailModel->thumbnailStillNeeded( m_row );
}
-
-ThumbnailView::ThumbnailCacheRequest::ThumbnailCacheRequest( const QString& \
fileName, const QSize& size, int angle, ThumbnailCache* client)
- : ImageManager::ImageRequest( fileName, size, angle, client ), _thumbnailCache( \
client ), _fileName( fileName )
-{
-}
-
-bool ThumbnailView::ThumbnailCacheRequest::stillNeeded() const
-{
- return _thumbnailCache->thumbnailStillNeeded( _fileName );
-}
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailRequest.h \
#1164151:1164152 @@ -21,7 +21,6 @@
namespace ThumbnailView
{
-class ThumbnailCache;
class ThumbnailModel;
class ThumbnailRequest : public ImageManager::ImageRequest
@@ -35,18 +34,7 @@
int m_row;
};
- // Temporarily here. TODO(hzeller): unify both these requests.
-class ThumbnailCacheRequest : public ImageManager::ImageRequest
-{
-public:
- ThumbnailCacheRequest( const QString& fileName, const QSize& size, int angle, \
ThumbnailCache* client);
- virtual bool stillNeeded() const;
-private:
- const ThumbnailCache* const _thumbnailCache;
- const QString _fileName;
-};
-
}
#endif /* THUMBNAILREQUEST_H */
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/ThumbnailWidget.cpp \
#1164151:1164152 @@ -19,7 +19,6 @@
#include <QScrollBar>
#include <QTimer>
#include "Delegate.h"
-#include "ThumbnailCache.h"
#include "ImageManager/ThumbnailCache.h"
#include "ThumbnailDND.h"
#include "KeyboardEventHandler.h"
@@ -268,8 +267,7 @@
void ThumbnailView::ThumbnailWidget::reload(bool flushCache, bool clearSelection)
{
- if ( flushCache )
- cache()->clear();
+ // PENDING(blackie) no more need for flushcache option?
if ( clearSelection )
this->clearSelection();
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/documentation.h \
#1164151:1164152 @@ -55,10 +55,6 @@
thumbnail in question. To implement this, we need to subclass
\ref ImageManager::ImageRequest - that's exactly what this class is about.
- \li \ref ThumbnailCache - To make the scrolling as smooth as possible, this
- class will try to preheat a cache of thumbnails that we expect would be
- needed at the next scroll action.
-
\li \ref ThumbnailBuilder - It is possible from the menus to ask the
application to rebuild all its thumnails on disk. This class will do that
for us.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic