mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
4d407dc666
For undo of picture manipulation, it will be crucial that the model and the core have the same order of pictures. The first sort criterion will be time, the second filename in the case that two pictures have, for whatever reason, the same timestamp. However in the core we us C-strings and thus sort byte-wise using strcmp. In the Qt-part we use QStrings, which sort according to unicode encoding. To enable consistent sorting, change the Qt-part to std::string, which uses a C-style 0-terminated string as its backing store. One might argue that in general filenames should use system-encoding and therefore use std::string instead of QString. However, a broader conversion to std::string turned out to be very painful, since Qt is (deliberately?) difficult to use with std::string. Notable all the file-manipulation functions don't take std::string by default. Thus, this commit only converts the internal data of DivePictureModel, but continues to use QString for the Qt-facing interface. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
46 lines
1.4 KiB
C++
46 lines
1.4 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DIVEPICTUREMODEL_H
|
|
#define DIVEPICTUREMODEL_H
|
|
|
|
#include "core/units.h"
|
|
|
|
#include <QAbstractTableModel>
|
|
#include <QImage>
|
|
#include <QFuture>
|
|
|
|
// We use std::string instead of QString to use the same character-encoding
|
|
// as in the C core (UTF-8). This is crucial to guarantee the same sort-order.
|
|
struct PictureEntry {
|
|
int diveId;
|
|
std::string filename;
|
|
QImage image;
|
|
int offsetSeconds;
|
|
duration_t length;
|
|
};
|
|
|
|
class DivePictureModel : public QAbstractTableModel {
|
|
Q_OBJECT
|
|
public:
|
|
static DivePictureModel *instance();
|
|
int columnCount(const QModelIndex &parent = QModelIndex()) const override;
|
|
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
|
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
|
|
void updateDivePictures();
|
|
void removePictures(const QVector<QString> &fileUrls);
|
|
void updateDivePictureOffset(int diveId, const QString &filename, int offsetSeconds);
|
|
signals:
|
|
void picturesRemoved(const QVector<QString> &fileUrls);
|
|
public slots:
|
|
void setZoomLevel(int level);
|
|
void updateThumbnail(QString filename, QImage thumbnail, duration_t duration);
|
|
private:
|
|
DivePictureModel();
|
|
QVector<PictureEntry> pictures;
|
|
int findPictureId(const std::string &filename); // Return -1 if not found
|
|
double zoomLevel; // -1.0: minimum, 0.0: standard, 1.0: maximum
|
|
int size;
|
|
void updateThumbnails();
|
|
void updateZoom();
|
|
};
|
|
|
|
#endif
|