修复加载完Job后连线消失的问题,此版本需将之间保存的prj删除

This commit is contained in:
liu.wenjie
2021-03-20 18:46:23 +08:00
parent 761cfc2b2f
commit 47f77f5e64
24 changed files with 288 additions and 8 deletions

Binary file not shown.

View File

@@ -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

View File

@@ -117,6 +117,7 @@ namespace CommonMethods
toolOutput.RemoveAt(i);
}
}
public Form GetFormTool()
{

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -7,3 +7,13 @@ G:\VisionEdit\VisionEdit\ToolBase\bin\Debug\halcondotnet.xml
G:\VisionEdit\VisionEdit\ToolBase\obj\Debug\ToolBase.csprojResolveAssemblyReference.cache
G:\VisionEdit\VisionEdit\ToolBase\obj\Debug\ToolBase.dll
G:\VisionEdit\VisionEdit\ToolBase\obj\Debug\ToolBase.pdb
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\ToolBase.dll
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\ToolBase.pdb
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\CommonMethods.dll
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\halcondotnet.dll
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\Newtonsoft.Json.dll
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\CommonMethods.pdb
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\bin\Debug\halcondotnet.xml
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\obj\Debug\ToolBase.csprojResolveAssemblyReference.cache
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\obj\Debug\ToolBase.dll
F:\GitHubClone\最新克隆\VisionEdit\ToolBase\obj\Debug\ToolBase.pdb

View File

@@ -22,6 +22,7 @@ using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -88,6 +89,10 @@ namespace ToolLib.VisionJob
public void InitJob(VisionJob myJob)
{
if(myJob.L_toolList.Count > 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
}
}
}
/// <summary>
/// 恢复工具之间的关系和连线
/// </summary>
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];
}
}
}

View File

@@ -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;
}
}
/// <summary>
/// 通过TreeNode节点文本获取输入输出节点
/// </summary>
/// <param name="toolName">工具名称</param>
/// <returns>IO名称</returns>
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;
}
}
/// <summary>
/// 删除连线及值传递
/// </summary>

View File

@@ -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;
}

View File

@@ -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