admin/HawkeyeVision
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.0.14

Browse Source
This commit is contained in:
EugeneTes
2026-02-17 10:11:33 +01:00
parent e133942594
commit 2bac7140a4
11 changed files with 82 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Hawkeye.VisionBuilder.UI.Sources.IDS/IDSImageSource.cs
View File

@@ -30,6 +30,7 @@ namespace Inspectron.Camera.UEye
_camera = new uEye.Camera();
cameraIdx = _settings.CameraId;
System.AppDomain.CurrentDomain.ProcessExit += AppDomain_ProcessExit;
}
private void AppDomain_ProcessExit(object sender, EventArgs e)
@@ -179,10 +180,10 @@ namespace Inspectron.Camera.UEye
throw new Exception("failed to save Parameters");
}
}
public int LastAqTime { get; private set; }
private void onFrameEvent(object sender, EventArgs e)
{
try
@@ -191,13 +192,14 @@ namespace Inspectron.Camera.UEye
int s32MemId;
int active = (int)camera.Memory.GetActive(out s32MemId);
int num1 = (int)camera.Memory.Lock(s32MemId);
var sw = System.Diagnostics.Stopwatch.StartNew();
var image = this.MemoryToImage(s32MemId);
int num2 = (int)camera.Memory.Unlock(s32MemId);
sw.Stop();
LastAqTime = (int)sw.ElapsedMilliseconds;
if (!_channel.Writer.TryWrite(image))
{
Log.Warning("Image channel is full, dropping image");
}
int num2 = (int)camera.Memory.Unlock(s32MemId);
_channel.Writer.TryWrite(image);
}
catch (TaskCanceledException ex)
{
@@ -206,9 +208,6 @@ namespace Inspectron.Camera.UEye
}
}
private Channel<Mat> _channel = Channel.CreateBounded<Mat>(new BoundedChannelOptions(1)
{

6
IDSTest/Program.cs
View File

@@ -1,6 +1,6 @@
using Inspectron.Camera.UEye;
IDSImageSource imageSource = new IDSImageSource();
IDSImageSource imageSource = new IDSImageSource(new IDSImageSourceSettings("camera"){CameraId = 1});
Console.WriteLine("Opening");
imageSource.InitializeModule();
@@ -8,6 +8,10 @@ imageSource.InitializeModule();
while (true)
{
Console.WriteLine("Getting image");
var sw = System.Diagnostics.Stopwatch.StartNew();
var image=imageSource.GetImage(CancellationToken.None).Result;
sw.Stop();
Console.WriteLine($"Got image in {sw.ElapsedMilliseconds} ms");
Console.WriteLine("Last acquisition time: " + imageSource.LastAqTime);
image.SaveImage("test.png");
}

24
Plugins/Siemens/B24SiemensPlugin/SiemensCameraModule.cs
View File

@@ -56,7 +56,31 @@ public class SiemensCameraModule: IVisionBuilderModule
}, null);
_statistics.Metadata = packet.Materialnummer.ToString();
}
Log.Information("Selected recipe {Recipe} for material number {MaterialNumber}", recipe, packet.Materialnummer);
}
//Log.Information("Lifebit: {Lifebit}, KameraStart: {KameraStart}", packet.Lifebit, packet.KameraStart);
//Log.Information("Camera running: {IsRunning}", _singleCameraVm.IsRunning);
//if (recipe != selectedRecipe?.RecipeName)
//{
// if (packet.KameraStart && !_singleCameraVm.IsRunning)
// {
// Log.Information("Starting camera based on PLC packet.");
// _singleCameraVm.SynchronizationContext!.Post((o) =>
// {
// _ = _singleCameraVm.Start();
// }, null);
// }
// if (!packet.KameraStart && _singleCameraVm.IsRunning)
// {
// Log.Information("Stopping camera based on PLC packet.");
// _singleCameraVm.SynchronizationContext!.Post((o) =>
// {
// _ = _singleCameraVm.Stop();
// }, null);
// }
//}
return packet;

5
VisionBuilder.UI.Common/Processing/BaseRecognitionControl.cs
View File

@@ -149,7 +149,8 @@ public abstract class BaseRecognitionControl: IRecognitionControl
SessionEnded = DateTime.Now
});
_loadingService.StopLoading($"Stopping {_settings.CameraName}");
IsPaused = false; // ensure paused is reset
// note: recipe can be stared paused
//IsPaused = false; // ensure paused is reset
}
}
@@ -157,6 +158,7 @@ public abstract class BaseRecognitionControl: IRecognitionControl
{
lock (_lock)
{
Log.Information("Pausing recognition");
IsPaused = true;
}
}
@@ -165,6 +167,7 @@ public abstract class BaseRecognitionControl: IRecognitionControl
{
lock (_lock)
{
Log.Information("Resuming recognition");
IsPaused = false;
}
}

4
VisionBuilder.UI.Common/ViewModel/SingleCameraVM.cs
View File

