trying to get box draw on label program

Author: Gin

Common/Cpp/Options/ConfigOption.h

@@ -32,18 +32,33 @@ enum class ConfigOptionState{
 };
 
 
-// An option of a program, like the number of boxes of eggs to hatch,
-// the number of frames to skip, or what type of pokeballs to throw.
-// It is responsible for setting the UI (by calling make_ui()) of this option.
+// Abstract base class for An option of a program, like the number of boxes of
+// eggs to hatch, the number of frames to skip, or what type of pokeballs to throw.
+// It is responsible for setting the UI (by calling make_QtWidget()) of this option.
 // It also uses load_json() and to_json() to load and save the option to
 // a json file, so that the program can remember what user has selected.
 class ConfigOption{
 public:
+    // the objects that listen to changes on the ConfigOption should inherit
+    // this Listener struct and call ConfigOption::add_listener() to add themselves
+    // to the listener set.
+    // Afterwards, whenever the config state is changed, all added listeners'
+    // corresponding member functions (e.g. value_changed()) will get called by
+    // the config option.
     struct Listener{
-        //  Pass the object that initiated the change. This is mainly used to
-        //  identify yourself as the initiater to avoid infinite loops.
+        //  When the config option value is changed, all added listeners' 
+        //  value_changed() will get called. 
+        //  object: the object that initiated the change. e.g. If the user changes
+        //  a UI content, object would be the UI option that is changed. This is
+        //  mainly used to avoid infinite loops. So if the initial change triggers
+        //  the original UI option's value_changed() get called, it will know that
+        //  object == this and therefore a loop is formed.
         virtual void on_config_value_changed(void* object){}
+        //  When the config UI visibility is changed, all added listeners'
+        //  visibility_changed() will get called.
         virtual void on_config_visibility_changed(){}
+        //  When the program state is changed, all added listeners'
+        //  program_state_changed() will get called.
         virtual void on_program_state_changed(bool program_is_running){}
     };
     void add_listener(Listener& listener);

SerialPrograms/Source/CommonFramework/Panels/PanelList.h

@@ -27,11 +27,11 @@ class PanelListDescriptor{
     const std::string& name() const{ return m_name; }
     bool enabled() const{ return m_enabled; }
 
-    virtual std::vector<PanelEntry> make_panels() const = 0;
-
-public:
     PanelListWidget* make_QWidget(QWidget& parent, PanelHolder& holder) const;
 
+protected:
+    virtual std::vector<PanelEntry> make_panels() const = 0;
+
 protected:
     std::string m_name;
     bool m_enabled;

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

@@ -52,9 +52,6 @@ class CameraBackend : public PokemonAutomation::CameraBackend{
 };
 
 
-
-
-
 class StaticQGraphicsView : public QGraphicsView{
 public:
     StaticQGraphicsView(QWidget* parent)
@@ -90,16 +87,6 @@ class StaticQGraphicsView : public QGraphicsView{
 };
 
 
-
-
-
-
-
-
-
-
-
-
 class CameraVideoSource : public QObject, public VideoSource{
 public:
     virtual ~CameraVideoSource();
@@ -147,7 +134,6 @@ class CameraVideoSource : public QObject, public VideoSource{
 
     PeriodicStatsReporterI32 m_stats_conversion;
 
-
 private:
     //  Last Frame: All accesses must be under this lock.
     //  These will be updated very rapidly by the main thread.

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h

@@ -107,14 +107,6 @@ class OverlayLogTextScope{
 };
 
 
-
-
-
-
-
-
-
-
 // Used by video inference sessions to manage inference boxes.
 // VideoOverlaySet will be passed to the inference callbacks in a session
 // to store inference boxes. When the session ends, VideoOverlaySet::clear()

SerialPrograms/Source/ML/ML_Panels.h

@@ -17,7 +17,8 @@ namespace ML{
 class PanelListFactory : public PanelListDescriptor{
 public:
     PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
 };
 
 

SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp

@@ -4,16 +4,99 @@
  *
  */
 
+#include <QLabel>
+#include <QDir>
 #include <QVBoxLayout>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsPixmapItem>
 #include <QScrollArea>
+#include <QPushButton>
+#include <QResizeEvent>
+#include <iostream>
+#include "Common/Cpp/Json/JsonObject.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Qt/CollapsibleGroupBox.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h"
+#include "CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h"
 #include "ML_LabelImages.h"
 #include "Pokemon/Pokemon_Strings.h"
+#include "Common/Qt/Options/ConfigWidget.h"
+
+
+using std::cout;
+using std::endl;
 
 namespace PokemonAutomation{
 namespace ML{
 
+
+DrawnBoundingBox::DrawnBoundingBox(LabelImages& parent, VideoOverlay& overlay)
+    : m_parent(parent)
+    , m_overlay(overlay)
+    , m_overlay_set(overlay)
+{
+    m_parent.X.add_listener(*this);
+    m_parent.Y.add_listener(*this);
+    m_parent.WIDTH.add_listener(*this);
+    m_parent.HEIGHT.add_listener(*this);
+    overlay.add_listener(*this);
+}
+
+DrawnBoundingBox::~DrawnBoundingBox(){
+    detach();
+}
+
+void DrawnBoundingBox::on_config_value_changed(void* object){
+    std::lock_guard<std::mutex> lg(m_lock);
+    m_overlay_set.clear();
+    m_overlay_set.add(COLOR_RED, {m_parent.X, m_parent.Y, m_parent.WIDTH, m_parent.HEIGHT});
+}
+void DrawnBoundingBox::on_mouse_press(double x, double y){
+    m_parent.WIDTH.set(0);
+    m_parent.HEIGHT.set(0);
+    m_parent.X.set(x);
+    m_parent.Y.set(y);
+    m_mouse_start.emplace();
+    m_mouse_start->first = x;
+    m_mouse_start->second = y;
+}
+void DrawnBoundingBox::on_mouse_release(double x, double y){
+    m_mouse_start.reset();
+}
+void DrawnBoundingBox::on_mouse_move(double x, double y){
+    if (!m_mouse_start){
+        return;
+    }
+
+    double xl = m_mouse_start->first;
+    double xh = x;
+    double yl = m_mouse_start->second;
+    double yh = y;
+
+    if (xl > xh){
+        std::swap(xl, xh);
+    }
+    if (yl > yh){
+        std::swap(yl, yh);
+    }
+
+    m_parent.X.set(xl);
+    m_parent.Y.set(yl);
+    m_parent.WIDTH.set(xh - xl);
+    m_parent.HEIGHT.set(yh - yl);
+}
+
+void DrawnBoundingBox::detach(){
+    m_overlay.remove_listener(*this);
+    m_parent.X.remove_listener(*this);
+    m_parent.Y.remove_listener(*this);
+    m_parent.WIDTH.remove_listener(*this);
+    m_parent.HEIGHT.remove_listener(*this);
+}
+
+
 LabelImages_Descriptor::LabelImages_Descriptor()
     : PanelDescriptor(
         Color(),
@@ -25,45 +108,55 @@ LabelImages_Descriptor::LabelImages_Descriptor()
 {}
 
 
+#define ADD_OPTION(x)    m_options.add_option(x, #x)
 
 LabelImages::LabelImages(const LabelImages_Descriptor& descriptor)
     : PanelInstance(descriptor)
-    // , m_switch({}, false)
-{}
+    , m_switch_control_option({}, false)
+    , m_options(LockMode::UNLOCK_WHILE_RUNNING)
+    , X("<b>X Coordinate:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.3, 0.0, 1.0)
+    , Y("<b>Y Coordinate:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.3, 0.0, 1.0)
+    , WIDTH("<b>Width:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.4, 0.0, 1.0)
+    , HEIGHT("<b>Height:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.4, 0.0, 1.0)
+{
+    ADD_OPTION(X);
+    ADD_OPTION(Y);
+    ADD_OPTION(WIDTH);
+    ADD_OPTION(HEIGHT);
+}
 void LabelImages::from_json(const JsonValue& json){
-    // m_switch.load_json(json);
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    const JsonValue* value = obj->get_value("SwitchSetup");
+    if (value){
+        m_switch_control_option.load_json(*value);
+    }
+    m_options.load_json(json);
 }
 JsonValue LabelImages::to_json() const{
-    return {};
-    // return m_switch.to_json();
+    JsonObject obj = std::move(*m_options.to_json().to_object());
+    obj["SwitchSetup"] = m_switch_control_option.to_json();
+    return obj;
 }
 QWidget* LabelImages::make_widget(QWidget& parent, PanelHolder& holder){
-    return LabelImages_Widget::make(parent, *this, holder);
+    return new LabelImages_Widget(parent, *this, holder);
 }
 
 
-
-LabelImages_Widget* LabelImages_Widget::make(
-    QWidget& parent,
-    LabelImages& instance,
-    PanelHolder& holder
-){
-    LabelImages_Widget* widget = new LabelImages_Widget(parent, instance, holder);
-    widget->construct();
-    return widget;
-}
 LabelImages_Widget::~LabelImages_Widget(){
-    // delete m_switch;
+    delete m_switch_widget;
 }
 LabelImages_Widget::LabelImages_Widget(
     QWidget& parent,
     LabelImages& instance,
     PanelHolder& holder
 )
     : PanelWidget(parent, instance, holder)
-    // , m_session(instance.m_switch, 0, 0)
-{}
-void LabelImages_Widget::construct(){
+    , m_session(instance.m_switch_control_option, 0, 0)
+    , m_drawn_box(instance, m_session.overlay())
+{
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(make_header(*this));
@@ -77,10 +170,15 @@ void LabelImages_Widget::construct(){
     QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
     scroll_layout->setAlignment(Qt::AlignTop);
 
-    // m_switch = new SwitchSystemWidget(*this, m_session, 0);
-    // scroll_layout->addWidget(m_switch);
-}
+    m_switch_widget = new NintendoSwitch::SwitchSystemWidget(*this, m_session, 0);
+    scroll_layout->addWidget(m_switch_widget);
+
+    QPushButton* button = new QPushButton("This is a button", scroll_inner);
+    scroll_layout->addWidget(button);
 
+    m_option_widget = instance.m_options.make_QtWidget(*scroll_inner);
+    scroll_layout->addWidget(&m_option_widget->widget());
+}