summaryrefslogtreecommitdiffstats
path: root/qt-models/divepicturemodel.h
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@gmail.com>2015-08-06 10:14:18 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-15 04:59:01 -0700
commited30059183f8a6d5d8e0692690f16f7f665fd369 (patch)
tree8b6fa24c49473c123e14d59193d117903b9a7de3 /qt-models/divepicturemodel.h
parent342479586d1f34a2b7f3d1d69037cb0d631489fa (diff)
downloadsubsurface-ed30059183f8a6d5d8e0692690f16f7f665fd369.tar.gz
Add DiveSitePicturesModel
This model should be used inside the Edit Dive Site mode. It should display all photos from all dives that are part of this dive site, ignoring trips. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/divepicturemodel.h')
-rw-r--r--qt-models/divepicturemodel.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h
index edcddd7a2..2ca22a1d9 100644
--- a/qt-models/divepicturemodel.h
+++ b/qt-models/divepicturemodel.h
@@ -12,12 +12,19 @@ public:
SHashedImage(struct picture *picture);
};
-
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:
@@ -25,11 +32,11 @@ public:
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();
+ virtual void updateDivePictures();
void updateDivePicturesWhenDone(QList<QFuture<void> >);
void removePicture(const QString& fileUrl);
-private:
+protected:
DivePictureModel();
int numberOfPictures;
// Currently, load the images on the fly
@@ -38,4 +45,4 @@ private:
QHash<QString, PhotoHelper> stringPixmapCache;
};
-#endif \ No newline at end of file
+#endif