add db WIP 2, 80%

refactor, renames

Azaion.Common/Controls/CanvasEditor.cs

@@ -24,7 +24,7 @@ public class CanvasEditor : Canvas
     private readonly TextBlock _classNameHint;
     
     private Rectangle _curRec = new();
-    private AnnotationControl _curAnn = null!;
+    private DetectionControl _curAnn = null!;
     
     private const int MIN_SIZE = 20;
     private readonly TimeSpan _viewThreshold = TimeSpan.FromMilliseconds(400);
@@ -44,8 +44,8 @@ public class CanvasEditor : Canvas
         set => SetValue(GetTimeFuncProp, value);
     }
 
-    private AnnotationClass _currentAnnClass = null!;
-    public AnnotationClass CurrentAnnClass
+    private DetectionClass _currentAnnClass = null!;
+    public DetectionClass CurrentAnnClass
     {
         get => _currentAnnClass; 
         set
@@ -62,7 +62,7 @@ public class CanvasEditor : Canvas
         }
     }
 
-    public readonly List<AnnotationControl> CurrentAnns = new();
+    public readonly List<DetectionControl> CurrentDetections = new();
     
     public CanvasEditor()
     {
@@ -173,7 +173,7 @@ public class CanvasEditor : Canvas
         SelectionState = SelectionState.AnnResizing;
         _lastPos = e.GetPosition(this);
         _curRec = (Rectangle)sender;
-        _curAnn = (AnnotationControl)((Grid)_curRec.Parent).Parent;
+        _curAnn = (DetectionControl)((Grid)_curRec.Parent).Parent;
         e.Handled = true;
     }
     
@@ -233,7 +233,7 @@ public class CanvasEditor : Canvas
     private void AnnotationPositionStart(object sender, MouseEventArgs e)
     {
         _lastPos = e.GetPosition(this);
-        _curAnn = (AnnotationControl)sender;
+        _curAnn = (DetectionControl)sender;
 
         if (!Keyboard.IsKeyDown(Key.LeftCtrl) && !Keyboard.IsKeyDown(Key.RightCtrl)) 
             ClearSelections();
@@ -310,9 +310,9 @@ public class CanvasEditor : Canvas
         });
     }
 
