make right annotation list more vivid

fix creation new anns bug
This commit is contained in:
Alex Bezdieniezhnykh
2024-11-06 02:06:17 +02:00
parent 36afeb7379
commit 2cf69f4e4e
9 changed files with 61 additions and 42 deletions
+7 -4
View File
@@ -4,12 +4,15 @@ using Azaion.Annotator.Extensions;
namespace Azaion.Annotator.DTO;
public class AnnotationClass(int id, string name = "")
public class AnnotationClass
{
public int Id { get; set; } = id;
public int Id { get; set; }
public string Name { get; set; } = name;
public Color Color { get; set; } = id.ToColor();
public string Name { get; set; }
public string ShortName { get; set; }
[JsonIgnore]
public Color Color => Id.ToColor();
[JsonIgnore]
public int ClassNumber => Id + 1;
+24 -17
View File
@@ -1,4 +1,5 @@
using System.Windows.Media;
using Azaion.Annotator.Extensions;
using Newtonsoft.Json;
namespace Azaion.Annotator.DTO;
@@ -23,38 +24,44 @@ public class AnnotationResult
//For XAML Form
public string TimeStr => $"{Time:h\\:mm\\:ss}";
private List<int>? _detectionClasses = null!;
//For Form
[JsonIgnore]
//For XAML Form
public string ClassName
{
get
{
if (Detections.Count == 0)
return "";
_detectionClasses ??= Detections.Select(x => x.ClassNumber).Distinct().ToList();
var groups = Detections.Select(x => x.ClassNumber).GroupBy(x => x).ToList();
return groups.Count > 1
? string.Join(",", groups.Select(x => x.Key + 1))
: _config.AnnotationClassesDict[groups.FirstOrDefault().Key].Name;
return _detectionClasses.Count > 1
? string.Join(", ", _detectionClasses.Select(x => _config.AnnotationClassesDict[x].ShortName))
: _config.AnnotationClassesDict[_detectionClasses.FirstOrDefault()].Name;
}
}
[JsonIgnore]
//For XAML Form
public Color ClassColor
public Color ClassColor1 => GetAnnotationClass(0);
[JsonIgnore]
public Color ClassColor2 => GetAnnotationClass(1);
[JsonIgnore]
public Color ClassColor3 => GetAnnotationClass(2);
[JsonIgnore]
public Color ClassColor4 => GetAnnotationClass(3);
private Color GetAnnotationClass(int colorNumber)
{
get
{
var defaultColor = (Color)ColorConverter.ConvertFromString("#404040");
if (Detections.Count == 0)
return defaultColor;
if (Detections.Count == 0)
return (-1).ToColor();
var groups = Detections.Select(x => x.ClassNumber).GroupBy(x => x).ToList();
_detectionClasses ??= Detections.Select(x => x.ClassNumber).Distinct().ToList();
return groups.Count > 1
? defaultColor
: _config.AnnotationClassesDict[groups.FirstOrDefault().Key].Color;
}
return colorNumber >= _detectionClasses.Count
? _config.AnnotationClassesDict[_detectionClasses.LastOrDefault()].Color
: _config.AnnotationClassesDict[_detectionClasses[colorNumber]].Color;
}
+2
View File
@@ -22,6 +22,8 @@ public class Config
public List<AnnotationClass> AnnotationClasses { get; set; } = [];
private Dictionary<int, AnnotationClass>? _annotationClassesDict;
[JsonIgnore]
public Dictionary<int, AnnotationClass> AnnotationClassesDict => _annotationClassesDict ??= AnnotationClasses.ToDictionary(x => x.Id);
public WindowConfig MainWindowConfig { get; set; } = null!;
+1 -1
View File
@@ -15,7 +15,7 @@ public class FormState
public Size CurrentVideoSize { get; set; }
public TimeSpan CurrentVideoLength { get; set; }
public bool BackgroundShown { get; set; }
public TimeSpan? BackgroundTime { get; set; }
public int CurrentVolume { get; set; } = 100;
public ObservableCollection<AnnotationResult> AnnotationResults { get; set; } = [];
public WindowsEnum ActiveWindow { get; set; }