diff --git a/Basler.Base/Data/Item.cs b/Basler.Base/Data/Item.cs index cdbe0bd..0e12928 100644 --- a/Basler.Base/Data/Item.cs +++ b/Basler.Base/Data/Item.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Basler.Base.Data +namespace Basler.Base.Data { public class Item { diff --git a/Basler.Base/Data/SystemData.cs b/Basler.Base/Data/SystemData.cs index da7d382..57d2bbe 100644 --- a/Basler.Base/Data/SystemData.cs +++ b/Basler.Base/Data/SystemData.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Drawing; namespace Basler.Base.Data { diff --git a/Basler.Base/Enumers.cs b/Basler.Base/Enumers.cs index 6574e42..490efa1 100644 --- a/Basler.Base/Enumers.cs +++ b/Basler.Base/Enumers.cs @@ -1,6 +1,4 @@ -using System; - -namespace Basler.Base +namespace Basler.Base { public enum PixelFormat { diff --git a/Basler.Vision/Algorithm/HSIClassImple.cs b/Basler.Vision/Algorithm/HSIClassImple.cs index dabb620..38cc9fe 100644 --- a/Basler.Vision/Algorithm/HSIClassImple.cs +++ b/Basler.Vision/Algorithm/HSIClassImple.cs @@ -3,16 +3,8 @@ using Emgu.CV; using Emgu.CV.CvEnum; using System; -using System.Collections.Generic; using System.Drawing; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using Basler.Base; -using Emgu.CV.Ocl; -using Emgu.CV.Util; namespace Basler.Vision.Algorithm { @@ -22,8 +14,8 @@ public class HSIClassImple : IHSIClass private Mat _kernel11x11; public HSIClassImple() { - _kernel5x5 = CvInvoke.GetStructuringElement(Emgu.CV.CvEnum.ElementShape.Rectangle, new Size(5, 5), new Point(2, 2)); - _kernel11x11 = CvInvoke.GetStructuringElement(Emgu.CV.CvEnum.ElementShape.Rectangle, new Size(11, 11), new Point(2, 2)); + _kernel5x5 = CvInvoke.GetStructuringElement(ElementShape.Rectangle, new Size(5, 5), new Point(2, 2)); + _kernel11x11 = CvInvoke.GetStructuringElement(ElementShape.Rectangle, new Size(11, 11), new Point(2, 2)); } public byte[] Execute((IntPtr bytes, int width, int height) image, (ResultSelection result, PixelFormat pxielFormat, Point H, Point S, Point I) p) { @@ -120,7 +112,6 @@ public byte[] Execute((IntPtr bytes, int width, int height) image, (ResultSelect i?.Dispose(); opening?.Dispose(); closing?.Dispose(); - //Marshal.FreeHGlobal(buffer); } } } diff --git a/Basler.Vision/VisionHelper.cs b/Basler.Vision/VisionHelper.cs index c6f8c1b..1235dc0 100644 --- a/Basler.Vision/VisionHelper.cs +++ b/Basler.Vision/VisionHelper.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.InteropServices; using Emgu.CV; using Emgu.CV.Structure; @@ -9,13 +8,10 @@ public class VisionHelper { public static byte[] Resize(IntPtr img, int w, int h, int sw, int sh) { - //var buffer = IntPtr.Zero; Image img1 = null; Image simg = null; try { - //buffer = Marshal.AllocHGlobal(img.Length); - //Marshal.Copy(img, 0, buffer, img.Length); img1 = new Image(w, h, w, img); simg = img1.Resize(sw, sh, Emgu.CV.CvEnum.Inter.Nearest); @@ -25,8 +21,6 @@ public static byte[] Resize(IntPtr img, int w, int h, int sw, int sh) { img1?.Dispose(); simg?.Dispose(); - //Marshal.FreeHGlobal(img); - //Marshal.FreeHGlobal(buffer); } } } diff --git a/Main/ConfigHandler.cs b/Main/ConfigHandler.cs index 5e5eda9..617f0cf 100644 --- a/Main/ConfigHandler.cs +++ b/Main/ConfigHandler.cs @@ -1,15 +1,9 @@ using Basler.Base; using Basler.Base.Data; -using Basler.Vision; using Main.Helper; -using System; -using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; using System.Xml; namespace Main @@ -17,6 +11,9 @@ namespace Main internal class ConfigHandler { private static ConfigHandler _instance; + /// + /// Save system file in executable exist path. + /// private static string SystemFile = $@"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}\System.xml"; internal static ConfigHandler Instance => _instance ?? (_instance = new ConfigHandler()); internal ConfigHandler() diff --git a/Main/Helper/XMLHelper.cs b/Main/Helper/XMLHelper.cs index 12217b4..79b7ae6 100644 --- a/Main/Helper/XMLHelper.cs +++ b/Main/Helper/XMLHelper.cs @@ -4,33 +4,12 @@ using System.Diagnostics; using System.Globalization; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Serialization; using System.Xml; namespace Main.Helper { public static class XmlHelper { - //public static bool Compare(string source, string changed) - //{ - // XmlDocument sourceDoc = new XmlDocument(); - // sourceDoc.LoadXml(source); - // XmlNode sourceNode = sourceDoc.DocumentElement; - - // XmlDocument changedDoc = new XmlDocument(); - // changedDoc.LoadXml(changed); - // XmlNode changedNode = changedDoc.DocumentElement; - - // XmlDiff xmlDiff = new XmlDiff(XmlDiffOptions.IgnoreChildOrder | XmlDiffOptions.IgnoreComments | XmlDiffOptions.IgnoreWhitespace); - - // var isDiff = xmlDiff.Compare(sourceNode, changedNode); - - // return isDiff; - //} - /// /// Convert generic type which had IFormattable to string. /// diff --git a/Main/ViewModels/MainViewModel.cs b/Main/ViewModels/MainViewModel.cs index 538e564..32ea9ce 100644 --- a/Main/ViewModels/MainViewModel.cs +++ b/Main/ViewModels/MainViewModel.cs @@ -1,12 +1,8 @@ using System; using System.Collections.ObjectModel; using System.IO; -using System.Reflection; using System.Threading.Tasks; -using System.Windows.Input; using Main.Helper; -using Main.Models; -using Basler.Text; using Basler.Base.Data; using Basler.Vision; using System.Threading; @@ -19,10 +15,6 @@ using System.Windows; using Basler.Base; using Point = System.Drawing.Point; -using System.Drawing; -using System.Drawing.Imaging; -using System.Windows.Media.Media3D; -using System.Drawing.Drawing2D; namespace Main.ViewModels { @@ -509,9 +501,9 @@ private void ShowRGB(byte[] img) Xy = ""; } } - catch + catch(Exception ex) { - + Console.WriteLine(ex); } } private byte[] CPUProcess(IntPtr img) @@ -519,20 +511,5 @@ private byte[] CPUProcess(IntPtr img) return VisionHandler.Instance.HSIClass.Execute((img, _size.Width, _size.Height), (SelectDisplayItem, SelectDebayerFormatItem, new Point(HueMin, HueMax), new Point(SaturationMin, SaturationMax), new Point(IntensityMin, IntensityMax))); } - private void AddLog(string msg) - { - this.DispatchToUi(() => - { - if (LogMessage.Count > 50) - { - LogMessage.RemoveAt(LogMessage.Count - 1); - } - if (LogMessage.Count > 0) - LogMessage.Insert(0, msg); - else - LogMessage.Add(msg); - OnPropertyChanged("LogMessage"); - }); - } } }