-    public AnnotationControl CreateAnnotation(AnnotationClass annClass, TimeSpan? time, CanvasLabel canvasLabel)
+    public DetectionControl CreateAnnotation(DetectionClass annClass, TimeSpan? time, CanvasLabel canvasLabel)
     {
-        var annotationControl = new AnnotationControl(annClass, time, AnnotationResizeStart, canvasLabel.Probability)
+        var annotationControl = new DetectionControl(annClass, time, AnnotationResizeStart, canvasLabel.Probability)
         {
             Width = canvasLabel.Width,
             Height = canvasLabel.Height
@@ -321,40 +321,40 @@ public class CanvasEditor : Canvas
         SetLeft(annotationControl, canvasLabel.X );
         SetTop(annotationControl, canvasLabel.Y);
         Children.Add(annotationControl);
-        CurrentAnns.Add(annotationControl);
+        CurrentDetections.Add(annotationControl);
         _newAnnotationRect.Fill = new SolidColorBrush(annClass.Color);
         return annotationControl;
     }
     
     #endregion
 
-    private void RemoveAnnotations(IEnumerable<AnnotationControl> listToRemove)
+    private void RemoveAnnotations(IEnumerable<DetectionControl> listToRemove)
     {
         foreach (var ann in listToRemove)
         {
             Children.Remove(ann);
-            CurrentAnns.Remove(ann);
+            CurrentDetections.Remove(ann);
         }   
     }
 
     public void RemoveAllAnns()
     {
-        foreach (var ann in CurrentAnns)
+        foreach (var ann in CurrentDetections)
             Children.Remove(ann);
-        CurrentAnns.Clear();
+        CurrentDetections.Clear();
     }
 
-    public void RemoveSelectedAnns() => RemoveAnnotations(CurrentAnns.Where(x => x.IsSelected).ToList());
+    public void RemoveSelectedAnns() => RemoveAnnotations(CurrentDetections.Where(x => x.IsSelected).ToList());
 
     private void ClearSelections()
     {
-        foreach (var ann in CurrentAnns)
+        foreach (var ann in CurrentDetections)
             ann.IsSelected = false;
     }
 
     public void ClearExpiredAnnotations(TimeSpan time)
     {
-        var expiredAnns = CurrentAnns.Where(x =>
+        var expiredAnns = CurrentDetections.Where(x =>
             x.Time.HasValue &&
             Math.Abs((time - x.Time.Value).TotalMilliseconds) > _viewThreshold.TotalMilliseconds)
             .ToList();

Azaion.Common/Controls/DetectionClasses.xaml

@@ -1,4 +1,4 @@
-<DataGrid x:Class="Azaion.Common.Controls.AnnotationClasses"
+<DataGrid x:Class="Azaion.Common.Controls.DetectionClasses"
           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

Azaion.Common/Controls/DetectionClasses.xaml.cs

@@ -1,8 +1,8 @@
 namespace Azaion.Common.Controls;
 
-public partial class AnnotationClasses
+public partial class DetectionClasses
 {
-    public AnnotationClasses()
+    public DetectionClasses()
     {
         InitializeComponent();
     }

Azaion.Common/Controls/DetectionControl.cs

@@ -8,7 +8,7 @@ using Label = System.Windows.Controls.Label;
 
 namespace Azaion.Common.Controls;
 
-public class AnnotationControl : Border
+public class DetectionControl : Border
 {
     private readonly Action<object, MouseButtonEventArgs> _resizeStart;
     private const double RESIZE_RECT_SIZE = 9;
@@ -18,16 +18,16 @@ public class AnnotationControl : Border
     private readonly Label _probabilityLabel;
     public TimeSpan? Time { get; set; }
         
-    private AnnotationClass _annotationClass = null!;
-    public AnnotationClass AnnotationClass
+    private DetectionClass _detectionClass = null!;
+    public DetectionClass DetectionClass
     {
-        get => _annotationClass;
+        get => _detectionClass;
         set
         {
             _grid.Background = value.ColorBrush;
             _probabilityLabel.Background = value.ColorBrush;
             _classNameLabel.Text = value.Name;
-            _annotationClass = value;
+            _detectionClass = value;
         }
     }
     
@@ -44,13 +44,13 @@ public class AnnotationControl : Border
         }
     }
     
-    public AnnotationControl(AnnotationClass annotationClass, TimeSpan? time, Action<object, MouseButtonEventArgs> resizeStart, double? probability = null)
+    public DetectionControl(DetectionClass detectionClass, TimeSpan? time, Action<object, MouseButtonEventArgs> resizeStart, double? probability = null)
     {
         Time = time;
         _resizeStart = resizeStart;
         _classNameLabel = new TextBlock
         {
-            Text = annotationClass.Name,
+            Text = detectionClass.Name,
             HorizontalAlignment = HorizontalAlignment.Center,
             VerticalAlignment = VerticalAlignment.Top,
             Margin = new Thickness(0, 15, 0, 0),
@@ -97,7 +97,7 @@ public class AnnotationControl : Border
             _grid.Children.Add(_probabilityLabel);
         Child = _grid;
         Cursor = Cursors.SizeAll;
-        AnnotationClass = annotationClass;
+        DetectionClass = detectionClass;
     }
     
     //small corners
@@ -118,5 +118,9 @@ public class AnnotationControl : Border
         return rect;
     }
 
-    public CanvasLabel Info => new(AnnotationClass.Id, Canvas.GetLeft(this), Canvas.GetTop(this), Width, Height);
+    public YoloLabel GetLabel(Size canvasSize, Size? videoSize = null)
+    {
+        var label = new CanvasLabel(DetectionClass.Id, Canvas.GetLeft(this), Canvas.GetTop(this), Width, Height);
+        return new YoloLabel(label, canvasSize, videoSize);
+    }
 }