BoxDraw with click and drop.

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -485,6 +485,7 @@ file(GLOB MAIN_SOURCES
     Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
     Source/CommonFramework/VideoPipeline/UI/VideoWidget.h
     Source/CommonFramework/VideoPipeline/VideoFeed.h
+    Source/CommonFramework/VideoPipeline/VideoOverlay.cpp
     Source/CommonFramework/VideoPipeline/VideoOverlay.h
     Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp
     Source/CommonFramework/VideoPipeline/VideoOverlayOption.h

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h

@@ -195,6 +195,18 @@ class StaticQGraphicsView : public QGraphicsView{
         QFrame::resizeEvent(e);
     }
 
+    //  QGraphicsView doesn't like to propagate mouse events.
+    //  https://forum.qt.io/topic/152138/struggling-with-mouse-events/2
+    virtual void mousePressEvent(QMouseEvent* event) override{
+        QWidget::mousePressEvent(event);
+    }
+    virtual void mouseReleaseEvent(QMouseEvent* event) override{
+        QWidget::mouseReleaseEvent(event);
+    }
+    virtual void mouseMoveEvent(QMouseEvent* event) override{
+        QWidget::mouseMoveEvent(event);
+    }
+
 };
 
 

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp

@@ -7,6 +7,7 @@
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMouseEvent>
 #include "Common/Cpp/PrettyPrint.h"
 #include "VideoDisplayWidget.h"
 #include "VideoDisplayWindow.h"
@@ -171,6 +172,24 @@ void VideoDisplayWidget::resizeEvent(QResizeEvent* event){
     m_height_box->setText(QString::number(m_last_height));
 }
 
+void VideoDisplayWidget::mousePressEvent(QMouseEvent* event){
+    WidgetStackFixedAspectRatio::mousePressEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_overlay_session.issue_mouse_press(x, y);
+}
+void VideoDisplayWidget::mouseReleaseEvent(QMouseEvent* event){
+    WidgetStackFixedAspectRatio::mouseReleaseEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_overlay_session.issue_mouse_release(x, y);
+}
+void VideoDisplayWidget::mouseMoveEvent(QMouseEvent* event){
+    WidgetStackFixedAspectRatio::mouseMoveEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_overlay_session.issue_mouse_move(x, y);
+}
 
 OverlayStatSnapshot VideoSourceFPS::get_current(){
     double fps = m_parent.m_video->camera().fps_source();

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h

@@ -89,6 +89,11 @@ class VideoDisplayWidget : public WidgetStackFixedAspectRatio{
     // Override QWidget::mouseDoubleClickEvent().
     // When double click, call move_to_new_window() to move to a new window to be ready for full screen.
     virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
+
+    virtual void mousePressEvent(QMouseEvent* event) override;
+    virtual void mouseReleaseEvent(QMouseEvent* event) override;
+    virtual void mouseMoveEvent(QMouseEvent* event) override;
+
     virtual void paintEvent(QPaintEvent*) override;
     virtual void resizeEvent(QResizeEvent* event) override;
 

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp

@@ -92,6 +92,7 @@ void VideoOverlayWidget::on_watchdog_timeout(){
 //    cout << "VideoOverlayWidget::on_watchdog_timeout(): " << c++ << endl;
 }
 
+
 void VideoOverlayWidget::resizeEvent(QResizeEvent* event){}
 void VideoOverlayWidget::paintEvent(QPaintEvent*){
     QPainter painter(this);

SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h

@@ -7,7 +7,6 @@
 #ifndef PokemonAutomation_VideoPipeline_VideoOverlayWidget_H
 #define PokemonAutomation_VideoPipeline_VideoOverlayWidget_H
 
-#include <map>
 #include <QWidget>
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Concurrency/Watchdog.h"
@@ -17,7 +16,7 @@ namespace PokemonAutomation{
 
 struct OverlayText;
 
-class VideoOverlayWidget : public QWidget, private VideoOverlaySession::Listener, private WatchdogCallback{
+class VideoOverlayWidget : public QWidget, private VideoOverlaySession::ContentListener, private WatchdogCallback{
 public:
     static constexpr bool DEFAULT_ENABLE_BOXES  = true;
     static constexpr bool DEFAULT_ENABLE_TEXT   = true;

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp

@@ -0,0 +1,47 @@
+/*  Video Overlay
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "VideoOverlay.h"
+
+namespace PokemonAutomation{
+
+
+
+struct VideoOverlay::Data{
+    ListenerSet<MouseListener> m_listeners;
+};
+
+
+VideoOverlay::VideoOverlay()
+    : m_data(CONSTRUCT_TOKEN)
+{}
+VideoOverlay::~VideoOverlay() = default;
+
+
+
+void VideoOverlay::add_listener(MouseListener& listener){
+    m_data->m_listeners.add(listener);
+}
+void VideoOverlay::remove_listener(MouseListener& listener){
+    m_data->m_listeners.remove(listener);
+}
+void VideoOverlay::issue_mouse_press(double x, double y){
+    m_data->m_listeners.run_method_unique(&MouseListener::on_mouse_press, x, y);
+}
+void VideoOverlay::issue_mouse_release(double x, double y){
+    m_data->m_listeners.run_method_unique(&MouseListener::on_mouse_release, x, y);
+}
+void VideoOverlay::issue_mouse_move(double x, double y){
+    m_data->m_listeners.run_method_unique(&MouseListener::on_mouse_move, x, y);
+}
+
+
+
+
+
+}

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.h

@@ -1,4 +1,4 @@
-/*  Video Overlay Set
+/*  Video Overlay
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -8,15 +8,20 @@
 #define PokemonAutomation_VideoOverlaySet_H
 
 #include <string>
+#include "Common/Compiler.h"
 #include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/Pimpl.h"
 #include "VideoOverlayTypes.h"
 
 namespace PokemonAutomation{
 
 
 class VideoOverlay{
 public:
-    
+    VideoOverlay();
+    virtual ~VideoOverlay();
+
+public:
     // Asychronously, add an inference box as part of the video overlay.
     // Once added, `box` cannot be destroyed until after `VideoOverlay::remove_box()` is called to remove it.
     // If a `box` with the same address is added, it will override the old box's position, shape and color. You only need to
@@ -25,7 +30,7 @@ class VideoOverlay{
     // Can use `InferenceBoxScope: public ImageFloatBox` to handle box removal automatically when it's destroyed.
     // Can also use `VideoOverlay.h:VideoOverlaySet` to manage multiple boxes.
     virtual void add_box(const OverlayBox& box) = 0;
-    
+
     // Asychronously, remove an added inference box.
     // The box must be already added.
     // See `add_box()` for more info on managing boxes.
@@ -55,6 +60,22 @@ class VideoOverlay{
     virtual void add_stat(OverlayStat& stat) = 0;
     virtual void remove_stat(OverlayStat& stat) = 0;
 
+
+public:
+    struct MouseListener{
+        virtual void on_mouse_press(double x, double y){}
+        virtual void on_mouse_release(double x, double y){};
+        virtual void on_mouse_move(double x, double y){};
+    };
+    void add_listener(MouseListener& listener);
+    void remove_listener(MouseListener& listener);
+    void issue_mouse_press(double x, double y);
+    void issue_mouse_release(double x, double y);
+    void issue_mouse_move(double x, double y);
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
 };