diff --git a/tools/lammps-gui/imageviewer.cpp b/tools/lammps-gui/imageviewer.cpp index 5afb02e5b1..b1e2ecd787 100644 --- a/tools/lammps-gui/imageviewer.cpp +++ b/tools/lammps-gui/imageviewer.cpp @@ -207,9 +207,7 @@ ImageViewer::ImageViewer(const QString &fileName, LammpsWrapper *_lammps, QWidge resize(image.width() + 20, image.height() + 50); scrollArea->setVisible(true); - fitToWindowAct->setEnabled(true); updateActions(); - if (!fitToWindowAct->isChecked()) imageLabel->adjustSize(); setLayout(mainLayout); } @@ -464,30 +462,6 @@ void ImageViewer::saveAs() void ImageViewer::copy() {} -void ImageViewer::zoomIn() -{ - scaleImage(1.25); -} - -void ImageViewer::zoomOut() -{ - scaleImage(0.8); -} - -void ImageViewer::normalSize() -{ - imageLabel->adjustSize(); - scaleFactor = 1.0; -} - -void ImageViewer::fitToWindow() -{ - bool fitToWindow = fitToWindowAct->isChecked(); - scrollArea->setWidgetResizable(fitToWindow); - if (!fitToWindow) normalSize(); - updateActions(); -} - void ImageViewer::saveFile(const QString &fileName) { if (!fileName.isEmpty()) image.save(fileName); @@ -509,39 +483,12 @@ void ImageViewer::createActions() QAction *exitAct = fileMenu->addAction("&Close", this, &QWidget::close); exitAct->setIcon(QIcon(":/window-close.png")); exitAct->setShortcut(QKeySequence::fromString("Ctrl+W")); - - QMenu *viewMenu = menuBar->addMenu("&View"); - - zoomInAct = viewMenu->addAction("Image Zoom &In (25%)", this, &ImageViewer::zoomIn); - zoomInAct->setShortcut(QKeySequence::ZoomIn); - zoomInAct->setIcon(QIcon(":/gtk-zoom-in.png")); - zoomInAct->setEnabled(false); - - zoomOutAct = viewMenu->addAction("Image Zoom &Out (25%)", this, &ImageViewer::zoomOut); - zoomOutAct->setShortcut(QKeySequence::ZoomOut); - zoomOutAct->setIcon(QIcon(":/gtk-zoom-out.png")); - zoomOutAct->setEnabled(false); - - normalSizeAct = viewMenu->addAction("&Reset Image Size", this, &ImageViewer::normalSize); - normalSizeAct->setShortcut(QKeySequence::fromString("Ctrl+0")); - normalSizeAct->setIcon(QIcon(":/gtk-zoom-fit.png")); - normalSizeAct->setEnabled(false); - - viewMenu->addSeparator(); - - fitToWindowAct = viewMenu->addAction("&Fit to Window", this, &ImageViewer::fitToWindow); - fitToWindowAct->setEnabled(false); - fitToWindowAct->setCheckable(true); - fitToWindowAct->setShortcut(QKeySequence::fromString("Ctrl+=")); } void ImageViewer::updateActions() { saveAsAct->setEnabled(!image.isNull()); copyAct->setEnabled(!image.isNull()); - zoomInAct->setEnabled(!fitToWindowAct->isChecked()); - zoomOutAct->setEnabled(!fitToWindowAct->isChecked()); - normalSizeAct->setEnabled(!fitToWindowAct->isChecked()); } void ImageViewer::scaleImage(double factor) @@ -555,8 +502,6 @@ void ImageViewer::scaleImage(double factor) adjustScrollBar(scrollArea->horizontalScrollBar(), factor); adjustScrollBar(scrollArea->verticalScrollBar(), factor); - zoomInAct->setEnabled(scaleFactor < 3.0); - zoomOutAct->setEnabled(scaleFactor > 0.333); } void ImageViewer::adjustScrollBar(QScrollBar *scrollBar, double factor) diff --git a/tools/lammps-gui/imageviewer.h b/tools/lammps-gui/imageviewer.h index 3dbf3df324..013a90249f 100644 --- a/tools/lammps-gui/imageviewer.h +++ b/tools/lammps-gui/imageviewer.h @@ -40,10 +40,6 @@ public: private slots: void saveAs(); void copy(); - void zoomIn(); - void zoomOut(); - void normalSize(); - void fitToWindow(); void edit_size(); void reset_view();