better box selection

Author: Gin

SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp

@@ -95,6 +95,28 @@ size_t ImagePixelBox::distance_y(const ImagePixelBox& box) const{
     return 0;
 }
 
+size_t ImagePixelBox::distance_to_point_x(const size_t x) const{
+    size_t min_x = std::max(this->min_x, x);
+    size_t max_x = std::min(this->max_x, x);
+    return min_x - max_x;
+}
+//  The distance to a point on y axis. If the point is in the box, the distance is 0.
+size_t ImagePixelBox::distance_to_point_y(const size_t y) const{
+    size_t min_y = std::max(this->min_y, y);
+    size_t max_y = std::min(this->max_y, y);
+    return min_y - max_y;
+}
+//  The distance from the box center to a point on x axis
+size_t ImagePixelBox::center_distance_to_point_x(const size_t x) const{
+    size_t d = center_x() - x;
+    return d > 0 ? d : -d;
+}
+//  The distance from the box center to a point on y axis
+size_t ImagePixelBox::center_distance_to_point_y(const size_t y) const{
+    size_t d = center_y() - y;
+    return d > 0 ? d : -d;
+}
+
 
 ImageViewRGB32 extract_box_reference(const ImageViewRGB32& image, const ImagePixelBox& box){
     return image.sub_image(box.min_x, box.min_y, box.width(), box.height());

SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.h

@@ -56,6 +56,14 @@ struct ImagePixelBox : public Rectangle<size_t>{
     size_t distance_x(const ImagePixelBox& box) const;
     //  The distance to another box on y axis. If two boxes overlap, the distance is 0.
     size_t distance_y(const ImagePixelBox& box) const;
+    //  The distance to a point on x axis. If the point is in the box, the distance is 0.
+    size_t distance_to_point_x(const size_t x) const;
+    //  The distance to a point on y axis. If the point is in the box, the distance is 0.
+    size_t distance_to_point_y(const size_t y) const;
+    //  The distance from the box center to a point on x axis
+    size_t center_distance_to_point_x(const size_t x) const;
+    //  The distance from the box center to a point on y axis
+    size_t center_distance_to_point_y(const size_t y) const;
 };
 
 // An axis aligned box in the normalized image space. Used for getting a crop from an image for various

SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp

@@ -447,19 +447,39 @@ void LabelImages::change_annotation_selection_by_mouse(double x, double y){
     if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0){
         return;
     }
+
+    const size_t px = (size_t)std::max<double>(source_image_width * x + 0.5, 0);
+    const size_t py = (size_t)std::max<double>(source_image_height * y + 0.5, 0);
 
     double closest_distance = DBL_MAX;
+    std::vector<size_t> zero_distance_annotations;
     for(size_t i = 0; i < m_annotations.size(); i++){
-        ImageFloatBox float_box = pixelbox_to_floatbox(source_image_width, source_image_height, m_annotations[i].mask_box);
-        double center_x = float_box.x + float_box.width/2.0;
-        double center_y = float_box.y + float_box.height/2.0;
-        double d2 = (center_x-x)*(center_x-x) + (center_y-y)*(center_y-y);
+        const size_t dx = m_annotations[i].mask_box.distance_to_point_x(px);
+        const size_t dy = m_annotations[i].mask_box.distance_to_point_y(py);
+        const size_t d2 = dx*dx + dy*dy;
+        if (d2 == 0){
+            zero_distance_annotations.push_back(i);
+        }
         if (d2 < closest_distance){
             closest_distance = d2;
             m_selected_obj_idx = i;
         }
     }
 
+    if (zero_distance_annotations.size() > 1){
+        // this point is inside multiple boxes, we then use the closest to the box center to determine
+        closest_distance = DBL_MAX;
+        for(size_t i : zero_distance_annotations){
+            const size_t dx = m_annotations[i].mask_box.center_distance_to_point_x(px);
+            const size_t dy = m_annotations[i].mask_box.center_distance_to_point_y(py);
+            const size_t d2 = dx*dx + dy*dy;
+            if (d2 < closest_distance){
+                closest_distance = d2;
+                m_selected_obj_idx = i;
+            }
+        }
+    }
+
     auto new_label = m_annotations[m_selected_obj_idx].label;
     set_selected_label(new_label);
 }
@@ -779,17 +799,30 @@ void LabelImages_Widget::on_mouse_press(double x, double y){
     m_mouse_end.emplace();
     m_mouse_start->first = m_mouse_end->first = x;
     m_mouse_start->second = m_mouse_end->second = y;
+    m_mouse_start_time = std::chrono::high_resolution_clock::now();
 }
 
 void LabelImages_Widget::on_mouse_release(double x, double y){
-    if (m_mouse_start == m_mouse_end){
+    const std::chrono::duration<double> duration = std::chrono::high_resolution_clock::now() - m_mouse_start_time;
+    const double rel_x = std::fabs(m_mouse_start->first - m_mouse_end->first);
+    const double rel_y = std::fabs(m_mouse_start->second - m_mouse_end->second);
+
+    m_mouse_start.reset();
+    m_mouse_end.reset();
+
+    // cout << "Mouse release " << (rel_x) << " " << (rel_y) << " duration " << duration << " " <<
+    //     (duration < std::chrono::milliseconds(150)) << endl;
+
+    // user may have very small movement while doing quick clicking. To register this as a simple click, use relative
+    // screen distance threshold 0.0015 and click duration threshold 0.15 second:
+    if ((rel_x == 0 && rel_y == 0) || (rel_x < 0.0015 && rel_y < 0.0015 && duration < std::chrono::milliseconds(150))){
         // process mouse clicking
         // change currently selected annotation
         // also change the option values in the UI
         m_program.change_annotation_selection_by_mouse(x, y);
+        return;
     }
-    m_mouse_start.reset();
-    m_mouse_end.reset();
+
     m_program.compute_mask();
 }
 

SerialPrograms/Source/ML/Programs/ML_LabelImages.h

@@ -7,8 +7,9 @@
 #ifndef PokemonAutomation_ML_LabelImages_H
 #define PokemonAutomation_ML_LabelImages_H
 
-#include <QGraphicsScene>
 #include <memory>
+#include <chrono>
+#include <QGraphicsScene>
 #include "Common/Cpp/Options/BatchOption.h"
 #include "Common/Cpp/Options/FloatingPointOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
@@ -219,6 +220,7 @@ class LabelImages_Widget : public PanelWidget,
 
     std::optional<std::pair<double, double>> m_mouse_start;
     std::optional<std::pair<double, double>> m_mouse_end;
+    std::chrono::time_point<std::chrono::high_resolution_clock> m_mouse_start_time;
 };