fix regression

Author: marcschefer

SEImplementation/SEImplementation/Plugin/MeasurementFrameRectangle/MeasurementFrameRectangle.h

@@ -42,11 +42,12 @@ class MeasurementFrameRectangle: public Property {
   m_min_coord{-1, -1}, m_max_coord{-1, -1}, m_min_coord_image{-1, -1},
   m_max_coord_image{-1, -1}, m_bad_projection{bad_projection} {}
 
-  MeasurementFrameRectangle(ImageCoordinate min_coord_image, ImageCoordinate max_coord_image):
+  MeasurementFrameRectangle(PixelCoordinate min_coord, PixelCoordinate max_coord,
+                            ImageCoordinate min_coord_image, ImageCoordinate max_coord_image):
+      m_min_coord(min_coord), m_max_coord(max_coord),
       m_min_coord_image(min_coord_image), m_max_coord_image(max_coord_image), m_bad_projection{false} {
+    assert(min_coord.m_x <= max_coord.m_x && min_coord.m_y <= max_coord.m_y);
     assert(min_coord_image.m_x <= max_coord_image.m_x && min_coord_image.m_y <= max_coord_image.m_y);
-    m_min_coord = PixelCoordinate(static_cast<int>(min_coord_image.m_x + 0.5), static_cast<int>(min_coord_image.m_y + 0.5));
-    m_max_coord = PixelCoordinate(static_cast<int>(max_coord_image.m_x + 0.5), static_cast<int>(max_coord_image.m_y + 0.5));
   }
 
   PixelCoordinate getTopLeft() const {

SEImplementation/src/lib/Plugin/MeasurementFrameRectangle/MeasurementFrameRectangleTask.cpp

@@ -67,20 +67,26 @@ void MeasurementFrameRectangleTask::computeProperties(SourceInterface& source) c
   auto max_x = std::max(coord1.m_x, std::max(coord2.m_x, std::max(coord3.m_x, coord4.m_x)));
   auto max_y = std::max(coord1.m_y, std::max(coord2.m_y, std::max(coord3.m_y, coord4.m_y)));
 
+  PixelCoordinate min_coord, max_coord;
+  min_coord.m_x = int(min_x);
+  min_coord.m_y = int(min_y);
+  max_coord.m_x = int(max_x) + 1;
+  max_coord.m_y = int(max_y) + 1;
+
   // The full boundaries may lie outside of the frame
-  if (bad_coordinates || max_x < 0.0 || max_y < 0.0 ||
-      min_x >= measurement_frame_info.getWidth() - 0.5 || min_y >= measurement_frame_info.getHeight() - 0.5) {
+  if (bad_coordinates || max_coord.m_x < 0 || max_coord.m_y < 0 ||
+      min_coord.m_x >= measurement_frame_info.getWidth() || min_coord.m_y >= measurement_frame_info.getHeight()) {
     source.setIndexedProperty<MeasurementFrameRectangle>(m_instance, bad_coordinates);
   }
   // Clip the coordinates to fit the available image
   else {
-    min_x = std::max(0.0, min_x);
-    min_y = std::max(0.0, min_y);
-    max_x = std::min(double(measurement_frame_info.getWidth()) - 0.5, max_x);
-    max_y = std::min(double(measurement_frame_info.getHeight()) - 0.5, max_y);
+    min_coord.m_x = std::max(0, min_coord.m_x);
+    min_coord.m_y = std::max(0, min_coord.m_y);
+    max_coord.m_x = std::min(measurement_frame_info.getWidth() - 1, max_coord.m_x);
+    max_coord.m_y = std::min(measurement_frame_info.getHeight() - 1, max_coord.m_y);
 
     source.setIndexedProperty<MeasurementFrameRectangle>(
-      m_instance, ImageCoordinate(min_x, min_y), ImageCoordinate(max_x, max_y));
+      m_instance, min_coord, max_coord, ImageCoordinate(min_x, min_y), ImageCoordinate(max_x, max_y));
   }
 }
 

SEImplementation/src/lib/Plugin/MeasurementFrameRectangle/MeasurementFrameRectangleTaskNoDetect.cpp

@@ -64,20 +64,26 @@ void MeasurementFrameRectangleTaskNoDetect::computeProperties(SourceInterface& s
   auto max_x = std::max(coord1.m_x, std::max(coord2.m_x, std::max(coord3.m_x, coord4.m_x)));
   auto max_y = std::max(coord1.m_y, std::max(coord2.m_y, std::max(coord3.m_y, coord4.m_y)));
 
+  PixelCoordinate min_coord, max_coord;
+  min_coord.m_x = int(min_x);
+  min_coord.m_y = int(min_y);
+  max_coord.m_x = int(max_x) + 1;
+  max_coord.m_y = int(max_y) + 1;
+
   // The full boundaries may lie outside of the frame
-  if (bad_coordinates || max_x < 0.0 || max_y < 0.0 ||
-      min_x >= measurement_frame_info.getWidth() - 0.5 || min_y >= measurement_frame_info.getHeight() - 0.5) {
+  if (bad_coordinates || max_coord.m_x < 0 || max_coord.m_y < 0 ||
+      min_coord.m_x >= measurement_frame_info.getWidth() || min_coord.m_y >= measurement_frame_info.getHeight()) {
     source.setIndexedProperty<MeasurementFrameRectangle>(m_instance, bad_coordinates);
   }
   // Clip the coordinates to fit the available image
   else {
-    min_x = std::max(0.0, min_x);
-    min_y = std::max(0.0, min_y);
-    max_x = std::min(double(measurement_frame_info.getWidth()) - 0.5, max_x);
-    max_y = std::min(double(measurement_frame_info.getHeight()) - 0.5, max_y);
+    min_coord.m_x = std::max(0, min_coord.m_x);
+    min_coord.m_y = std::max(0, min_coord.m_y);
+    max_coord.m_x = std::min(measurement_frame_info.getWidth() - 1, max_coord.m_x);
+    max_coord.m_y = std::min(measurement_frame_info.getHeight() - 1, max_coord.m_y);
 
     source.setIndexedProperty<MeasurementFrameRectangle>(
-      m_instance, ImageCoordinate(min_x, min_y), ImageCoordinate(max_x, max_y));
+      m_instance, min_coord, max_coord, ImageCoordinate(min_x, min_y), ImageCoordinate(max_x, max_y));
   }
 }