更新算法

CarerayImage/CarerayImage.csproj

@@ -21,7 +21,8 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Asa.CarerayImage.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,10 +35,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ConfigHelper">
-      <HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
+      <HintPath>..\dll\ConfigHelper.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
-      <HintPath>..\..\..\..\DLL\log4net.dll</HintPath>
+      <HintPath>..\dll\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

CarerayImage/eyemLib.cs

@@ -16,91 +16,48 @@ namespace Asa
     /// </summary>
     public static unsafe class eyemLib
     {
-        /// <summary>
-        /// 读取图像
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <param name="iFalgs">填 -1</param>
-        /// <param name="ucpImage"></param>
-        /// <returns></returns>
+        //读取图像
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
         public static extern int eyemImageRead(string filename, int iFalgs, out EyemImage ucpImage);
 
-        /// <summary>
-        /// 释放图像资源
-        /// </summary>
-        /// <param name="eyemImage"></param>
+        //释放图像资源
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
         public static extern void eyemImageFree(ref EyemImage eyemImage);
 
-        /// <summary>
-        /// 普通器件
-        /// </summary>
-        /// <param name="tpSrcImg"></param>
-        /// <param name="tpRoi"></param>
-        /// <param name="fileName"></param>
-        /// <param name="dOffset"></param>
-        /// <param name="iMinArea"></param>
-        /// <param name="iMaxArea"></param>
-        /// <param name="iWinSize"></param>
-        /// <param name="pNumObj"></param>
-        /// <param name="tpDstImg"></param>
-        /// <returns></returns>
-        //[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
-        //internal static extern int eyemCountObject(EyemImage tpSrcImg, string fileName, double dOffset, int iMinArea, int iMaxArea, int iWinSize, ref IntPtr pNumObj, out EyemImage tpDstImg);
 
-        /// <summary>
-        /// 异型器件
-        /// </summary>
-        /// <param name="tpSrcImg"></param>
-        /// <param name="fileName"></param>
-        /// <param name="dOffset"></param>
-        /// <param name="strType"></param>
-        /// <param name="iMaxArea"></param>
-        /// <param name="iWinSize"></param>
-        /// <param name="pNumObj"></param>
-        /// <param name="tpDstImg"></param>
-        /// <returns></returns>
-        //[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
-        //internal static extern int eyemCountObjectIrregularParts(EyemImage tpSrcImg, string fileName, double dOffset, string strType, int iMaxArea, int iWinSize, ref IntPtr pNumObj, out EyemImage tpDstImg);
-
-        /// <summary>
-        /// 普通器件
-        /// </summary>
-        /// <param name="tpSrcImg"></param>
-        /// <param name="tpRoi"></param>
-        /// <param name="fileName"></param>
-        /// <param name="dOffset"></param>
-        /// <param name="iMinArea"></param>
-        /// <param name="iMaxArea"></param>
-        /// <param name="iWinSize"></param>
-        /// <param name="pNumObj"></param>
-        /// <param name="tpDstImg"></param>
-        /// <returns></returns>
+        //普通器件(仍采用旧的算法)
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int eyemCountObject(EyemImage tpSrcImg, EyemRect tpRoi, string fileName, double dOffset, int iMinArea, int iMaxArea, int iWinSize, ref string pNumObj, out EyemImage tpDstImg);
+        public static extern int eyemCountObject(EyemImage tpImage, EyemRect tpRoi, string fileName, [MarshalAs(UnmanagedType.LPArray)] int[] ipReelNum, out EyemImage tpDstImg);
 
-        /// <summary>
-        /// 异型器件
-        /// </summary>
-        /// <param name="tpSrcImg"></param>
-        /// <param name="tpRoi"></param>
-        /// <param name="fileName"></param>
-        /// <param name="dOffset"></param>
-        /// <param name="strType"></param>
-        /// <param name="iMaxArea"></param>
-        /// <param name="iWinSize"></param>
-        /// <param name="pNumObj"></param>
-        /// <param name="tpDstImg"></param>
-        /// <returns></returns>
+        //异型器件(新版本新算法)
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int eyemCountObjectIrregularParts(EyemImage tpSrcImg, EyemRect tpRoi, string fileName, double dOffset, string strType, int iMaxArea, int iWinSize, ref string pNumObj, out EyemImage tpDstImg);
-        //普通器件(新版本)
+        public static extern int eyemCountObjectIrregularParts(EyemImage tpImage, EyemRect tpRoi, string fileName, string strType, [MarshalAs(UnmanagedType.LPArray)] int[] ipReelNum, out EyemImage tpDstImg);
+
+        //普通器件(新版本新算法)
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int eyemCountObjectE(EyemImage tpImage, EyemRect tpRoi, string fileName, ref string pNumObj, out EyemImage tpDstImg);
-        //异型器件(新版本)
+        public static extern int eyemCountObjectE(EyemImage tpImage, EyemRect tpRoi, string fileName, [MarshalAs(UnmanagedType.LPArray)] int[] ipReelNum, out EyemImage tpDstImg);
+
+        //异型器件(新版本模板匹配)
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern int eyemCountObjectIrregularPartsE(EyemImage tpImage, EyemRect tpRoi, string fileName, string ccTplName, IntPtr hModelIDs, ref string pNumObj, out EyemImage tpDstImg);
+        public static extern int eyemCountObjectIrregularPartsE(EyemImage tpImage, EyemRect tpRoi, string fileName, string ccTplName, IntPtr hModelID, [MarshalAs(UnmanagedType.LPArray)] int[] ipReelNum, out EyemImage tpDstImg);
+
+
+
+        //[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
+        //internal static extern int eyemCountObject(EyemImage tpSrcImg, EyemRect tpRoi, string fileName, double dOffset, int iMinArea, int iMaxArea, int iWinSize, ref string pNumObj, out EyemImage tpDstImg);
+
+        //[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
+        //internal static extern int eyemCountObjectIrregularParts(EyemImage tpSrcImg, EyemRect tpRoi, string fileName, double dOffset, string strType, int iMaxArea, int iWinSize, ref string pNumObj, out EyemImage tpDstImg);
+      
+        //[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
+        //internal static extern int eyemCountObjectE(EyemImage tpImage, EyemRect tpRoi, string fileName, ref string pNumObj, out EyemImage tpDstImg);
+     
+        //[DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
+        //internal static extern int eyemCountObjectIrregularPartsE(EyemImage tpImage, EyemRect tpRoi, string fileName, string ccTplName, IntPtr hModelIDs, ref string pNumObj, out EyemImage tpDstImg);
+
+
+
+
 
         //创建模板匹配模型
         [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]

dll/ConfigHelper.xml

+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>ConfigHelper</name>
+    </assembly>
+    <members>
+        <member name="M:ConfigHelper.Config.Get``1(System.Object,``0)">
+            <summary>
+            读取配置
+            </summary>
+            <typeparam name="T">返回类型</typeparam>
+            <param name="key">传入一个枚举值</param>
+            <param name="defaultvalue">失败默认值</param>
+            <returns></returns>
+        </member>
+    </members>
+</doc>