path fix
This commit is contained in:
@@ -80,7 +80,7 @@ namespace Hawkeye.VisionBuilder.UI.Sources.Emulation
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
_currentFolder = imagesFolder;
|
_currentFolder = imagesFolder;
|
||||||
var path = Path.Combine(@"..\Data\Emulation", imagesFolder);
|
var path = Path.Combine("..", "Data", "Emulation", imagesFolder);
|
||||||
_selectedFiles = Directory.GetFiles(path, "*.bmp")
|
_selectedFiles = Directory.GetFiles(path, "*.bmp")
|
||||||
.Concat(Directory.GetFiles(path, "*.png"))
|
.Concat(Directory.GetFiles(path, "*.png"))
|
||||||
.Concat(Directory.GetFiles(path, "*.jpg"))
|
.Concat(Directory.GetFiles(path, "*.jpg"))
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||||
<PlatformTarget>x64</PlatformTarget>
|
|
||||||
<Configurations>Debug;Release;CPU</Configurations>
|
<Configurations>Debug;Release;CPU</Configurations>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace CandyboxPlugin.Detectors
|
|||||||
// get this dll path
|
// get this dll path
|
||||||
var path=Assembly.GetCallingAssembly().Location;
|
var path=Assembly.GetCallingAssembly().Location;
|
||||||
var dir=System.IO.Path.GetDirectoryName(path);
|
var dir=System.IO.Path.GetDirectoryName(path);
|
||||||
var modelPath = Path.Combine(dir,"models\\" + MODEL_NAME);
|
var modelPath = Path.Combine(dir,"models" , MODEL_NAME);
|
||||||
_AIsession = new InferenceSession(modelPath, opts);
|
_AIsession = new InferenceSession(modelPath, opts);
|
||||||
_inputName = _AIsession.InputMetadata.First().Key;
|
_inputName = _AIsession.InputMetadata.First().Key;
|
||||||
_dimensions = _AIsession.InputMetadata.First().Value.Dimensions;
|
_dimensions = _AIsession.InputMetadata.First().Value.Dimensions;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace CandyboxPlugin.Detectors
|
|||||||
// get this dll path
|
// get this dll path
|
||||||
var path = Assembly.GetCallingAssembly().Location;
|
var path = Assembly.GetCallingAssembly().Location;
|
||||||
var dir = System.IO.Path.GetDirectoryName(path);
|
var dir = System.IO.Path.GetDirectoryName(path);
|
||||||
var modelPath = Path.Combine(dir, "models\\" + MODEL_NAME);
|
var modelPath = Path.Combine(dir, "models" , MODEL_NAME);
|
||||||
_AIsession = new InferenceSession(modelPath, opts);
|
_AIsession = new InferenceSession(modelPath, opts);
|
||||||
_inputName = _AIsession.InputMetadata.First().Key;
|
_inputName = _AIsession.InputMetadata.First().Key;
|
||||||
_dimensions = _AIsession.InputMetadata.First().Value.Dimensions;
|
_dimensions = _AIsession.InputMetadata.First().Value.Dimensions;
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ public partial class MainLayout : IDisposable
|
|||||||
};
|
};
|
||||||
|
|
||||||
private MudTheme _currentTheme = null!;
|
private MudTheme _currentTheme = null!;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
protected override void OnInitialized()
|
protected override void OnInitialized()
|
||||||
{
|
{
|
||||||
@@ -71,6 +72,7 @@ public partial class MainLayout : IDisposable
|
|||||||
|
|
||||||
private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
|
private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (_disposed) return;
|
||||||
if (e.PropertyName == nameof(MainWindowVM.TestMode))
|
if (e.PropertyName == nameof(MainWindowVM.TestMode))
|
||||||
{
|
{
|
||||||
_testMode = MainWindowVm.TestMode;
|
_testMode = MainWindowVm.TestMode;
|
||||||
@@ -98,6 +100,7 @@ public partial class MainLayout : IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
_disposed = true;
|
||||||
MainWindowVm.PropertyChanged -= OnPropertyChanged;
|
MainWindowVm.PropertyChanged -= OnPropertyChanged;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ builder.Services.AddMudServices();
|
|||||||
CommandLineParser commandLineParser = new CommandLineParser(args);
|
CommandLineParser commandLineParser = new CommandLineParser(args);
|
||||||
|
|
||||||
// Setup settings
|
// Setup settings
|
||||||
InspectronSettings settings = new InspectronSettings("..\\Data\\Config");
|
InspectronSettings settings = new InspectronSettings(Path.Combine("..", "Data", "Config"));
|
||||||
|
|
||||||
var mainKernel = VisionBuilder.UI.Common.VisionBuilder.CreateMainKernel(settings);
|
var mainKernel = VisionBuilder.UI.Common.VisionBuilder.CreateMainKernel(settings);
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MudBlazor" Version="8.0.0" />
|
<PackageReference Include="MudBlazor" Version="8.0.0" />
|
||||||
<PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
|
<PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
|
||||||
|
<PackageReference Include="OpenCvSharp4.runtime.linux-arm" Version="4.13.0.20260318" />
|
||||||
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.6.0.20220608" />
|
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.6.0.20220608" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public partial class ErrorPreview : ComponentBase, IDisposable
|
|||||||
|
|
||||||
private List<ErrorData> _errors = new();
|
private List<ErrorData> _errors = new();
|
||||||
private ErrorsVM? _subscribedVm;
|
private ErrorsVM? _subscribedVm;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
@@ -41,6 +42,7 @@ public partial class ErrorPreview : ComponentBase, IDisposable
|
|||||||
|
|
||||||
private async void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
|
private async void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (_disposed) return;
|
||||||
if (ViewModel != null)
|
if (ViewModel != null)
|
||||||
_errors = new List<ErrorData>(ViewModel.Errors);
|
_errors = new List<ErrorData>(ViewModel.Errors);
|
||||||
await InvokeAsync(StateHasChanged);
|
await InvokeAsync(StateHasChanged);
|
||||||
@@ -54,6 +56,7 @@ public partial class ErrorPreview : ComponentBase, IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
_disposed = true;
|
||||||
Unsubscribe();
|
Unsubscribe();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ public partial class PreviewWindow : ComponentBase, IDisposable
|
|||||||
private DateTime _lastRenderTime = DateTime.MinValue;
|
private DateTime _lastRenderTime = DateTime.MinValue;
|
||||||
private Timer? _pendingTimer;
|
private Timer? _pendingTimer;
|
||||||
private PreviewVM? _subscribedVm;
|
private PreviewVM? _subscribedVm;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
@@ -69,6 +70,8 @@ public partial class PreviewWindow : ComponentBase, IDisposable
|
|||||||
|
|
||||||
private async Task RenderCurrentFrame()
|
private async Task RenderCurrentFrame()
|
||||||
{
|
{
|
||||||
|
if (_disposed) return;
|
||||||
|
|
||||||
_lastRenderTime = DateTime.UtcNow;
|
_lastRenderTime = DateTime.UtcNow;
|
||||||
|
|
||||||
var mat = ViewModel?.ImagePreview;
|
var mat = ViewModel?.ImagePreview;
|
||||||
@@ -88,6 +91,7 @@ public partial class PreviewWindow : ComponentBase, IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
_disposed = true;
|
||||||
_pendingTimer?.Dispose();
|
_pendingTimer?.Dispose();
|
||||||
Unsubscribe();
|
Unsubscribe();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ public partial class SingleCameraControl : ComponentBase, IDisposable
|
|||||||
private bool _canHotReload;
|
private bool _canHotReload;
|
||||||
private bool _showPauseButton;
|
private bool _showPauseButton;
|
||||||
private SingleCameraVM? _subscribedVm;
|
private SingleCameraVM? _subscribedVm;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
@@ -61,6 +62,7 @@ public partial class SingleCameraControl : ComponentBase, IDisposable
|
|||||||
|
|
||||||
private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
|
private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (_disposed) return;
|
||||||
UpdateState();
|
UpdateState();
|
||||||
await InvokeAsync(StateHasChanged);
|
await InvokeAsync(StateHasChanged);
|
||||||
}
|
}
|
||||||
@@ -103,6 +105,7 @@ public partial class SingleCameraControl : ComponentBase, IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
_disposed = true;
|
||||||
Unsubscribe();
|
Unsubscribe();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ public partial class Stats : ComponentBase, IDisposable
|
|||||||
private string _errorRate = "";
|
private string _errorRate = "";
|
||||||
private string _statisticsDetails = "";
|
private string _statisticsDetails = "";
|
||||||
private StatisticsVM? _subscribedVm;
|
private StatisticsVM? _subscribedVm;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
@@ -43,6 +44,8 @@ public partial class Stats : ComponentBase, IDisposable
|
|||||||
|
|
||||||
private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
|
private async void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (_disposed) return;
|
||||||
|
|
||||||
_sessionStarted = ViewModel?.SessionStarted ?? "";
|
_sessionStarted = ViewModel?.SessionStarted ?? "";
|
||||||
_recipeName = ViewModel?.RecipeName ?? "";
|
_recipeName = ViewModel?.RecipeName ?? "";
|
||||||
_processingTime = ViewModel?.ProcessingTime ?? "";
|
_processingTime = ViewModel?.ProcessingTime ?? "";
|
||||||
@@ -57,6 +60,7 @@ public partial class Stats : ComponentBase, IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
_disposed = true;
|
||||||
Unsubscribe();
|
Unsubscribe();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,14 +48,24 @@
|
|||||||
[CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = null!;
|
[CascadingParameter] private IMudDialogInstance MudDialog { get; set; } = null!;
|
||||||
[Parameter] public ErrorPreviewVM? ViewModel { get; set; }
|
[Parameter] public ErrorPreviewVM? ViewModel { get; set; }
|
||||||
|
|
||||||
|
private ErrorPreviewVM? _subscribedVm;
|
||||||
|
private bool _disposed;
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override void OnParametersSet()
|
||||||
{
|
{
|
||||||
|
if (_subscribedVm != ViewModel)
|
||||||
|
{
|
||||||
|
if (_subscribedVm != null)
|
||||||
|
_subscribedVm.PropertyChanged -= OnPropertyChanged;
|
||||||
|
_subscribedVm = ViewModel;
|
||||||
if (ViewModel != null)
|
if (ViewModel != null)
|
||||||
ViewModel.PropertyChanged += OnPropertyChanged;
|
ViewModel.PropertyChanged += OnPropertyChanged;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async void OnPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
|
private async void OnPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (_disposed) return;
|
||||||
await InvokeAsync(StateHasChanged);
|
await InvokeAsync(StateHasChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,7 +82,8 @@
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
if (ViewModel != null)
|
_disposed = true;
|
||||||
ViewModel.PropertyChanged -= OnPropertyChanged;
|
if (_subscribedVm != null)
|
||||||
|
_subscribedVm.PropertyChanged -= OnPropertyChanged;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ public static class WorkflowRecipeHelper
|
|||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
private const string RECIPES_DIR = "..\\Data\\Recipes";
|
private static string RECIPES_DIR => Path.Combine("..", "Data", "Recipes");
|
||||||
public static List<string> ListRecipeFiles(string nameFilter)
|
public static List<string> ListRecipeFiles(string nameFilter)
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(RECIPES_DIR);
|
Directory.CreateDirectory(RECIPES_DIR);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Specifies directory, in which MaxBad and MaxGood are applied.
|
|||||||
"+ PathSettingsUtils.INSTUCTIONS
|
"+ PathSettingsUtils.INSTUCTIONS
|
||||||
)]
|
)]
|
||||||
[SettingPreview(typeof(VisionBuilderRingbufferSettings), nameof(ImagesPathTemplatePreview))]
|
[SettingPreview(typeof(VisionBuilderRingbufferSettings), nameof(ImagesPathTemplatePreview))]
|
||||||
public string Root { get; set; } = @"..\Data\Ringbuffer\$SS_MONTH_NAME $SS_YEAR";
|
public string Root { get; set; } = Path.Combine("..", "Data", "Ringbuffer", "$SS_MONTH_NAME $SS_YEAR");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ Specifies directory, in which MaxBad and MaxGood are applied.
|
|||||||
"+PathSettingsUtils.INSTUCTIONS
|
"+PathSettingsUtils.INSTUCTIONS
|
||||||
)]
|
)]
|
||||||
[SettingPreview(typeof(VisionBuilderStatisticsSettings), nameof(PathTemplatePreview))]
|
[SettingPreview(typeof(VisionBuilderStatisticsSettings), nameof(PathTemplatePreview))]
|
||||||
public string PathTemplate { get; set; }= @$"..\Data\Statistics\$SS_MONTH_NUM $SS_YEAR\$RECIPE_NAME\";
|
public string PathTemplate { get; set; }= Path.Combine("..", "Data", "Statistics", "$SS_MONTH_NUM $SS_YEAR", "$RECIPE_NAME");
|
||||||
|
|
||||||
public string StartDateColumnName { get; set; } = "Start Date";
|
public string StartDateColumnName { get; set; } = "Start Date";
|
||||||
public string StartTimeColumnName { get; set; } = "Start time";
|
public string StartTimeColumnName { get; set; } = "Start time";
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ internal static class Program
|
|||||||
MaterialSkin.MaterialSkinManager.ConfigureForInspectron();
|
MaterialSkin.MaterialSkinManager.ConfigureForInspectron();
|
||||||
CommandLineParser commandLineParser = new CommandLineParser(args);
|
CommandLineParser commandLineParser = new CommandLineParser(args);
|
||||||
|
|
||||||
InspectronSettings settings = new InspectronSettings("..\\Data\\Config");
|
InspectronSettings settings = new InspectronSettings(Path.Combine("..", "Data", "Config"));
|
||||||
|
|
||||||
var mainKernel = VisionBuilder.UI.Common.VisionBuilder.CreateMainKernel(settings);
|
var mainKernel = VisionBuilder.UI.Common.VisionBuilder.CreateMainKernel(settings);
|
||||||
var profile = commandLineParser.GetStringArgument("profile", 'p');
|
var profile = commandLineParser.GetStringArgument("profile", 'p');
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ namespace Inspectron.Camera.Emulation
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
_currentFolder = imagesFolder;
|
_currentFolder = imagesFolder;
|
||||||
var path = Path.Combine(@"..\Data\Emulation", imagesFolder);
|
var path = Path.Combine("..","Data","Emulation", imagesFolder);
|
||||||
_selectedFiles = Directory.GetFiles(path, "*.bmp")
|
_selectedFiles = Directory.GetFiles(path, "*.bmp")
|
||||||
.Concat(Directory.GetFiles(path, "*.png"))
|
.Concat(Directory.GetFiles(path, "*.png"))
|
||||||
.Concat(Directory.GetFiles(path, "*.jpg"))
|
.Concat(Directory.GetFiles(path, "*.jpg"))
|
||||||
|
|||||||
Reference in New Issue
Block a user