From 47f77f5e64d308fa50b29dfd1583ef41c700cd7f Mon Sep 17 00:00:00 2001 From: "liu.wenjie" Date: Sat, 20 Mar 2021 18:46:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E8=BD=BD=E5=AE=8CJo?= =?UTF-8?q?b=E5=90=8E=E8=BF=9E=E7=BA=BF=E6=B6=88=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=AD=A4=E7=89=88=E6=9C=AC=E9=9C=80?= =?UTF-8?q?=E5=B0=86=E4=B9=8B=E9=97=B4=E4=BF=9D=E5=AD=98=E7=9A=84prj?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/VisionEdit/v14/.suo | Bin 422400 -> 436736 bytes .../CaliperTool.csproj.FileListAbsolute.txt | 32 ++++++++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7713 -> 7683 bytes CommonMethods/Interface/IToolInfo.cs | 1 + .../CommonHelper.csproj.FileListAbsolute.txt | 8 +++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7131 -> 7125 bytes .../DataStruct.csproj.FileListAbsolute.txt | 6 ++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7361 -> 7343 bytes ...FindCircleTool.csproj.FileListAbsolute.txt | 18 ++++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7707 -> 7677 bytes .../FindLineTool.csproj.FileListAbsolute.txt | 32 ++++++++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7624 -> 7600 bytes .../HalconTool.csproj.FileListAbsolute.txt | 30 +++++++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 7155 -> 7143 bytes .../HWindow_Tool.csproj.FileListAbsolute.txt | 12 ++++ ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6881 -> 6872 bytes .../ToolBase.csproj.FileListAbsolute.txt | 10 +++ ToolLib.VisionJob/OperateProject.cs | 59 ++++++++++++++++++ ToolLib.VisionJob/VisionJob.cs | 37 ++++++++++- ToolLib.VisionJob/VisionProject.cs | 10 +-- VisionEdit/bin/Debug/DockPanel.config | Bin 6954 -> 5352 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 12764 -> 12764 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 9158 -> 9086 bytes .../VisionEdit.csproj.FileListAbsolute.txt | 41 ++++++++++++ 24 files changed, 288 insertions(+), 8 deletions(-) diff --git a/.vs/VisionEdit/v14/.suo b/.vs/VisionEdit/v14/.suo index 98e331b5d6d94fbfc71ee14bb88b521557e77ec4..4abcd9c16a91f25debae8179cd7f042504a01ac6 100644 GIT binary patch delta 23372 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 diff --git a/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt b/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt index 90e3c7b..211d2e4 100644 --- a/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt +++ b/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt @@ -32,3 +32,35 @@ G:\VisionEdit\VisionEdit\CaliperTool\obj\Debug\CaliperTool.FormCaliper.resources G:\VisionEdit\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache G:\VisionEdit\VisionEdit\CaliperTool\obj\Debug\CaliperTool.dll G:\VisionEdit\VisionEdit\CaliperTool\obj\Debug\CaliperTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\log4net.config +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\CaliperTool.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\CaliperTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\DataStruct.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\FormLib.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\LogForm.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\Logger.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\ToolBase.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\ToolLib.VisionJob.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\Newtonsoft.Json.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\log4net.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\DevComponents.DotNetBar2.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\DataStruct.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\FormLib.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\ToolBase.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\LogForm.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\Logger.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\ToolLib.VisionJob.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.pdb +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\bin\Debug\DevComponents.DotNetBar2.xml +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.FormCaliper.resources +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.dll +F:\GitHubClone\最新克隆\VisionEdit\CaliperTool\obj\Debug\CaliperTool.pdb diff --git a/CaliperTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CaliperTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 71971593ca4b21669fdf1722d85e3360838a4c07..ee6036d4411302859799f3eb76800976387c6b31 100644 GIT binary patch delta 348 zcmZ2z(`>V03Aap|n^lZ^W{F2>l5l5Abztp@8o;IBJYV`(d50t c2J+GP)okVzS<5ExfL{?XBqcV#l9FTw01`F7uK)l5 diff --git a/CommonMethods/Interface/IToolInfo.cs b/CommonMethods/Interface/IToolInfo.cs index 1b6c8ea..73b24d9 100644 --- a/CommonMethods/Interface/IToolInfo.cs +++ b/CommonMethods/Interface/IToolInfo.cs @@ -117,6 +117,7 @@ namespace CommonMethods toolOutput.RemoveAt(i); } } + public Form GetFormTool() { diff --git a/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt b/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt index 25c0111..f54a0ee 100644 --- a/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt +++ b/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt @@ -4,3 +4,11 @@ G:\VisionEdit\VisionEdit\CommonMethods\bin\Debug\halcondotnet.dll G:\VisionEdit\VisionEdit\CommonMethods\bin\Debug\halcondotnet.xml G:\VisionEdit\VisionEdit\CommonMethods\obj\Debug\CommonMethods.dll G:\VisionEdit\VisionEdit\CommonMethods\obj\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\Newtonsoft.Json.dll +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\obj\Debug\CommonHelper.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\obj\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\CommonMethods\obj\Debug\CommonMethods.pdb diff --git a/CommonMethods/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CommonMethods/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 64363e0d06ccce2984986078e400d460f0625272..f58a9fba2a18fb5484391cb5ab403c9dc93d700c 100644 GIT binary patch delta 75 zcmca@e${-#5^k9cH>();%o2~%BB>exFd-G delta 85 zcmca=e%pM*5^niyH>();%o2~%B6Taz3bVu_9wfyJzcVM^8xN-Jn~NX P6-_?CEwy=%gd{Tn34bc= diff --git a/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt b/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt index 031d73f..2aa02a7 100644 --- a/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt +++ b/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt @@ -4,3 +4,9 @@ G:\VisionEdit\VisionEdit\DataStruct\bin\Debug\halcondotnet.dll G:\VisionEdit\VisionEdit\DataStruct\bin\Debug\halcondotnet.xml G:\VisionEdit\VisionEdit\DataStruct\obj\Debug\DataStruct.dll G:\VisionEdit\VisionEdit\DataStruct\obj\Debug\DataStruct.pdb +F:\GitHubClone\最新克隆\VisionEdit\DataStruct\bin\Debug\DataStruct.dll +F:\GitHubClone\最新克隆\VisionEdit\DataStruct\bin\Debug\DataStruct.pdb +F:\GitHubClone\最新克隆\VisionEdit\DataStruct\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\DataStruct\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\DataStruct\obj\Debug\DataStruct.dll +F:\GitHubClone\最新克隆\VisionEdit\DataStruct\obj\Debug\DataStruct.pdb diff --git a/FindCircle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/FindCircle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d8306f6962d2d58af47c4d9a678bf145dc0f56b1..7c9403f61a8edbc0010080e8083548520bed9230 100644 GIT binary patch delta 212 zcmX?Tx!!Wa5^kAPH>();%o2~%B();%o2~%B6Taz3bVu_9wfyJzcVM@&WGm^1%eu uoaV8T_a&f4k+(%Y1izZi2YFw!$a@k{bV6u0o4h@KML<`JZ=NP8$qWF(<#q1> diff --git a/FindCircle/obj/Debug/FindCircleTool.csproj.FileListAbsolute.txt b/FindCircle/obj/Debug/FindCircleTool.csproj.FileListAbsolute.txt index 738e02d..9e31e99 100644 --- a/FindCircle/obj/Debug/FindCircleTool.csproj.FileListAbsolute.txt +++ b/FindCircle/obj/Debug/FindCircleTool.csproj.FileListAbsolute.txt @@ -24,3 +24,21 @@ G:\VisionEdit\VisionEdit\FindCircle\obj\Debug\FindCircle.FormFindCircle.resource G:\VisionEdit\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csproj.GenerateResource.Cache G:\VisionEdit\VisionEdit\FindCircle\obj\Debug\FindCircleTool.dll G:\VisionEdit\VisionEdit\FindCircle\obj\Debug\FindCircleTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\FindCircleTool.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\FindCircleTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\DataStruct.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\ToolBase.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\Newtonsoft.Json.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\DataStruct.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\ToolBase.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircle.FormFindCircle.resources +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.dll +F:\GitHubClone\最新克隆\VisionEdit\FindCircle\obj\Debug\FindCircleTool.pdb diff --git a/FindLine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/FindLine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 6035b225735f62138e16da55a1558559cfa6713a..1c23d9ed9d5386c26e0de7f9c626526fe907655e 100644 GIT binary patch delta 352 zcmbPj^VfRA5^kAfH>();%o2~%B();%o2~%B6Taz3bVu_9wfyJzcVM@&WF*^1%eu zoaC{R_a&f4p4UX)oq(Er-a7dZ0%|zd&fzL`lkbpS}eA1gQ@||Uo_avZjm#~3+ cGyydUd?K5rL}s$d+Y(TCfLnC)6Ddh%0BUc*v;Y7A diff --git a/FindLine/obj/Debug/FindLineTool.csproj.FileListAbsolute.txt b/FindLine/obj/Debug/FindLineTool.csproj.FileListAbsolute.txt index 36ef1bd..ae45c82 100644 --- a/FindLine/obj/Debug/FindLineTool.csproj.FileListAbsolute.txt +++ b/FindLine/obj/Debug/FindLineTool.csproj.FileListAbsolute.txt @@ -32,3 +32,35 @@ G:\VisionEdit\VisionEdit\FindLine\obj\Debug\FindLineTool.FormFindLine.resources G:\VisionEdit\VisionEdit\FindLine\obj\Debug\FindLineTool.csproj.GenerateResource.Cache G:\VisionEdit\VisionEdit\FindLine\obj\Debug\FindLineTool.dll G:\VisionEdit\VisionEdit\FindLine\obj\Debug\FindLineTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\log4net.config +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\FindLineTool.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\FindLineTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\DataStruct.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\FormLib.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\LogForm.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\Logger.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\ToolBase.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\ToolLib.VisionJob.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\Newtonsoft.Json.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\log4net.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\DevComponents.DotNetBar2.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\DataStruct.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\FormLib.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\ToolBase.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\LogForm.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\Logger.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\ToolLib.VisionJob.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\WeifenLuo.WinFormsUI.Docking.pdb +F:\GitHubClone\最新克隆\VisionEdit\FindLine\bin\Debug\DevComponents.DotNetBar2.xml +F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.FormFindLine.resources +F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.dll +F:\GitHubClone\最新克隆\VisionEdit\FindLine\obj\Debug\FindLineTool.pdb diff --git a/HalconTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HalconTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 10ff9b8d4734e8ee39b09b67b0545edea7a83771..41ef9da37d57285c9bda50fedbf0e9e0b961fd20 100644 GIT binary patch delta 274 zcmX?My}^3J5^kAPH>();%o2~%B_^#`l6n#tn~($+f};G7)$bY(68rmQBV6pNbh$2Fw6W CFoBl< delta 285 zcmdmBeZqRf5^nhnH>();%o2~%B6Taz3bVu_9wfyJzcVM@&WGm^1%eu zoaX75cPF5xjJHlcgn$|WKI_R}cm?@Tov=Bb?*)szCjq_L!Upou_| I1}Ot(0QE?d>;M1& diff --git a/HalconTool/obj/Debug/HalconTool.csproj.FileListAbsolute.txt b/HalconTool/obj/Debug/HalconTool.csproj.FileListAbsolute.txt index 606ce14..e8b95ee 100644 --- a/HalconTool/obj/Debug/HalconTool.csproj.FileListAbsolute.txt +++ b/HalconTool/obj/Debug/HalconTool.csproj.FileListAbsolute.txt @@ -32,3 +32,33 @@ G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resource G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.dll G:\VisionEdit\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\log4net.config +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HalconTool.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HalconTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\FormLib.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\Logger.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolBase.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\Newtonsoft.Json.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\LogForm.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\log4net.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\FormLib.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolBase.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\Logger.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\ToolLib.VisionJob.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\DevComponents.DotNetBar2.xml +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\WeifenLuo.WinFormsUI.Docking.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\bin\Debug\LogForm.pdb +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.FormHalconTool.resources +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.dll +F:\GitHubClone\最新克隆\VisionEdit\HalconTool\obj\Debug\HalconTool.pdb diff --git a/ImageWindow/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ImageWindow/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 955cf446747fc74ede2a64eb772bf2a11f48aa45..47072e13d357c7ab8cf7f39f515e46c44214a95d 100644 GIT binary patch delta 153 zcmext{@i@SB5s*1H>();%o2~%B();%o2~%B6Taz3bVu_9wfyJzcVM@;>f&@(u*m cNKAgf!!I91Slwo2UT$uA7a|lUNwhKp0LYh8cK`qY diff --git a/ImageWindow/obj/x64/Debug/HWindow_Tool.csproj.FileListAbsolute.txt b/ImageWindow/obj/x64/Debug/HWindow_Tool.csproj.FileListAbsolute.txt index 32d6d39..3a4594b 100644 --- a/ImageWindow/obj/x64/Debug/HWindow_Tool.csproj.FileListAbsolute.txt +++ b/ImageWindow/obj/x64/Debug/HWindow_Tool.csproj.FileListAbsolute.txt @@ -27,3 +27,15 @@ D:\halcon平移缩放(halcon1712)\C#源码\ihalcon开源窗体控件\halcon控 D:\halcon平移缩放(halcon1712)\C#源码\ihalcon开源窗体控件\halcon控件\obj\x64\Debug\HWindow_Tool.csproj.GenerateResource.Cache D:\halcon平移缩放(halcon1712)\C#源码\ihalcon开源窗体控件\halcon控件\obj\x64\Debug\HWindow_Tool.dll D:\halcon平移缩放(halcon1712)\C#源码\ihalcon开源窗体控件\halcon控件\obj\x64\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\bin\x64\Debug\HWindow_Tool.dll.config +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\bin\x64\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\bin\x64\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\bin\x64\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\bin\x64\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\ViewROI.HWindowTool_Smart.resources +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\ChoiceTech.Halcon.Control.HWindow_Final.resources +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\ViewROI.Properties.Resources.resources +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\ImageWindow\obj\x64\Debug\HWindow_Tool.pdb diff --git a/ToolBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ToolBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b56b4b0472e9c19cf139102c41f4f1d9c85d1f36..002adb253dca90fefb8e7f9d5f49a23d7b0f9f2e 100644 GIT binary patch delta 108 zcmaE8dc$();%o2~%BoEfW*`G7z delta 121 zcmca%`p|U45^ni4H>();%o2~%B6Taz3bVu_9wfyJzcVM@&WF*^1=Ak XY(B|zluO 0) + { + ReCoverJob(myJob); + } myJob.GetJobTree().Dock = DockStyle.Fill; myJob.GetJobTree().ImageList = FormToolBox.Instance.imageListTool; myJob.GetJobTree().Font = new Font("微软雅黑", 9, FontStyle.Bold); @@ -190,6 +195,60 @@ namespace ToolLib.VisionJob } } } + /// + /// 恢复工具之间的关系和连线 + /// + private void ReCoverJob(VisionJob myJob) + { + //反序列化各工具 + myJob.D_itemAndSource.Clear(); + for (int i = 0; i < myJob.L_toolList.Count; i++) + { + TreeNode node = myJob.GetJobTree().Nodes.Add(myJob.L_toolList[i].toolName); + for (int j = 0; j < myJob.L_toolList[i].toolInput.Count; j++) + { + TreeNode treeNode; + //因为OutputBox只有源，所以此处特殊处理 + if (myJob.L_toolList[i].toolType != ToolType.Output) + treeNode = node.Nodes.Add("<--" + myJob.L_toolList[i].toolInput[j].IOName + myJob.L_toolList[i].toolInput[j].value); + else + treeNode = node.Nodes.Add("<--" + myJob.L_toolList[i].toolInput[j].IOName); + + treeNode.Tag = myJob.L_toolList[i].toolInput[j].ioType; + treeNode.ForeColor = Color.DarkMagenta; + + //解析需要连线的节点对 + if (treeNode.ToString().Contains("《-")) + { + string toolNodeText = Regex.Split(myJob.L_toolList[i].toolInput[j].value.ToString(), "->")[0].Substring(3); + string a = myJob.L_toolList[i].toolInput[j].value.ToString(); + string toolIONodeText = "-->" + Regex.Split(myJob.L_toolList[i].toolInput[j].value.ToString(), "->")[1]; + TreeNode bbb = myJob.GetToolIONodeByNodeText(toolNodeText, toolIONodeText); + myJob.D_itemAndSource.Add(treeNode, myJob.GetToolIONodeByNodeText(toolNodeText, toolIONodeText)); + } + if (myJob.L_toolList[i].toolType == ToolType.Output) + { + string toolNodeText = Regex.Split(treeNode.Text, "->")[0].Substring(3); + string toolIONodeText = Regex.Split(treeNode.Text, "->")[1]; + TreeNode aaa = myJob.GetToolIONodeByNodeText(toolNodeText, "-->" + toolIONodeText); + myJob.D_itemAndSource.Add(treeNode, myJob.GetToolIONodeByNodeText(toolNodeText, "-->" + toolIONodeText)); + } + } + for (int k = 0; k < myJob.L_toolList[i].toolOutput.Count; k++) + { + TreeNode treeNode = node.Nodes.Add("-->" + myJob.L_toolList[i].toolOutput[k].IOName); + + treeNode.Tag = myJob.L_toolList[i].toolOutput[k].ioType; + treeNode.ForeColor = Color.Blue; + } + } + + // UpdateJobTreeIcon(job.jobName); + + //默认选中第一个节点 + //if (tvw_job.Nodes.Count > 0) + // tvw_job.SelectedNode = tvw_job.Nodes[0]; + } } } diff --git a/ToolLib.VisionJob/VisionJob.cs b/ToolLib.VisionJob/VisionJob.cs index a448805..b236ba8 100644 --- a/ToolLib.VisionJob/VisionJob.cs +++ b/ToolLib.VisionJob/VisionJob.cs @@ -222,8 +222,10 @@ namespace ToolLib.VisionJob input = Regex.Split(input, "《")[0]; else //第一次连接源就需要添加到输入输出集合 D_itemAndSource.Add(targeNode, moveNode); - GetToolInfoByToolName(targeNode.Parent.Text).GetInput(input.Substring(3)).value = "《- " + moveNode.Parent.Text + " . " + moveNode.Text.Substring(3); - targeNode.Text = input + "《- " + moveNode.Parent.Text + " . " + moveNode.Text.Substring(3); + // GetToolInfoByToolName(targeNode.Parent.Text).GetInput(input.Substring(3)).value = "《- " + moveNode.Parent.Text + " . " + moveNode.Text.Substring(3); + // targeNode.Text = input + "《- " + moveNode.Parent.Text + " . " + moveNode.Text.Substring(3); + GetToolInfoByToolName(targeNode.Parent.Text).GetInput(input.Substring(3)).value = "《- " + moveNode.Parent.Text + "->" + moveNode.Text.Substring(3); + targeNode.Text = input + "《- " + moveNode.Parent.Text + "->" + moveNode.Text.Substring(3); DrawLine(); //移除拖放的节点 @@ -533,7 +535,36 @@ namespace ToolLib.VisionJob return null; } } - + /// + /// 通过TreeNode节点文本获取输入输出节点 + /// + /// 工具名称 + /// IO名称 + internal TreeNode GetToolIONodeByNodeText(string toolName, string toolIOName) + { + try + { + foreach (TreeNode toolNode in GetJobTree().Nodes) + { + if (toolNode.Text == toolName) + { + foreach (TreeNode itemNode in toolNode.Nodes) + { + if (itemNode.Text == toolIOName) + { + return itemNode; + } + } + } + } + return null; + } + catch (Exception ex) + { + LoggerClass.WriteLog("通过TreeNode节点文本获取输入输出节点时出错", ex); + return null; + } + } /// /// 删除连线及值传递 /// diff --git a/ToolLib.VisionJob/VisionProject.cs b/ToolLib.VisionJob/VisionProject.cs index a17e75c..4c9d9ff 100644 --- a/ToolLib.VisionJob/VisionProject.cs +++ b/ToolLib.VisionJob/VisionProject.cs @@ -50,11 +50,11 @@ namespace ToolLib.VisionJob foreach (var item in Project) { OperateProject.Instance.CreateNewJob(item.Key, false); - foreach (var tool in item.Value.L_toolList) - { - OperateTreeView.Instance.Add_Tool((ToolType)Enum.Parse(typeof(ToolType), tool.toolType.ToString()), false); - } - OperateProject.Instance.InitJob(item.Value); + //foreach (var tool in item.Value.L_toolList) + //{ + // OperateTreeView.Instance.Add_Tool((ToolType)Enum.Parse(typeof(ToolType), tool.toolType.ToString()), false); + //} + // OperateProject.Instance.InitJob(item.Value); } return true; } diff --git a/VisionEdit/bin/Debug/DockPanel.config b/VisionEdit/bin/Debug/DockPanel.config index e576f900a0904fd0ea88060b6ce78882d60dc5eb..a9d30d015d86aba6340d6c40fad82a8694c10823 100644 GIT binary patch delta 321 zcmZ2w_Cj;R1SVM{1_K5&22%!O1`7sDAj=HM2SG!inAzmjOuCFllW#J~PF54LuCIN6U& zX0n4I+hz++F~-SF+$xi2hzd-0)f0KZ~Y AWB>pF delta 597 zcmaE%xyo$A1SV-i22&ukU@&7aW-wx~WH12JCJZJF7L(U9=`tElzRe`dXgc{PQ@vss zLncEp5a%=GF}O0M09hprdJJwrei1`1gAYUIL@9vYUVmyBk9e(6xz^y}4AG zbr}pN7jo54uH(p>9L24&`3k!TBcsXWjqK7`m8}zIoBWL{1sD_$g^V}%aZ4~w7811B ze2=$=aq>E0i^*PsTYy%a0UF0PIf4J#=6`}47#U4BuNM|(lr>^dVz6W2W#D2^fI=H! zuz{VzP%>FxK-|&*s6v6k3Fx>|VBn?zgV`1+Vhn_a3_3s=P&65VS;oL9GC;5<^9##w zR^!!RPiXGBOy!kw$ JlP`!!003!lgKz)< diff --git a/VisionEdit/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/VisionEdit/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 1a58fa74ea56d31f8f46731e9c95418424a9060c..85f898a232b72f26bcff1b778c2ae8436cef18c6 100644 GIT binary patch delta 26 icmcbUd?$HBCnKZ4<}OAqb~Y_#`NdvaHqYX4(gXm7ObF}% delta 26 icmcbUd?$HBCnF>O<}OAqcD6pY9VKGon`d!2X#xO;GYHE7 diff --git a/VisionEdit/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/VisionEdit/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0aea818ed093441acdf6ba03ff17ac002ad1f4c9..461247c9b1bd91a834ddfc03f543f25bcc1f9d63 100644 GIT binary patch delta 895 zcmX@+{?Bd05^kAPH>();%o2~%BCsyG-VioH0@yoaqvU&r*psHR$UOJmR0|Ns=hXx36 zPd>}XN7zRJ0s;_Y6@kVQbVLHbl#B;qmr4`17Zj4*0z~*bKtPIc;4Ab=S3mu&91_>toQ?Lp@e}<1U|=I d6cU-tBB>`6hDXunKuI-rLis>(^L7P(W&pBsip~H4 delta 997 zcmez8cFcXl5^nhnH>();%o2~%B6Taz3bVu_9wfyJzcVM@&WD-@__`^ zh);gZqbP4rK%D}wn!G0gH3zuGC-?Jn={;T2`($sgUO`?un+yX31CiP$pXcQ#){4o} zeEjlWL^(%ravmQivF7SM>zw>_PXpNL3dB2o59sgd$i825ypsfqXOpN3D}^l8+>y2ADTCD@*dT6U=BJg{caX F%mB3~<0Jq8 diff --git a/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt b/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt index 4ed9450..eaa1967 100644 --- a/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt +++ b/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt @@ -72,3 +72,44 @@ G:\VisionEdit\VisionEdit\VisionEdit\obj\Debug\VisionEdit.FormLib.FormToolBox.res G:\VisionEdit\VisionEdit\VisionEdit\obj\Debug\VisionEdit.FormMain.resources G:\VisionEdit\VisionEdit\VisionEdit\obj\Debug\VisionEdit.Properties.Resources.resources G:\VisionEdit\VisionEdit\VisionEdit\obj\Debug\VisionEdit.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\log4net.config +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\VisionEdit.exe.config +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\VisionEdit.exe +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\VisionEdit.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\CommonMethods.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\DataStruct.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\DevComponents.DotNetBar2.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\FormLib.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\halcondotnet.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\HWindow_Tool.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\LogForm.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\Logger.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\ToolBase.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\ToolLib.VisionJob.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\WeifenLuo.WinFormsUI.Docking.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\Newtonsoft.Json.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\log4net.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\HalconTool.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\FindLineTool.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\CaliperTool.dll +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\CommonMethods.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\DataStruct.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\FormLib.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\ToolBase.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\LogForm.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\Logger.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\ToolLib.VisionJob.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\ToolLib.VisionToolList.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\HWindow_Tool.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\DevComponents.DotNetBar2.xml +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\halcondotnet.xml +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\WeifenLuo.WinFormsUI.Docking.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\HalconTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\FindLineTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\bin\Debug\CaliperTool.pdb +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\obj\Debug\VisionEdit.csprojResolveAssemblyReference.cache +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\obj\Debug\VisionEdit.FormMain.resources +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\obj\Debug\VisionEdit.Properties.Resources.resources +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\obj\Debug\VisionEdit.csproj.GenerateResource.Cache +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\obj\Debug\VisionEdit.exe +F:\GitHubClone\最新克隆\VisionEdit\VisionEdit\obj\Debug\VisionEdit.pdb