@@ -156,14 +156,14 @@ namespace VisionBuilder.UI.Common
}
[RelayCommand(CanExecute = nameof(IsResumed))]
[RelayCommand]
public void Pause()
{
_recognitionControl.Pause();
IsPaused = true;
}
[RelayCommand(CanExecute = nameof(IsPaused))]
[RelayCommand]
public void Resume()
{
_recognitionControl.Resume();

23
VisionBuilder.UI.IOCommander/Modules/IOCommanderModule.cs
View File

@@ -30,23 +30,42 @@ public class IOCommanderModule:IVisionBuilderModule
{
_ioCommander = _factory.Create();
_ioCommander.OnPinChanged += OnPinChanged;
BroadcastInitialPinStates();
}
catch (Exception e)
{
Log.Warning("IOCommander did non load: {e}",e);
_ioCommander= null;
}
if (_settings.ShowDebugView)_debugViewService.ShowDebugView();
}
private void BroadcastInitialPinStates()
{
if (_ioCommander == null) return;
Task.Run(async () =>
{
// Wait for the first poll cycle to populate PinState
for (int attempt = 0; attempt < 10 && _ioCommander?.PinState == null; attempt++)
{
await Task.Delay(200);
}
if (_ioCommander?.PinState == null) return;
for (int i = 0; i < _ioCommander.PinState.Length; i++)
{
OnPinChanged(i + 1, _ioCommander.PinState[i]);
}
});
}
ConcurrentDictionary<int, bool> _pinStates = new ConcurrentDictionary<int, bool>();
public event Action<int, bool>? OnPinChangedEvent = delegate { };
private void OnPinChanged(int arg1, bool arg2)
{
_pinStates.TryAdd(arg1, arg2);
_pinStates[arg1] = arg2;
_debugViewService.SetInputPinStatus(arg1, arg2);
OnPinChangedEvent?.Invoke(arg1, arg2);
}

6
VisionBuilder.UI.Recipes.HawkeyeRecipe/HawkeyeRecognitionControl.cs
View File

@@ -75,6 +75,7 @@ namespace VisionBuilder.UI.Recipes.HawkeyeRecipe
protected override (Mat originalImage, Mat analysisImage,TimeSpan processingTime, TimeSpan acquisitionTime, string[] errorNames)? ProcessImage(CancellationToken token)
{
var sw = Stopwatch.StartNew();
_workflow.Context.CancellationToken = token;
_workflow.ImageSource = _imageSource;
@@ -105,7 +106,10 @@ namespace VisionBuilder.UI.Recipes.HawkeyeRecipe
}
string[] errorNames = _workflow.Operations.Where(x => !x.Result).Select(x => x.Label).ToArray();
if (_recognitionConfiguration.AlwaysError)
{
errorNames = errorNames.Concat(new[] { "Forced error" }).ToArray();
}
return (originalImage, analysisImage, sw.Elapsed, cameraTime, errorNames);
}

9
VisionBuilder.UI.Recipes.HawkeyeRecipe/HawkeyeRecognitionSettings.cs
View File

@@ -6,6 +6,11 @@ namespace VisionBuilder.UI.Recipes.HawkeyeRecipe;
public class HawkeyeRecognitionSettings(string cameraName) : BaseRecognitionControlSettings(cameraName)
{
public bool AlwaysError { get; set; }
public override void RegisterSettings(InspectronSettings settings)
{
base.RegisterSettings(settings);
settings.RegisterSimple(this, () => AlwaysError, CameraName + "/" + "Recognition", nameof(AlwaysError));
}
}

2
VisionBuilder.UI.Windows.Duo/VisionBuilder.UI.Windows.Duo.csproj
View File

@@ -8,7 +8,7 @@
<Nullable>enable</Nullable>
<ApplicationIcon>Inspectron icon-512.ico</ApplicationIcon>
<Deterministic>false</Deterministic>
<Version>2.0.12</Version>
<Version>2.0.14</Version>
</PropertyGroup>
<ItemGroup>

11
VisionBuilder.UI.Windows.Test/Program.cs
View File

@@ -36,13 +36,10 @@ namespace VisionBuilder.UI.Windows.Test
//AppDomain.CurrentDomain.FirstChanceException += (sender, e) =>
//{
// if (e.Exception.Message.Contains("timed out"))
// {
// File.AppendAllText("timeout_log.txt",
// $"[{DateTime.Now:O}] {e.Exception.GetType().FullName}: {e.Exception.Message}\n" +
// $"{e.Exception.StackTrace}\n" +
// $"--- Inner: {e.Exception.InnerException}\n\n");
// }
// File.AppendAllText("timeout_log.txt",
// $"[{DateTime.Now:O}] {e.Exception.GetType().FullName}: {e.Exception.Message}\n" +
// $"{e.Exception.StackTrace}\n" +
// $"--- Inner: {e.Exception.InnerException}\n\n");
//};
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.

2
VisionBuilder.UI.Windows.Test/VisionBuilder.UI.Windows.Uno.csproj
View File

@@ -8,7 +8,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<ApplicationIcon>Inspectron icon-512.ico</ApplicationIcon>
<Deterministic>false</Deterministic>
<Version>2.0.13</Version>
<Version>2.0.14</Version>
</PropertyGroup>