Skip to content

顾剑亮 / Camera

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

1

1 个父辈 d543ae03
内嵌 并排
正在显示 74 个修改的文件 包含 163 行增加 和 99 行删除
.vs/Camera/v16/.suo
此文件类型无法预览
.vs/Camera/v17/.suo 0 → 100644
此文件类型无法预览
BarcodeIdentify/BarcodeIdentify.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.Barcode</RootNamespace> <RootNamespace>Asa.Barcode</RootNamespace>
<AssemblyName>Asa.Barcode</AssemblyName> <AssemblyName>Asa.Barcode</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
BarcodeIdentify/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
BarcodeIdentify/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
BaslerVisionCamera/BaslerVisionCamera.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.Basler</RootNamespace> <RootNamespace>Asa.Basler</RootNamespace>
<AssemblyName>Asa.Basler.VisionCamera</AssemblyName> <AssemblyName>Asa.Basler.VisionCamera</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
BaslerVisionCamera/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
BaslerVisionCamera/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
CameraFactory/CameraFactory.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.CameraFactory</RootNamespace> <RootNamespace>Asa.CameraFactory</RootNamespace>
<AssemblyName>Asa.CameraFactory</AssemblyName> <AssemblyName>Asa.CameraFactory</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
CameraFactory/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
CameraFactory/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
CameraTest/App.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup> </startup>
</configuration> </configuration>
CameraTest/CameraTest.csproj
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>Camera</RootNamespace> <RootNamespace>Camera</RootNamespace>
<AssemblyName>Camera</AssemblyName> <AssemblyName>Camera</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -71,6 +72,7 @@ ...@@ -71,6 +72,7 @@
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="log4net.config"> <None Include="log4net.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
CameraTest/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
// 运行时版本: 4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能导致不正确的行为，如果 // 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，则所做更改将丢失。 // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Camera.Properties {
using System;
namespace Camera.Properties
{
/// <summary> /// <summary>
/// 强类型资源类，用于查找本地化字符串等。 /// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources internal class Resources {
{
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() internal Resources() {
{
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。 /// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager internal static global::System.Resources.ResourceManager ResourceManager {
{ get {
get if (object.ReferenceEquals(resourceMan, null)) {
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Camera.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Camera.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
...@@ -55,14 +51,11 @@ namespace Camera.Properties ...@@ -55,14 +51,11 @@ namespace Camera.Properties
/// 使用此强类型资源类的所有资源查找执行重写。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture internal static global::System.Globalization.CultureInfo Culture {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }
......
CameraTest/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// Runtime Version:4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为，并且如果
// the code is regenerated. // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace Camera.Properties {
namespace Camera.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default public static Settings Default {
{ get {
get
{
return defaultInstance; return defaultInstance;
} }
} }
......
CameraTest/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
CameraTest/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
CameraVisionLib/Barcode.cs
...@@ -158,6 +158,7 @@ namespace Asa.Barcode ...@@ -158,6 +158,7 @@ namespace Asa.Barcode
HOperatorSet.CreateBarCodeModel(new HTuple(), new HTuple(), out HTuple hv_BarCode); //创建条码模型 HOperatorSet.CreateBarCodeModel(new HTuple(), new HTuple(), out HTuple hv_BarCode); //创建条码模型
HOperatorSet.SetBarCodeParam(hv_BarCode, "num_scanlines", 5); //扫描线的最大数量 HOperatorSet.SetBarCodeParam(hv_BarCode, "num_scanlines", 5); //扫描线的最大数量
HOperatorSet.SetBarCodeParam(hv_BarCode, "min_identical_scanlines", 3); //成功解码最少扫描线数量 HOperatorSet.SetBarCodeParam(hv_BarCode, "min_identical_scanlines", 3); //成功解码最少扫描线数量
//HOperatorSet.SetBarCodeParam(hv_BarCode, "element_size_min", 1); //成功解码最少扫描线数量
//HOperatorSet.SetBarCodeParam(hv_BarCode, "start_stop_tolerance", "high"); //扫描线的起点和终点的容许误差，high误差大，low误差小 //HOperatorSet.SetBarCodeParam(hv_BarCode, "start_stop_tolerance", "high"); //扫描线的起点和终点的容许误差，high误差大，low误差小
HOperatorSet.SetBarCodeParam(hv_BarCode, "max_diff_orient", 5); //条码相邻两条竖条边缘扭曲的最大角度容差 HOperatorSet.SetBarCodeParam(hv_BarCode, "max_diff_orient", 5); //条码相邻两条竖条边缘扭曲的最大角度容差
HOperatorSet.FindBarCode(grayImage, out HObject symbolRegions, hv_BarCode, "auto", out HTuple hv_String); //寻找条码 HOperatorSet.FindBarCode(grayImage, out HObject symbolRegions, hv_BarCode, "auto", out HTuple hv_String); //寻找条码
...@@ -181,7 +182,7 @@ namespace Asa.Barcode ...@@ -181,7 +182,7 @@ namespace Asa.Barcode
CodeType = hv_Type.SArr[i], CodeType = hv_Type.SArr[i],
Angle = Convert.ToSingle(hv_Orientation.DArr[i]), Angle = Convert.ToSingle(hv_Orientation.DArr[i]),
Center = new PointF(Convert.ToSingle(column.DArr[i] / zoom), Convert.ToSingle(row.DArr[i] / zoom)), Center = new PointF(Convert.ToSingle(column.DArr[i] / zoom), Convert.ToSingle(row.DArr[i] / zoom)),
Size = new SizeF(Convert.ToSingle(length1.DArr[i] * 2), Convert.ToSingle(length2.DArr[i] * 2)) Size = new SizeF(Convert.ToSingle(length1.DArr[i] *2/ zoom), Convert.ToSingle(length2.DArr[i] * 2 / zoom))
}; };
double tan = Math.Tan(AngleToRadian(0 - info.Angle)); double tan = Math.Tan(AngleToRadian(0 - info.Angle));
info.Distance = Convert.ToSingle(Math.Abs((tan * info.Center.X - info.Center.Y) / Math.Sqrt(tan * tan + 1))); info.Distance = Convert.ToSingle(Math.Abs((tan * info.Center.X - info.Center.Y) / Math.Sqrt(tan * tan + 1)));
......
CameraVisionLib/CameraVisionLib.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.Camera</RootNamespace> <RootNamespace>Asa.Camera</RootNamespace>
<AssemblyName>Asa.Camera.VisionLib</AssemblyName> <AssemblyName>Asa.Camera.VisionLib</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>false</Deterministic> <Deterministic>false</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
CameraVisionLib/HIK/HIK_VisionCamera.cs
...@@ -7,6 +7,7 @@ using System.Drawing.Imaging; ...@@ -7,6 +7,7 @@ using System.Drawing.Imaging;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using MvCamCtrl.NET; using MvCamCtrl.NET;
using CameraVisionLib.Model; using CameraVisionLib.Model;
using System.Runtime.ExceptionServices;
namespace Asa.HIK namespace Asa.HIK
{ {
...@@ -270,7 +271,7 @@ namespace Asa.HIK ...@@ -270,7 +271,7 @@ namespace Asa.HIK
[HandleProcessCorruptedStateExceptions]
private bool OpenDevice(int idx) private bool OpenDevice(int idx)
{ {
try try
...@@ -303,6 +304,12 @@ namespace Asa.HIK ...@@ -303,6 +304,12 @@ namespace Asa.HIK
if (nPacketSize > 0) if (nPacketSize > 0)
result = cameraCurr[idx].MV_CC_SetIntValue_NET("GevSCPSPacketSize", (uint)nPacketSize); result = cameraCurr[idx].MV_CC_SetIntValue_NET("GevSCPSPacketSize", (uint)nPacketSize);
} }
result = cameraCurr[idx].MV_CC_SetIntValue_NET("GevHeartbeatTimeout", 5000);
if (MyCamera.MV_OK != result)
{
Common.log.Info("Set GevHeartbeatTimeout failed:" + result);
}
//cameraCurr[idx].MV_CC_SetEnumValue_NET("AcquisitionMode", 2); //工作在连续模式 //cameraCurr[idx].MV_CC_SetEnumValue_NET("AcquisitionMode", 2); //工作在连续模式
cameraCurr[idx].MV_CC_SetEnumValue_NET("TriggerMode", 0); //连续模式 cameraCurr[idx].MV_CC_SetEnumValue_NET("TriggerMode", 0); //连续模式
MyCamera.MVCC_INTVALUE pstValue = new(); MyCamera.MVCC_INTVALUE pstValue = new();
...@@ -340,7 +347,7 @@ namespace Asa.HIK ...@@ -340,7 +347,7 @@ namespace Asa.HIK
cameraCurr[idx] = null; cameraCurr[idx] = null;
Common.log.Info("Close OK " + cameraName[idx]); Common.log.Info("Close OK " + cameraName[idx]);
} }
[HandleProcessCorruptedStateExceptions]
private bool GrabDevice(int idx, out Bitmap bmp) private bool GrabDevice(int idx, out Bitmap bmp)
{ {
bmp = null; bmp = null;
...@@ -358,7 +365,7 @@ namespace Asa.HIK ...@@ -358,7 +365,7 @@ namespace Asa.HIK
return false; return false;
} }
} }
[HandleProcessCorruptedStateExceptions]
private bool GrabDevice(int idx, out byte[] buff, out PixelFormat format) private bool GrabDevice(int idx, out byte[] buff, out PixelFormat format)
{ {
buff = null; buff = null;
...@@ -378,7 +385,7 @@ namespace Asa.HIK ...@@ -378,7 +385,7 @@ namespace Asa.HIK
return false; return false;
} }
} }
[HandleProcessCorruptedStateExceptions]
private bool GrabDevice(int idx, out IntPtr handle, out PixelFormat format) private bool GrabDevice(int idx, out IntPtr handle, out PixelFormat format)
{ {
handle = IntPtr.Zero; handle = IntPtr.Zero;
...@@ -398,7 +405,7 @@ namespace Asa.HIK ...@@ -398,7 +405,7 @@ namespace Asa.HIK
return false; return false;
} }
} }
[HandleProcessCorruptedStateExceptions]
private void ImageCapture(int idx) private void ImageCapture(int idx)
{ {
MyCamera.MVCC_INTVALUE stParam = new(); MyCamera.MVCC_INTVALUE stParam = new();
......
CameraVisionLib/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
CameraVisionLib/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
CameraVisionLib/obj/Debug/CameraVisionLib.csproj.CoreCompileInputs.cache
c7b4b4ed56c2cca5b29e9a91b6ab30a40a436b80 c90e0890c78022bbcbda53204bbb7db88bc8a3d9
CameraVisionLibSetting/App.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
</configuration> </configuration>
CameraVisionLibSetting/CameraVisionLibSetting.csproj
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>CameraVisionLibSetting</RootNamespace> <RootNamespace>CameraVisionLibSetting</RootNamespace>
<AssemblyName>CameraVisionLibSetting</AssemblyName> <AssemblyName>CameraVisionLibSetting</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -65,6 +66,7 @@ ...@@ -65,6 +66,7 @@
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="log4net.config"> <None Include="log4net.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
......
CameraVisionLibSetting/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
// 运行时版本: 4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// 对此文件的更改可能导致不正确的行为，如果 // 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，则所做更改将丢失。 // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace CameraVisionLibSetting.Properties {
using System;
namespace CameraVisionLibSetting.Properties
{
/// <summary> /// <summary>
/// 强类型资源类，用于查找本地化字符串等。 /// 一个强类型的资源类，用于查找本地化的字符串等。
/// </summary> /// </summary>
// 此类是由 StronglyTypedResourceBuilder // 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources internal class Resources {
{
private static global::System.Resources.ResourceManager resourceMan; private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture; private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() internal Resources() {
{
} }
/// <summary> /// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。 /// 返回此类使用的缓存的 ResourceManager 实例。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager internal static global::System.Resources.ResourceManager ResourceManager {
{ get {
get if (object.ReferenceEquals(resourceMan, null)) {
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CameraVisionLibSetting.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CameraVisionLibSetting.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
...@@ -55,14 +51,11 @@ namespace CameraVisionLibSetting.Properties ...@@ -55,14 +51,11 @@ namespace CameraVisionLibSetting.Properties
/// 使用此强类型资源类的所有资源查找执行重写。 /// 使用此强类型资源类的所有资源查找执行重写。
/// </summary> /// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture internal static global::System.Globalization.CultureInfo Culture {
{ get {
get
{
return resourceCulture; return resourceCulture;
} }
set set {
{
resourceCulture = value; resourceCulture = value;
} }
} }
......
CameraVisionLibSetting/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// Runtime Version:4.0.30319.42000 // 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为，并且如果
// the code is regenerated. // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace CameraVisionLibSetting.Properties {
namespace CameraVisionLibSetting.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default public static Settings Default {
{ get {
get
{
return defaultInstance; return defaultInstance;
} }
} }
......
CameraVisionLibSetting/bin/Debug/CameraVisionLibSetting.exe.config
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
</configuration> </configuration>
CameraVisionLibSetting/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
CameraVisionLibSetting/obj/Debug/CameraVisionLibSetting.csproj.CoreCompileInputs.cache
ce753d018d583adbb261299a7a41305a9386cf8b d30825daf9dd04cae94067639d7945e99065bfe3
CameraVisionLibSetting/obj/Debug/CameraVisionLibSetting.csproj.FileListAbsolute.txt
...@@ -37,3 +37,4 @@ D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.csproj ...@@ -37,3 +37,4 @@ D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.csproj
D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.csproj.CopyComplete D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.csproj.CopyComplete
D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.exe D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.exe
D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.pdb D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.pdb
D:\rick\vs\Camera\CameraVisionLibSetting\obj\Debug\CameraVisionLibSetting.csproj.SuggestedBindingRedirects.cache
HIKIPCamera/HIKIPCamera.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.HIK</RootNamespace> <RootNamespace>Asa.HIK</RootNamespace>
<AssemblyName>Asa.HIK.IPCamera</AssemblyName> <AssemblyName>Asa.HIK.IPCamera</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
HIKIPCamera/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
HIKIPCamera/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
HIKVisionCamera/HIKVisionCamera.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.HIK</RootNamespace> <RootNamespace>Asa.HIK</RootNamespace>
<AssemblyName>Asa.HIK.VisionCamera</AssemblyName> <AssemblyName>Asa.HIK.VisionCamera</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
HIKVisionCamera/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
HIKVisionCamera/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
RegionFeature/RegionFeature.csproj
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Asa.Region</RootNamespace> <RootNamespace>Asa.Region</RootNamespace>
<AssemblyName>Asa.Region.Feature</AssemblyName> <AssemblyName>Asa.Region.Feature</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
......
RegionFeature/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs 0 → 100644
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!