Move DivePictureModel to qt-models

This class will surely be used on the mobile version, and it was very
tangled inside divepicturewidget.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-05-29 14:42:57 -03:00 committed by Dirk Hohndel
parent 37bd82f623
commit ffc0c8ee99
11 changed files with 181 additions and 156 deletions

View file

@ -7,18 +7,6 @@
#include <QFuture>
#include <QNetworkReply>
typedef QPair<QString, QByteArray> SHashedFilename;
struct PhotoHelper {
QImage image;
int offsetSeconds;
};
class SHashedImage : public QImage {
public:
SHashedImage(struct picture *picture);
};
class ImageDownloader : public QObject {
Q_OBJECT;
public:
@ -31,26 +19,6 @@ private slots:
void saveImage(QNetworkReply *reply);
};
class DivePictureModel : public QAbstractTableModel {
Q_OBJECT
public:
static DivePictureModel *instance();
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
void updateDivePictures();
void updateDivePicturesWhenDone(QList<QFuture<void> >);
void removePicture(const QString& fileUrl);
private:
DivePictureModel();
int numberOfPictures;
// Currently, load the images on the fly
// Later, use a thread to load the images
// Later, save the thumbnails so we don't need to reopen every time.
QHash<QString, PhotoHelper> stringPixmapCache;
};
class DivePictureWidget : public QListView {
Q_OBJECT
public: