Enhance quadrilateral selection and hover handling

- Added hover interactions with `MouseEnter` and `MouseLeave` events.
- Introduced hover highlight functionality in `MainWindow`.
- Improved duplicate detection in `QuadrilateralDetector`.
- Integrated new `QuadrilateralSelector` into the UI.
- Refactored and cleaned up unused code for better maintainability.

Author: TheJoeFin

MagickCrop/Controls/QuadrilateralSelector.xaml

@@ -35,6 +35,8 @@
                             CornerRadius="4"
                             Cursor="Hand"
                             MouseDown="QuadrilateralItem_MouseDown"
+                            MouseEnter="QuadrilateralItem_MouseEnter"
+                            MouseLeave="QuadrilateralItem_MouseLeave"
                             ToolTip="Click to use this quadrilateral">
                             <Border.Style>
                                 <Style TargetType="Border">

MagickCrop/Controls/QuadrilateralSelector.xaml.cs

@@ -62,6 +62,8 @@ private static PointCollection ScalePointsForPreview(QuadrilateralDetector.Detec
     public event EventHandler<QuadrilateralDetector.DetectedQuadrilateral>? QuadrilateralSelected;
     public event EventHandler? ManualSelection;
     public event EventHandler? Cancelled;
+    public event EventHandler<QuadrilateralDetector.DetectedQuadrilateral>? QuadrilateralHoverEnter;
+    public event EventHandler? QuadrilateralHoverExit;
 
     public QuadrilateralSelector()
     {
@@ -82,6 +84,19 @@ private void QuadrilateralItem_MouseDown(object sender, MouseButtonEventArgs e)
         }
     }
 
+    private void QuadrilateralItem_MouseEnter(object sender, MouseEventArgs e)
+    {
+        if (sender is Border border && border.DataContext is QuadrilateralViewModel vm)
+        {
+            QuadrilateralHoverEnter?.Invoke(this, vm.Quadrilateral);
+        }
+    }
+
+    private void QuadrilateralItem_MouseLeave(object sender, MouseEventArgs e)
+    {
+      QuadrilateralHoverExit?.Invoke(this, EventArgs.Empty);
+    }
+
     private void ManualButton_Click(object sender, RoutedEventArgs e)
     {
         ManualSelection?.Invoke(this, EventArgs.Empty);

MagickCrop/Helpers/QuadrilateralDetector.cs

@@ -21,6 +21,9 @@ public static class QuadrilateralDetector
     private const double SizeWeight = 0.6;
     private const double RectangularityWeight = 0.4;
 
+    // Duplicate detection threshold - quadrilaterals with corners closer than this are considered duplicates
+    private const double DuplicateDistanceThreshold = 5.0; // pixels
+    
     /// <summary>
     /// Represents a detected quadrilateral with its corner points
     /// </summary>
@@ -183,6 +186,9 @@ public static DetectionResult DetectQuadrilateralsWithDimensions(string imagePat
                 }
             }
 
+            // Remove duplicates before sorting
+            result.Quadrilaterals = FilterDuplicates(result.Quadrilaterals);
+
             // Sort by confidence (highest first) and take top results
             result.Quadrilaterals = result.Quadrilaterals.OrderByDescending(q => q.Confidence).Take(maxResults).ToList();
         }
@@ -296,6 +302,61 @@ private static double CalculateAngle(System.Windows.Point p1, System.Windows.Poi
         return angleDiff;
     }
 
+    /// <summary>
+    /// Filter out duplicate quadrilaterals that have very similar corner positions
+    /// </summary>
+    private static List<DetectedQuadrilateral> FilterDuplicates(List<DetectedQuadrilateral> quadrilaterals)
+    {
+    var filtered = new List<DetectedQuadrilateral>();
+
+ foreach (var quad in quadrilaterals)
+        {
+            bool isDuplicate = false;
+  foreach (var existing in filtered)
+         {
+if (AreDuplicates(quad, existing))
+             {
+      isDuplicate = true;
+             break;
+            }
+        }
+
+        if (!isDuplicate)
+            {
+ filtered.Add(quad);
+            }
+     }
+
+ return filtered;
+    }
+
+    /// <summary>
+/// Check if two quadrilaterals are duplicates based on corner proximity
+/// </summary>
+    private static bool AreDuplicates(DetectedQuadrilateral quad1, DetectedQuadrilateral quad2)
+    {
+   // Calculate average distance between corresponding corners
+        double totalDistance =
+            Distance(quad1.TopLeft, quad2.TopLeft) +
+            Distance(quad1.TopRight, quad2.TopRight) +
+       Distance(quad1.BottomRight, quad2.BottomRight) +
+      Distance(quad1.BottomLeft, quad2.BottomLeft);
+
+        double averageDistance = totalDistance / 4.0;
+
+    return averageDistance < DuplicateDistanceThreshold;
+ }
+
+    /// <summary>
+    /// Calculate Euclidean distance between two points
+    /// </summary>
+    private static double Distance(System.Windows.Point p1, System.Windows.Point p2)
+ {
+        double dx = p1.X - p2.X;
+        double dy = p1.Y - p2.Y;
+        return Math.Sqrt(dx * dx + dy * dy);
+    }
+
     /// <summary>
     /// Scale detected quadrilateral points to fit display dimensions
     /// </summary>

