Skip to content

刘韬 / CarerayImage

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 5504ad63 由 刘韬
选项

Merge branch 'master' of http://106.15.194.121:8083/liutao/CarerayImage

2 个父辈 a8ca4df2 34134cee
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 51 行增加 和 76 行删除
CarerayImage/CarerayImage.csproj
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Asa.CarerayImage.xml</DocumentationFile> <DocumentationFile>
</DocumentationFile>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
...@@ -34,10 +35,10 @@ ...@@ -34,10 +35,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ConfigHelper"> <Reference Include="ConfigHelper">
<HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath> <HintPath>..\dll\ConfigHelper.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\..\..\..\DLL\log4net.dll</HintPath> <HintPath>..\dll\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
......
CarerayImage/eyemLib.cs
...@@ -16,91 +16,48 @@ namespace Asa ...@@ -16,91 +16,48 @@ namespace Asa
/// </summary> /// </summary>
public static unsafe class eyemLib 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)] [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
public static extern int eyemImageRead(string filename, int iFalgs, out EyemImage ucpImage); 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)] [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
public static extern void eyemImageFree(ref EyemImage eyemImage); 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)] [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)] [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)] [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)] [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)] [DllImport("eyemLib.dll", CharSet = CharSet.None, CallingConvention = CallingConvention.Cdecl)]
......
dll/ConfigHelper.dll 0 → 100644
此文件类型无法预览
dll/ConfigHelper.xml 0 → 100644
<?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>
dll/log4net.dll 0 → 100644
此文件类型无法预览
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!