Fixed #26: Added mouse move and mouse release events on output label

JairajJangle · Sep 12, 2020 · 5ededf7 · 5ededf7
1 parent bf48ac6
commit 5ededf7
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 17 deletions.
diff --git a/CustomWidgets/ClickableLabel/clickablelabel.cpp b/CustomWidgets/ClickableLabel/clickablelabel.cpp
@@ -20,6 +20,8 @@
 
 #include "clickablelabel.h"
 
+#include <QDebug>
+
 ClickableLabel::ClickableLabel(QWidget* parent)
     : QLabel(parent)
 {
@@ -32,6 +34,7 @@ void ClickableLabel::mousePressEvent(QMouseEvent* event)
 {
     if(event->button() == Qt::LeftButton)
     {
+        ismouseLBMoved = false;
         emit LBclicked(QPoint(event->x(), event->y()));
     }
     if(event->button() == Qt::RightButton)
@@ -40,8 +43,20 @@ void ClickableLabel::mousePressEvent(QMouseEvent* event)
     }
 }
 
-//void ClickableLabel::mouseMoveEvent(QMouseEvent *event)
-//{
-//    ClickPos = cv::Point(event->x(), event->y());
-//    emit clicked();
-//}
+void ClickableLabel::mouseMoveEvent(QMouseEvent* event)
+{
+    if(event->buttons() == Qt::LeftButton)
+    {
+        ismouseLBMoved = true;
+        emit LBMoved(event->pos());
+    }
+}
+
+void ClickableLabel::mouseReleaseEvent(QMouseEvent* event)
+{
+    if(event->button() == Qt::LeftButton
+            && ismouseLBMoved)
+    {
+        emit LBReleased(event->pos());
+    }
+}
diff --git a/CustomWidgets/ClickableLabel/clickablelabel.h b/CustomWidgets/ClickableLabel/clickablelabel.h
@@ -39,20 +39,34 @@ class ClickableLabel : public QLabel
 
 signals:
     /**
-     * @brief LBclicked Signal fired when Left Mouse Button click is recorded on this widget
+     * @brief LBclicked Signal fired when Left Mouse Button clicked
      */
     void LBclicked(QPoint);
 
     /**
-     * @brief LBclicked Signal fired when Right Mouse Button click is recorded on this widget
+     * @brief LBclicked Signal fired when Right Mouse Button clicked
      */
     void RBclicked(QPoint);
 
+    /**
+     * @brief LBMoved Signal fired when Left Mouse Button is dragged and moved
+     */
+    void LBMoved(QPoint);
+
+    /**
+     * @brief LBReleased Signal fired when Left Mouse Button is released after a move
+     */
+    void LBReleased(QPoint);
+
 protected:
     /**
      * @brief mousePressEvent Overriden method from QLabel
      * @param event See QLabel::mousePressEvent
      */
     void mousePressEvent(QMouseEvent* event) override;
-    // void mouseMoveEvent(QMouseEvent* event);
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+
+private:
+    bool ismouseLBMoved = false;
 };
diff --git a/CustomWidgets/baseconfigwidget.cpp b/CustomWidgets/baseconfigwidget.cpp
@@ -21,12 +21,22 @@
 #include "CustomWidgets/baseconfigwidget.h"
 #include "Utils/constants.h"
 
-void BaseConfigWidget::beginPointChanged(QPoint point)
+void BaseConfigWidget::mouseLBClicked(QPoint point)
 {
     if(chainMenuWidget->getRadioButton()->isChecked())
         begin = cv::Point(point.x(), point.y());
 }
 