MagickCrop/MainWindow.QuadrilateralHover.cs

@@ -0,0 +1,72 @@
+using MagickCrop.Helpers;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace MagickCrop;
+
+public partial class MainWindow
+{
+    private void QuadrilateralSelector_HoverEnter(object? sender, QuadrilateralDetector.DetectedQuadrilateral quad)
+    {
+        ShowHoverHighlight(quad);
+    }
+
+    private void QuadrilateralSelector_HoverExit(object? sender, EventArgs e)
+    {
+        RemoveHoverHighlight();
+    }
+
+    private void ShowHoverHighlight(QuadrilateralDetector.DetectedQuadrilateral quad)
+    {
+        // Remove existing highlight if any
+        RemoveHoverHighlight();
+
+        // Create highlight polygon
+        hoverHighlightPolygon = new Polygon
+        {
+            Stroke = new SolidColorBrush(Color.FromArgb(255, 255, 165, 0)), // Orange
+            StrokeThickness = 3,
+            Fill = new SolidColorBrush(Color.FromArgb(60, 255, 165, 0)), // Semi-transparent orange
+            IsHitTestVisible = false,
+            StrokeLineJoin = PenLineJoin.Round,
+            Points = new PointCollection
+            {
+                quad.TopLeft,
+                quad.TopRight,
+                quad.BottomRight,
+                quad.BottomLeft
+            }
+        };
+
+        // Add to canvas
+        ShapeCanvas.Children.Add(hoverHighlightPolygon);
+    }
+
+    private void RemoveHoverHighlight()
+    {
+        if (hoverHighlightPolygon != null)
+        {
+            ShapeCanvas.Children.Remove(hoverHighlightPolygon);
+            hoverHighlightPolygon = null;
+        }
+    }
+
+    private void UnwireQuadrilateralHoverEvents()
+    {
+        QuadrilateralSelectorControl.QuadrilateralHoverEnter -= QuadrilateralSelector_HoverEnter;
+        QuadrilateralSelectorControl.QuadrilateralHoverExit -= QuadrilateralSelector_HoverExit;
+        RemoveHoverHighlight();
+    }
+
+    private void HideQuadrilateralSelector()
+    {
+        QuadrilateralSelectorControl.Visibility = Visibility.Collapsed;
+        UnwireQuadrilateralHoverEvents();
+    }
+
+    private void ShowQuadrilateralSelector()
+    {
+        QuadrilateralSelectorControl.Visibility = Visibility.Visible;
+    }
+}

MagickCrop/MainWindow.xaml

@@ -840,6 +840,16 @@
                             <wpfui:SymbolIcon Symbol="ShapeIntersect24" />
                         </wpfui:Button.Icon>
                     </wpfui:Button>
+
+                    <!--  Quadrilateral Selector in Sidebar  -->
+                    <c:QuadrilateralSelector
+                        x:Name="QuadrilateralSelectorControl"
+                        Margin="0,8,0,0"
+                        Visibility="Collapsed"
+                        Cancelled="QuadrilateralSelector_Cancelled"
+                        ManualSelection="QuadrilateralSelector_ManualSelection"
+                        QuadrilateralSelected="QuadrilateralSelector_Selected" />
+
                     <wpfui:Button
                         x:Name="ApplyTransformButton"
                         Width="180"
@@ -1066,44 +1076,9 @@
             ToolTip="Processing..."
             Visibility="Collapsed" />
 
-        <!--  Quadrilateral Selector Overlay  -->
-        <Border
-            x:Name="QuadrilateralSelectorOverlay"
-            Grid.Row="1"
-            Grid.ColumnSpan="2"
-            Background="#CC000000"
-            Visibility="Collapsed">
-            <Border
-                MaxWidth="450"
-                MaxHeight="400"
-                Margin="40"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Background="{DynamicResource ApplicationBackgroundBrush}"
-                BorderBrush="{DynamicResource ControlStrongStrokeColorDefaultBrush}"
-                BorderThickness="1"
-                CornerRadius="8">
-                <c:QuadrilateralSelector
-                    x:Name="QuadrilateralSelectorControl"
-                    Cancelled="QuadrilateralSelector_Cancelled"
-                    ManualSelection="QuadrilateralSelector_ManualSelection"
-                    QuadrilateralSelected="QuadrilateralSelector_Selected" />
-            </Border>
-        </Border>
-
         <ContentPresenter
             x:Name="Presenter"
