mirror of
https://github.com/azaion/annotations.git
synced 2026-04-22 11:16:30 +00:00
fixed selection on editor
fixed image view and play
This commit is contained in:
@@ -304,7 +304,7 @@ public partial class Annotator
|
||||
{
|
||||
if (File.Exists(annotation.ImagePath))
|
||||
{
|
||||
Editor.SetImageSource(await annotation.ImagePath.OpenImage());
|
||||
Editor.SetBackground(await annotation.ImagePath.OpenImage());
|
||||
_formState.BackgroundTime = annotation.Time;
|
||||
videoSize = Editor.RenderSize;
|
||||
}
|
||||
@@ -534,7 +534,7 @@ public partial class Annotator
|
||||
if (LvFiles.SelectedIndex == -1)
|
||||
LvFiles.SelectedIndex = 0;
|
||||
|
||||
Dispatcher.Invoke(() => Editor.ResetBackground());
|
||||
Dispatcher.Invoke(() => Editor.SetBackground(null));
|
||||
|
||||
IsInferenceNow = true;
|
||||
AIDetectBtn.IsEnabled = false;
|
||||
|
||||
@@ -143,7 +143,7 @@ public class AnnotatorEventHandler(
|
||||
|
||||
if (formState.BackgroundTime.HasValue)
|
||||
{
|
||||
mainWindow.Editor.ResetBackground();
|
||||
mainWindow.Editor.SetBackground(null);
|
||||
formState.BackgroundTime = null;
|
||||
}
|
||||
break;
|
||||
@@ -226,7 +226,7 @@ public class AnnotatorEventHandler(
|
||||
if (mainWindow.LvFiles.SelectedItem == null)
|
||||
return;
|
||||
var mediaInfo = (MediaFileInfo)mainWindow.LvFiles.SelectedItem;
|
||||
mainWindow.Editor.ResetBackground();
|
||||
mainWindow.Editor.SetBackground(null);
|
||||
|
||||
formState.CurrentMedia = mediaInfo;
|
||||
mainWindow.Title = $"Azaion Annotator - {mediaInfo.Name}";
|
||||
@@ -262,7 +262,7 @@ public class AnnotatorEventHandler(
|
||||
if (formState.BackgroundTime.HasValue)
|
||||
{
|
||||
//no need to save image, it's already there, just remove background
|
||||
mainWindow.Editor.ResetBackground();
|
||||
mainWindow.Editor.SetBackground(null);
|
||||
formState.BackgroundTime = null;
|
||||
|
||||
//next item
|
||||
|
||||
@@ -124,7 +124,7 @@ public class CanvasEditor : Canvas
|
||||
MouseWheel += CanvasWheel;
|
||||
}
|
||||
|
||||
public void SetImageSource(ImageSource? source)
|
||||
public void SetBackground(ImageSource? source)
|
||||
{
|
||||
SetZoom();
|
||||
_backgroundImage.Source = source;
|
||||
@@ -228,20 +228,20 @@ public class CanvasEditor : Canvas
|
||||
_newAnnotationRect.Height = 0;
|
||||
var width = Math.Abs(endPos.X - _newAnnotationStartPos.X);
|
||||
var height = Math.Abs(endPos.Y - _newAnnotationStartPos.Y);
|
||||
if (width < MIN_SIZE || height < MIN_SIZE)
|
||||
return;
|
||||
|
||||
var time = GetTimeFunc();
|
||||
var control = CreateDetectionControl(CurrentAnnClass, time, new CanvasLabel
|
||||
if (width >= MIN_SIZE && height >= MIN_SIZE)
|
||||
{
|
||||
Width = width,
|
||||
Height = height,
|
||||
X = Math.Min(endPos.X, _newAnnotationStartPos.X),
|
||||
Y = Math.Min(endPos.Y, _newAnnotationStartPos.Y),
|
||||
Confidence = 1
|
||||
});
|
||||
control.UpdateLayout();
|
||||
CheckLabelBoundaries(control);
|
||||
var time = GetTimeFunc();
|
||||
var control = CreateDetectionControl(CurrentAnnClass, time, new CanvasLabel
|
||||
{
|
||||
Width = width,
|
||||
Height = height,
|
||||
X = Math.Min(endPos.X, _newAnnotationStartPos.X),
|
||||
Y = Math.Min(endPos.Y, _newAnnotationStartPos.Y),
|
||||
Confidence = 1
|
||||
});
|
||||
control.UpdateLayout();
|
||||
CheckLabelBoundaries(control);
|
||||
}
|
||||
}
|
||||
else if (SelectionState != SelectionState.PanZoomMoving)
|
||||
CheckLabelBoundaries(_curAnn);
|
||||
|
||||
Reference in New Issue
Block a user