diff --git a/tools/lammps-gui/CMakeLists.txt b/tools/lammps-gui/CMakeLists.txt index 0cd15bd753..4195c21406 100644 --- a/tools/lammps-gui/CMakeLists.txt +++ b/tools/lammps-gui/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -project(lammps-gui VERSION 1.4.0 LANGUAGES CXX) +project(lammps-gui VERSION 1.4.1 LANGUAGES CXX) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) diff --git a/tools/lammps-gui/imageviewer.cpp b/tools/lammps-gui/imageviewer.cpp index 4a7ac32c7c..139d73cb38 100644 --- a/tools/lammps-gui/imageviewer.cpp +++ b/tools/lammps-gui/imageviewer.cpp @@ -103,8 +103,10 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge connect(xval, &QAbstractSpinBox::editingFinished, this, &ImageViewer::edit_size); connect(yval, &QAbstractSpinBox::editingFinished, this, &ImageViewer::edit_size); + // workaround for incorrect highlight bug on macOS auto *dummy = new QPushButton(QIcon(), ""); dummy->hide(); + auto *dossao = new QPushButton(QIcon(":/hd-img.png"), ""); dossao->setCheckable(true); dossao->setToolTip("Toggle SSAO rendering"); diff --git a/tools/lammps-gui/slideshow.cpp b/tools/lammps-gui/slideshow.cpp index 418d2214ae..71ae76d70f 100644 --- a/tools/lammps-gui/slideshow.cpp +++ b/tools/lammps-gui/slideshow.cpp @@ -52,6 +52,10 @@ SlideShow::SlideShow(const QString &fileName, QWidget *parent) : auto *mainLayout = new QVBoxLayout; auto *navLayout = new QHBoxLayout; + // workaround for incorrect highlight bug on macOS + auto *dummy = new QPushButton(QIcon(), ""); + dummy->hide(); + auto *gofirst = new QPushButton(QIcon(":/go-first.png"), ""); gofirst->setToolTip("Go to first Image"); auto *goprev = new QPushButton(QIcon(":/go-previous-2.png"), ""); @@ -90,6 +94,7 @@ SlideShow::SlideShow(const QString &fileName, QWidget *parent) : navLayout->addWidget(imageName); navLayout->addSpacerItem(new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum)); + navLayout->addWidget(dummy); navLayout->addWidget(gofirst); navLayout->addWidget(goprev); navLayout->addWidget(goplay); @@ -144,6 +149,8 @@ void SlideShow::loadImage(int idx) do { QImageReader reader(imagefiles[idx]); reader.setAutoTransform(true); + if (!reader.canRead()) + fprintf(stderr, "cannot read file %s\n", imagefiles[idx].toStdString().c_str()); const QImage newImage = reader.read(); // There was an error reading the image file. Try reading the previous image instead.