mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-02 23:20:20 +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>
128 lines
2.9 KiB
C++
128 lines
2.9 KiB
C++
#include "divepicturemodel.h"
|
|
#include "dive.h"
|
|
#include "metrics.h"
|
|
#include "divelist.h"
|
|
#include "imagedownloader.h"
|
|
|
|
#include <QtConcurrent>
|
|
|
|
SPixmap scaleImages(picturepointer picture)
|
|
{
|
|
static QHash <QString, QImage > cache;
|
|
SPixmap ret;
|
|
ret.first = picture;
|
|
if (cache.contains(picture->filename) && !cache.value(picture->filename).isNull()) {
|
|
ret.second = cache.value(picture->filename);
|
|
} else {
|
|
int dim = defaultIconMetrics().sz_pic;
|
|
QImage p = SHashedImage(picture);
|
|
if(!p.isNull()) {
|
|
p = p.scaled(dim, dim, Qt::KeepAspectRatio);
|
|
cache.insert(picture->filename, p);
|
|
}
|
|
ret.second = p;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
DivePictureModel *DivePictureModel::instance()
|
|
{
|
|
static DivePictureModel *self = new DivePictureModel();
|
|
return self;
|
|
}
|
|
|
|
DivePictureModel::DivePictureModel() : numberOfPictures(0)
|
|
{
|
|
}
|
|
|
|
|
|
void DivePictureModel::updateDivePicturesWhenDone(QList<QFuture<void> > futures)
|
|
{
|
|
Q_FOREACH (QFuture<void> f, futures) {
|
|
f.waitForFinished();
|
|
}
|
|
updateDivePictures();
|
|
}
|
|
|
|
void DivePictureModel::updateDivePictures()
|
|
{
|
|
if (numberOfPictures != 0) {
|
|
beginRemoveRows(QModelIndex(), 0, numberOfPictures - 1);
|
|
numberOfPictures = 0;
|
|
endRemoveRows();
|
|
}
|
|
|
|
// if the dive_table is empty, ignore the displayed_dive
|
|
numberOfPictures = dive_table.nr == 0 ? 0 : dive_get_picture_count(&displayed_dive);
|
|
if (numberOfPictures == 0) {
|
|
return;
|
|
}
|
|
|
|
stringPixmapCache.clear();
|
|
SPictureList pictures;
|
|
FOR_EACH_PICTURE_NON_PTR(displayed_dive) {
|
|
stringPixmapCache[QString(picture->filename)].offsetSeconds = picture->offset.seconds;
|
|
pictures.push_back(picture);
|
|
}
|
|
|
|
QList<SPixmap> list = QtConcurrent::blockingMapped(pictures, scaleImages);
|
|
Q_FOREACH (const SPixmap &pixmap, list)
|
|
stringPixmapCache[pixmap.first->filename].image = pixmap.second;
|
|
|
|
beginInsertRows(QModelIndex(), 0, numberOfPictures - 1);
|
|
endInsertRows();
|
|
}
|
|
|
|
int DivePictureModel::columnCount(const QModelIndex &parent) const
|
|
{
|
|
return 2;
|
|
}
|
|
|
|
QVariant DivePictureModel::data(const QModelIndex &index, int role) const
|
|
{
|
|
QVariant ret;
|
|
if (!index.isValid())
|
|
return ret;
|
|
|
|
QString key = stringPixmapCache.keys().at(index.row());
|
|
if (index.column() == 0) {
|
|
switch (role) {
|
|
case Qt::ToolTipRole:
|
|
ret = key;
|
|
break;
|
|
case Qt::DecorationRole:
|
|
ret = stringPixmapCache[key].image;
|
|
break;
|
|
case Qt::DisplayRole:
|
|
ret = QFileInfo(key).fileName();
|
|
break;
|
|
case Qt::DisplayPropertyRole:
|
|
ret = QFileInfo(key).filePath();
|
|
}
|
|
} else if (index.column() == 1) {
|
|
switch (role) {
|
|
case Qt::UserRole:
|
|
ret = QVariant::fromValue((int)stringPixmapCache[key].offsetSeconds);
|
|
break;
|
|
case Qt::DisplayRole:
|
|
ret = key;
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void DivePictureModel::removePicture(const QString &fileUrl, bool last)
|
|
{
|
|
dive_remove_picture(fileUrl.toUtf8().data());
|
|
if (last) {
|
|
copy_dive(current_dive, &displayed_dive);
|
|
updateDivePictures();
|
|
mark_divelist_changed(true);
|
|
}
|
|
}
|
|
|
|
int DivePictureModel::rowCount(const QModelIndex &parent) const
|
|
{
|
|
return numberOfPictures;
|
|
}
|