iocommander input and virtual input
This commit is contained in:
@@ -36,11 +36,7 @@ namespace Hawkeye.VisionBuilder.UI.Sources.Emulation
|
|||||||
//clear the channel if it is full
|
//clear the channel if it is full
|
||||||
if (_channel.Reader.Count > 0)
|
if (_channel.Reader.Count > 0)
|
||||||
{
|
{
|
||||||
while (await _channel.Reader.WaitToReadAsync(token))
|
while (_channel.Reader.TryRead(out _)) { }
|
||||||
{
|
|
||||||
if (_channel.Reader.TryRead(out _)) continue;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//get the next image
|
//get the next image
|
||||||
await Task.Run(new Action(() => _ = GetImageInternal(CancellationToken.None)), token);
|
await Task.Run(new Action(() => _ = GetImageInternal(CancellationToken.None)), token);
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
<PackageReference Include="Ninject" Version="3.3.6" />
|
<PackageReference Include="Ninject" Version="3.3.6" />
|
||||||
<PackageReference Include="OpenCvSharp4" Version="4.6.0.20220608" />
|
<PackageReference Include="OpenCvSharp4" Version="4.6.0.20220608" />
|
||||||
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.6.0.20220608" />
|
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.6.0.20220608" />
|
||||||
<PackageReference Include="Serilog" Version="4.2.0" />
|
|
||||||
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public static class ModuleExtensions
|
|||||||
{
|
{
|
||||||
self.Bind<CameraSettings, ISettings>().ToConstant(new CameraSettings(cameraName));
|
self.Bind<CameraSettings, ISettings>().ToConstant(new CameraSettings(cameraName));
|
||||||
self.Bind<EmulationSettings, ISettings>().ToConstant(new EmulationSettings(cameraName));
|
self.Bind<EmulationSettings, ISettings>().ToConstant(new EmulationSettings(cameraName));
|
||||||
|
self.Bind<SingleCameraVM>().ToSelf().InSingletonScope();
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
private static void BindCameras(CameraSettings cameraSettings, IChildKernel kernel)
|
private static void BindCameras(CameraSettings cameraSettings, IChildKernel kernel)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using Inspectron.Settings;
|
using Inspectron.Settings;
|
||||||
using Ninject;
|
using Ninject;
|
||||||
using Ninject.Extensions.ChildKernel;
|
using Ninject.Extensions.ChildKernel;
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
namespace VisionBuilder.UI.Common;
|
namespace VisionBuilder.UI.Common;
|
||||||
|
|
||||||
@@ -28,10 +29,18 @@ public static class Extensions
|
|||||||
var serviceTypes = self.GetAll(typeof(IVisionBuilderModule)).Select(x => (IVisionBuilderModule)x).ToList();
|
var serviceTypes = self.GetAll(typeof(IVisionBuilderModule)).Select(x => (IVisionBuilderModule)x).ToList();
|
||||||
foreach (var service in serviceTypes)
|
foreach (var service in serviceTypes)
|
||||||
{
|
{
|
||||||
if (service != null)
|
try
|
||||||
{
|
{
|
||||||
service.InitializeModule();
|
if (service != null)
|
||||||
|
{
|
||||||
|
service.InitializeModule();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Log.Error($"Error initializing module {service.GetType().Name}: {e.Message}", e);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
<PackageReference Include="Ninject" Version="3.3.6" />
|
<PackageReference Include="Ninject" Version="3.3.6" />
|
||||||
<PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
|
<PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
|
||||||
<PackageReference Include="OpenCvSharp4" Version="4.6.0.20220608" />
|
<PackageReference Include="OpenCvSharp4" Version="4.6.0.20220608" />
|
||||||
|
<PackageReference Include="Serilog" Version="4.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
49
VisionBuilder.UI.IOCommander.Windows/IOCommanderVirtualInput.Designer.cs
generated
Normal file
49
VisionBuilder.UI.IOCommander.Windows/IOCommanderVirtualInput.Designer.cs
generated
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
namespace VisionBuilder.UI.IOCommander.Windows
|
||||||
|
{
|
||||||
|
partial class IOCommanderVirtualInput
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// IOCommanderVirtualInput
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||||
|
AutoScaleMode = AutoScaleMode.Font;
|
||||||
|
ClientSize = new Size(200, 500);
|
||||||
|
ControlBox = false;
|
||||||
|
FormBorderStyle = FormBorderStyle.FixedToolWindow;
|
||||||
|
MaximizeBox = false;
|
||||||
|
MinimizeBox = false;
|
||||||
|
Name = "IOCommanderVirtualInput";
|
||||||
|
Text = "IO Commander Virtual Input";
|
||||||
|
ResumeLayout(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using VisionBuilder.UI.Common;
|
||||||
|
using VisionBuilder.UI.IOCommander.Interfaces;
|
||||||
|
|
||||||
|
namespace VisionBuilder.UI.IOCommander.Windows
|
||||||
|
{
|
||||||
|
public partial class IOCommanderVirtualInput : Form, IIOCommander
|
||||||
|
{
|
||||||
|
private CheckBox[] _checkBoxes;
|
||||||
|
|
||||||
|
public IOCommanderVirtualInput()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
InitializeCheckboxes();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BitArray PinState { get; set; } = new BitArray(20);
|
||||||
|
public event Action<int, bool>? OnPinChanged = delegate { };
|
||||||
|
|
||||||
|
public void SetPins(int pin, bool state)
|
||||||
|
{
|
||||||
|
// This is a dummy function as per requirement
|
||||||
|
}
|
||||||
|
|
||||||
|
private void InitializeCheckboxes()
|
||||||
|
{
|
||||||
|
// Set form properties
|
||||||
|
this.Text = "IO Commander Virtual Input";
|
||||||
|
this.ClientSize = new Size(200, 500);
|
||||||
|
this.FormBorderStyle = FormBorderStyle.FixedDialog;
|
||||||
|
this.MaximizeBox = false;
|
||||||
|
this.StartPosition = FormStartPosition.Manual;
|
||||||
|
this.Location = new Point(350, 50); // Set a fixed position for the form
|
||||||
|
|
||||||
|
// Create a panel to contain checkboxes with scrolling if needed
|
||||||
|
Panel panel = new Panel
|
||||||
|
{
|
||||||
|
Dock = DockStyle.Fill,
|
||||||
|
AutoScroll = true
|
||||||
|
};
|
||||||
|
this.Controls.Add(panel);
|
||||||
|
|
||||||
|
// Initialize checkboxes
|
||||||
|
_checkBoxes = new CheckBox[20];
|
||||||
|
|
||||||
|
for (int i = 0; i < 20; i++)
|
||||||
|
{
|
||||||
|
int pinNumber = i + 1; // Pins are 1-indexed
|
||||||
|
_checkBoxes[i] = new CheckBox
|
||||||
|
{
|
||||||
|
Text = pinNumber.ToString(),
|
||||||
|
Location = new Point(20, 20 + (i * 22)),
|
||||||
|
Size = new Size(150, 20),
|
||||||
|
Tag = pinNumber, // Store the pin number in Tag for easy reference
|
||||||
|
};
|
||||||
|
|
||||||
|
// Add event handler
|
||||||
|
_checkBoxes[i].CheckedChanged += CheckBox_CheckedChanged;
|
||||||
|
|
||||||
|
panel.Controls.Add(_checkBoxes[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CheckBox_CheckedChanged(object? sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is CheckBox checkBox)
|
||||||
|
{
|
||||||
|
int pin = (int)checkBox.Tag;
|
||||||
|
bool state = checkBox.Checked;
|
||||||
|
|
||||||
|
// Update the BitArray
|
||||||
|
PinState.Set(pin - 1, state); // Adjust for 0-based indexing in BitArray
|
||||||
|
|
||||||
|
// Trigger the event
|
||||||
|
OnPinChanged?.Invoke(pin, state);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected override void OnShown(EventArgs e)
|
||||||
|
{
|
||||||
|
TopMost= true;
|
||||||
|
Focus();
|
||||||
|
TopMost = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
using VisionBuilder.UI.IOCommander.Interfaces;
|
||||||
|
using VisionBuilder.UI.IOCommander.Settings;
|
||||||
|
|
||||||
|
namespace VisionBuilder.UI.IOCommander.Windows;
|
||||||
|
|
||||||
|
public class IOCommanderVirtualInputFactory: IIOCommanderFactory
|
||||||
|
{
|
||||||
|
private readonly VirtualInputSettings _settings;
|
||||||
|
private readonly DefaultIOCommanderFactory _defaultFactory;
|
||||||
|
|
||||||
|
public IOCommanderVirtualInputFactory(VirtualInputSettings settings, IOCommanderSettings ioCommanderSettings)
|
||||||
|
{
|
||||||
|
_settings = settings;
|
||||||
|
_defaultFactory = new DefaultIOCommanderFactory(ioCommanderSettings);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IIOCommander Create()
|
||||||
|
{
|
||||||
|
if (_settings.Enabled)
|
||||||
|
{
|
||||||
|
var res = new IOCommanderVirtualInput();
|
||||||
|
res.Show();
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
return _defaultFactory.Create();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,4 +18,11 @@ public static class ModuleExtensions
|
|||||||
self.Bind<WindowsIOCommanderDebugViewSettings,ISettings>().ToConstant(new WindowsIOCommanderDebugViewSettings());
|
self.Bind<WindowsIOCommanderDebugViewSettings,ISettings>().ToConstant(new WindowsIOCommanderDebugViewSettings());
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static IKernel UseIOCommanderVirtualInput(this IKernel self)
|
||||||
|
{
|
||||||
|
self.Bind<VirtualInputSettings, ISettings>().To<VirtualInputSettings>().InSingletonScope();
|
||||||
|
self.Rebind<IIOCommanderFactory>().To<IOCommanderVirtualInputFactory>().InSingletonScope();
|
||||||
|
return self;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
13
VisionBuilder.UI.IOCommander.Windows/VirtualInputSettings.cs
Normal file
13
VisionBuilder.UI.IOCommander.Windows/VirtualInputSettings.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using Inspectron.Settings;
|
||||||
|
using VisionBuilder.UI.Common;
|
||||||
|
|
||||||
|
namespace VisionBuilder.UI.IOCommander.Windows;
|
||||||
|
|
||||||
|
public class VirtualInputSettings: ISettings
|
||||||
|
{
|
||||||
|
public bool Enabled { get; set; }
|
||||||
|
public void RegisterSettings(InspectronSettings settings)
|
||||||
|
{
|
||||||
|
settings.RegisterSimple(this,()=>this.Enabled,"IOCommander/Virtual input",nameof(Enabled));
|
||||||
|
}
|
||||||
|
}
|
||||||
19
VisionBuilder.UI.IOCommander/DefaultIOCommanderFactory.cs
Normal file
19
VisionBuilder.UI.IOCommander/DefaultIOCommanderFactory.cs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
using VisionBuilder.UI.IOCommander.Interfaces;
|
||||||
|
using VisionBuilder.UI.IOCommander.Settings;
|
||||||
|
|
||||||
|
namespace VisionBuilder.UI.IOCommander;
|
||||||
|
|
||||||
|
public class DefaultIOCommanderFactory: IIOCommanderFactory
|
||||||
|
{
|
||||||
|
private readonly IOCommanderSettings _settings;
|
||||||
|
|
||||||
|
public DefaultIOCommanderFactory(IOCommanderSettings settings)
|
||||||
|
{
|
||||||
|
_settings = settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IIOCommander Create()
|
||||||
|
{
|
||||||
|
return new IOCommander(_settings.Port);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.IO.Ports;
|
using System.IO.Ports;
|
||||||
|
using VisionBuilder.UI.IOCommander.Interfaces;
|
||||||
|
|
||||||
namespace VisionBuilder.UI.IOCommander;
|
namespace VisionBuilder.UI.IOCommander;
|
||||||
|
|
||||||
public class IOCommander
|
public class IOCommander : IIOCommander
|
||||||
{
|
{
|
||||||
|
|
||||||
SerialPort _port;
|
SerialPort _port;
|
||||||
|
|||||||
10
VisionBuilder.UI.IOCommander/Interfaces/IIOCommander.cs
Normal file
10
VisionBuilder.UI.IOCommander/Interfaces/IIOCommander.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
using System.Collections;
|
||||||
|
|
||||||
|
namespace VisionBuilder.UI.IOCommander.Interfaces;
|
||||||
|
|
||||||
|
public interface IIOCommander
|
||||||
|
{
|
||||||
|
BitArray PinState { get; }
|
||||||
|
event Action<int, bool> OnPinChanged;
|
||||||
|
void SetPins(int pin, bool state);
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace VisionBuilder.UI.IOCommander.Interfaces;
|
||||||
|
|
||||||
|
public interface IIOCommanderFactory
|
||||||
|
{
|
||||||
|
public IIOCommander Create();
|
||||||
|
}
|
||||||
@@ -22,6 +22,7 @@ public static class ModuleExtensions
|
|||||||
self.Bind<IOCommanderModule,IVisionBuilderModule>().To<IOCommanderModule>().InSingletonScope();
|
self.Bind<IOCommanderModule,IVisionBuilderModule>().To<IOCommanderModule>().InSingletonScope();
|
||||||
self.Bind<IOCommanderProgramModule, IVisionBuilderModule>().To<IOCommanderProgramModule>().InSingletonScope();
|
self.Bind<IOCommanderProgramModule, IVisionBuilderModule>().To<IOCommanderProgramModule>().InSingletonScope();
|
||||||
self.Bind<IIOCommanderDebugViewService>().To<NoDebugView>().InSingletonScope();
|
self.Bind<IIOCommanderDebugViewService>().To<NoDebugView>().InSingletonScope();
|
||||||
|
self.Bind<IIOCommanderFactory>().To<DefaultIOCommanderFactory>().InSingletonScope();
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,22 +14,54 @@ public class IOCommanderCameraModule: IVisionBuilderModule
|
|||||||
private readonly IOCommanderCameraSettings _cameraSettings;
|
private readonly IOCommanderCameraSettings _cameraSettings;
|
||||||
private readonly IRecognitionControl _recognitionControl;
|
private readonly IRecognitionControl _recognitionControl;
|
||||||
private readonly MainWindowVM _mainWindowVm;
|
private readonly MainWindowVM _mainWindowVm;
|
||||||
|
private readonly SingleCameraVM _cameraVm;
|
||||||
|
|
||||||
public IOCommanderCameraModule(IOCommanderModule mainModule, IOCommanderSettings settings, IOCommanderCameraSettings cameraSettings, IRecognitionControl recognitionControl, MainWindowVM mainWindowVm)
|
public IOCommanderCameraModule(IOCommanderModule mainModule, IOCommanderSettings settings, IOCommanderCameraSettings cameraSettings, IRecognitionControl recognitionControl, MainWindowVM mainWindowVm, SingleCameraVM cameraVm)
|
||||||
{
|
{
|
||||||
_mainModule = mainModule;
|
_mainModule = mainModule;
|
||||||
_settings = settings;
|
_settings = settings;
|
||||||
_cameraSettings = cameraSettings;
|
_cameraSettings = cameraSettings;
|
||||||
_recognitionControl = recognitionControl;
|
_recognitionControl = recognitionControl;
|
||||||
_mainWindowVm = mainWindowVm;
|
_mainWindowVm = mainWindowVm;
|
||||||
|
_cameraVm = cameraVm;
|
||||||
|
|
||||||
_recognitionControl.ImageProcessed += _recognitionControl_ImageProcessed;
|
_recognitionControl.ImageProcessed += _recognitionControl_ImageProcessed;
|
||||||
_recognitionControl.SessionStarted += _recognitionControl_SessionStarted;
|
_recognitionControl.SessionStarted += _recognitionControl_SessionStarted;
|
||||||
_recognitionControl.SessionEnded += _recognitionControl_SessionEnded;
|
_recognitionControl.SessionEnded += _recognitionControl_SessionEnded;
|
||||||
|
mainModule.OnPinChangedEvent += MainModule_OnPinChangedEvent;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void ProcessCommand(EGPIOCommand command)
|
||||||
|
{
|
||||||
|
switch (command)
|
||||||
|
{
|
||||||
|
case EGPIOCommand.Start:
|
||||||
|
if(_cameraVm.StartCommand.CanExecute(null))
|
||||||
|
{
|
||||||
|
_cameraVm.StartCommand.Execute(null);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case EGPIOCommand.Stop:
|
||||||
|
if(_cameraVm.StopCommand.CanExecute(null))
|
||||||
|
{
|
||||||
|
_cameraVm.StopCommand.Execute(null);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(command), command, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void MainModule_OnPinChangedEvent(int arg1, bool arg2)
|
||||||
|
{
|
||||||
|
var @event = _cameraSettings.GPIOCommands.FirstOrDefault(x => x.Pin == arg1 && x.OnHigh == arg2);
|
||||||
|
if (@event != null)
|
||||||
|
{
|
||||||
|
ProcessCommand(@event.Command);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void EmitEvent(EProcessingEvent @event)
|
private void EmitEvent(EProcessingEvent @event)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,28 +12,32 @@ namespace VisionBuilder.UI.IOCommander.Modules;
|
|||||||
public class IOCommanderModule:IVisionBuilderModule
|
public class IOCommanderModule:IVisionBuilderModule
|
||||||
{
|
{
|
||||||
private readonly IOCommanderSettings _settings;
|
private readonly IOCommanderSettings _settings;
|
||||||
|
private readonly IIOCommanderFactory _factory;
|
||||||
private readonly IIOCommanderDebugViewService _debugViewService;
|
private readonly IIOCommanderDebugViewService _debugViewService;
|
||||||
|
|
||||||
private IOCommander? _ioCommander;
|
private IIOCommander? _ioCommander;
|
||||||
public IOCommanderModule(IOCommanderSettings settings, IIOCommanderDebugViewService debugViewService)
|
public IOCommanderModule(IOCommanderSettings settings, IIOCommanderFactory factory, IIOCommanderDebugViewService debugViewService)
|
||||||
{
|
{
|
||||||
_settings = settings;
|
_settings = settings;
|
||||||
|
_factory = factory;
|
||||||
_debugViewService = debugViewService;
|
_debugViewService = debugViewService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void InitializeModule()
|
public void InitializeModule()
|
||||||
{
|
{
|
||||||
if (!_settings.EmulationMode)
|
_ioCommander = _factory.Create();
|
||||||
{
|
_ioCommander.OnPinChanged += OnPinChanged;
|
||||||
_ioCommander = new IOCommander(_settings.Port);
|
|
||||||
_ioCommander.OnPinChanged += OnPinChanged;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(_settings.ShowDebugView)_debugViewService.ShowDebugView();
|
if (_settings.ShowDebugView)_debugViewService.ShowDebugView();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
ConcurrentDictionary<int, bool> _pinStates = new ConcurrentDictionary<int, bool>();
|
ConcurrentDictionary<int, bool> _pinStates = new ConcurrentDictionary<int, bool>();
|
||||||
|
public event Action<int, bool>? OnPinChangedEvent
|
||||||
|
{
|
||||||
|
add => _ioCommander!.OnPinChanged += value;
|
||||||
|
remove => _ioCommander!.OnPinChanged -= value;
|
||||||
|
}
|
||||||
private void OnPinChanged(int arg1, bool arg2)
|
private void OnPinChanged(int arg1, bool arg2)
|
||||||
{
|
{
|
||||||
_pinStates.TryAdd(arg1, arg2);
|
_pinStates.TryAdd(arg1, arg2);
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ public class IOCommanderSettings: ISettings
|
|||||||
{
|
{
|
||||||
public IOCommanderCameraSettings[] Cameras { get; }
|
public IOCommanderCameraSettings[] Cameras { get; }
|
||||||
public int PulseLength { get; set; } = 100;
|
public int PulseLength { get; set; } = 100;
|
||||||
public bool EmulationMode { get; set; } = true;
|
|
||||||
public bool ShowDebugView { get; set; } = false;
|
public bool ShowDebugView { get; set; } = false;
|
||||||
public string Port { get; set; }="COM3";
|
public string Port { get; set; }="COM3";
|
||||||
|
|
||||||
@@ -27,7 +26,6 @@ public class IOCommanderSettings: ISettings
|
|||||||
{
|
{
|
||||||
settings.RegisterSimple(this, () => Port, "IOCommander", nameof(Port));
|
settings.RegisterSimple(this, () => Port, "IOCommander", nameof(Port));
|
||||||
settings.RegisterSimple(this, () => PulseLength, "IOCommander", nameof(PulseLength));
|
settings.RegisterSimple(this, () => PulseLength, "IOCommander", nameof(PulseLength));
|
||||||
settings.RegisterSimple(this, () => EmulationMode, "IOCommander", nameof(EmulationMode));
|
|
||||||
settings.RegisterSimple(this, () => ShowDebugView, "IOCommander", nameof(ShowDebugView));
|
settings.RegisterSimple(this, () => ShowDebugView, "IOCommander", nameof(ShowDebugView));
|
||||||
|
|
||||||
foreach (IOCommanderProcessingEvent @event in GlobalEvents)
|
foreach (IOCommanderProcessingEvent @event in GlobalEvents)
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ namespace VisionBuilder.UI.Windows.Test
|
|||||||
mainKernel
|
mainKernel
|
||||||
.UseIOCommander([CAMERA1])
|
.UseIOCommander([CAMERA1])
|
||||||
.UseIOCommanderWindowsDebug()
|
.UseIOCommanderWindowsDebug()
|
||||||
|
.UseIOCommanderVirtualInput()
|
||||||
.UseConsole()
|
.UseConsole()
|
||||||
.UseWindowsServices();
|
.UseWindowsServices();
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,12 @@ namespace VisionBuilder.UI.Windows.Components
|
|||||||
this.stats1.SetViewModel(singleCameraVm.StatisticsVm);
|
this.stats1.SetViewModel(singleCameraVm.StatisticsVm);
|
||||||
|
|
||||||
SetBindings();
|
SetBindings();
|
||||||
|
_singleCameraVm.PropertyChanged += SingleCameraVm_PropertyChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SingleCameraVm_PropertyChanged(object? sender, PropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetBindings()
|
private void SetBindings()
|
||||||
|
|||||||
Reference in New Issue
Block a user