Refs issue #43: fixed onclick

snailsnap · Jun 9, 2018 · f6a17f6 · f6a17f6
1 parent 24b6d2c
commit f6a17f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -17,6 +17,7 @@ MainWindow::MainWindow(QWidget *parent, MolluscPalette* molluscPalette, bool use
     , m_selectedMolluscIndex(0)
     , m_layout(new QGridLayout())
     , m_scrollArea(new QScrollArea())
+    , m_resultLabel(new QLabel())
     , m_infoWidget(new QWidget())
     , m_dWidget(new QDockWidget(this))
     , m_classLabel(new QLabel())
@@ -57,6 +58,7 @@ MainWindow::MainWindow(QWidget *parent, MolluscPalette* molluscPalette, bool use
     this->setCentralWidget(m_view);
     m_view->setScene(m_scene);
 
+    m_scene->addWidget(m_resultLabel);
     this->showCameraButton();
     this->showDia();
 }
@@ -306,11 +308,13 @@ void MainWindow::processAndShowPicture(std::shared_ptr<QImage> inputImage) {
     m_idImage = new QImage(image.width(), image.height(), image.format());
     m_molluscs = Painter::paint(molluscPositions, m_molluscPalette, *m_result, *m_idImage);
 
-    m_scene->removeItem(m_pixmapItem);
-    delete m_pixmapItem;
+    //m_scene->removeItem(m_pixmapItem);
+    //delete m_pixmapItem;
     auto offset = (display.width() - m_result->width()) / 2;
-    m_scene->setSceneRect(-offset, 0, display.width(), display.height());
-    m_pixmapItem = m_scene->addPixmap(QPixmap::fromImage(*m_result));
+    //m_scene->setSceneRect(-offset, 0, display.width(), display.height());
+    //m_pixmapItem = m_scene->addPixmap(QPixmap::fromImage(*m_result));
+    m_resultLabel->setFixedSize(display.width(), display.height());
+    m_resultLabel->setPixmap(QPixmap::fromImage(*m_result));
 
     m_cameraButton->move(display.width() - m_cameraButton->iconSize().width() - offset, display.height() - m_cameraButton->iconSize().height());
 

diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
@@ -65,6 +65,7 @@ class MainWindow : public QMainWindow {
     QWidget *m_infoWidget;
     QDockWidget *m_dWidget;
     QPushButton *m_cameraButton;
+    QLabel *m_resultLabel;
 
     QLabel *m_classLabel;
     QLabel *m_familyLabel;

diff --git a/src/molluscview.cpp b/src/molluscview.cpp
@@ -9,5 +9,6 @@ MolluscView::MolluscView(MainWindow * window)
 
 void MolluscView::mouseReleaseEvent(QMouseEvent * event)
 {
+    QGraphicsView::mouseReleaseEvent(event);
     m_window->onClick(event);
 }