Add marking and unmark from thumbnails view

This commit is contained in:
2022-05-20 22:27:53 +02:00
parent 41b29f0701
commit 9ceb7556f9
5 changed files with 47 additions and 21 deletions
+33 -9
View File
@@ -10,6 +10,7 @@
#include <QMessageBox>
#include <QCoreApplication>
#include <QPainter>
#include <QFileInfo>
struct RawImageType
{
@@ -45,7 +46,8 @@ void setScrollRange(QScrollBar *scrollBar, int newRange)
scrollBar->setValue(relPos*newRange - page/2);
}
ImageWidget::ImageWidget(QWidget *parent) : QOpenGLWidget(parent)
ImageWidget::ImageWidget(Database *database, QWidget *parent) : QOpenGLWidget(parent)
, m_database(database)
{
setFocusPolicy(Qt::ClickFocus);
m_range = UINT16_MAX;
@@ -117,19 +119,23 @@ void ImageWidget::blockRepaint(bool block)
if(!block)update();
}
void ImageWidget::allocateThumbnails(const QStringList &names)
void ImageWidget::allocateThumbnails(const QStringList &paths)
{
int count = names.size();
int count = paths.size();
m_thumbnailCount = count;
m_thumnails.clear();
for(auto &name : names)
m_thumnails.push_back({name, QSize(0, 0), false});
QStringList marked = m_database->getMarkedFiles();
for(auto &path : paths)
{
QString name = QFileInfo(path).fileName();
m_thumnails.push_back({name, path, QSize(0, 0), marked.contains(path), false});
}
m_thumbnailTexture->destroy();
m_thumbnailTexture->create();
m_thumbnailTexture->setFormat(QOpenGLTexture::RGB16_UNorm);
m_thumbnailTexture->setSize(THUMB_SIZE, THUMB_SIZE);
m_thumbnailTexture->setLayers(names.size());
m_thumbnailTexture->setLayers(paths.size());
m_thumbnailTexture->allocateStorage();
m_bufferSizes->bind();
float *tmp = new float[count*3];
@@ -440,6 +446,24 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *event)
{
m_selecting = false;
event->accept();
QStringList mark;
QStringList unmark;
for(auto &thumb : m_thumnails)
{
if(thumb.dirty)
{
if(thumb.selected)
mark.append(thumb.path);
else
unmark.append(thumb.path);
thumb.dirty = false;
}
}
if(!mark.isEmpty())
m_database->mark(mark);
if(!unmark.isEmpty())
m_database->unmark(unmark);
}
else
event->ignore();
@@ -467,19 +491,19 @@ void ImageWidget::thumbSelect(QMouseEvent *event)
if(newVal != oldVal)
{
emit thumbSelected(i);
m_thumnails[i].selected = newVal;
m_thumnails[i].dirty = true;
update();
}
}
}
ImageScrollAreaGL::ImageScrollAreaGL(QWidget *parent) : QWidget(parent)
ImageScrollAreaGL::ImageScrollAreaGL(Database *database, QWidget *parent) : QWidget(parent)
{
QGridLayout *layout = new QGridLayout(this);
setLayout(layout);
m_imageWidget = new ImageWidget(this);
m_imageWidget = new ImageWidget(database, this);
m_verticalScrollBar = new QScrollBar(Qt::Vertical, this);
m_horizontalScrollBar = new QScrollBar(Qt::Horizontal, this);