1、修复因加入输入位姿引发的BUG

2、PMA工具完善
3、其他BUG修复

CaliperTool/Caliper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using CommonMethods;
 using HalconDotNet;
 using ToolBase;

CaliperTool/CaliperTool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

CaliperTool/CaliperToolRun.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: CaliperToolRun

CaliperTool/FormCaliper.Designer.cs

@@ -1,4 +1,4 @@
-namespace CaliperTool
+namespace CaliperTool
 {
     partial class FormCaliper
     {

CaliperTool/FormCaliper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;

CaliperTool/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt

@@ -62,33 +62,33 @@ F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.FormCal
 F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache
 F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.dll
 F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\log4net.config
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\CaliperTool.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\CaliperTool.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\DataStruct.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\FormLib.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\HWindow_Tool.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\Logger.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\ToolBase.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\ToolLib.VisionJob.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\Newtonsoft.Json.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\log4net.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\DevComponents.DotNetBar2.dll
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\DataStruct.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\FormLib.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\ToolBase.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\Logger.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\ToolLib.VisionJob.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\HWindow_Tool.pdb
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\Newtonsoft.Json.xml
-F:\GitHubClone\VisionEdit\CaliperTool\bin\Debug\DevComponents.DotNetBar2.xml
-F:\GitHubClone\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\CaliperTool\obj\Debug\CaliperTool.FormCaliper.resources
-F:\GitHubClone\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache
-F:\GitHubClone\VisionEdit\CaliperTool\obj\Debug\CaliperTool.dll
-F:\GitHubClone\VisionEdit\CaliperTool\obj\Debug\CaliperTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\log4net.config
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\CaliperTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\CaliperTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\DataStruct.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\FormLib.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\HWindow_Tool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\Logger.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\ToolBase.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\ToolLib.VisionJob.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\Newtonsoft.Json.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\log4net.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\DevComponents.DotNetBar2.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\DataStruct.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\FormLib.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\ToolBase.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\Logger.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\ToolLib.VisionJob.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\HWindow_Tool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\Newtonsoft.Json.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\bin\Debug\DevComponents.DotNetBar2.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\obj\Debug\CaliperTool.FormCaliper.resources
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\obj\Debug\CaliperTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CaliperTool\obj\Debug\CaliperTool.pdb

CommonMethods/ComGlobalParams.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

CommonMethods/CommonHelper.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

CommonMethods/CommonMethods.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

CommonMethods/FileOperate.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: FileOperate

CommonMethods/Interface/CommonStruct.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

CommonMethods/Interface/IToolInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

CommonMethods/Interface/IToolRun.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: IToolRun

CommonMethods/Interface/IVisionJobInterface.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;

CommonMethods/Interface/ToolRun.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: ToolRun

CommonMethods/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

CommonMethods/Serialize.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: Serial

CommonMethods/VisionToolAttribute.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: VisionToolAttribute

CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt

@@ -12,12 +12,12 @@ F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\halcondotnet.xml
 F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\Newtonsoft.Json.xml
 F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\obj\Debug\CommonMethods.dll
 F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\obj\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\CommonMethods\bin\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\CommonMethods\bin\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\CommonMethods\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\CommonMethods\bin\Debug\Newtonsoft.Json.dll
-F:\GitHubClone\VisionEdit\CommonMethods\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\CommonMethods\bin\Debug\Newtonsoft.Json.xml
-F:\GitHubClone\VisionEdit\CommonMethods\obj\Debug\CommonHelper.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\CommonMethods\obj\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\CommonMethods\obj\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\bin\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\bin\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\bin\Debug\Newtonsoft.Json.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\bin\Debug\Newtonsoft.Json.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\obj\Debug\CommonHelper.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\obj\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\CommonMethods\obj\Debug\CommonMethods.pdb

CreateTool/CreateTool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

CreateTool/FormToolBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace CreateTool
+namespace CreateTool
 {
     partial class FormToolBox
     {

CreateTool/FormToolBox.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;

CreateTool/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

DataStruct/DataStruct.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

DataStruct/DataStruct.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

DataStruct/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt

@@ -10,10 +10,10 @@ F:\GitHubClone\最新克隆\VisionEdit\DataStruct\bin\Debug\halcondotnet.dll
 F:\GitHubClone\最新克隆\VisionEdit\DataStruct\bin\Debug\halcondotnet.xml
 F:\GitHubClone\最新克隆\VisionEdit\DataStruct\obj\Debug\DataStruct.dll
 F:\GitHubClone\最新克隆\VisionEdit\DataStruct\obj\Debug\DataStruct.pdb
-F:\GitHubClone\VisionEdit\DataStruct\bin\Debug\DataStruct.dll
-F:\GitHubClone\VisionEdit\DataStruct\bin\Debug\DataStruct.pdb
-F:\GitHubClone\VisionEdit\DataStruct\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\DataStruct\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\DataStruct\obj\Debug\DataStruct.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\DataStruct\obj\Debug\DataStruct.dll
-F:\GitHubClone\VisionEdit\DataStruct\obj\Debug\DataStruct.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\bin\Debug\DataStruct.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\bin\Debug\DataStruct.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\obj\Debug\DataStruct.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\obj\Debug\DataStruct.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\DataStruct\obj\Debug\DataStruct.pdb

FindCircle/FindCircle.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using HalconDotNet;
 using static DataStruct.DataStruct;
 using ToolBase;

FindCircle/FindCircleTool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

FindCircle/FormFindCircle.Designer.cs

@@ -1,4 +1,4 @@
-namespace FindCircle
+namespace FindCircle
 {
     partial class FormFindCircle
     {

FindCircle/FormFindCircle.cs

@@ -1,4 +1,4 @@
-using ChoiceTech.Halcon.Control;
+using ChoiceTech.Halcon.Control;
 using System;
 using System.Windows.Forms;
 

FindCircle/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

FindCircle/obj/Debug/FindCircleTool.csproj.FileListAbsolute.txt

@@ -43,22 +43,22 @@ F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircle.FormFindC
 F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csproj.GenerateResource.Cache
 F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.dll
 F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.pdb
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\FindCircleTool.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\FindCircleTool.pdb
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\DataStruct.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\HWindow_Tool.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\ToolBase.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\Newtonsoft.Json.dll
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\DataStruct.pdb
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\ToolBase.pdb
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\HWindow_Tool.pdb
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\FindCircle\bin\Debug\Newtonsoft.Json.xml
-F:\GitHubClone\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\FindCircle\obj\Debug\FindCircle.FormFindCircle.resources
-F:\GitHubClone\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csproj.GenerateResource.Cache
-F:\GitHubClone\VisionEdit\FindCircle\obj\Debug\FindCircleTool.dll
-F:\GitHubClone\VisionEdit\FindCircle\obj\Debug\FindCircleTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\FindCircleTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\FindCircleTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\DataStruct.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\HWindow_Tool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\ToolBase.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\Newtonsoft.Json.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\DataStruct.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\ToolBase.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\HWindow_Tool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\bin\Debug\Newtonsoft.Json.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\obj\Debug\FindCircle.FormFindCircle.resources
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csproj.GenerateResource.Cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\obj\Debug\FindCircleTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindCircle\obj\Debug\FindCircleTool.pdb

FindLine/FindLine.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using HalconDotNet;
 using static DataStruct.DataStruct;
 using ToolBase;

FindLine/FindLineTool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

FindLine/FindLineToolRun.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: FindLineToolRun

FindLine/FormFindLine.Designer.cs

@@ -1,4 +1,4 @@
-namespace FindLineTool
+namespace FindLineTool
 {
     partial class FormFindLine
     {

FindLine/FormFindLine.cs

@@ -1,4 +1,4 @@
-using CommonMethods;
+using CommonMethods;
 using HalconDotNet;
 using System;
 using System.Collections.Generic;

FindLine/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

FindLine/obj/Debug/FindLineTool.csproj.FileListAbsolute.txt

@@ -62,33 +62,33 @@ F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.FormFindL
 F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.csproj.GenerateResource.Cache
 F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.dll
 F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\log4net.config
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\FindLineTool.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\FindLineTool.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\DataStruct.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\FormLib.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\HWindow_Tool.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\Logger.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\ToolBase.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\ToolLib.VisionJob.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\Newtonsoft.Json.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\log4net.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\DevComponents.DotNetBar2.dll
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\DataStruct.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\FormLib.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\ToolBase.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\Logger.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\ToolLib.VisionJob.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\HWindow_Tool.pdb
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\Newtonsoft.Json.xml
-F:\GitHubClone\VisionEdit\FindLine\bin\Debug\DevComponents.DotNetBar2.xml
-F:\GitHubClone\VisionEdit\FindLine\obj\Debug\FindLineTool.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\FindLine\obj\Debug\FindLineTool.FormFindLine.resources
-F:\GitHubClone\VisionEdit\FindLine\obj\Debug\FindLineTool.csproj.GenerateResource.Cache
-F:\GitHubClone\VisionEdit\FindLine\obj\Debug\FindLineTool.dll
-F:\GitHubClone\VisionEdit\FindLine\obj\Debug\FindLineTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\log4net.config
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\FindLineTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\FindLineTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\DataStruct.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\FormLib.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\HWindow_Tool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\Logger.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\ToolBase.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\ToolLib.VisionJob.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\Newtonsoft.Json.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\log4net.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\DevComponents.DotNetBar2.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\DataStruct.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\FormLib.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\ToolBase.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\Logger.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\ToolLib.VisionJob.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\HWindow_Tool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\Newtonsoft.Json.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\bin\Debug\DevComponents.DotNetBar2.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\obj\Debug\FindLineTool.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\obj\Debug\FindLineTool.FormFindLine.resources
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\obj\Debug\FindLineTool.csproj.GenerateResource.Cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\obj\Debug\FindLineTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\FindLine\obj\Debug\FindLineTool.pdb

FormLib/FormImageWindow.cs.Designer.cs

@@ -1,4 +1,4 @@
-namespace FormLib
+namespace FormLib
 {
     partial class FormImageWindow
     {

FormLib/FormImageWindow.cs.cs

@@ -1,4 +1,4 @@
-using ChoiceTech.Halcon.Control;
+using ChoiceTech.Halcon.Control;
 using HalconDotNet;
 using System;
 using System.Collections.Generic;

FormLib/FormLib.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

FormLib/FormLog.Designer.cs

@@ -1,4 +1,4 @@
-namespace FormLib
+namespace FormLib
 {
     partial class FormLog
     {

FormLib/FormLog.cs

@@ -1,4 +1,4 @@
-using Logger;
+using Logger;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

FormLib/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

HalconTool/FormHalconTool.Designer.cs

@@ -1,4 +1,4 @@
-namespace HalconTool
+namespace HalconTool
 {
     partial class FormHalconTool
     {

HalconTool/FormHalconTool.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;

HalconTool/HalconTool.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

HalconTool/HalconTool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

HalconTool/HalconToolRun.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: HalconToolRun

HalconTool/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

HalconTool/obj/Debug/HalconTool.csproj.FileListAbsolute.txt

@@ -60,31 +60,31 @@ F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalco
 F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache
 F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.dll
 F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\log4net.config
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\HalconTool.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\HalconTool.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\FormLib.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\Logger.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\ToolBase.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\log4net.dll
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\FormLib.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\ToolBase.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\Logger.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.pdb
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.xml
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.xml
-F:\GitHubClone\VisionEdit\HalconTool\obj\Debug\HalconTool.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resources
-F:\GitHubClone\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache
-F:\GitHubClone\VisionEdit\HalconTool\obj\Debug\HalconTool.dll
-F:\GitHubClone\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\log4net.config
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\HalconTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\HalconTool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\FormLib.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\Logger.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\ToolBase.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\log4net.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\FormLib.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\ToolBase.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\Logger.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\obj\Debug\HalconTool.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resources
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\obj\Debug\HalconTool.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb

ImageWindow/4 HWindow_Tool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

ImageWindow/Backup/HWindow_Tool.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HWindow_Tool", "HWindow_Tool.csproj", "{9BAA53FD-89B5-43E2-AC59-A27B006DEBB6}"

ImageWindow/Config/Circle.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Config/CircularArc.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Config/HObjectWithColor.cs

@@ -1,4 +1,4 @@
-using HalconDotNet;
+using HalconDotNet;
 using System;
 using System.Collections.Generic;
 using System.Linq;

ImageWindow/Config/Line.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Config/Rectangle1.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Config/Rectangle2.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Config/SerializeHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Xml;

ImageWindow/HWindowTool_Smart.Designer.cs

@@ -1,4 +1,4 @@
-namespace ViewROI
+namespace ViewROI
 {
     partial class HWindowTool_Smart
     {

ImageWindow/HWindowTool_Smart.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;

ImageWindow/HWindow_Final.cs

@@ -1,4 +1,4 @@
-// 版权所有(C) ChoiceTech Corporation。保留所有权利。
+// 版权所有(C) ChoiceTech Corporation。保留所有权利。
 // 此代码的发布遵从
 // ChoiceTech 公共许可(HY-PL，http://choicetech.cn/hy-pl.html)的条款。
 //

ImageWindow/HWindow_Final.designer.cs

@@ -1,4 +1,4 @@
-namespace ChoiceTech.Halcon.Control
+namespace ChoiceTech.Halcon.Control
 {
     partial class HWindow_Final
     {

ImageWindow/HWindow_Tool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

ImageWindow/HWindow_Tool.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HWindow_Tool", "HWindow_Tool.csproj", "{9BAA53FD-89B5-43E2-AC59-A27B006DEBB6}"

ImageWindow/Model/HWndCtrl.cs

@@ -62,7 +62,7 @@ namespace ViewWindow.Model
 		/// stack without loss. For each additional object, the first entry 
 		/// is removed from the stack again.
 		/// </summary>
-		private const int MAXNUMOBJLIST       = 2;//原始值为50 实际上2都可以,因这里只是存储背景图片
+		private const int MAXNUMOBJLIST       = 2;//原始值为50 实际上2都可以,因这里只是存储背景图片
 
 
 		private int    stateView;
@@ -83,10 +83,10 @@ namespace ViewWindow.Model
 		private int           dispROI;
 
         /// <summary>
-        /// 缩放事件开关
+        /// 缩放事件开关
         /// </summary>
         public bool drawModel = false;
-        //开启编辑模式
+        //开启编辑模式
         public bool EditModel = true;
 
 		/* Basic parameters, like dimension of window and displayed image part */
@@ -187,7 +187,7 @@ namespace ViewWindow.Model
 
         private void HMouseWheel(object sender, HMouseEventArgs e)
         {
-            //关闭缩放事件
+            //关闭缩放事件
             if (drawModel)
             {
                 return;
@@ -284,7 +284,7 @@ namespace ViewWindow.Model
 		/****************************************************************************/
 		private void zoomImage(double x, double y, double scale)
 		{
-            //关闭缩放事件
+            //关闭缩放事件
             if (drawModel)
             {
                 return;
@@ -321,13 +321,13 @@ namespace ViewWindow.Model
 
             if (zoomWndFactor < 0.01 && _zoomWndFactor < zoomWndFactor)
             {
-                //超过一定缩放比例就不在缩放
+                //超过一定缩放比例就不在缩放
                 resetWindow();
                 return;
             }
             if (zoomWndFactor > 100 && _zoomWndFactor > zoomWndFactor)
             {
-                //超过一定缩放比例就不在缩放
+                //超过一定缩放比例就不在缩放
                 resetWindow();
                 return;
             }
@@ -467,7 +467,7 @@ namespace ViewWindow.Model
 		/*************************************************************************/
 		private void mouseDown(object sender, HalconDotNet.HMouseEventArgs e)
 		{
-            //关闭缩放事件
+            //关闭缩放事件
             if (drawModel)
             {
                 return;
@@ -545,7 +545,7 @@ namespace ViewWindow.Model
 		/*******************************************************************/
 		private void mouseUp(object sender, HalconDotNet.HMouseEventArgs e)
 		{
-            //关闭缩放事件
+            //关闭缩放事件
             if (drawModel)
             {
                 return;
@@ -569,7 +569,7 @@ namespace ViewWindow.Model
 		private void mouseMoved(object sender, HalconDotNet.HMouseEventArgs e)
 		{
 
-            //关闭缩放事件
+            //关闭缩放事件
             if (drawModel)
             {
                 return;
@@ -745,7 +745,7 @@ namespace ViewWindow.Model
 			    window.ClearWindow();
 			    mGC.stateOfSettings.Clear();
 
-                //显示图片
+                //显示图片
 			    for (int i=0; i < count; i++)
 			    {
 				    entry = ((HObjectEntry)HObjImageList[i]);
@@ -754,7 +754,7 @@ namespace ViewWindow.Model
 
 			    }
 
-                //显示region
+                //显示region
                 showHObjectList();
 
 
@@ -766,7 +766,7 @@ namespace ViewWindow.Model
 
 			    HSystem.SetSystem("flush_graphic", "true");
 
-                //注释了下面语句,会导致窗口无法实现缩放和拖动
+                //注释了下面语句,会导致窗口无法实现缩放和拖动
                 window.SetColor("black");
                 window.DispLine(-100.0, -100.0, -101.0, -101.0);
 
@@ -790,7 +790,7 @@ namespace ViewWindow.Model
 		/// <param name="obj">Iconic object</param>
 		public void addIconicVar(HObject img)
 		{
-            //先把HObjImageList给全部释放了,源代码 会出现内存泄漏问题
+            //先把HObjImageList给全部释放了,源代码 会出现内存泄漏问题
             for (int i = 0; i < HObjImageList.Count; i++)
             {
                  ((HObjectEntry)HObjImageList[i]).clear();
@@ -838,12 +838,12 @@ namespace ViewWindow.Model
 
 			HObjImageList.Add(entry);
 
-            //每当传入背景图的时候 都清空HObjectList
+            //每当传入背景图的时候 都清空HObjectList
             clearHObjectList();
 
             if (HObjImageList.Count > MAXNUMOBJLIST)
             {
-                //需要自己手动释放
+                //需要自己手动释放
                 ((HObjectEntry)HObjImageList[0]).clear();
                 HObjImageList.RemoveAt(1);
             }
@@ -987,7 +987,7 @@ namespace ViewWindow.Model
             this.setViewState(HWndCtrl.MODE_VIEW_NONE);
         }
         /// <summary>
-        /// 添加设定显示的图像
+        /// 添加设定显示的图像
         /// </summary>
         /// <param name="image"></param>
         protected internal void addImageShow(HObject image)
@@ -996,32 +996,32 @@ namespace ViewWindow.Model
         }
 
 
-        #region 再次显示region和 xld
+        #region 再次显示region和 xld
 
         /// <summary>
-        /// hObjectList用来存储存入的HObject
+        /// hObjectList用来存储存入的HObject
         /// </summary>
         private List<HObjectWithColor> hObjectList = new List<HObjectWithColor>();
 
         /// <summary>
-        /// 默认红颜色显示
+        /// 默认红颜色显示
         /// </summary>
-        /// <param name="hObj">传入的region.xld,image</param>
+        /// <param name="hObj">传入的region.xld,image</param>
         public void DispObj(HObject hObj)
         {
             DispObj(hObj, null);
         }
 
         /// <summary>
-        /// 重新开辟内存保存 防止被传入的HObject在其他地方dispose后,不能重现
+        /// 重新开辟内存保存 防止被传入的HObject在其他地方dispose后,不能重现
         /// </summary>
-        /// <param name="hObj">传入的region.xld,image</param>
-        /// <param name="color">颜色</param>
+        /// <param name="hObj">传入的region.xld,image</param>
+        /// <param name="color">颜色</param>
         public void DispObj(HObject hObj, string color)
         {
             lock (this)
             {
-                //显示指定的颜色
+                //显示指定的颜色
                 if (color != null)
                 {
                     HOperatorSet.SetColor(viewPort.HalconWindow, color);
@@ -1043,13 +1043,13 @@ namespace ViewWindow.Model
 
                 }
 
-                //恢复默认的红色
+                //恢复默认的红色
                 HOperatorSet.SetColor(viewPort.HalconWindow, "red");
             }
         }
 
         /// <summary>
-        /// 每次传入新的背景Image时,清空hObjectList,避免内存没有被释放
+        /// 每次传入新的背景Image时,清空hObjectList,避免内存没有被释放
         /// </summary>
         public void clearHObjectList()
         {
@@ -1063,7 +1063,7 @@ namespace ViewWindow.Model
         }
 
         /// <summary>
-        /// 将hObjectList中的HObject,按照先后顺序显示出来
+        /// 将hObjectList中的HObject,按照先后顺序显示出来
         /// </summary>
         private void showHObjectList()
         {
@@ -1083,14 +1083,14 @@ namespace ViewWindow.Model
                     {
                         viewPort.HalconWindow.DispObj(hObjectWithColor.HObject);
 
-                        //恢复默认的红色
+                        //恢复默认的红色
                         HOperatorSet.SetColor(viewPort.HalconWindow, "red");
                     }
                 }
             }
             catch (Exception e)
             {
-                //有时候hobj被dispose了,但是其本身不为null,此时则报错. 已经使用IsInitialized解决了 
+                //有时候hobj被dispose了,但是其本身不为null,此时则报错. 已经使用IsInitialized解决了 
             }
         }
 

ImageWindow/Model/IViewWindow.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Model/ROIController.cs

@@ -405,7 +405,7 @@ namespace ViewWindow.Model
             }
             catch (Exception)
             {
-               //没有显示roi的时候 移动鼠标会报错
+               //没有显示roi的时候 移动鼠标会报错
             }
 
 		}
@@ -418,7 +418,7 @@ namespace ViewWindow.Model
 
         /*****************************/
         /// <summary>
-        /// 在指定位置显示ROI--Rectangle1
+        /// 在指定位置显示ROI--Rectangle1
         /// </summary>
         /// <param name="row1"></param>
         /// <param name="col1"></param>
@@ -460,7 +460,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置显示ROI--Rectangle2
+        /// 在指定位置显示ROI--Rectangle2
         /// </summary>
         /// <param name="row"></param>
         /// <param name="col"></param>
@@ -486,7 +486,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Circle
+        /// 在指定位置生成ROI--Circle
         /// </summary>
         /// <param name="row"></param>
         /// <param name="col"></param>
@@ -529,7 +529,7 @@ namespace ViewWindow.Model
         }
 
         /// <summary>
-        /// 在指定位置显示ROI--Line
+        /// 在指定位置显示ROI--Line
         /// </summary>
         /// <param name="beginRow"></param>
         /// <param name="beginCol"></param>
@@ -554,7 +554,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Rectangle1
+        /// 在指定位置生成ROI--Rectangle1
         /// </summary>
         /// <param name="row1"></param>
         /// <param name="col1"></param>
@@ -584,7 +584,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Rectangle1
+        /// 在指定位置生成ROI--Rectangle1
         /// </summary>
         /// <param name="row1"></param>
         /// <param name="col1"></param>
@@ -614,7 +614,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Rectangle1
+        /// 在指定位置生成ROI--Rectangle1
         /// </summary>
         /// <param name="row1"></param>
         /// <param name="col1"></param>
@@ -644,7 +644,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Rectangle2
+        /// 在指定位置生成ROI--Rectangle2
         /// </summary>
         /// <param name="row"></param>
         /// <param name="col"></param>
@@ -675,7 +675,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Rectangle2
+        /// 在指定位置生成ROI--Rectangle2
         /// </summary>
         /// <param name="row"></param>
         /// <param name="col"></param>
@@ -706,7 +706,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Circle
+        /// 在指定位置生成ROI--Circle
         /// </summary>
         /// <param name="row"></param>
         /// <param name="col"></param>
@@ -758,7 +758,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 在指定位置生成ROI--Line
+        /// 在指定位置生成ROI--Line
         /// </summary>
         /// <param name="beginRow"></param>
         /// <param name="beginCol"></param>
@@ -788,7 +788,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 获取当前选中ROI的信息
+        /// 获取当前选中ROI的信息
         /// </summary>
         /// <returns></returns>
         protected internal System.Collections.Generic.List<double> smallestActiveROI(out string name, out int index)
@@ -853,7 +853,7 @@ namespace ViewWindow.Model
         }
 
         /// <summary>
-        /// 删除当前选中ROI
+        /// 删除当前选中ROI
         /// </summary>
         /// <param name="roi"></param>
         protected internal void removeActiveROI(ref System.Collections.Generic.List<ROI> roi)
@@ -866,7 +866,7 @@ namespace ViewWindow.Model
             }
         }
         /// <summary>
-        /// 选中激活ROI
+        /// 选中激活ROI
         /// </summary>
         /// <param name="index"></param>
         protected internal void selectROI(int index)
@@ -876,7 +876,7 @@ namespace ViewWindow.Model
             this.viewController.repaint();
         }
         /// <summary>
-        /// 复位窗口显示
+        /// 复位窗口显示
         /// </summary>
         protected internal void resetWindowImage()
         {

ImageWindow/Model/RoiData.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;

ImageWindow/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

ImageWindow/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
 //     运行时版本:4.0.30319.42000

ImageWindow/Properties/Settings.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
 //     运行时版本:4.0.30319.42000

ImageWindow/ViewWindow.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ImageWindow/bin/Debug/HWindow_Final.cs

@@ -1,4 +1,4 @@
-// 版权所有(C) ChoiceTech Corporation。保留所有权利。
+// 版权所有(C) ChoiceTech Corporation。保留所有权利。
 // 此代码的发布遵从
 // ChoiceTech 公共许可(HY-PL，http://choicetech.cn/hy-pl.html)的条款。
 //

ImageWindow/bin/Debug/HWindow_Final.designer.cs

@@ -1,4 +1,4 @@
-namespace ChoiceTech.Halcon.Control
+namespace ChoiceTech.Halcon.Control
 {
     partial class HWindow_Final
     {

ImageWindow/obj/x64/Debug/HWindow_Tool.csproj.FileListAbsolute.txt

@@ -38,15 +38,3 @@ F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\ViewROI.Propert
 F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.csproj.GenerateResource.Cache
 F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.dll
 F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.pdb
-F:\GitHubClone\VisionEdit\ImageWindow\bin\x64\Debug\HWindow_Tool.dll.config
-F:\GitHubClone\VisionEdit\ImageWindow\bin\x64\Debug\HWindow_Tool.dll
-F:\GitHubClone\VisionEdit\ImageWindow\bin\x64\Debug\HWindow_Tool.pdb
-F:\GitHubClone\VisionEdit\ImageWindow\bin\x64\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\ImageWindow\bin\x64\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\ViewROI.HWindowTool_Smart.resources
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\ChoiceTech.Halcon.Control.HWindow_Final.resources
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\ViewROI.Properties.Resources.resources
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.csproj.GenerateResource.Cache
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.dll
-F:\GitHubClone\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.pdb

PMAlignTool/FormPMAlignTool.Designer.cs

@@ -1,4 +1,4 @@
-namespace PMAlignTool
+namespace PMAlignTool
 {
     partial class FormPMAlignTool
     {

PMAlignTool/FormPMAlignTool.cs

@@ -1,4 +1,4 @@
-using ChoiceTech.Halcon.Control;
+using ChoiceTech.Halcon.Control;
 using CommonMethods;
 using HalconDotNet;
 using Logger;

PMAlignTool/PMAlign.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: PMAlign

PMAlignTool/PMAlignTool.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

PMAlignTool/PMAlignToolRun.cs

@@ -1,4 +1,4 @@
-/*
+/*
 * ==============================================================================
 *
 * Filename: PMAlignToolRun

PMAlignTool/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

PMAlignTool/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
 //     运行时版本:4.0.30319.42000

ToolBase/IToolBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

ToolBase/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

ToolBase/ToolBase.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>

ToolBase/obj/Debug/ToolBase.csproj.FileListAbsolute.txt

@@ -18,14 +18,14 @@ F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\Newtonsoft.Json.xml
 F:\GitHubClone\最新克隆\VisionEdit\ToolBase\obj\Debug\ToolBase.csprojResolveAssemblyReference.cache
 F:\GitHubClone\最新克隆\VisionEdit\ToolBase\obj\Debug\ToolBase.dll
 F:\GitHubClone\最新克隆\VisionEdit\ToolBase\obj\Debug\ToolBase.pdb
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\ToolBase.dll
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\ToolBase.pdb
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\CommonMethods.dll
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\halcondotnet.dll
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\Newtonsoft.Json.dll
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\CommonMethods.pdb
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\halcondotnet.xml
-F:\GitHubClone\VisionEdit\ToolBase\bin\Debug\Newtonsoft.Json.xml
-F:\GitHubClone\VisionEdit\ToolBase\obj\Debug\ToolBase.csprojResolveAssemblyReference.cache
-F:\GitHubClone\VisionEdit\ToolBase\obj\Debug\ToolBase.dll
-F:\GitHubClone\VisionEdit\ToolBase\obj\Debug\ToolBase.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\ToolBase.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\ToolBase.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\CommonMethods.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\halcondotnet.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\Newtonsoft.Json.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\CommonMethods.pdb
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\halcondotnet.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\bin\Debug\Newtonsoft.Json.xml
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\obj\Debug\ToolBase.csprojResolveAssemblyReference.cache
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\obj\Debug\ToolBase.dll
+F:\GitHubClone\最新克隆-本地编辑版\VisionEdit\ToolBase\obj\Debug\ToolBase.pdb

ToolLib.Log/Logger/LogDetail.Designer.cs

@@ -1,4 +1,4 @@
-namespace Logger
+namespace Logger
 {
     partial class LogDetail
     {
@@ -8,7 +8,7 @@
         private System.ComponentModel.IContainer components = null;
 
         /// <summary>
-        /// Clean up any resources being used. 
+        /// 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)