mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
9edb4f3fa9
This required a bit more untangling, but with this it seems we can build subsurface-mobile again (at least on the desktop). Interesting is the removal from inside the ImageDownloader of the call to DivePictureModel::instance()->updateDivePictures() - which actually could cause some interesting recursion issues. If it turns out we did indeed need this, it needs to be re-architected. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
40 lines
1.2 KiB
C++
40 lines
1.2 KiB
C++
#ifndef DIVEPICTUREMODEL_H
|
|
#define DIVEPICTUREMODEL_H
|
|
|
|
#include <QAbstractTableModel>
|
|
#include <QImage>
|
|
#include <QFuture>
|
|
|
|
struct PhotoHelper {
|
|
QImage image;
|
|
int offsetSeconds;
|
|
};
|
|
|
|
typedef QList<struct picture *> SPictureList;
|
|
typedef struct picture *picturepointer;
|
|
typedef QPair<picturepointer, QImage> SPixmap;
|
|
|
|
// function that will scale the pixmap, used inside the QtConcurrent thread.
|
|
SPixmap scaleImages(picturepointer picture);
|
|
|
|
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;
|
|
virtual void updateDivePictures();
|
|
void updateDivePicturesWhenDone(QList<QFuture<void> >);
|
|
void removePicture(const QString& fileUrl, bool last);
|
|
|
|
protected:
|
|
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;
|
|
};
|
|
|
|
#endif
|