diff --git a/.vs/VisionEdit/v14/.suo b/.vs/VisionEdit/v14/.suo index 7cdba93..afcfa15 100644 Binary files a/.vs/VisionEdit/v14/.suo and b/.vs/VisionEdit/v14/.suo differ diff --git a/CaliperTool/CaliperTool.cs b/CaliperTool/CaliperTool.cs index b1a1a4a..2656ec5 100644 --- a/CaliperTool/CaliperTool.cs +++ b/CaliperTool/CaliperTool.cs @@ -118,6 +118,9 @@ namespace CaliperTool public ToolRunStatu toolRunStatu { get; set; } = ToolRunStatu.Not_Run; + public SoftwareRunState softwareRunState { get; set; } = SoftwareRunState.Debug; + + public void DispImage() { if (inputImage != null) @@ -174,13 +177,16 @@ namespace CaliperTool DispImage(); } - public void Run() + public void Run(SoftwareRunState softwareRunState) { HTuple HMeasureHandle = new HTuple(); HTuple resultRow, resultCol; if (inputImage == null) { - FormCaliper.Instance.TextBoxMessageDisp("图像为空", System.Drawing.Color.Red); + if(softwareRunState == SoftwareRunState.Debug) + { + FormCaliper.Instance.TextBoxMessageDisp("图像为空", System.Drawing.Color.Red); + } toolRunStatu = ToolRunStatu.Not_Input_Image; return; } @@ -217,18 +223,25 @@ namespace CaliperTool } //把点显示出来 - HOperatorSet.GenCrossContourXld(out crossDisp, ResulttRow, ResultCol, new HTuple(12), new HTuple(0)); - DispMainWindow(FormCaliper.Instance.myHwindow); + HOperatorSet.GenCrossContourXld(out crossDisp, ResulttRow, ResultCol, new HTuple(60), new HTuple(0)); + if(softwareRunState == SoftwareRunState.Debug) + { + DispMainWindow(FormCaliper.Instance.myHwindow); + FormCaliper.Instance.tbx_resultStartRow.Text = ResulttRow.ToString(); + FormCaliper.Instance.tbx_resultStartCol.Text = ResultCol.ToString(); + FormCaliper.Instance.TextBoxMessageDisp("运行成功", System.Drawing.Color.Green); + } // 参数传递 ParamsTrans(); - FormCaliper.Instance.tbx_resultStartRow.Text = ResulttRow.ToString(); - FormCaliper.Instance.tbx_resultStartCol.Text = ResultCol.ToString(); - FormCaliper.Instance.TextBoxMessageDisp("运行成功", System.Drawing.Color.Green); toolRunStatu = ToolRunStatu.Succeed; } catch (Exception ex) { - FormCaliper.Instance.TextBoxMessageDisp("工具运行异常" + ex.Message, System.Drawing.Color.Red); + toolRunStatu = ToolRunStatu.Not_Succeed; + if (softwareRunState == SoftwareRunState.Debug) + { + FormCaliper.Instance.TextBoxMessageDisp("工具运行异常" + ex.Message, System.Drawing.Color.Red); + } } finally { @@ -243,9 +256,13 @@ namespace CaliperTool /// private void ParamsTrans() { - FormCaliper.Instance.myToolInfo.toolOutput.Clear(); - FormCaliper.Instance.myToolInfo.toolOutput.Add(new ToolIO("outputCenterRow", ResulttRow, DataType.IntValue)); - FormCaliper.Instance.myToolInfo.toolOutput.Add(new ToolIO("outputCenterColumn", ResultCol, DataType.IntValue)); + if(FormCaliper.Instance.myToolInfo != null) + { + FormCaliper.Instance.myToolInfo.toolOutput.Clear(); + FormCaliper.Instance.myToolInfo.toolOutput.Add(new ToolIO("outputCenterRow", ResulttRow, DataType.IntValue)); + FormCaliper.Instance.myToolInfo.toolOutput.Add(new ToolIO("outputCenterColumn", ResultCol, DataType.IntValue)); + } + } public void DispMainWindow(HWindow_Final window) @@ -258,7 +275,7 @@ namespace CaliperTool // 显示交点 if (dispCross) { - window.DispObj(crossDisp, "orange"); + window.DispObj(crossDisp, "yellow"); } //显示找到的线 // window.DispObj(LineDisp, "green"); diff --git a/CaliperTool/FormCaliper.cs b/CaliperTool/FormCaliper.cs index 80df4a7..8614c65 100644 --- a/CaliperTool/FormCaliper.cs +++ b/CaliperTool/FormCaliper.cs @@ -19,14 +19,14 @@ namespace CaliperTool public IToolInfo myToolInfo = null; public HWindow_Final myHwindow = new HWindow_Final(); - private static FormCaliper _instance; + private static FormCaliper _instance = null; public FormCaliper(ref object caliper) { InitializeComponent(); myToolInfo = (IToolInfo)caliper; myCaliper = (Caliper)myToolInfo.tool; _instance = this; - + myCaliper.DispImage(); } public static FormCaliper Instance { @@ -86,7 +86,7 @@ namespace CaliperTool txbLog.BackColor = setColor; txbLog.Text = mes; txbLog.Font = new Font("微软雅黑", 10, FontStyle.Bold); - CommonMethods.CommonMethods.Delay(2000); + //CommonMethods.CommonMethods.Delay(2000); txbLog.BackColor = Color.White; } @@ -98,12 +98,12 @@ namespace CaliperTool myCaliper.expectAngle = Convert.ToDouble(tbx_expectPhi.Text.Trim()); // 运行参数 myCaliper.threshold = Convert.ToInt16(tbx_threshold.Text.Trim()); - myCaliper.length1 = Convert.ToInt16(tbx_caliperLength1.Text.Trim()); - myCaliper.length2 = Convert.ToInt16(tbx_caliperLength2.Text.Trim()); + myCaliper.length1 = Convert.ToDouble(tbx_caliperLength1.Text.Trim()); + myCaliper.length2 = Convert.ToDouble(tbx_caliperLength2.Text.Trim()); myCaliper.polarity = cbx_polarity.SelectedItem.ToString() == "从明到暗" ? "negative" : "positive"; myCaliper.edgeSelect = cbx_edgeSelect.SelectedItem.ToString(); myCaliper.sigma = Convert.ToDouble(tbx_Sigma.Text.Trim()); - myCaliper.Run(); + myCaliper.Run(SoftwareRunState.Debug); } } } diff --git a/CaliperTool/bin/Debug/CaliperTool.dll b/CaliperTool/bin/Debug/CaliperTool.dll index 80ec6b3..1831ccf 100644 Binary files a/CaliperTool/bin/Debug/CaliperTool.dll and b/CaliperTool/bin/Debug/CaliperTool.dll differ diff --git a/CaliperTool/bin/Debug/CaliperTool.pdb b/CaliperTool/bin/Debug/CaliperTool.pdb index 940bd14..e818d20 100644 Binary files a/CaliperTool/bin/Debug/CaliperTool.pdb and b/CaliperTool/bin/Debug/CaliperTool.pdb differ diff --git a/CaliperTool/bin/Debug/CommonMethods.dll b/CaliperTool/bin/Debug/CommonMethods.dll index 67fa8d5..f0d1ddc 100644 Binary files a/CaliperTool/bin/Debug/CommonMethods.dll and b/CaliperTool/bin/Debug/CommonMethods.dll differ diff --git a/CaliperTool/bin/Debug/CommonMethods.pdb b/CaliperTool/bin/Debug/CommonMethods.pdb index d524819..8f9602f 100644 Binary files a/CaliperTool/bin/Debug/CommonMethods.pdb and b/CaliperTool/bin/Debug/CommonMethods.pdb differ diff --git a/CaliperTool/bin/Debug/DataStruct.dll b/CaliperTool/bin/Debug/DataStruct.dll index c8a8dc5..162524c 100644 Binary files a/CaliperTool/bin/Debug/DataStruct.dll and b/CaliperTool/bin/Debug/DataStruct.dll differ diff --git a/CaliperTool/bin/Debug/DataStruct.pdb b/CaliperTool/bin/Debug/DataStruct.pdb index 7248371..1e699d2 100644 Binary files a/CaliperTool/bin/Debug/DataStruct.pdb and b/CaliperTool/bin/Debug/DataStruct.pdb differ diff --git a/CaliperTool/bin/Debug/HalconWindow.exe b/CaliperTool/bin/Debug/HalconWindow.exe index 525d690..8772b38 100644 Binary files a/CaliperTool/bin/Debug/HalconWindow.exe and b/CaliperTool/bin/Debug/HalconWindow.exe differ diff --git a/CaliperTool/bin/Debug/HalconWindow.pdb b/CaliperTool/bin/Debug/HalconWindow.pdb index 6a9099f..a82c59d 100644 Binary files a/CaliperTool/bin/Debug/HalconWindow.pdb and b/CaliperTool/bin/Debug/HalconWindow.pdb differ diff --git a/CaliperTool/bin/Debug/ToolBase.dll b/CaliperTool/bin/Debug/ToolBase.dll index eb05f4e..a83f146 100644 Binary files a/CaliperTool/bin/Debug/ToolBase.dll and b/CaliperTool/bin/Debug/ToolBase.dll differ diff --git a/CaliperTool/bin/Debug/ToolBase.pdb b/CaliperTool/bin/Debug/ToolBase.pdb index 3dd2156..e60866c 100644 Binary files a/CaliperTool/bin/Debug/ToolBase.pdb and b/CaliperTool/bin/Debug/ToolBase.pdb differ diff --git a/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt b/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt index c748211..a6fe011 100644 Binary files a/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt and b/CaliperTool/obj/Debug/CaliperTool.csproj.FileListAbsolute.txt differ diff --git a/CaliperTool/obj/Debug/CaliperTool.csprojResolveAssemblyReference.cache b/CaliperTool/obj/Debug/CaliperTool.csprojResolveAssemblyReference.cache index c4164c0..d077685 100644 Binary files a/CaliperTool/obj/Debug/CaliperTool.csprojResolveAssemblyReference.cache and b/CaliperTool/obj/Debug/CaliperTool.csprojResolveAssemblyReference.cache differ diff --git a/CaliperTool/obj/Debug/CaliperTool.dll b/CaliperTool/obj/Debug/CaliperTool.dll index 80ec6b3..1831ccf 100644 Binary files a/CaliperTool/obj/Debug/CaliperTool.dll and b/CaliperTool/obj/Debug/CaliperTool.dll differ diff --git a/CaliperTool/obj/Debug/CaliperTool.pdb b/CaliperTool/obj/Debug/CaliperTool.pdb index 940bd14..e818d20 100644 Binary files a/CaliperTool/obj/Debug/CaliperTool.pdb and b/CaliperTool/obj/Debug/CaliperTool.pdb differ diff --git a/CommonMethods/Interface/CommonStruct.cs b/CommonMethods/Interface/CommonStruct.cs index 995ffba..7bacde5 100644 --- a/CommonMethods/Interface/CommonStruct.cs +++ b/CommonMethods/Interface/CommonStruct.cs @@ -55,6 +55,12 @@ namespace CommonMethods Pose, } + public enum SoftwareRunState + { + Debug, + Release + } + public enum ToolRunStatu { Not_Run, diff --git a/CommonMethods/bin/Debug/CommonMethods.dll b/CommonMethods/bin/Debug/CommonMethods.dll index 67fa8d5..f0d1ddc 100644 Binary files a/CommonMethods/bin/Debug/CommonMethods.dll and b/CommonMethods/bin/Debug/CommonMethods.dll differ diff --git a/CommonMethods/bin/Debug/CommonMethods.pdb b/CommonMethods/bin/Debug/CommonMethods.pdb index d524819..8f9602f 100644 Binary files a/CommonMethods/bin/Debug/CommonMethods.pdb and b/CommonMethods/bin/Debug/CommonMethods.pdb differ diff --git a/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt b/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt index b80578a..8152463 100644 Binary files a/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt and b/CommonMethods/obj/Debug/CommonHelper.csproj.FileListAbsolute.txt differ diff --git a/CommonMethods/obj/Debug/CommonHelper.csprojResolveAssemblyReference.cache b/CommonMethods/obj/Debug/CommonHelper.csprojResolveAssemblyReference.cache deleted file mode 100644 index 193c4be..0000000 Binary files a/CommonMethods/obj/Debug/CommonHelper.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/CommonMethods/obj/Debug/CommonMethods.dll b/CommonMethods/obj/Debug/CommonMethods.dll index 67fa8d5..f0d1ddc 100644 Binary files a/CommonMethods/obj/Debug/CommonMethods.dll and b/CommonMethods/obj/Debug/CommonMethods.dll differ diff --git a/CommonMethods/obj/Debug/CommonMethods.pdb b/CommonMethods/obj/Debug/CommonMethods.pdb index d524819..8f9602f 100644 Binary files a/CommonMethods/obj/Debug/CommonMethods.pdb and b/CommonMethods/obj/Debug/CommonMethods.pdb differ diff --git a/DataStruct/bin/Debug/DataStruct.dll b/DataStruct/bin/Debug/DataStruct.dll index c8a8dc5..162524c 100644 Binary files a/DataStruct/bin/Debug/DataStruct.dll and b/DataStruct/bin/Debug/DataStruct.dll differ diff --git a/DataStruct/bin/Debug/DataStruct.pdb b/DataStruct/bin/Debug/DataStruct.pdb index 7248371..1e699d2 100644 Binary files a/DataStruct/bin/Debug/DataStruct.pdb and b/DataStruct/bin/Debug/DataStruct.pdb differ diff --git a/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt b/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt index 30b2ba3..caf68e8 100644 Binary files a/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt and b/DataStruct/obj/Debug/DataStruct.csproj.FileListAbsolute.txt differ diff --git a/DataStruct/obj/Debug/DataStruct.csprojResolveAssemblyReference.cache b/DataStruct/obj/Debug/DataStruct.csprojResolveAssemblyReference.cache deleted file mode 100644 index c0ae63b..0000000 Binary files a/DataStruct/obj/Debug/DataStruct.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/DataStruct/obj/Debug/DataStruct.dll b/DataStruct/obj/Debug/DataStruct.dll index c8a8dc5..162524c 100644 Binary files a/DataStruct/obj/Debug/DataStruct.dll and b/DataStruct/obj/Debug/DataStruct.dll differ diff --git a/DataStruct/obj/Debug/DataStruct.pdb b/DataStruct/obj/Debug/DataStruct.pdb index 7248371..1e699d2 100644 Binary files a/DataStruct/obj/Debug/DataStruct.pdb and b/DataStruct/obj/Debug/DataStruct.pdb differ diff --git a/FindCircle/bin/Debug/DataStruct.dll b/FindCircle/bin/Debug/DataStruct.dll index c8a8dc5..9179ad7 100644 Binary files a/FindCircle/bin/Debug/DataStruct.dll and b/FindCircle/bin/Debug/DataStruct.dll differ diff --git a/FindCircle/bin/Debug/DataStruct.pdb b/FindCircle/bin/Debug/DataStruct.pdb index 7248371..ba96465 100644 Binary files a/FindCircle/bin/Debug/DataStruct.pdb and b/FindCircle/bin/Debug/DataStruct.pdb differ diff --git a/FindCircle/bin/Debug/FindCircleTool.dll b/FindCircle/bin/Debug/FindCircleTool.dll index 280df50..9b2a176 100644 Binary files a/FindCircle/bin/Debug/FindCircleTool.dll and b/FindCircle/bin/Debug/FindCircleTool.dll differ diff --git a/FindCircle/bin/Debug/FindCircleTool.pdb b/FindCircle/bin/Debug/FindCircleTool.pdb index e598d9a..f913fc1 100644 Binary files a/FindCircle/bin/Debug/FindCircleTool.pdb and b/FindCircle/bin/Debug/FindCircleTool.pdb differ diff --git a/FindCircle/bin/Debug/HalconWindow.exe b/FindCircle/bin/Debug/HalconWindow.exe index 525d690..bd0485e 100644 Binary files a/FindCircle/bin/Debug/HalconWindow.exe and b/FindCircle/bin/Debug/HalconWindow.exe differ diff --git a/FindCircle/bin/Debug/HalconWindow.pdb b/FindCircle/bin/Debug/HalconWindow.pdb index 6a9099f..554ca39 100644 Binary files a/FindCircle/bin/Debug/HalconWindow.pdb and b/FindCircle/bin/Debug/HalconWindow.pdb differ diff --git a/FindCircle/obj/Debug/FindCircleTool.csprojResolveAssemblyReference.cache b/FindCircle/obj/Debug/FindCircleTool.csprojResolveAssemblyReference.cache index b64c268..2c24d0a 100644 Binary files a/FindCircle/obj/Debug/FindCircleTool.csprojResolveAssemblyReference.cache and b/FindCircle/obj/Debug/FindCircleTool.csprojResolveAssemblyReference.cache differ diff --git a/FindCircle/obj/Debug/FindCircleTool.dll b/FindCircle/obj/Debug/FindCircleTool.dll index 280df50..9b2a176 100644 Binary files a/FindCircle/obj/Debug/FindCircleTool.dll and b/FindCircle/obj/Debug/FindCircleTool.dll differ diff --git a/FindCircle/obj/Debug/FindCircleTool.pdb b/FindCircle/obj/Debug/FindCircleTool.pdb index e598d9a..f913fc1 100644 Binary files a/FindCircle/obj/Debug/FindCircleTool.pdb and b/FindCircle/obj/Debug/FindCircleTool.pdb differ diff --git a/FindLine/FindLine.cs b/FindLine/FindLine.cs index 73c48ec..bdde740 100644 --- a/FindLine/FindLine.cs +++ b/FindLine/FindLine.cs @@ -187,10 +187,18 @@ namespace FindLineTool } set { _angle = value; } } - + /// + /// 输入图像 + /// public HObject inputImage { get; set; } = null; - + /// + /// 工具运行结果 + /// public ToolRunStatu toolRunStatu { get; set; } = ToolRunStatu.Not_Run; + /// + /// 软件运行状态 + /// + public SoftwareRunState softwareRunState { get; set; } = SoftwareRunState.Debug; public void DispImage() { if(inputImage != null) @@ -205,7 +213,7 @@ namespace FindLineTool DispImage(); } - public void Run() + public void Run(SoftwareRunState softwareRunState) { HTuple homMat2DArrow = null; HObject arrow = null, arrowTrans = null; @@ -213,7 +221,10 @@ namespace FindLineTool if (inputImage == null) { - FormFindLine.Instance.TextBoxMessageDisp("图像为空", System.Drawing.Color.Red); + if(softwareRunState == SoftwareRunState.Debug) + { + FormFindLine.Instance.TextBoxMessageDisp("图像为空", System.Drawing.Color.Red); + } toolRunStatu = ToolRunStatu.Not_Input_Image; return; } @@ -304,20 +315,24 @@ namespace FindLineTool Point end = new Point() { Row = ResultLineEndRow, Col = ResultLineEndCol }; resultLine = new Line() { StartPoint = start, EndPoint = end }; } - DispMainWindow(FormFindLine.Instance.myHwindow); HOperatorSet.AngleLx(ResultLineStartRow, ResultLineStartCol, ResultLineEndRow, ResultLineEndCol, out _angle); + if (softwareRunState == SoftwareRunState.Debug) + { + DispMainWindow(FormFindLine.Instance.myHwindow); + FormFindLine.Instance.tbx_resultStartRow.Text = ResultLineStartRow.ToString(); + FormFindLine.Instance.tbx_resultStartCol.Text = ResultLineEndCol.ToString(); + FormFindLine.Instance.tbx_resultEndRow.Text = ResultLineEndRow.ToString(); + FormFindLine.Instance.tbx_resultEndCol.Text = ResultLineEndCol.ToString(); + FormFindLine.Instance.TextBoxMessageDisp("运行成功", System.Drawing.Color.Green); + } HOperatorSet.ClearMetrologyModel(handleID); // 参数传递 ParamsTrans(); - FormFindLine.Instance.tbx_resultStartRow.Text = ResultLineStartRow.ToString(); - FormFindLine.Instance.tbx_resultStartCol.Text = ResultLineEndCol.ToString(); - FormFindLine.Instance.tbx_resultEndRow.Text = ResultLineEndRow.ToString(); - FormFindLine.Instance.tbx_resultEndCol.Text = ResultLineEndCol.ToString(); - FormFindLine.Instance.TextBoxMessageDisp("运行成功", System.Drawing.Color.Green); toolRunStatu = ToolRunStatu.Succeed; } catch (Exception ex) { + toolRunStatu = ToolRunStatu.Not_Succeed; FormFindLine.Instance.TextBoxMessageDisp("工具运行异常" + ex.Message, System.Drawing.Color.Red); } finally @@ -352,7 +367,7 @@ namespace FindLineTool FormFindLine.Instance.tbx_expectLineEndCol.Text = expectLineEndCol.TupleString("10.3f"); myHwindow.DrawModel = false; - Run(); + Run(SoftwareRunState.Debug); } catch (Exception ex) { diff --git a/FindLine/FormFindLine.cs b/FindLine/FormFindLine.cs index 3a36748..a47838a 100644 --- a/FindLine/FormFindLine.cs +++ b/FindLine/FormFindLine.cs @@ -80,7 +80,7 @@ namespace FindLineTool txbLog.BackColor = setColor; txbLog.Text = mes; txbLog.Font = new Font("微软雅黑", 10, FontStyle.Bold); - CommonMethods.CommonMethods.Delay(2000); + // CommonMethods.CommonMethods.Delay(2000); txbLog.BackColor = Color.White; } @@ -101,7 +101,7 @@ namespace FindLineTool myFindLine.edgeSelect = cbx_edgeSelect.SelectedItem.ToString(); myFindLine.sigma = Convert.ToDouble(tbx_Sigma.Text.Trim()); // Run - myFindLine.Run(); + myFindLine.Run(SoftwareRunState.Debug); } public void InitTool() diff --git a/FindLine/bin/Debug/CommonMethods.dll b/FindLine/bin/Debug/CommonMethods.dll index 67fa8d5..998e514 100644 Binary files a/FindLine/bin/Debug/CommonMethods.dll and b/FindLine/bin/Debug/CommonMethods.dll differ diff --git a/FindLine/bin/Debug/CommonMethods.pdb b/FindLine/bin/Debug/CommonMethods.pdb index d524819..557a6ba 100644 Binary files a/FindLine/bin/Debug/CommonMethods.pdb and b/FindLine/bin/Debug/CommonMethods.pdb differ diff --git a/FindLine/bin/Debug/DataStruct.dll b/FindLine/bin/Debug/DataStruct.dll index c8a8dc5..9179ad7 100644 Binary files a/FindLine/bin/Debug/DataStruct.dll and b/FindLine/bin/Debug/DataStruct.dll differ diff --git a/FindLine/bin/Debug/DataStruct.pdb b/FindLine/bin/Debug/DataStruct.pdb index 7248371..ba96465 100644 Binary files a/FindLine/bin/Debug/DataStruct.pdb and b/FindLine/bin/Debug/DataStruct.pdb differ diff --git a/FindLine/bin/Debug/FindLineTool.dll b/FindLine/bin/Debug/FindLineTool.dll index 966ccaf..9a6e389 100644 Binary files a/FindLine/bin/Debug/FindLineTool.dll and b/FindLine/bin/Debug/FindLineTool.dll differ diff --git a/FindLine/bin/Debug/FindLineTool.pdb b/FindLine/bin/Debug/FindLineTool.pdb index dde873a..06c8b4d 100644 Binary files a/FindLine/bin/Debug/FindLineTool.pdb and b/FindLine/bin/Debug/FindLineTool.pdb differ diff --git a/FindLine/bin/Debug/HalconWindow.exe b/FindLine/bin/Debug/HalconWindow.exe index 525d690..bd0485e 100644 Binary files a/FindLine/bin/Debug/HalconWindow.exe and b/FindLine/bin/Debug/HalconWindow.exe differ diff --git a/FindLine/bin/Debug/HalconWindow.pdb b/FindLine/bin/Debug/HalconWindow.pdb index 6a9099f..554ca39 100644 Binary files a/FindLine/bin/Debug/HalconWindow.pdb and b/FindLine/bin/Debug/HalconWindow.pdb differ diff --git a/FindLine/bin/Debug/ToolBase.dll b/FindLine/bin/Debug/ToolBase.dll index eb05f4e..8deeade 100644 Binary files a/FindLine/bin/Debug/ToolBase.dll and b/FindLine/bin/Debug/ToolBase.dll differ diff --git a/FindLine/bin/Debug/ToolBase.pdb b/FindLine/bin/Debug/ToolBase.pdb index 3dd2156..221e97e 100644 Binary files a/FindLine/bin/Debug/ToolBase.pdb and b/FindLine/bin/Debug/ToolBase.pdb differ diff --git a/FindLine/obj/Debug/FindLineTool.csprojResolveAssemblyReference.cache b/FindLine/obj/Debug/FindLineTool.csprojResolveAssemblyReference.cache index c4164c0..c884158 100644 Binary files a/FindLine/obj/Debug/FindLineTool.csprojResolveAssemblyReference.cache and b/FindLine/obj/Debug/FindLineTool.csprojResolveAssemblyReference.cache differ diff --git a/FindLine/obj/Debug/FindLineTool.dll b/FindLine/obj/Debug/FindLineTool.dll index 966ccaf..9a6e389 100644 Binary files a/FindLine/obj/Debug/FindLineTool.dll and b/FindLine/obj/Debug/FindLineTool.dll differ diff --git a/FindLine/obj/Debug/FindLineTool.pdb b/FindLine/obj/Debug/FindLineTool.pdb index dde873a..06c8b4d 100644 Binary files a/FindLine/obj/Debug/FindLineTool.pdb and b/FindLine/obj/Debug/FindLineTool.pdb differ diff --git a/HalconTool/FormHalconTool.cs b/HalconTool/FormHalconTool.cs index a641090..1a8ffd1 100644 --- a/HalconTool/FormHalconTool.cs +++ b/HalconTool/FormHalconTool.cs @@ -91,7 +91,7 @@ namespace HalconTool { } - myHalconTool.DispImage(); + myHalconTool.Run(SoftwareRunState.Debug); ParamsTrans(); } diff --git a/HalconTool/HalconTool.cs b/HalconTool/HalconTool.cs index 74848b1..2dcc64f 100644 --- a/HalconTool/HalconTool.cs +++ b/HalconTool/HalconTool.cs @@ -81,32 +81,16 @@ namespace HalconTool /// 读取单张图像或批量读取文件夹图像工作模式 /// internal WorkMode workMode = WorkMode.ReadMultImage; + public ToolRunStatu toolRunStatu { get; set; } = ToolRunStatu.Not_Run; + - public ToolRunStatu toolRunStatu - { - get - { - throw new NotImplementedException(); - } + public HObject inputImage { get; set; } = null; - set - { - throw new NotImplementedException(); - } - } - - public HObject inputImage - { - get - { - throw new NotImplementedException(); - } - - set - { - throw new NotImplementedException(); - } - } + /// + /// 运行模式 + /// + public SoftwareRunState softwareRunState { get; set; } = SoftwareRunState.Debug; + public bool ReadImage(out string filePath) { @@ -124,8 +108,9 @@ namespace HalconTool return true; } - public void Run() + public void Run(SoftwareRunState softwareState) { + softwareRunState = softwareState; DispImage(); } @@ -149,13 +134,18 @@ namespace HalconTool } catch { - FormHalconTool.Instance.txbLog.Text = "图像文件异常或路径不合法"; - CommonMethods.CommonMethods.Delay(1000); + if(softwareRunState == SoftwareRunState.Debug) + { + FormHalconTool.Instance.txbLog.Text = "图像文件异常或路径不合法"; + } return; } if (outputImage != null) { - FormHalconTool.Instance.myHwindow.HobjectToHimage(outputImage); + if (softwareRunState == SoftwareRunState.Debug) + { + FormHalconTool.Instance.myHwindow.HobjectToHimage(outputImage); + } } } diff --git a/HalconTool/bin/Debug/CommonMethods.dll b/HalconTool/bin/Debug/CommonMethods.dll index 67fa8d5..998e514 100644 Binary files a/HalconTool/bin/Debug/CommonMethods.dll and b/HalconTool/bin/Debug/CommonMethods.dll differ diff --git a/HalconTool/bin/Debug/CommonMethods.pdb b/HalconTool/bin/Debug/CommonMethods.pdb index d524819..557a6ba 100644 Binary files a/HalconTool/bin/Debug/CommonMethods.pdb and b/HalconTool/bin/Debug/CommonMethods.pdb differ diff --git a/HalconTool/bin/Debug/HalconTool.dll b/HalconTool/bin/Debug/HalconTool.dll index 22ff894..eeb932f 100644 Binary files a/HalconTool/bin/Debug/HalconTool.dll and b/HalconTool/bin/Debug/HalconTool.dll differ diff --git a/HalconTool/bin/Debug/HalconTool.pdb b/HalconTool/bin/Debug/HalconTool.pdb index 3af998a..9fb4e45 100644 Binary files a/HalconTool/bin/Debug/HalconTool.pdb and b/HalconTool/bin/Debug/HalconTool.pdb differ diff --git a/HalconTool/bin/Debug/HalconWindow.exe b/HalconTool/bin/Debug/HalconWindow.exe index 525d690..bd0485e 100644 Binary files a/HalconTool/bin/Debug/HalconWindow.exe and b/HalconTool/bin/Debug/HalconWindow.exe differ diff --git a/HalconTool/bin/Debug/HalconWindow.pdb b/HalconTool/bin/Debug/HalconWindow.pdb index 6a9099f..554ca39 100644 Binary files a/HalconTool/bin/Debug/HalconWindow.pdb and b/HalconTool/bin/Debug/HalconWindow.pdb differ diff --git a/HalconTool/bin/Debug/ToolBase.dll b/HalconTool/bin/Debug/ToolBase.dll index eb05f4e..8deeade 100644 Binary files a/HalconTool/bin/Debug/ToolBase.dll and b/HalconTool/bin/Debug/ToolBase.dll differ diff --git a/HalconTool/bin/Debug/ToolBase.pdb b/HalconTool/bin/Debug/ToolBase.pdb index 3dd2156..221e97e 100644 Binary files a/HalconTool/bin/Debug/ToolBase.pdb and b/HalconTool/bin/Debug/ToolBase.pdb differ diff --git a/HalconTool/obj/Debug/HalconTool.csprojResolveAssemblyReference.cache b/HalconTool/obj/Debug/HalconTool.csprojResolveAssemblyReference.cache index 3c9de5b..5705ec7 100644 Binary files a/HalconTool/obj/Debug/HalconTool.csprojResolveAssemblyReference.cache and b/HalconTool/obj/Debug/HalconTool.csprojResolveAssemblyReference.cache differ diff --git a/HalconTool/obj/Debug/HalconTool.dll b/HalconTool/obj/Debug/HalconTool.dll index 22ff894..eeb932f 100644 Binary files a/HalconTool/obj/Debug/HalconTool.dll and b/HalconTool/obj/Debug/HalconTool.dll differ diff --git a/HalconTool/obj/Debug/HalconTool.pdb b/HalconTool/obj/Debug/HalconTool.pdb index 3af998a..9fb4e45 100644 Binary files a/HalconTool/obj/Debug/HalconTool.pdb and b/HalconTool/obj/Debug/HalconTool.pdb differ diff --git a/HalconWindowTest/bin/Debug/HalconWindow.exe b/HalconWindowTest/bin/Debug/HalconWindow.exe index 525d690..8772b38 100644 Binary files a/HalconWindowTest/bin/Debug/HalconWindow.exe and b/HalconWindowTest/bin/Debug/HalconWindow.exe differ diff --git a/HalconWindowTest/bin/Debug/HalconWindow.pdb b/HalconWindowTest/bin/Debug/HalconWindow.pdb index 6a9099f..a82c59d 100644 Binary files a/HalconWindowTest/bin/Debug/HalconWindow.pdb and b/HalconWindowTest/bin/Debug/HalconWindow.pdb differ diff --git a/HalconWindowTest/obj/Debug/HalconWindow.exe b/HalconWindowTest/obj/Debug/HalconWindow.exe index 525d690..8772b38 100644 Binary files a/HalconWindowTest/obj/Debug/HalconWindow.exe and b/HalconWindowTest/obj/Debug/HalconWindow.exe differ diff --git a/HalconWindowTest/obj/Debug/HalconWindow.pdb b/HalconWindowTest/obj/Debug/HalconWindow.pdb index 6a9099f..a82c59d 100644 Binary files a/HalconWindowTest/obj/Debug/HalconWindow.pdb and b/HalconWindowTest/obj/Debug/HalconWindow.pdb differ diff --git a/ToolBase/IToolBase.cs b/ToolBase/IToolBase.cs index ba1af56..b781267 100644 --- a/ToolBase/IToolBase.cs +++ b/ToolBase/IToolBase.cs @@ -10,8 +10,9 @@ namespace ToolBase { public interface IToolBase { + SoftwareRunState softwareRunState { get; set; } ToolRunStatu toolRunStatu { get; set; } - void Run(); + void Run(SoftwareRunState softwareRunState); HObject inputImage { get; set; } void DispImage(); } diff --git a/ToolBase/bin/Debug/CommonMethods.dll b/ToolBase/bin/Debug/CommonMethods.dll index 67fa8d5..f0d1ddc 100644 Binary files a/ToolBase/bin/Debug/CommonMethods.dll and b/ToolBase/bin/Debug/CommonMethods.dll differ diff --git a/ToolBase/bin/Debug/CommonMethods.pdb b/ToolBase/bin/Debug/CommonMethods.pdb index d524819..8f9602f 100644 Binary files a/ToolBase/bin/Debug/CommonMethods.pdb and b/ToolBase/bin/Debug/CommonMethods.pdb differ diff --git a/ToolBase/bin/Debug/ToolBase.dll b/ToolBase/bin/Debug/ToolBase.dll index eb05f4e..a83f146 100644 Binary files a/ToolBase/bin/Debug/ToolBase.dll and b/ToolBase/bin/Debug/ToolBase.dll differ diff --git a/ToolBase/bin/Debug/ToolBase.pdb b/ToolBase/bin/Debug/ToolBase.pdb index 3dd2156..e60866c 100644 Binary files a/ToolBase/bin/Debug/ToolBase.pdb and b/ToolBase/bin/Debug/ToolBase.pdb differ diff --git a/ToolBase/obj/Debug/ToolBase.csprojResolveAssemblyReference.cache b/ToolBase/obj/Debug/ToolBase.csprojResolveAssemblyReference.cache index b5e8b3c..e1c58a6 100644 Binary files a/ToolBase/obj/Debug/ToolBase.csprojResolveAssemblyReference.cache and b/ToolBase/obj/Debug/ToolBase.csprojResolveAssemblyReference.cache differ diff --git a/ToolBase/obj/Debug/ToolBase.dll b/ToolBase/obj/Debug/ToolBase.dll index eb05f4e..a83f146 100644 Binary files a/ToolBase/obj/Debug/ToolBase.dll and b/ToolBase/obj/Debug/ToolBase.dll differ diff --git a/ToolBase/obj/Debug/ToolBase.pdb b/ToolBase/obj/Debug/ToolBase.pdb index 3dd2156..e60866c 100644 Binary files a/ToolBase/obj/Debug/ToolBase.pdb and b/ToolBase/obj/Debug/ToolBase.pdb differ diff --git a/VisionEdit/VisionJob.cs b/VisionEdit/VisionJob.cs index b080eed..ab18454 100644 --- a/VisionEdit/VisionJob.cs +++ b/VisionEdit/VisionJob.cs @@ -686,7 +686,7 @@ namespace VisionEdit #region halconTool case ToolType.HalconTool: HalconTool.HalconTool myHalconTool = (HalconTool.HalconTool)L_toolList[i].tool; - myHalconTool.Run(); + myHalconTool.Run(SoftwareRunState.Release); if(myHalconTool.outputImage == null) { FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); @@ -717,61 +717,74 @@ namespace VisionEdit sourceToolName = sourceToolName.Substring(3, Regex.Split(sourceFrom, " . ")[0].Length - 3); string toolItem = Regex.Split(sourceFrom, " . ")[1]; myFindLine.inputImage = GetToolInfoByToolName(GlobalParams.myVisionJob.JobName, sourceToolName).GetOutput(toolItem).value as HObject; - // myFindLine.Run(); - } - if(myFindLine.resultLine != null) - { - myFindLine.DispMainWindow(myFormImageWindow.myHWindow); - FormLogDisp(L_toolList[i].toolName + " 运行成功", Color.Green, treeNode); - } - else - { - FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); } } - - + } + myFindLine.Run(SoftwareRunState.Release); + if (myFindLine.toolRunStatu == ToolRunStatu.Succeed) + { + myFindLine.DispMainWindow(myFormImageWindow.myHWindow); + FormLogDisp(L_toolList[i].toolName + " 运行成功", Color.Green, treeNode); + } + else + { + FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); } break; #endregion case ToolType.Caliper: Caliper myCaliper = (Caliper)L_toolList[i].tool; - if(L_toolList[i].FormTool == null) - { - FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); - continue; - } + //if(L_toolList[i].FormTool == null) + //{ + // FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); + // continue; + //} for (int j = 0; j < inputItemNum; j++) { - if (L_toolList[i].toolInput[j].IOName == "inputImage" && L_toolList[i].GetInput(L_toolList[i].toolInput[j].IOName).value == null) + if (L_toolList[i].toolInput[j].IOName == "InputImage" && L_toolList[i].GetInput(L_toolList[i].toolInput[j].IOName).value == null) { treeNode.ForeColor = Color.Red; myFormLog.ShowLog(L_toolList[i].toolName + " 无输入图像"); + break; } else { - string sourceFrom = L_toolList[i].GetInput(L_toolList[i].toolInput[j].IOName).value.ToString(); - if (L_toolList[i].toolInput[j].IOName == "InputImage") + if(L_toolList[i].GetInput(L_toolList[i].toolInput[j].IOName).value != null) { + string sourceFrom = L_toolList[i].GetInput(L_toolList[i].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]; - myCaliper.inputImage = GetToolInfoByToolName(GlobalParams.myVisionJob.JobName, sourceToolName).GetOutput(toolItem).value as HObject; - myCaliper.Run(); - } - if (myCaliper.ResulttRow != null) - { - myCaliper.DispMainWindow(myFormImageWindow.myHWindow); - FormLogDisp(L_toolList[i].toolName + " 运行成功", Color.Green, treeNode); - } - else - { - FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); + if (L_toolList[i].toolInput[j].IOName == "InputImage") + { + myCaliper.inputImage = GetToolInfoByToolName(GlobalParams.myVisionJob.JobName, sourceToolName).GetOutput(toolItem).value as HObject; + } + if(L_toolList[i].toolInput[j].IOName == "inputCenterRow") + { + myCaliper.expectRecStartRow = GetToolInfoByToolName(GlobalParams.myVisionJob.JobName, sourceToolName).GetOutput(toolItem).value as HTuple; + } + if (L_toolList[i].toolInput[j].IOName == "inputCenterCol") + { + myCaliper.expectRecStartColumn = GetToolInfoByToolName(GlobalParams.myVisionJob.JobName, sourceToolName).GetOutput(toolItem).value as HTuple; + } + if (L_toolList[i].toolInput[j].IOName == "inputPhi") + { + myCaliper.expectAngle = GetToolInfoByToolName(GlobalParams.myVisionJob.JobName, sourceToolName).GetOutput(toolItem).value as HTuple; + } + } } - - + } + myCaliper.Run(SoftwareRunState.Release); + if (myCaliper.toolRunStatu == ToolRunStatu.Succeed) + { + myCaliper.DispMainWindow(myFormImageWindow.myHWindow); + FormLogDisp(L_toolList[i].toolName + " 运行成功", Color.Green, treeNode); + } + else + { + FormLogDisp(L_toolList[i].toolName + " 运行失败", Color.Red, treeNode); } break; } diff --git a/VisionEdit/bin/Debug/CaliperTool.dll b/VisionEdit/bin/Debug/CaliperTool.dll index 80ec6b3..47ccee6 100644 Binary files a/VisionEdit/bin/Debug/CaliperTool.dll and b/VisionEdit/bin/Debug/CaliperTool.dll differ diff --git a/VisionEdit/bin/Debug/CaliperTool.pdb b/VisionEdit/bin/Debug/CaliperTool.pdb index 940bd14..85cd95e 100644 Binary files a/VisionEdit/bin/Debug/CaliperTool.pdb and b/VisionEdit/bin/Debug/CaliperTool.pdb differ diff --git a/VisionEdit/bin/Debug/CommonMethods.dll b/VisionEdit/bin/Debug/CommonMethods.dll index 67fa8d5..998e514 100644 Binary files a/VisionEdit/bin/Debug/CommonMethods.dll and b/VisionEdit/bin/Debug/CommonMethods.dll differ diff --git a/VisionEdit/bin/Debug/CommonMethods.pdb b/VisionEdit/bin/Debug/CommonMethods.pdb index d524819..557a6ba 100644 Binary files a/VisionEdit/bin/Debug/CommonMethods.pdb and b/VisionEdit/bin/Debug/CommonMethods.pdb differ diff --git a/VisionEdit/bin/Debug/DataStruct.dll b/VisionEdit/bin/Debug/DataStruct.dll index c8a8dc5..9179ad7 100644 Binary files a/VisionEdit/bin/Debug/DataStruct.dll and b/VisionEdit/bin/Debug/DataStruct.dll differ diff --git a/VisionEdit/bin/Debug/DataStruct.pdb b/VisionEdit/bin/Debug/DataStruct.pdb index 7248371..ba96465 100644 Binary files a/VisionEdit/bin/Debug/DataStruct.pdb and b/VisionEdit/bin/Debug/DataStruct.pdb differ diff --git a/VisionEdit/bin/Debug/FindCircleTool.dll b/VisionEdit/bin/Debug/FindCircleTool.dll index 280df50..9b2a176 100644 Binary files a/VisionEdit/bin/Debug/FindCircleTool.dll and b/VisionEdit/bin/Debug/FindCircleTool.dll differ diff --git a/VisionEdit/bin/Debug/FindCircleTool.pdb b/VisionEdit/bin/Debug/FindCircleTool.pdb index e598d9a..f913fc1 100644 Binary files a/VisionEdit/bin/Debug/FindCircleTool.pdb and b/VisionEdit/bin/Debug/FindCircleTool.pdb differ diff --git a/VisionEdit/bin/Debug/FindLineTool.dll b/VisionEdit/bin/Debug/FindLineTool.dll index 966ccaf..9a6e389 100644 Binary files a/VisionEdit/bin/Debug/FindLineTool.dll and b/VisionEdit/bin/Debug/FindLineTool.dll differ diff --git a/VisionEdit/bin/Debug/FindLineTool.pdb b/VisionEdit/bin/Debug/FindLineTool.pdb index dde873a..06c8b4d 100644 Binary files a/VisionEdit/bin/Debug/FindLineTool.pdb and b/VisionEdit/bin/Debug/FindLineTool.pdb differ diff --git a/VisionEdit/bin/Debug/HalconTool.dll b/VisionEdit/bin/Debug/HalconTool.dll index 22ff894..eeb932f 100644 Binary files a/VisionEdit/bin/Debug/HalconTool.dll and b/VisionEdit/bin/Debug/HalconTool.dll differ diff --git a/VisionEdit/bin/Debug/HalconTool.pdb b/VisionEdit/bin/Debug/HalconTool.pdb index 3af998a..9fb4e45 100644 Binary files a/VisionEdit/bin/Debug/HalconTool.pdb and b/VisionEdit/bin/Debug/HalconTool.pdb differ diff --git a/VisionEdit/bin/Debug/HalconWindow.exe b/VisionEdit/bin/Debug/HalconWindow.exe index 525d690..bd0485e 100644 Binary files a/VisionEdit/bin/Debug/HalconWindow.exe and b/VisionEdit/bin/Debug/HalconWindow.exe differ diff --git a/VisionEdit/bin/Debug/HalconWindow.pdb b/VisionEdit/bin/Debug/HalconWindow.pdb index 6a9099f..554ca39 100644 Binary files a/VisionEdit/bin/Debug/HalconWindow.pdb and b/VisionEdit/bin/Debug/HalconWindow.pdb differ diff --git a/VisionEdit/bin/Debug/ToolBase.dll b/VisionEdit/bin/Debug/ToolBase.dll index eb05f4e..8deeade 100644 Binary files a/VisionEdit/bin/Debug/ToolBase.dll and b/VisionEdit/bin/Debug/ToolBase.dll differ diff --git a/VisionEdit/bin/Debug/ToolBase.pdb b/VisionEdit/bin/Debug/ToolBase.pdb index 3dd2156..221e97e 100644 Binary files a/VisionEdit/bin/Debug/ToolBase.pdb and b/VisionEdit/bin/Debug/ToolBase.pdb differ diff --git a/VisionEdit/bin/Debug/VisionEdit.exe b/VisionEdit/bin/Debug/VisionEdit.exe index a0cc496..3a00eea 100644 Binary files a/VisionEdit/bin/Debug/VisionEdit.exe and b/VisionEdit/bin/Debug/VisionEdit.exe differ diff --git a/VisionEdit/bin/Debug/VisionEdit.pdb b/VisionEdit/bin/Debug/VisionEdit.pdb index a638859..cd49e77 100644 Binary files a/VisionEdit/bin/Debug/VisionEdit.pdb and b/VisionEdit/bin/Debug/VisionEdit.pdb differ diff --git a/VisionEdit/bin/Debug/VisionJobFactory.dll b/VisionEdit/bin/Debug/VisionJobFactory.dll index 89c3ead..4cc5824 100644 Binary files a/VisionEdit/bin/Debug/VisionJobFactory.dll and b/VisionEdit/bin/Debug/VisionJobFactory.dll differ diff --git a/VisionEdit/bin/Debug/VisionJobFactory.pdb b/VisionEdit/bin/Debug/VisionJobFactory.pdb index 582d798..054109f 100644 Binary files a/VisionEdit/bin/Debug/VisionJobFactory.pdb and b/VisionEdit/bin/Debug/VisionJobFactory.pdb differ diff --git a/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt b/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt index db6ae92..f727766 100644 Binary files a/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt and b/VisionEdit/obj/Debug/VisionEdit.csproj.FileListAbsolute.txt differ diff --git a/VisionEdit/obj/Debug/VisionEdit.csprojResolveAssemblyReference.cache b/VisionEdit/obj/Debug/VisionEdit.csprojResolveAssemblyReference.cache index ed13d0c..5c0308f 100644 Binary files a/VisionEdit/obj/Debug/VisionEdit.csprojResolveAssemblyReference.cache and b/VisionEdit/obj/Debug/VisionEdit.csprojResolveAssemblyReference.cache differ diff --git a/VisionEdit/obj/Debug/VisionEdit.exe b/VisionEdit/obj/Debug/VisionEdit.exe index a0cc496..3a00eea 100644 Binary files a/VisionEdit/obj/Debug/VisionEdit.exe and b/VisionEdit/obj/Debug/VisionEdit.exe differ diff --git a/VisionEdit/obj/Debug/VisionEdit.pdb b/VisionEdit/obj/Debug/VisionEdit.pdb index a638859..cd49e77 100644 Binary files a/VisionEdit/obj/Debug/VisionEdit.pdb and b/VisionEdit/obj/Debug/VisionEdit.pdb differ diff --git a/VisionJobFactory/bin/Debug/CaliperTool.dll b/VisionJobFactory/bin/Debug/CaliperTool.dll index 80ec6b3..47ccee6 100644 Binary files a/VisionJobFactory/bin/Debug/CaliperTool.dll and b/VisionJobFactory/bin/Debug/CaliperTool.dll differ diff --git a/VisionJobFactory/bin/Debug/CaliperTool.pdb b/VisionJobFactory/bin/Debug/CaliperTool.pdb index 940bd14..85cd95e 100644 Binary files a/VisionJobFactory/bin/Debug/CaliperTool.pdb and b/VisionJobFactory/bin/Debug/CaliperTool.pdb differ diff --git a/VisionJobFactory/bin/Debug/CommonMethods.dll b/VisionJobFactory/bin/Debug/CommonMethods.dll index 67fa8d5..998e514 100644 Binary files a/VisionJobFactory/bin/Debug/CommonMethods.dll and b/VisionJobFactory/bin/Debug/CommonMethods.dll differ diff --git a/VisionJobFactory/bin/Debug/CommonMethods.pdb b/VisionJobFactory/bin/Debug/CommonMethods.pdb index d524819..557a6ba 100644 Binary files a/VisionJobFactory/bin/Debug/CommonMethods.pdb and b/VisionJobFactory/bin/Debug/CommonMethods.pdb differ diff --git a/VisionJobFactory/bin/Debug/DataStruct.dll b/VisionJobFactory/bin/Debug/DataStruct.dll index c8a8dc5..9179ad7 100644 Binary files a/VisionJobFactory/bin/Debug/DataStruct.dll and b/VisionJobFactory/bin/Debug/DataStruct.dll differ diff --git a/VisionJobFactory/bin/Debug/DataStruct.pdb b/VisionJobFactory/bin/Debug/DataStruct.pdb index 7248371..ba96465 100644 Binary files a/VisionJobFactory/bin/Debug/DataStruct.pdb and b/VisionJobFactory/bin/Debug/DataStruct.pdb differ diff --git a/VisionJobFactory/bin/Debug/FindLineTool.dll b/VisionJobFactory/bin/Debug/FindLineTool.dll index 966ccaf..9a6e389 100644 Binary files a/VisionJobFactory/bin/Debug/FindLineTool.dll and b/VisionJobFactory/bin/Debug/FindLineTool.dll differ diff --git a/VisionJobFactory/bin/Debug/FindLineTool.pdb b/VisionJobFactory/bin/Debug/FindLineTool.pdb index dde873a..06c8b4d 100644 Binary files a/VisionJobFactory/bin/Debug/FindLineTool.pdb and b/VisionJobFactory/bin/Debug/FindLineTool.pdb differ diff --git a/VisionJobFactory/bin/Debug/HalconTool.dll b/VisionJobFactory/bin/Debug/HalconTool.dll index 22ff894..eeb932f 100644 Binary files a/VisionJobFactory/bin/Debug/HalconTool.dll and b/VisionJobFactory/bin/Debug/HalconTool.dll differ diff --git a/VisionJobFactory/bin/Debug/HalconTool.pdb b/VisionJobFactory/bin/Debug/HalconTool.pdb index 3af998a..9fb4e45 100644 Binary files a/VisionJobFactory/bin/Debug/HalconTool.pdb and b/VisionJobFactory/bin/Debug/HalconTool.pdb differ diff --git a/VisionJobFactory/bin/Debug/HalconWindow.exe b/VisionJobFactory/bin/Debug/HalconWindow.exe index 525d690..bd0485e 100644 Binary files a/VisionJobFactory/bin/Debug/HalconWindow.exe and b/VisionJobFactory/bin/Debug/HalconWindow.exe differ diff --git a/VisionJobFactory/bin/Debug/HalconWindow.pdb b/VisionJobFactory/bin/Debug/HalconWindow.pdb index 6a9099f..554ca39 100644 Binary files a/VisionJobFactory/bin/Debug/HalconWindow.pdb and b/VisionJobFactory/bin/Debug/HalconWindow.pdb differ diff --git a/VisionJobFactory/bin/Debug/ToolBase.dll b/VisionJobFactory/bin/Debug/ToolBase.dll index eb05f4e..8deeade 100644 Binary files a/VisionJobFactory/bin/Debug/ToolBase.dll and b/VisionJobFactory/bin/Debug/ToolBase.dll differ diff --git a/VisionJobFactory/bin/Debug/ToolBase.pdb b/VisionJobFactory/bin/Debug/ToolBase.pdb index 3dd2156..221e97e 100644 Binary files a/VisionJobFactory/bin/Debug/ToolBase.pdb and b/VisionJobFactory/bin/Debug/ToolBase.pdb differ diff --git a/VisionJobFactory/bin/Debug/VisionJobFactory.dll b/VisionJobFactory/bin/Debug/VisionJobFactory.dll index 89c3ead..4cc5824 100644 Binary files a/VisionJobFactory/bin/Debug/VisionJobFactory.dll and b/VisionJobFactory/bin/Debug/VisionJobFactory.dll differ diff --git a/VisionJobFactory/bin/Debug/VisionJobFactory.pdb b/VisionJobFactory/bin/Debug/VisionJobFactory.pdb index 582d798..054109f 100644 Binary files a/VisionJobFactory/bin/Debug/VisionJobFactory.pdb and b/VisionJobFactory/bin/Debug/VisionJobFactory.pdb differ diff --git a/VisionJobFactory/obj/Debug/VisionJobFactory.csproj.FileListAbsolute.txt b/VisionJobFactory/obj/Debug/VisionJobFactory.csproj.FileListAbsolute.txt index 12309ac..29a43f0 100644 Binary files a/VisionJobFactory/obj/Debug/VisionJobFactory.csproj.FileListAbsolute.txt and b/VisionJobFactory/obj/Debug/VisionJobFactory.csproj.FileListAbsolute.txt differ diff --git a/VisionJobFactory/obj/Debug/VisionJobFactory.csprojResolveAssemblyReference.cache b/VisionJobFactory/obj/Debug/VisionJobFactory.csprojResolveAssemblyReference.cache index 5e51697..b5d498f 100644 Binary files a/VisionJobFactory/obj/Debug/VisionJobFactory.csprojResolveAssemblyReference.cache and b/VisionJobFactory/obj/Debug/VisionJobFactory.csprojResolveAssemblyReference.cache differ diff --git a/VisionJobFactory/obj/Debug/VisionJobFactory.dll b/VisionJobFactory/obj/Debug/VisionJobFactory.dll index 89c3ead..4cc5824 100644 Binary files a/VisionJobFactory/obj/Debug/VisionJobFactory.dll and b/VisionJobFactory/obj/Debug/VisionJobFactory.dll differ diff --git a/VisionJobFactory/obj/Debug/VisionJobFactory.pdb b/VisionJobFactory/obj/Debug/VisionJobFactory.pdb index 582d798..054109f 100644 Binary files a/VisionJobFactory/obj/Debug/VisionJobFactory.pdb and b/VisionJobFactory/obj/Debug/VisionJobFactory.pdb differ