Merge pull request #603 from jw098/boxdraw2

BoxDraw: add custom text box for ImageFloatBox coordinates.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.cpp

@@ -8,9 +8,9 @@
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "BoxDraw.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -33,11 +33,13 @@ BoxDraw::BoxDraw()
     , 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)
+    , BOX_COORDINATES(false, "ImageFloatBox coordinates", LockMode::UNLOCK_WHILE_RUNNING, "0.3, 0.3, 0.4, 0.4", "0.3, 0.3, 0.4, 0.4")
 {
     PA_ADD_OPTION(X);
     PA_ADD_OPTION(Y);
     PA_ADD_OPTION(WIDTH);
     PA_ADD_OPTION(HEIGHT);
+    PA_ADD_OPTION(BOX_COORDINATES);
 }
 
 class BoxDraw::DrawnBox : public ConfigOption::Listener, public VideoOverlay::MouseListener{
@@ -57,16 +59,28 @@ class BoxDraw::DrawnBox : public ConfigOption::Listener, public VideoOverlay::Mo
             m_parent.Y.add_listener(*this);
             m_parent.WIDTH.add_listener(*this);
             m_parent.HEIGHT.add_listener(*this);
+            m_parent.BOX_COORDINATES.add_listener(*this);
             overlay.add_listener(*this);
         }catch (...){
             detach();
             throw;
         }
     }
     virtual void on_config_value_changed(void* object) override{
-        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});
+        {
+            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});
+        }
+        
+        if (object == &m_parent.X || object == &m_parent.Y || object == &m_parent.WIDTH || object == &m_parent.HEIGHT){
+            m_parent.update_box_coordinates();
+        }
+        else if(object == &m_parent.BOX_COORDINATES){
+            m_parent.update_individual_coordinates();    
+        }
+
+        
     }
     virtual void on_mouse_press(double x, double y) override{
         // m_parent.WIDTH.set(0);
@@ -101,6 +115,7 @@ class BoxDraw::DrawnBox : public ConfigOption::Listener, public VideoOverlay::Mo
         m_parent.Y.set(yl);
         m_parent.WIDTH.set(xh - xl);
         m_parent.HEIGHT.set(yh - yl);
+        // m_parent.update_box_coordinates();
     }
 
 private:
@@ -110,6 +125,7 @@ class BoxDraw::DrawnBox : public ConfigOption::Listener, public VideoOverlay::Mo
         m_parent.Y.remove_listener(*this);
         m_parent.WIDTH.remove_listener(*this);
         m_parent.HEIGHT.remove_listener(*this);
+        m_parent.BOX_COORDINATES.remove_listener(*this);
     }
 
 private:
@@ -121,7 +137,55 @@ class BoxDraw::DrawnBox : public ConfigOption::Listener, public VideoOverlay::Mo
     std::optional<std::pair<double, double>> m_mouse_start;
 };
 
+void BoxDraw::update_box_coordinates(){
+    std::string box_coord_string = std::to_string(X) + ", " + std::to_string(Y) + ", " + std::to_string(WIDTH) + ", " + std::to_string(HEIGHT);
+    BOX_COORDINATES.set(box_coord_string);
+}
+
+std::vector<std::string> split(const std::string& str, const std::string& delimiter) {
+    std::vector<std::string> tokens;
+    size_t start = 0;
+    size_t end = str.find(delimiter);
+    
+    while (end != std::string::npos) {
+        tokens.push_back(str.substr(start, end - start));
+        start = end + delimiter.length();
+        end = str.find(delimiter, start);
+    }
+    
+    tokens.push_back(str.substr(start));
+    return tokens;
+}
+
+
+void BoxDraw::update_individual_coordinates(){
+    std::string box_coord_string = BOX_COORDINATES;
+    std::vector<std::string> all_coords = split(box_coord_string, ", ");
+
+    std::string x_string = all_coords[0];
+    std::string y_string = all_coords[1];
+    std::string width_string = all_coords[2];
+    std::string height_string = all_coords[3];
+
+    double x_coord = std::stod(x_string);
+    double y_coord = std::stod(y_string);
+    double width_coord = std::stod(width_string);
+    double height_coord = std::stod(height_string);
+
+    // cout << box_coord_string << endl;
+    // cout << std::to_string(x_coord) << endl;
+    // cout << std::to_string(y_coord) << endl;
+    // cout << std::to_string(width_coord) << endl;
+    // cout << std::to_string(height_coord) << endl;
+
+    X.set(x_coord);
+    Y.set(y_coord);
+    WIDTH.set(width_coord);
+    HEIGHT.set(height_coord);
+}
+
 void BoxDraw::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    update_individual_coordinates();
     DrawnBox drawn_box(*this, env.console.overlay());
     drawn_box.on_config_value_changed(this);
     context.wait_until_cancel();

SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.h

@@ -8,6 +8,7 @@
 #define PokemonAutomation_NintendoSwitch_BoxDraw_H
 
 #include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/StringOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -26,6 +27,9 @@ class BoxDraw : public SingleSwitchProgramInstance{
 public:
     BoxDraw();
 
+    void update_box_coordinates();
+    void update_individual_coordinates();
+
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
@@ -36,6 +40,7 @@ class BoxDraw : public SingleSwitchProgramInstance{
     FloatingPointOption Y;
     FloatingPointOption WIDTH;
     FloatingPointOption HEIGHT;
+    StringOption BOX_COORDINATES;
 };