传输优化

CaliperTool/CaliperTool.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using CommonMethods;
 using HalconDotNet;
-using HalconWindow.HalconWindow;
 using ToolBase;
 using static DataStruct.DataStruct;
+using ChoiceTech.Halcon.Control;
+
 
 namespace CaliperTool
 {
@@ -16,7 +13,7 @@ namespace CaliperTool
     {
         public bool toolEnable = true;
         /// <summary>
-        /// 输入姿态
+        /// 输入姿态..
         /// </summary>
         public PosXYU inputPose = new PosXYU();
         /// <summary>
@@ -119,7 +116,32 @@ namespace CaliperTool
         public ToolRunStatu toolRunStatu { get; set; } = ToolRunStatu.Not_Run;
 
         public SoftwareRunState softwareRunState { get; set; } = SoftwareRunState.Debug;
-       
+
+        public string runMessage
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public string runTime
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
 
         public void DispImage()
         {

CaliperTool/CaliperTool.csproj

@@ -46,6 +46,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CaliperTool.cs" />
+    <Compile Include="CaliperToolRun.cs" />
     <Compile Include="FormCaliper.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -63,14 +64,30 @@
       <Project>{DF3D4D4C-02DF-4F92-9FD4-0A861F64B0EF}</Project>
       <Name>DataStruct</Name>
     </ProjectReference>
-    <ProjectReference Include="..\HalconWindowTest\HalconWindow.csproj">
-      <Project>{4ADC75AE-59C7-4D36-B675-A6CE51B6F5BA}</Project>
-      <Name>HalconWindow</Name>
+    <ProjectReference Include="..\FormLib\FormLib.csproj">
+      <Project>{8C6FC8C6-8874-494B-8260-071F291AA33D}</Project>
+      <Name>FormLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ImageWindow\HWindow_Tool.csproj">
+      <Project>{9baa53fd-89b5-43e2-ac59-a27b006debb6}</Project>
+      <Name>HWindow_Tool</Name>
     </ProjectReference>
     <ProjectReference Include="..\ToolBase\ToolBase.csproj">
       <Project>{7CD50B44-BF56-4E8E-8FA1-05F6968C1835}</Project>
       <Name>ToolBase</Name>
     </ProjectReference>
+    <ProjectReference Include="..\ToolLib.Log\LogForm\LogForm.csproj">
+      <Project>{6b38d68f-e77b-4761-bde5-a261ea8925dd}</Project>
+      <Name>LogForm</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ToolLib.Log\Logger\Logger.csproj">
+      <Project>{d4e052b9-e541-4b67-a1f9-273073ef1d4b}</Project>
+      <Name>Logger</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ToolLib.VisionJob\ToolLib.VisionJob.csproj">
+      <Project>{16E8FF17-98A8-4452-AB9E-C433DC9C21F7}</Project>
+      <Name>ToolLib.VisionJob</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="FormCaliper.resx">

CaliperTool/CaliperToolRun.cs

@@ -0,0 +1,85 @@
+/*
+* ==============================================================================
+*
+* Filename: CaliperToolRun
+* Description: 
+*
+* Version: 1.0
+* Created: 2021/2/25 16:25:51
+*
+* Author: liu.wenjie
+*
+* ==============================================================================
+*/
+using CommonMethods;
+using CommonMethods.Interface;
+using FormLib;
+using HalconDotNet;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ToolLib.VisionJob;
+
+namespace CaliperTool
+{
+    public class CaliperRun : IToolRun
+    {
+        public void ToolRun(string jobName, int toolIndex, int inputItemNum, TreeNode selectNode, List<IToolInfo> L_toolList)
+        {
+            Caliper myCaliper = (Caliper)L_toolList[toolIndex].tool;
+            VisionJob myJob = VisionJobParams.pVisionProject.Project[jobName];
+            for (int j = 0; j < inputItemNum; j++)
+            {
+                if (L_toolList[toolIndex].toolInput[j].IOName == "InputImage" && L_toolList[toolIndex].GetInput(L_toolList[toolIndex].toolInput[j].IOName).value == null)
+                {
+                    selectNode.ForeColor = Color.Red;
+                    Logger.LoggerClass.WriteLog($"{L_toolList[toolIndex].toolName} 无输入图像");
+                    break;
+                }
+                else
+                {
+                    if (L_toolList[toolIndex].GetInput(L_toolList[toolIndex].toolInput[j].IOName).value != null)
+                    {
+                        string sourceFrom = L_toolList[toolIndex].GetInput(L_toolList[toolIndex].toolInput[j].IOName).value.ToString();
+                        string sourceToolName = Regex.Split(sourceFrom, " . ")[0];
+                        sourceToolName = sourceToolName.Substring(3, Regex.Split(sourceFrom, " . ")[0].Length - 3);
+                        string toolItem = Regex.Split(sourceFrom, " . ")[1];
+                        if (L_toolList[toolIndex].toolInput[j].IOName == "InputImage")
+                        {
+                            myCaliper.inputImage = myJob.GetToolInfoByToolName(sourceToolName).GetOutput(toolItem).value as HObject;
+                        }
+                        if (L_toolList[toolIndex].toolInput[j].IOName == "inputCenterRow")
+                        {
+                            myCaliper.expectRecStartRow = myJob.GetToolInfoByToolName(sourceToolName).GetOutput(toolItem).value as HTuple;
+                        }
+                        if (L_toolList[toolIndex].toolInput[j].IOName == "inputCenterCol")
+                        {
+                            myCaliper.expectRecStartColumn = myJob.GetToolInfoByToolName(sourceToolName).GetOutput(toolItem).value as HTuple;
+                        }
+                        if (L_toolList[toolIndex].toolInput[j].IOName == "inputPhi")
+                        {
+                            myCaliper.expectAngle = myJob.GetToolInfoByToolName(sourceToolName).GetOutput(toolItem).value as HTuple;
+                        }
+
+                    }
+                }
+            }
+            myCaliper.Run(SoftwareRunState.Release);
+            if (myCaliper.toolRunStatu == ToolRunStatu.Succeed)
+            {
+                myCaliper.DispMainWindow(FormImageWindow.Instance.myHWindow);
+                myJob.FormLogDisp(L_toolList[toolIndex].toolName + "  运行成功", Color.Green, selectNode);
+            }
+            else
+            {
+                myJob.FormLogDisp(L_toolList[toolIndex].toolName + "  运行失败", Color.Red, selectNode);
+            }
+        }
+
+    }
+}

CaliperTool/FormCaliper.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using CommonMethods;
-using HalconWindow.HalconWindow;
+using ChoiceTech.Halcon.Control;
 
 namespace CaliperTool
 {

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

@@ -1,34 +1,34 @@
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CaliperTool.dll
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CaliperTool.pdb
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CommonMethods.dll
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\DataStruct.dll
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\halcondotnet.dll
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\HalconWindow.exe
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\ToolBase.dll
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CommonMethods.pdb
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\DataStruct.pdb
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\HalconWindow.pdb
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\ToolBase.pdb
-F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\halcondotnet.xml
-F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache
-F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.FormCaliper.resources
-F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache
-F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.dll
-F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.pdb
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CaliperTool.dll
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CaliperTool.pdb
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CommonMethods.dll
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\DataStruct.dll
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\halcondotnet.dll
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\HalconWindow.exe
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\ToolBase.dll
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CommonMethods.pdb
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\DataStruct.pdb
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\HalconWindow.pdb
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\ToolBase.pdb
-G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\halcondotnet.xml
-G:\VisionEdit\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache
-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:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CaliperTool.dll
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CaliperTool.pdb
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CommonMethods.dll
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\DataStruct.dll
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\halcondotnet.dll
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\HalconWindow.exe
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\ToolBase.dll
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\CommonMethods.pdb
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\DataStruct.pdb
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\HalconWindow.pdb
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\ToolBase.pdb
+F:\VSCode\VisionEditTest\CaliperTool\bin\Debug\halcondotnet.xml
+F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache
+F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.FormCaliper.resources
+F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.csproj.GenerateResource.Cache
+F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.dll
+F:\VSCode\VisionEditTest\CaliperTool\obj\Debug\CaliperTool.pdb
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CaliperTool.dll
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CaliperTool.pdb
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CommonMethods.dll
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\DataStruct.dll
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\halcondotnet.dll
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\HalconWindow.exe
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\ToolBase.dll
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\CommonMethods.pdb
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\DataStruct.pdb
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\HalconWindow.pdb
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\ToolBase.pdb
+G:\VisionEdit\VisionEdit\CaliperTool\bin\Debug\halcondotnet.xml
+G:\VisionEdit\VisionEdit\CaliperTool\obj\Debug\CaliperTool.csprojResolveAssemblyReference.cache
+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