Merge branch 'main' of https://github.com/PokemonAutomation/Arduino-Source

Author: Mysticial

SerialPrograms/CMakeLists.txt

@@ -871,8 +871,8 @@ file(GLOB MAIN_SOURCES
     Source/Kernels/Waterfill/Kernels_Waterfill_Session.h
     Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp
     Source/Kernels/Waterfill/Kernels_Waterfill_Types.h
-    Source/ML/DataLabeling/SegmentAnythingEmbedding.cpp
-    Source/ML/DataLabeling/SegmentAnythingEmbedding.h
+    Source/ML/DataLabeling/SegmentAnythingModel.cpp
+    Source/ML/DataLabeling/SegmentAnythingModel.h
     Source/ML/ML_Panels.cpp
     Source/ML/ML_Panels.h
     Source/ML/Programs/ML_LabelImages.cpp

SerialPrograms/Source/CommonFramework/Globals.h

@@ -57,7 +57,7 @@ const std::string& USER_FILE_PATH();
 // Resource folder path. Resources include JSON files, images, sound files and others required by
 // various automation programs.
 const std::string& RESOURCE_PATH();
-// Hold ML trainign data.
+// Hold ML training data.
 const std::string& TRAINING_PATH();
 
 

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

@@ -97,7 +97,6 @@ void VideoOverlayWidget::resizeEvent(QResizeEvent* event){}
 
 void VideoOverlayWidget::paintEvent(QPaintEvent*){
     QPainter painter(this);
-
     {
         WriteSpinLock lg(m_lock, "VideoOverlay::paintEvent()");
 

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.cpp

@@ -35,6 +35,7 @@ std::string VideoSourceDescriptor_StillImage::path() const{
 void VideoSourceDescriptor_StillImage::set_path(std::string path){
     WriteSpinLock lg(m_lock);
     m_path = std::move(path);
+    m_source_image_height = m_source_image_width = 0;
 }
 
 void VideoSourceDescriptor_StillImage::run_post_select(){
@@ -52,6 +53,7 @@ void VideoSourceDescriptor_StillImage::load_json(const JsonValue& json){
     if (name != nullptr){
         WriteSpinLock lg(m_lock);
         m_path = *name;
+        m_source_image_height = m_source_image_width = 0;
     }
 }
 JsonValue VideoSourceDescriptor_StillImage::to_json() const{
@@ -61,8 +63,12 @@ JsonValue VideoSourceDescriptor_StillImage::to_json() const{
 
 std::unique_ptr<VideoSource> VideoSourceDescriptor_StillImage::make_VideoSource(Logger& logger, Resolution resolution) const{
 //    cout << "make_VideoSource: " << m_path << endl;
-    //  Intentionally copy the path so we release the lock.
-    return std::make_unique<VideoSource_StillImage>(path(), resolution);
+    auto video_source = std::make_unique<VideoSource_StillImage>(path(), resolution);
+
+    ReadSpinLock lg(m_lock);
+    m_source_image_width = video_source->original_image().width();
+    m_source_image_height = video_source->original_image().height();
+    return video_source;
 }
 
 

SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSources/VideoSource_StillImage.h

@@ -24,10 +24,17 @@ class VideoSourceDescriptor_StillImage : public VideoSourceDescriptor{
         , m_path(std::move(path))
     {}
 
-
 public:
+    // get the image source path
     std::string path() const;
+    // set the image source path
     void set_path(std::string path);
+    // Get the source image width. Its value is only loaded after `make_VideoSource()` is called.
+    // Otherwise, return 0.
+    size_t source_image_width() const{return m_source_image_width;}
+    // Get the source image height. Its value is only loaded after `make_VideoSource()` is called.
+    // Otherwise, return 0.
+    size_t source_image_height() const{return m_source_image_height;}
 
     virtual bool operator==(const VideoSourceDescriptor& x) const override;
     virtual std::string display_name() const override{
@@ -44,6 +51,8 @@ class VideoSourceDescriptor_StillImage : public VideoSourceDescriptor{
 private:
     mutable SpinLock m_lock;
     std::string m_path;
+    mutable size_t m_source_image_width = 0;
+    mutable size_t m_source_image_height = 0;
 };
 
 
@@ -69,7 +78,7 @@ class VideoSource_StillImage : public VideoSource{
 
     virtual QWidget* make_display_QtWidget(QWidget* parent) override;
 
-
+    const QImage& original_image() const { return m_original_image;}
 private:
     friend class VideoWidget_StillImage;