diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 394fc86..40e4ec9 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -221,11 +221,12 @@ } } + // 开始取流 public void Grabbing() { if (ProMemory.isSyning) { - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType,"数据更新过程中"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据更新过程中"); return; } //ProMemory.jobRuning = true; @@ -268,6 +269,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, msg); + // 最重要的操作,将findingEyes的变量设置为true,表示可以开始找眼 ProMemory.findingEyes = true; } catch (Exception ex) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 394fc86..40e4ec9 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -221,11 +221,12 @@ } } + // 开始取流 public void Grabbing() { if (ProMemory.isSyning) { - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType,"数据更新过程中"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据更新过程中"); return; } //ProMemory.jobRuning = true; @@ -268,6 +269,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, msg); + // 最重要的操作,将findingEyes的变量设置为true,表示可以开始找眼 ProMemory.findingEyes = true; } catch (Exception ex) diff --git a/irisRefactor/IrisThread/IdentiyfTh.cs b/irisRefactor/IrisThread/IdentiyfTh.cs index c7da889..99878de 100644 --- a/irisRefactor/IrisThread/IdentiyfTh.cs +++ b/irisRefactor/IrisThread/IdentiyfTh.cs @@ -34,6 +34,7 @@ while (ProMemory.irisConfig.IdentifyThreadRun == true && iMatchNumber == 0 && ProMemory.Tag_IdentifyTimer == 0 && !ProMemory.goingToCloseForm && !ProMemory.isSyning) { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q4:" + ProMemory.irisConfig.Q4.Count); if (ProMemory.irisConfig.Q4.Count > 0) { lock (ProMemory.irisConfig.Q4) @@ -51,7 +52,7 @@ } } - ProMemory.timer2.Dispose();//停止计时器 + // ProMemory.timer2.Dispose();//停止计时器 //跳出循环,条件是时间到、匹配成功或者正在关闭程序 ProMemory.irisConfig.AssessThreadRun = false; diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 394fc86..40e4ec9 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -221,11 +221,12 @@ } } + // 开始取流 public void Grabbing() { if (ProMemory.isSyning) { - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType,"数据更新过程中"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据更新过程中"); return; } //ProMemory.jobRuning = true; @@ -268,6 +269,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, msg); + // 最重要的操作,将findingEyes的变量设置为true,表示可以开始找眼 ProMemory.findingEyes = true; } catch (Exception ex) diff --git a/irisRefactor/IrisThread/IdentiyfTh.cs b/irisRefactor/IrisThread/IdentiyfTh.cs index c7da889..99878de 100644 --- a/irisRefactor/IrisThread/IdentiyfTh.cs +++ b/irisRefactor/IrisThread/IdentiyfTh.cs @@ -34,6 +34,7 @@ while (ProMemory.irisConfig.IdentifyThreadRun == true && iMatchNumber == 0 && ProMemory.Tag_IdentifyTimer == 0 && !ProMemory.goingToCloseForm && !ProMemory.isSyning) { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q4:" + ProMemory.irisConfig.Q4.Count); if (ProMemory.irisConfig.Q4.Count > 0) { lock (ProMemory.irisConfig.Q4) @@ -51,7 +52,7 @@ } } - ProMemory.timer2.Dispose();//停止计时器 + // ProMemory.timer2.Dispose();//停止计时器 //跳出循环,条件是时间到、匹配成功或者正在关闭程序 ProMemory.irisConfig.AssessThreadRun = false; diff --git a/irisRefactor/IrisThread/PreIdentifyTh.cs b/irisRefactor/IrisThread/PreIdentifyTh.cs new file mode 100644 index 0000000..90d4848 --- /dev/null +++ b/irisRefactor/IrisThread/PreIdentifyTh.cs @@ -0,0 +1,201 @@ +using irisHelper; +using irisRefactor.FrmService; +using System; +using System.Diagnostics; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Threading; + +namespace irisRefactor.IrisThread +{ + /** + * 识别之前的线程 + * 找眼和质量评估两步操作串行进行 + * + */ + class PreIdentifyTh + { + private PreIdentifyTh() + { + + } + + private static readonly PreIdentifyTh _preIdentifyTh = new PreIdentifyTh(); + + public static PreIdentifyTh GetInstance { get => _preIdentifyTh; } + + public void FindEyes() + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "PreIdentify -- FindEyes"); + + ProMemory.Tag_SleepTimer = 0; + + // 用于计算操作耗时 + Stopwatch sw = new Stopwatch(); + + try + { + // 条件:找眼线程在运行中;休眠线程标志为0;不在数据同步;连续未找到眼睛数小于100 + while (ProMemory.irisConfig.EyeFinderThreadRun && ProMemory.Tag_SleepTimer == 0 && !ProMemory.isSyning && ProMemory.identifyConfig.Count_NoEyeLast <= 100) + { + //M++; + if (ProMemory.irisConfig.Q1.Count > 0) + { + lock (ProMemory.irisConfig.Q1) + { + if (ProMemory.irisConfig.Q1.Count > 0) + { + ProMemory.irisConfig.FaceBuffer = ProMemory.irisConfig.Q1.Pop(); + } + } + + if (ProMemory.irisConfig.FaceBuffer != null) + { + unsafe + { + // 申请内存,复制内存 + IntPtr ptrFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrFace, 1280 * 960); + + // mark = 找到的眼睛数量 + int mark; + // 左右眼睛的定位参数:x,y,r + int[] posvec = new int[] { 0, 0, 0, 0, 0, 0 }; + + fixed (int* pos = &posvec[0]) + { + int* ptrPos = pos; + + sw.Restart(); + mark = ProMemory.CaptureEye_Rec(ptrFace, ref ptrPos); // 调用找眼算法 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次找眼操作[" + mark + "]:" + sw.ElapsedMilliseconds); + + int[] irisPos = { ptrPos[0], ptrPos[1], ptrPos[2], ptrPos[3], ptrPos[4], ptrPos[5] }; + + // 找到1个或者2个眼睛 + if (mark == 1 || mark == 2) + { + // 1.持续没有找到眼的计数器清零 + ProMemory.identifyConfig.Count_NoEyeLast = 0; + + // 2.黄灯闪烁 + //ProMemory.IoControllService.setYellowFlash(true); + //Thread flashThrd = new Thread(ProMemory.IoControllService.YellowFlash); + //flashThrd.Start(); + + // 3.质量评估 + int score = 0; + Byte[] irisBytesL = new byte[640 * 480]; + Byte[] irisBytesR = new byte[640 * 480]; + + IntPtr ptrIrisFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrIrisFace, 1280 * 960); + + unsafe + { + fixed (byte* irisL = &irisBytesL[0]) + { + fixed (byte* irisR = &irisBytesR[0]) + { + byte* ptrIrisL = irisL; + byte* ptrIrisR = irisR; + + sw.Restart(); + score = ProMemory.AssessFocus_Rec(ptrIrisFace, irisPos, ref ptrIrisL, ref ptrIrisR); //质量评估 0均不合格 1一幅合格 2均合格 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次质量评估操作[" + score + "]:" + sw.ElapsedMilliseconds); + } + } + } + + + if (score > 0) + { + if (score == 1) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + } + } + else if (score == 2) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + ProMemory.irisConfig.Q4.Push(irisBytesR); + } + } + + + if (ProMemory.irisConfig.Key_Identify == 0) + { + ProMemory.irisConfig.Key_Identify = 1; + + ProMemory.irisConfig.IdentifyThreadRun = true; + Thread m_IdentifyThread = new Thread(IdentiyfTh.GetInstance().Identify); + m_IdentifyThread.Name = "Identify"; + m_IdentifyThread.Start(); + } + + } + + Marshal.FreeHGlobal(ptrIrisFace); + } + else + { + ProMemory.identifyConfig.Count_NoEyeLast++; + } + } + + Marshal.FreeHGlobal(ptrFace); + } + } + + lock (ProMemory.irisConfig.Q2) + { + if (ProMemory.irisConfig.Q2.Count >= 30) + { + ProMemory.irisConfig.Q2.Clear(); //手动控制堆栈容量 + } + } + + lock (ProMemory.irisConfig.Q3) + { + if (ProMemory.irisConfig.Q3.Count >= 30) + { + ProMemory.irisConfig.Q3.Clear(); //手动控制堆栈容量 + } + } + } + } + + //if (ProMemory.Tag_SleepTimer == 1) //待机时间到,仍未找到眼睛 + if (ProMemory.identifyConfig.Count_NoEyeLast > 100) + { + if (ProMemory.m_bGrabbing) + { + if (ProMemory.IoControllService.getSensorVal() == 0) //未再次触发,待机 + { + if (ProMemory.formType == "1") + Form1.GetInstance().ReInitializeToSleep(); + else if (ProMemory.formType == "2") + Form2.GetInstance().ReInitializeToSleep(); + Thread.Sleep(200); + ProMemory.cameraController.ContinuousShot_TriggerOn(); + } + else //已再次触发,继续下一轮识别 + { + ProMemory.cameraController.ContinuousShot_TriggerOff(); + } + } + } + } + catch (Exception ex) + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "眼睛搜索线程CatchError:" + ex); + } + } + } +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 394fc86..40e4ec9 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -221,11 +221,12 @@ } } + // 开始取流 public void Grabbing() { if (ProMemory.isSyning) { - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType,"数据更新过程中"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据更新过程中"); return; } //ProMemory.jobRuning = true; @@ -268,6 +269,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, msg); + // 最重要的操作,将findingEyes的变量设置为true,表示可以开始找眼 ProMemory.findingEyes = true; } catch (Exception ex) diff --git a/irisRefactor/IrisThread/IdentiyfTh.cs b/irisRefactor/IrisThread/IdentiyfTh.cs index c7da889..99878de 100644 --- a/irisRefactor/IrisThread/IdentiyfTh.cs +++ b/irisRefactor/IrisThread/IdentiyfTh.cs @@ -34,6 +34,7 @@ while (ProMemory.irisConfig.IdentifyThreadRun == true && iMatchNumber == 0 && ProMemory.Tag_IdentifyTimer == 0 && !ProMemory.goingToCloseForm && !ProMemory.isSyning) { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q4:" + ProMemory.irisConfig.Q4.Count); if (ProMemory.irisConfig.Q4.Count > 0) { lock (ProMemory.irisConfig.Q4) @@ -51,7 +52,7 @@ } } - ProMemory.timer2.Dispose();//停止计时器 + // ProMemory.timer2.Dispose();//停止计时器 //跳出循环,条件是时间到、匹配成功或者正在关闭程序 ProMemory.irisConfig.AssessThreadRun = false; diff --git a/irisRefactor/IrisThread/PreIdentifyTh.cs b/irisRefactor/IrisThread/PreIdentifyTh.cs new file mode 100644 index 0000000..90d4848 --- /dev/null +++ b/irisRefactor/IrisThread/PreIdentifyTh.cs @@ -0,0 +1,201 @@ +using irisHelper; +using irisRefactor.FrmService; +using System; +using System.Diagnostics; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Threading; + +namespace irisRefactor.IrisThread +{ + /** + * 识别之前的线程 + * 找眼和质量评估两步操作串行进行 + * + */ + class PreIdentifyTh + { + private PreIdentifyTh() + { + + } + + private static readonly PreIdentifyTh _preIdentifyTh = new PreIdentifyTh(); + + public static PreIdentifyTh GetInstance { get => _preIdentifyTh; } + + public void FindEyes() + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "PreIdentify -- FindEyes"); + + ProMemory.Tag_SleepTimer = 0; + + // 用于计算操作耗时 + Stopwatch sw = new Stopwatch(); + + try + { + // 条件:找眼线程在运行中;休眠线程标志为0;不在数据同步;连续未找到眼睛数小于100 + while (ProMemory.irisConfig.EyeFinderThreadRun && ProMemory.Tag_SleepTimer == 0 && !ProMemory.isSyning && ProMemory.identifyConfig.Count_NoEyeLast <= 100) + { + //M++; + if (ProMemory.irisConfig.Q1.Count > 0) + { + lock (ProMemory.irisConfig.Q1) + { + if (ProMemory.irisConfig.Q1.Count > 0) + { + ProMemory.irisConfig.FaceBuffer = ProMemory.irisConfig.Q1.Pop(); + } + } + + if (ProMemory.irisConfig.FaceBuffer != null) + { + unsafe + { + // 申请内存,复制内存 + IntPtr ptrFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrFace, 1280 * 960); + + // mark = 找到的眼睛数量 + int mark; + // 左右眼睛的定位参数:x,y,r + int[] posvec = new int[] { 0, 0, 0, 0, 0, 0 }; + + fixed (int* pos = &posvec[0]) + { + int* ptrPos = pos; + + sw.Restart(); + mark = ProMemory.CaptureEye_Rec(ptrFace, ref ptrPos); // 调用找眼算法 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次找眼操作[" + mark + "]:" + sw.ElapsedMilliseconds); + + int[] irisPos = { ptrPos[0], ptrPos[1], ptrPos[2], ptrPos[3], ptrPos[4], ptrPos[5] }; + + // 找到1个或者2个眼睛 + if (mark == 1 || mark == 2) + { + // 1.持续没有找到眼的计数器清零 + ProMemory.identifyConfig.Count_NoEyeLast = 0; + + // 2.黄灯闪烁 + //ProMemory.IoControllService.setYellowFlash(true); + //Thread flashThrd = new Thread(ProMemory.IoControllService.YellowFlash); + //flashThrd.Start(); + + // 3.质量评估 + int score = 0; + Byte[] irisBytesL = new byte[640 * 480]; + Byte[] irisBytesR = new byte[640 * 480]; + + IntPtr ptrIrisFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrIrisFace, 1280 * 960); + + unsafe + { + fixed (byte* irisL = &irisBytesL[0]) + { + fixed (byte* irisR = &irisBytesR[0]) + { + byte* ptrIrisL = irisL; + byte* ptrIrisR = irisR; + + sw.Restart(); + score = ProMemory.AssessFocus_Rec(ptrIrisFace, irisPos, ref ptrIrisL, ref ptrIrisR); //质量评估 0均不合格 1一幅合格 2均合格 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次质量评估操作[" + score + "]:" + sw.ElapsedMilliseconds); + } + } + } + + + if (score > 0) + { + if (score == 1) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + } + } + else if (score == 2) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + ProMemory.irisConfig.Q4.Push(irisBytesR); + } + } + + + if (ProMemory.irisConfig.Key_Identify == 0) + { + ProMemory.irisConfig.Key_Identify = 1; + + ProMemory.irisConfig.IdentifyThreadRun = true; + Thread m_IdentifyThread = new Thread(IdentiyfTh.GetInstance().Identify); + m_IdentifyThread.Name = "Identify"; + m_IdentifyThread.Start(); + } + + } + + Marshal.FreeHGlobal(ptrIrisFace); + } + else + { + ProMemory.identifyConfig.Count_NoEyeLast++; + } + } + + Marshal.FreeHGlobal(ptrFace); + } + } + + lock (ProMemory.irisConfig.Q2) + { + if (ProMemory.irisConfig.Q2.Count >= 30) + { + ProMemory.irisConfig.Q2.Clear(); //手动控制堆栈容量 + } + } + + lock (ProMemory.irisConfig.Q3) + { + if (ProMemory.irisConfig.Q3.Count >= 30) + { + ProMemory.irisConfig.Q3.Clear(); //手动控制堆栈容量 + } + } + } + } + + //if (ProMemory.Tag_SleepTimer == 1) //待机时间到,仍未找到眼睛 + if (ProMemory.identifyConfig.Count_NoEyeLast > 100) + { + if (ProMemory.m_bGrabbing) + { + if (ProMemory.IoControllService.getSensorVal() == 0) //未再次触发,待机 + { + if (ProMemory.formType == "1") + Form1.GetInstance().ReInitializeToSleep(); + else if (ProMemory.formType == "2") + Form2.GetInstance().ReInitializeToSleep(); + Thread.Sleep(200); + ProMemory.cameraController.ContinuousShot_TriggerOn(); + } + else //已再次触发,继续下一轮识别 + { + ProMemory.cameraController.ContinuousShot_TriggerOff(); + } + } + } + } + catch (Exception ex) + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "眼睛搜索线程CatchError:" + ex); + } + } + } +} diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index 6bf8ac6..ab978b4 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -39,6 +39,7 @@ if (image == null) return; //2.对图像进行人眼搜索处理 + // 条件:未处在待机状态;正在取流过程;没有进行数据同步 if (ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try @@ -47,6 +48,7 @@ lock (ProMemory.irisConfig.Q1) { ProMemory.irisConfig.Q1.Push(imgBytes); + // LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q1.Push:" + ProMemory.irisConfig.Q1.Count); } } catch (Exception ee) @@ -54,13 +56,27 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "errorerrorerror : 采集线程push q1 :" + ee); } + // 条件:找眼线程未开启;未处于待机状态 if (ProMemory.irisConfig.Key_FindEyes == 0 && !ProMemory.isWait) { + // 标记进入找眼线程 + /* ProMemory.irisConfig.Key_FindEyes = 1; ProMemory.irisConfig.EyeFinderThreadRun = true; + + // 新建线程进行找眼 Thread m_EyeFinderThread = new Thread(FindEyesTh.GetInstance().FindEyes); m_EyeFinderThread.Name = "FindEyes"; m_EyeFinderThread.Start(); + */ + + // 开启工作线程 + ProMemory.identifyConfig.Flag_Working = 1; + ProMemory.irisConfig.Key_FindEyes = 1; + ProMemory.irisConfig.EyeFinderThreadRun = true; + Thread th_PreIdentify = new Thread(PreIdentifyTh.GetInstance.FindEyes); + th_PreIdentify.Name = "FindEyes"; + th_PreIdentify.Start(); } } diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 394fc86..40e4ec9 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -221,11 +221,12 @@ } } + // 开始取流 public void Grabbing() { if (ProMemory.isSyning) { - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType,"数据更新过程中"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据更新过程中"); return; } //ProMemory.jobRuning = true; @@ -268,6 +269,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, msg); + // 最重要的操作,将findingEyes的变量设置为true,表示可以开始找眼 ProMemory.findingEyes = true; } catch (Exception ex) diff --git a/irisRefactor/IrisThread/IdentiyfTh.cs b/irisRefactor/IrisThread/IdentiyfTh.cs index c7da889..99878de 100644 --- a/irisRefactor/IrisThread/IdentiyfTh.cs +++ b/irisRefactor/IrisThread/IdentiyfTh.cs @@ -34,6 +34,7 @@ while (ProMemory.irisConfig.IdentifyThreadRun == true && iMatchNumber == 0 && ProMemory.Tag_IdentifyTimer == 0 && !ProMemory.goingToCloseForm && !ProMemory.isSyning) { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q4:" + ProMemory.irisConfig.Q4.Count); if (ProMemory.irisConfig.Q4.Count > 0) { lock (ProMemory.irisConfig.Q4) @@ -51,7 +52,7 @@ } } - ProMemory.timer2.Dispose();//停止计时器 + // ProMemory.timer2.Dispose();//停止计时器 //跳出循环,条件是时间到、匹配成功或者正在关闭程序 ProMemory.irisConfig.AssessThreadRun = false; diff --git a/irisRefactor/IrisThread/PreIdentifyTh.cs b/irisRefactor/IrisThread/PreIdentifyTh.cs new file mode 100644 index 0000000..90d4848 --- /dev/null +++ b/irisRefactor/IrisThread/PreIdentifyTh.cs @@ -0,0 +1,201 @@ +using irisHelper; +using irisRefactor.FrmService; +using System; +using System.Diagnostics; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Threading; + +namespace irisRefactor.IrisThread +{ + /** + * 识别之前的线程 + * 找眼和质量评估两步操作串行进行 + * + */ + class PreIdentifyTh + { + private PreIdentifyTh() + { + + } + + private static readonly PreIdentifyTh _preIdentifyTh = new PreIdentifyTh(); + + public static PreIdentifyTh GetInstance { get => _preIdentifyTh; } + + public void FindEyes() + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "PreIdentify -- FindEyes"); + + ProMemory.Tag_SleepTimer = 0; + + // 用于计算操作耗时 + Stopwatch sw = new Stopwatch(); + + try + { + // 条件:找眼线程在运行中;休眠线程标志为0;不在数据同步;连续未找到眼睛数小于100 + while (ProMemory.irisConfig.EyeFinderThreadRun && ProMemory.Tag_SleepTimer == 0 && !ProMemory.isSyning && ProMemory.identifyConfig.Count_NoEyeLast <= 100) + { + //M++; + if (ProMemory.irisConfig.Q1.Count > 0) + { + lock (ProMemory.irisConfig.Q1) + { + if (ProMemory.irisConfig.Q1.Count > 0) + { + ProMemory.irisConfig.FaceBuffer = ProMemory.irisConfig.Q1.Pop(); + } + } + + if (ProMemory.irisConfig.FaceBuffer != null) + { + unsafe + { + // 申请内存,复制内存 + IntPtr ptrFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrFace, 1280 * 960); + + // mark = 找到的眼睛数量 + int mark; + // 左右眼睛的定位参数:x,y,r + int[] posvec = new int[] { 0, 0, 0, 0, 0, 0 }; + + fixed (int* pos = &posvec[0]) + { + int* ptrPos = pos; + + sw.Restart(); + mark = ProMemory.CaptureEye_Rec(ptrFace, ref ptrPos); // 调用找眼算法 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次找眼操作[" + mark + "]:" + sw.ElapsedMilliseconds); + + int[] irisPos = { ptrPos[0], ptrPos[1], ptrPos[2], ptrPos[3], ptrPos[4], ptrPos[5] }; + + // 找到1个或者2个眼睛 + if (mark == 1 || mark == 2) + { + // 1.持续没有找到眼的计数器清零 + ProMemory.identifyConfig.Count_NoEyeLast = 0; + + // 2.黄灯闪烁 + //ProMemory.IoControllService.setYellowFlash(true); + //Thread flashThrd = new Thread(ProMemory.IoControllService.YellowFlash); + //flashThrd.Start(); + + // 3.质量评估 + int score = 0; + Byte[] irisBytesL = new byte[640 * 480]; + Byte[] irisBytesR = new byte[640 * 480]; + + IntPtr ptrIrisFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrIrisFace, 1280 * 960); + + unsafe + { + fixed (byte* irisL = &irisBytesL[0]) + { + fixed (byte* irisR = &irisBytesR[0]) + { + byte* ptrIrisL = irisL; + byte* ptrIrisR = irisR; + + sw.Restart(); + score = ProMemory.AssessFocus_Rec(ptrIrisFace, irisPos, ref ptrIrisL, ref ptrIrisR); //质量评估 0均不合格 1一幅合格 2均合格 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次质量评估操作[" + score + "]:" + sw.ElapsedMilliseconds); + } + } + } + + + if (score > 0) + { + if (score == 1) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + } + } + else if (score == 2) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + ProMemory.irisConfig.Q4.Push(irisBytesR); + } + } + + + if (ProMemory.irisConfig.Key_Identify == 0) + { + ProMemory.irisConfig.Key_Identify = 1; + + ProMemory.irisConfig.IdentifyThreadRun = true; + Thread m_IdentifyThread = new Thread(IdentiyfTh.GetInstance().Identify); + m_IdentifyThread.Name = "Identify"; + m_IdentifyThread.Start(); + } + + } + + Marshal.FreeHGlobal(ptrIrisFace); + } + else + { + ProMemory.identifyConfig.Count_NoEyeLast++; + } + } + + Marshal.FreeHGlobal(ptrFace); + } + } + + lock (ProMemory.irisConfig.Q2) + { + if (ProMemory.irisConfig.Q2.Count >= 30) + { + ProMemory.irisConfig.Q2.Clear(); //手动控制堆栈容量 + } + } + + lock (ProMemory.irisConfig.Q3) + { + if (ProMemory.irisConfig.Q3.Count >= 30) + { + ProMemory.irisConfig.Q3.Clear(); //手动控制堆栈容量 + } + } + } + } + + //if (ProMemory.Tag_SleepTimer == 1) //待机时间到,仍未找到眼睛 + if (ProMemory.identifyConfig.Count_NoEyeLast > 100) + { + if (ProMemory.m_bGrabbing) + { + if (ProMemory.IoControllService.getSensorVal() == 0) //未再次触发,待机 + { + if (ProMemory.formType == "1") + Form1.GetInstance().ReInitializeToSleep(); + else if (ProMemory.formType == "2") + Form2.GetInstance().ReInitializeToSleep(); + Thread.Sleep(200); + ProMemory.cameraController.ContinuousShot_TriggerOn(); + } + else //已再次触发,继续下一轮识别 + { + ProMemory.cameraController.ContinuousShot_TriggerOff(); + } + } + } + } + catch (Exception ex) + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "眼睛搜索线程CatchError:" + ex); + } + } + } +} diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index 6bf8ac6..ab978b4 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -39,6 +39,7 @@ if (image == null) return; //2.对图像进行人眼搜索处理 + // 条件:未处在待机状态;正在取流过程;没有进行数据同步 if (ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try @@ -47,6 +48,7 @@ lock (ProMemory.irisConfig.Q1) { ProMemory.irisConfig.Q1.Push(imgBytes); + // LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q1.Push:" + ProMemory.irisConfig.Q1.Count); } } catch (Exception ee) @@ -54,13 +56,27 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "errorerrorerror : 采集线程push q1 :" + ee); } + // 条件:找眼线程未开启;未处于待机状态 if (ProMemory.irisConfig.Key_FindEyes == 0 && !ProMemory.isWait) { + // 标记进入找眼线程 + /* ProMemory.irisConfig.Key_FindEyes = 1; ProMemory.irisConfig.EyeFinderThreadRun = true; + + // 新建线程进行找眼 Thread m_EyeFinderThread = new Thread(FindEyesTh.GetInstance().FindEyes); m_EyeFinderThread.Name = "FindEyes"; m_EyeFinderThread.Start(); + */ + + // 开启工作线程 + ProMemory.identifyConfig.Flag_Working = 1; + ProMemory.irisConfig.Key_FindEyes = 1; + ProMemory.irisConfig.EyeFinderThreadRun = true; + Thread th_PreIdentify = new Thread(PreIdentifyTh.GetInstance.FindEyes); + th_PreIdentify.Name = "FindEyes"; + th_PreIdentify.Start(); } } diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 441f1c2..07d8bfa 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -24,6 +24,7 @@ public static ProConfig proConfig; public static AppConfig appConfig; public static IrisConfig irisConfig; + public static IdentifyConfig identifyConfig; public static IoControllService IoControllService = (IoControllService)IrisIoControllObject.getEntity(); public static IrisDataService irisDataService = (IrisDataService)IrisDataBaseObject.getEntity("IrisDataService"); public static IrisPersonViewService irisPersonViewService = (IrisPersonViewService)IrisDataBaseObject.getEntity("IrisPersonView"); @@ -83,7 +84,8 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); - + identifyConfig = IdentifyConfig.GetInstance; + cameraController = CameraController.GetInstance(); //GetHostIPv4(); diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..28a6647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +################################################################################ +# 此 .gitignore 文件已由 Microsoft(R) Visual Studio 自动创建。 +################################################################################ + +/irisTemperature/obj +/IrisSetting/obj +/IrisSetting/obj/Debug +/irisRefactor/obj +/irisPrint/obj +/irisMemory/obj +/irisIoControll/obj +/irisHelper/obj +/irisDoor/obj +/irisDatabase/obj +/irisConfig/obj +/bin +/.vs \ No newline at end of file diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index 627fe36..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5699c20..0000000 --- a/IrisSetting/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources b/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.Properties.Resources.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources b/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources deleted file mode 100644 index 6c05a97..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.SettingForm.resources +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete b/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CopyComplete +++ /dev/null diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache deleted file mode 100644 index 77ab0bb..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -4eb94c05385d528aee9b8041e6a07aa8cb20e767 diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt b/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt deleted file mode 100644 index 66f93ce..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,50 +0,0 @@ -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -D:\git\irisRefactor\bin\Debug\系统设置.exe -D:\git\irisRefactor\bin\Debug\系统设置.pdb -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\irisRefactor\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.exe -D:\git\irisRefactor\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\bin\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.Cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -E:\Develop\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\iris\yxw\code\yxw\模块化\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\bin\Debug\系统设置.pdb -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csprojAssemblyReference.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.Properties.Resources.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.SettingForm.resources -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.GenerateResource.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CoreCompileInputs.cache -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\IrisSetting.csproj.CopyComplete -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.exe -D:\git\IRIS_REFACTOR\IrisSetting\obj\Debug\系统设置.pdb diff --git a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache b/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache deleted file mode 100644 index 67fac2a..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache +++ /dev/null Binary files differ diff --git a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache b/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache deleted file mode 100644 index 37ca0f6..0000000 --- a/IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" deleted file mode 100644 index d50a92d..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.exe" +++ /dev/null Binary files differ diff --git "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" "b/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" deleted file mode 100644 index 6f6a49c..0000000 --- "a/IrisSetting/obj/Debug/\347\263\273\347\273\237\350\256\276\347\275\256.pdb" +++ /dev/null Binary files differ diff --git a/irisHelper/LogHelper.cs b/irisHelper/LogHelper.cs index 1f5508e..f9d985e 100644 --- a/irisHelper/LogHelper.cs +++ b/irisHelper/LogHelper.cs @@ -20,7 +20,7 @@ { //ILog log = log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); log4net.ILog log = log4net.LogManager.GetLogger(t); - log.Info(System.DateTime.Now.ToString() + " " + msg); + log.Info(msg); } diff --git a/irisMemory/IdentifyConfig.cs b/irisMemory/IdentifyConfig.cs new file mode 100644 index 0000000..5b3241e --- /dev/null +++ b/irisMemory/IdentifyConfig.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace irisMemory +{ + public class IdentifyConfig + { + // =1时表示在工作,从队列中取出图片调用找眼算法; + // =0时表示终端待机 + private int flag_Working; // 是否在找眼标志位,是否在工作标志位 + private int flag_FoundEye; // 是否找到合格眼睛标志位,用于表示是否进入识别过程 + + private int count_NoEyeLast; // 连续没找到眼的次数 + + private IdentifyConfig() + { + this.Flag_Working = 0; + this.Flag_FoundEye = 0; + + this.Count_NoEyeLast = 0; + } + + private static readonly IdentifyConfig identifyConfig = new IdentifyConfig(); + + public int Flag_Working { get => flag_Working; set => flag_Working = value; } + public int Flag_FoundEye { get => flag_FoundEye; set => flag_FoundEye = value; } + public int Count_NoEyeLast { get => count_NoEyeLast; set => count_NoEyeLast = value; } + + public static IdentifyConfig GetInstance { get => identifyConfig; } + } +} diff --git a/irisMemory/irisMemory.csproj b/irisMemory/irisMemory.csproj index e6b85ff..3ee243d 100644 --- a/irisMemory/irisMemory.csproj +++ b/irisMemory/irisMemory.csproj @@ -54,6 +54,7 @@ + diff --git a/irisRefactor/IrisCamera/CameraController.cs b/irisRefactor/IrisCamera/CameraController.cs index 394fc86..40e4ec9 100644 --- a/irisRefactor/IrisCamera/CameraController.cs +++ b/irisRefactor/IrisCamera/CameraController.cs @@ -221,11 +221,12 @@ } } + // 开始取流 public void Grabbing() { if (ProMemory.isSyning) { - LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType,"数据更新过程中"); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "数据更新过程中"); return; } //ProMemory.jobRuning = true; @@ -268,6 +269,7 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, msg); + // 最重要的操作,将findingEyes的变量设置为true,表示可以开始找眼 ProMemory.findingEyes = true; } catch (Exception ex) diff --git a/irisRefactor/IrisThread/IdentiyfTh.cs b/irisRefactor/IrisThread/IdentiyfTh.cs index c7da889..99878de 100644 --- a/irisRefactor/IrisThread/IdentiyfTh.cs +++ b/irisRefactor/IrisThread/IdentiyfTh.cs @@ -34,6 +34,7 @@ while (ProMemory.irisConfig.IdentifyThreadRun == true && iMatchNumber == 0 && ProMemory.Tag_IdentifyTimer == 0 && !ProMemory.goingToCloseForm && !ProMemory.isSyning) { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q4:" + ProMemory.irisConfig.Q4.Count); if (ProMemory.irisConfig.Q4.Count > 0) { lock (ProMemory.irisConfig.Q4) @@ -51,7 +52,7 @@ } } - ProMemory.timer2.Dispose();//停止计时器 + // ProMemory.timer2.Dispose();//停止计时器 //跳出循环,条件是时间到、匹配成功或者正在关闭程序 ProMemory.irisConfig.AssessThreadRun = false; diff --git a/irisRefactor/IrisThread/PreIdentifyTh.cs b/irisRefactor/IrisThread/PreIdentifyTh.cs new file mode 100644 index 0000000..90d4848 --- /dev/null +++ b/irisRefactor/IrisThread/PreIdentifyTh.cs @@ -0,0 +1,201 @@ +using irisHelper; +using irisRefactor.FrmService; +using System; +using System.Diagnostics; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Threading; + +namespace irisRefactor.IrisThread +{ + /** + * 识别之前的线程 + * 找眼和质量评估两步操作串行进行 + * + */ + class PreIdentifyTh + { + private PreIdentifyTh() + { + + } + + private static readonly PreIdentifyTh _preIdentifyTh = new PreIdentifyTh(); + + public static PreIdentifyTh GetInstance { get => _preIdentifyTh; } + + public void FindEyes() + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "PreIdentify -- FindEyes"); + + ProMemory.Tag_SleepTimer = 0; + + // 用于计算操作耗时 + Stopwatch sw = new Stopwatch(); + + try + { + // 条件:找眼线程在运行中;休眠线程标志为0;不在数据同步;连续未找到眼睛数小于100 + while (ProMemory.irisConfig.EyeFinderThreadRun && ProMemory.Tag_SleepTimer == 0 && !ProMemory.isSyning && ProMemory.identifyConfig.Count_NoEyeLast <= 100) + { + //M++; + if (ProMemory.irisConfig.Q1.Count > 0) + { + lock (ProMemory.irisConfig.Q1) + { + if (ProMemory.irisConfig.Q1.Count > 0) + { + ProMemory.irisConfig.FaceBuffer = ProMemory.irisConfig.Q1.Pop(); + } + } + + if (ProMemory.irisConfig.FaceBuffer != null) + { + unsafe + { + // 申请内存,复制内存 + IntPtr ptrFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrFace, 1280 * 960); + + // mark = 找到的眼睛数量 + int mark; + // 左右眼睛的定位参数:x,y,r + int[] posvec = new int[] { 0, 0, 0, 0, 0, 0 }; + + fixed (int* pos = &posvec[0]) + { + int* ptrPos = pos; + + sw.Restart(); + mark = ProMemory.CaptureEye_Rec(ptrFace, ref ptrPos); // 调用找眼算法 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次找眼操作[" + mark + "]:" + sw.ElapsedMilliseconds); + + int[] irisPos = { ptrPos[0], ptrPos[1], ptrPos[2], ptrPos[3], ptrPos[4], ptrPos[5] }; + + // 找到1个或者2个眼睛 + if (mark == 1 || mark == 2) + { + // 1.持续没有找到眼的计数器清零 + ProMemory.identifyConfig.Count_NoEyeLast = 0; + + // 2.黄灯闪烁 + //ProMemory.IoControllService.setYellowFlash(true); + //Thread flashThrd = new Thread(ProMemory.IoControllService.YellowFlash); + //flashThrd.Start(); + + // 3.质量评估 + int score = 0; + Byte[] irisBytesL = new byte[640 * 480]; + Byte[] irisBytesR = new byte[640 * 480]; + + IntPtr ptrIrisFace = Marshal.AllocHGlobal(1280 * 960); + Marshal.Copy(ProMemory.irisConfig.FaceBuffer, 0, ptrIrisFace, 1280 * 960); + + unsafe + { + fixed (byte* irisL = &irisBytesL[0]) + { + fixed (byte* irisR = &irisBytesR[0]) + { + byte* ptrIrisL = irisL; + byte* ptrIrisR = irisR; + + sw.Restart(); + score = ProMemory.AssessFocus_Rec(ptrIrisFace, irisPos, ref ptrIrisL, ref ptrIrisR); //质量评估 0均不合格 1一幅合格 2均合格 + sw.Stop(); + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "执行一次质量评估操作[" + score + "]:" + sw.ElapsedMilliseconds); + } + } + } + + + if (score > 0) + { + if (score == 1) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + } + } + else if (score == 2) + { + lock (ProMemory.irisConfig.Q4) + { + ProMemory.irisConfig.Q4.Push(irisBytesL); + ProMemory.irisConfig.Q4.Push(irisBytesR); + } + } + + + if (ProMemory.irisConfig.Key_Identify == 0) + { + ProMemory.irisConfig.Key_Identify = 1; + + ProMemory.irisConfig.IdentifyThreadRun = true; + Thread m_IdentifyThread = new Thread(IdentiyfTh.GetInstance().Identify); + m_IdentifyThread.Name = "Identify"; + m_IdentifyThread.Start(); + } + + } + + Marshal.FreeHGlobal(ptrIrisFace); + } + else + { + ProMemory.identifyConfig.Count_NoEyeLast++; + } + } + + Marshal.FreeHGlobal(ptrFace); + } + } + + lock (ProMemory.irisConfig.Q2) + { + if (ProMemory.irisConfig.Q2.Count >= 30) + { + ProMemory.irisConfig.Q2.Clear(); //手动控制堆栈容量 + } + } + + lock (ProMemory.irisConfig.Q3) + { + if (ProMemory.irisConfig.Q3.Count >= 30) + { + ProMemory.irisConfig.Q3.Clear(); //手动控制堆栈容量 + } + } + } + } + + //if (ProMemory.Tag_SleepTimer == 1) //待机时间到,仍未找到眼睛 + if (ProMemory.identifyConfig.Count_NoEyeLast > 100) + { + if (ProMemory.m_bGrabbing) + { + if (ProMemory.IoControllService.getSensorVal() == 0) //未再次触发,待机 + { + if (ProMemory.formType == "1") + Form1.GetInstance().ReInitializeToSleep(); + else if (ProMemory.formType == "2") + Form2.GetInstance().ReInitializeToSleep(); + Thread.Sleep(200); + ProMemory.cameraController.ContinuousShot_TriggerOn(); + } + else //已再次触发,继续下一轮识别 + { + ProMemory.cameraController.ContinuousShot_TriggerOff(); + } + } + } + } + catch (Exception ex) + { + LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "眼睛搜索线程CatchError:" + ex); + } + } + } +} diff --git a/irisRefactor/IrisThread/SaveImageTh.cs b/irisRefactor/IrisThread/SaveImageTh.cs index 6bf8ac6..ab978b4 100644 --- a/irisRefactor/IrisThread/SaveImageTh.cs +++ b/irisRefactor/IrisThread/SaveImageTh.cs @@ -39,6 +39,7 @@ if (image == null) return; //2.对图像进行人眼搜索处理 + // 条件:未处在待机状态;正在取流过程;没有进行数据同步 if (ProMemory.isWait == false && ProMemory.findingEyes && !ProMemory.isSyning) { try @@ -47,6 +48,7 @@ lock (ProMemory.irisConfig.Q1) { ProMemory.irisConfig.Q1.Push(imgBytes); + // LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "Q1.Push:" + ProMemory.irisConfig.Q1.Count); } } catch (Exception ee) @@ -54,13 +56,27 @@ LogHelper.WriteLog(MethodBase.GetCurrentMethod().DeclaringType, "errorerrorerror : 采集线程push q1 :" + ee); } + // 条件:找眼线程未开启;未处于待机状态 if (ProMemory.irisConfig.Key_FindEyes == 0 && !ProMemory.isWait) { + // 标记进入找眼线程 + /* ProMemory.irisConfig.Key_FindEyes = 1; ProMemory.irisConfig.EyeFinderThreadRun = true; + + // 新建线程进行找眼 Thread m_EyeFinderThread = new Thread(FindEyesTh.GetInstance().FindEyes); m_EyeFinderThread.Name = "FindEyes"; m_EyeFinderThread.Start(); + */ + + // 开启工作线程 + ProMemory.identifyConfig.Flag_Working = 1; + ProMemory.irisConfig.Key_FindEyes = 1; + ProMemory.irisConfig.EyeFinderThreadRun = true; + Thread th_PreIdentify = new Thread(PreIdentifyTh.GetInstance.FindEyes); + th_PreIdentify.Name = "FindEyes"; + th_PreIdentify.Start(); } } diff --git a/irisRefactor/ProMemory.cs b/irisRefactor/ProMemory.cs index 441f1c2..07d8bfa 100644 --- a/irisRefactor/ProMemory.cs +++ b/irisRefactor/ProMemory.cs @@ -24,6 +24,7 @@ public static ProConfig proConfig; public static AppConfig appConfig; public static IrisConfig irisConfig; + public static IdentifyConfig identifyConfig; public static IoControllService IoControllService = (IoControllService)IrisIoControllObject.getEntity(); public static IrisDataService irisDataService = (IrisDataService)IrisDataBaseObject.getEntity("IrisDataService"); public static IrisPersonViewService irisPersonViewService = (IrisPersonViewService)IrisDataBaseObject.getEntity("IrisPersonView"); @@ -83,7 +84,8 @@ proConfig = ProConfig.GetInstance(); appConfig = AppConfig.GetInstance(); irisConfig = IrisConfig.GetInstance(); - + identifyConfig = IdentifyConfig.GetInstance; + cameraController = CameraController.GetInstance(); //GetHostIPv4(); diff --git a/irisRefactor/irisRefactor.csproj b/irisRefactor/irisRefactor.csproj index 88735d7..f0c6cf1 100644 --- a/irisRefactor/irisRefactor.csproj +++ b/irisRefactor/irisRefactor.csproj @@ -161,6 +161,7 @@ +