-            Grid.Row="1"
-            Grid.ColumnSpan="2" />
-
-        <Grid.ContextMenu>
-            <ContextMenu>
-                <MenuItem
-                    x:Name="ResetMenuItem"
-                    Click="ResetMenuItem_Click"
-                    Header="Reset"
-                    ToolTip="Reset the workspace" />
-            </ContextMenu>
-        </Grid.ContextMenu>
+   Grid.Row="1"
+  Grid.ColumnSpan="2" />
     </Grid>
 </wpfui:FluentWindow>

MagickCrop/MainWindow.xaml.cs

@@ -131,6 +131,9 @@ public partial class MainWindow : FluentWindow
     private AdornerLayer? rotateAdornerLayer;
     private bool isAdornerRotatingDrag = false; // true while adorner has the mouse captured
 
+    // Hover highlight polygon for quadrilateral selector
+    private Polygon? hoverHighlightPolygon;
+
     public MainWindow()
     {
         ThemeService themeService = new();
@@ -1808,6 +1811,9 @@ private void HideTransformControls()
 
         foreach (UIElement element in _polygonElements)
             element.Visibility = Visibility.Collapsed;
+
+        if (lines is not null)
+            lines.Visibility = Visibility.Collapsed;
     }
 
     private async void DetectShapeButton_Click(object sender, RoutedEventArgs e)
@@ -1848,10 +1854,12 @@ private async void DetectShapeButton_Click(object sender, RoutedEventArgs e)
 
                 // Show selector
                 QuadrilateralSelectorControl.SetQuadrilaterals(scaledQuads);
-                QuadrilateralSelectorOverlay.Visibility = Visibility.Visible;
-            }
+    QuadrilateralSelectorControl.QuadrilateralHoverEnter += QuadrilateralSelector_HoverEnter;
+                QuadrilateralSelectorControl.QuadrilateralHoverExit += QuadrilateralSelector_HoverExit;
+                ShowQuadrilateralSelector();
+ }
         }
-        catch (Exception ex)
+     catch (Exception ex)
         {
             _ = System.Windows.MessageBox.Show(
                 $"Error detecting quadrilaterals: {ex.Message}",
@@ -1868,7 +1876,7 @@ private async void DetectShapeButton_Click(object sender, RoutedEventArgs e)
     private void QuadrilateralSelector_Selected(object? sender, Helpers.QuadrilateralDetector.DetectedQuadrilateral quad)
     {
         // Hide selector overlay
-        QuadrilateralSelectorOverlay.Visibility = Visibility.Collapsed;
+        HideQuadrilateralSelector();
 
         // Position the corner markers
         PositionCornerMarkers(quad);
@@ -1877,13 +1885,13 @@ private void QuadrilateralSelector_Selected(object? sender, Helpers.Quadrilatera
     private void QuadrilateralSelector_ManualSelection(object? sender, EventArgs e)
     {
         // Hide selector overlay and let user position markers manually
-        QuadrilateralSelectorOverlay.Visibility = Visibility.Collapsed;
+        HideQuadrilateralSelector();
     }
 
     private void QuadrilateralSelector_Cancelled(object? sender, EventArgs e)
     {
         // Hide selector overlay
-        QuadrilateralSelectorOverlay.Visibility = Visibility.Collapsed;
+        HideQuadrilateralSelector();
     }
 
     private void PositionCornerMarkers(Helpers.QuadrilateralDetector.DetectedQuadrilateral quad)
@@ -2395,7 +2403,7 @@ private void MeasurementPoint_MouseDown(object sender, MouseButtonEventArgs? e)
     {
         if (isAdornerRotatingDrag)
         {
-            if (e is not null) e.Handled = true;
+            e.Handled = true;
             return;
         }
         if (sender is Ellipse senderEllipse
@@ -2614,7 +2622,6 @@ private void SaveMeasurementsPackageToFile()
         {
             package.Measurements.PolygonMeasurements.Add(control.ToDto());
         }
-        Debug.WriteLine($"Saved {polygonMeasurementTools.Count} polygon measurements");
 
         foreach (VerticalLineControl control in verticalLineControls)
             package.Measurements.VerticalLines.Add(control.ToDto());
@@ -3547,6 +3554,7 @@ private void ApplyPreviewRotation()
     {
         if (previewRotateTransform == null)
             return;
+
         previewRotateTransform.Angle = currentPreviewRotation;
     }
 
@@ -3567,6 +3575,7 @@ private void RotateAngleSlider_ValueChanged(object sender, RoutedPropertyChanged
     {
         if (suppressRotateEvents || !isRotateMode)
             return;
+
         currentPreviewRotation = e.NewValue;
         UpdateRotationUiValues(currentPreviewRotation); // keep number box in sync
         ApplyPreviewRotation();