+void BaseConfigWidget::mouseLBMoved(QPoint point)
+{
+    qInfo() << "Mouse LB moved at: " << point;
+}
+
+void BaseConfigWidget::mouseLBReleased(QPoint point)
+{
+    qInfo() << "Mouse LB released at: " << point;
+}
+
 BaseConfigWidget::BaseConfigWidget(){
     begin =cv::Point(-1, -1);
     end =cv::Point(-1, -1);

diff --git a/CustomWidgets/baseconfigwidget.h b/CustomWidgets/baseconfigwidget.h
@@ -90,7 +90,9 @@ class BaseConfigWidget : public QWidget
     void operationSelected(ParamAdjustWidget*);
 
 public slots:
-    void beginPointChanged(QPoint point);
+    virtual void mouseLBClicked(QPoint point);
+    virtual void mouseLBMoved(QPoint point);
+    virtual void mouseLBReleased(QPoint point);
 
 public:
     cv::Point begin;

diff --git a/Window/MainWindow/mainwindow.cpp b/Window/MainWindow/mainwindow.cpp
@@ -140,6 +140,10 @@ void MainWindow::connectSignals()
 
     connect(ui->labelOutput, SIGNAL(LBclicked(QPoint)),
             this, SLOT(outputLabelLBClicked(QPoint)));
+    connect(ui->labelOutput, SIGNAL(LBMoved(QPoint)),
+            this, SLOT(outputLabelLBMoved(QPoint)));
+    connect(ui->labelOutput, SIGNAL(LBReleased(QPoint)),
+            this, SLOT(outputLabelLBReleased(QPoint)));
 
     connect(this, SIGNAL(removeOperationWidgetSignal()),
             this, SLOT(removeOperationWidget()));
@@ -170,6 +174,16 @@ void MainWindow::connectSignals()
         ui->labelInputFPS->setText(
                     QString(Strings::fps).arg(fps));
     });
+
+    // Not yet implemented features
+    connect(ui->actionSave_Chain, &QAction::triggered,
+            this, [=](){
+        setUserMessage("Save Chain feature is not yet implemented", WARNING);
+    });
+    connect(ui->actionLoad_Chain, &QAction::triggered,
+            this, [=](){
+        setUserMessage("Load Chain feature is not yet implemented", WARNING);
+    });
 }
 
 void MainWindow::addOperation(OPCodes opCode)
@@ -319,7 +333,11 @@ void MainWindow::addOperationWidget()
     });
 
     connect(ui->labelOutput, SIGNAL(LBclicked(QPoint)),
-            baseConfigWidgetChain.last(), SLOT(beginPointChanged(QPoint)));
+            baseConfigWidgetChain.last(), SLOT(mouseLBClicked(QPoint)));
+    connect(ui->labelOutput, SIGNAL(LBMoved(QPoint)),
+            baseConfigWidgetChain.last(), SLOT(mouseLBMoved(QPoint)));
+    connect(ui->labelOutput, SIGNAL(LBReleased(QPoint)),
+            baseConfigWidgetChain.last(), SLOT(mouseLBReleased(QPoint)));
 
     connect(baseConfigWidgetChain.last(), SIGNAL(operationSelected(ParamAdjustWidget*)),
             this, SLOT(operationSelectedToDisplay(ParamAdjustWidget*)));
@@ -911,6 +929,16 @@ void MainWindow::outputLabelLBClicked(QPoint point)
     qDebug() << "Output label Mouse LB button click pos = " << point;
 }
 
+void MainWindow::outputLabelLBMoved(QPoint point)
+{
+    qDebug() << "Output label Mouse LB button move pos = " << point;
+}
+
+void MainWindow::outputLabelLBReleased(QPoint point)
+{
+    qDebug() << "Output label Mouse LB button release pos = " << point;
+}
+
 void MainWindow::toggleFlipSource(bool isChecked)
 {
     isSourceFlipped = isChecked;

diff --git a/Window/MainWindow/mainwindow.h b/Window/MainWindow/mainwindow.h
@@ -88,12 +88,12 @@ class MainWindow : public QMainWindow
                  HISTOGRAM_CALCULATION, HARRIS_CORNER, ERODE, DILATE, BITWISE_OPS,
                  CONTOURS, RESIZE,
 
-              /*
-               * Add all other Enum values before this
-               *
-               * To connect OpenCV operation Base Config widget to
-               * the added OpCodes enum, see MainWindow::addOperation(...)
-               */
+                 /*
+                                 * Add all other Enum values before this
+                                 *
+                                 * To connect OpenCV operation Base Config widget to
+                                 * the added OpCodes enum, see MainWindow::addOperation(...)
+                                 */
                  NONE /* Corresponds to OPCodes::NO_OPERATION */ };
 
 private slots:
@@ -110,6 +110,8 @@ private slots:
     void lastOperationChanged(MainWindow::OPCodes opCode);
     void showAboutDialog();
     void outputLabelLBClicked(QPoint);
+    void outputLabelLBMoved(QPoint);
+    void outputLabelLBReleased(QPoint);
     void showHideExplodedView(int);
     void refreshOutputImage(const cv::Mat img);
     void addOperationWidget();