1、解决因在debug目录下放置多余的dll导致反射时报错的问题

2、解决显示窗口滑动时,坐标及灰度值不实时更新的问题
3、解决模板匹配工具,模板图像不更新的问题
4、将各工具的生成位置改至主程序的debug目录下
This commit is contained in:
liu.wenjie
2022-10-26 15:55:48 +08:00
parent 900ea68f69
commit a5b6142bad
30 changed files with 1697 additions and 1600 deletions

Binary file not shown.

View File

@@ -84,6 +84,8 @@ namespace CaliperTool
/// 新的跟随姿态变化后的预期线信息 /// 新的跟随姿态变化后的预期线信息
/// </summary> /// </summary>
HTuple newExpectRecStartRow = new HTuple(200), newExpectRecStartColumn = new HTuple(200), newExpectPhi = new HTuple(0); HTuple newExpectRecStartRow = new HTuple(200), newExpectRecStartColumn = new HTuple(200), newExpectPhi = new HTuple(0);
[NonSerialized]
public HDrawingObject calibDrawObject = new HDrawingObject();
/// <summary> /// <summary>
/// 查找到的线的起点行坐标 /// 查找到的线的起点行坐标
/// </summary> /// </summary>
@@ -134,10 +136,6 @@ namespace CaliperTool
templatePose.Y = inputPose.Y; templatePose.Y = inputPose.Y;
templatePose.U = inputPose.U; templatePose.U = inputPose.U;
} }
// 输入
FormCaliper.Instance.tbx_expectCenterRow.Text = expectRecStartRow.TupleString("10.3f");
FormCaliper.Instance.tbx_expectCenterCol.Text = expectRecStartColumn.TupleString("10.3f");
FormCaliper.Instance.tbx_expectPhi.Text = expectAngle.TupleString("10.3f");
// 参数 // 参数
FormCaliper.Instance.tbx_caliperLength1.Text = length1.TupleString("10.3f"); FormCaliper.Instance.tbx_caliperLength1.Text = length1.TupleString("10.3f");
FormCaliper.Instance.tbx_caliperLength2.Text = length2.TupleString("10.3f"); FormCaliper.Instance.tbx_caliperLength2.Text = length2.TupleString("10.3f");
@@ -267,19 +265,5 @@ namespace CaliperTool
//显示找到的线 //显示找到的线
// window.DispObj(LineDisp, "green"); // window.DispObj(LineDisp, "green");
} }
public void SetToolStatusDisp()
{
FormCaliper.Instance.lb_RunStatus.Text = toolRunStatu == ToolRunStatu.Succeed ? "工具运行成功!" : $"工具运行异常, 异常原因:{runMessage}";
FormCaliper.Instance.lb_RunTime.Text = runTime;
if (toolRunStatu == ToolRunStatu.Succeed)
{
FormCaliper.Instance.statusStrip.BackColor = System.Drawing.Color.LimeGreen;
}
else
{
FormCaliper.Instance.statusStrip.BackColor = System.Drawing.Color.Red;
}
}
} }
} }

View File

@@ -17,10 +17,11 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>

View File

@@ -29,230 +29,109 @@ namespace CaliperTool
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormCaliper)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormCaliper));
this.tbx_resultStartRow = new System.Windows.Forms.TextBox(); this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.label5 = new System.Windows.Forms.Label(); this.tsbtRunTool = new System.Windows.Forms.ToolStripButton();
this.label16 = new System.Windows.Forms.Label(); this.statusStrip = new System.Windows.Forms.StatusStrip();
this.label14 = new System.Windows.Forms.Label(); this.lb_RunStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.label15 = new System.Windows.Forms.Label(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.label13 = new System.Windows.Forms.Label(); this.lb_RunTime = new System.Windows.Forms.ToolStripStatusLabel();
this.label11 = new System.Windows.Forms.Label();
this.tbx_caliperLength2 = new System.Windows.Forms.TextBox();
this.tbx_Sigma = new System.Windows.Forms.TextBox();
this.tbx_caliperLength1 = new System.Windows.Forms.TextBox();
this.tbx_threshold = new System.Windows.Forms.TextBox();
this.cbx_polarity = new System.Windows.Forms.ComboBox();
this.btn_runCaliperool = new System.Windows.Forms.Button();
this.btn_moveCliperRegion = new System.Windows.Forms.Button();
this.cbx_edgeSelect = new System.Windows.Forms.ComboBox();
this.tbx_resultStartCol = new System.Windows.Forms.TextBox();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.label14 = new System.Windows.Forms.Label();
this.cbx_edgeSelect = new System.Windows.Forms.ComboBox();
this.cbx_polarity = new System.Windows.Forms.ComboBox();
this.tbx_threshold = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.tbx_caliperLength1 = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
this.tbx_Sigma = new System.Windows.Forms.TextBox();
this.tbx_caliperLength2 = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.chBDispCaliperROI = new System.Windows.Forms.CheckBox(); this.chBDispCaliperROI = new System.Windows.Forms.CheckBox();
this.chBDispCross = new System.Windows.Forms.CheckBox(); this.chBDispCross = new System.Windows.Forms.CheckBox();
this.chBDispRec = new System.Windows.Forms.CheckBox(); this.chBDispRec = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label3 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.tbx_expectPhi = new System.Windows.Forms.TextBox();
this.tbx_expectCenterCol = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.tbx_expectCenterRow = new System.Windows.Forms.TextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.tbx_resultStartRow = new System.Windows.Forms.TextBox();
this.tbx_resultStartCol = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel(); this.toolStrip1.SuspendLayout();
this.statusStrip = new System.Windows.Forms.StatusStrip(); this.statusStrip.SuspendLayout();
this.lb_RunStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.lb_Split = new System.Windows.Forms.ToolStripStatusLabel();
this.lb_RunTime = new System.Windows.Forms.ToolStripStatusLabel();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout(); this.splitContainer1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.statusStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// tbx_resultStartRow // toolStrip1
// //
this.tbx_resultStartRow.Location = new System.Drawing.Point(98, 28); this.toolStrip1.ImageScalingSize = new System.Drawing.Size(25, 25);
this.tbx_resultStartRow.Margin = new System.Windows.Forms.Padding(2); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tbx_resultStartRow.Name = "tbx_resultStartRow"; this.tsbtRunTool});
this.tbx_resultStartRow.Size = new System.Drawing.Size(71, 21); this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.tbx_resultStartRow.TabIndex = 102; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1112, 32);
this.toolStrip1.TabIndex = 5;
this.toolStrip1.Text = "toolStrip1";
// //
// label5 // tsbtRunTool
// //
this.label5.AutoSize = true; this.tsbtRunTool.Image = ((System.Drawing.Image)(resources.GetObject("tsbtRunTool.Image")));
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tsbtRunTool.ImageTransparentColor = System.Drawing.Color.Magenta;
this.label5.Location = new System.Drawing.Point(19, 201); this.tsbtRunTool.Name = "tsbtRunTool";
this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.tsbtRunTool.Size = new System.Drawing.Size(85, 29);
this.label5.Name = "label5"; this.tsbtRunTool.Text = "运行工具";
this.label5.Size = new System.Drawing.Size(79, 20); this.tsbtRunTool.Click += new System.EventHandler(this.tsbtRunTool_Click);
this.label5.TabIndex = 279;
this.label5.Text = "结果选择:";
// //
// label16 // statusStrip
// //
this.label16.AutoSize = true; this.statusStrip.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.label16.Location = new System.Drawing.Point(19, 71); this.lb_RunStatus,
this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.toolStripStatusLabel1,
this.label16.Name = "label16"; this.lb_RunTime});
this.label16.Size = new System.Drawing.Size(65, 20); this.statusStrip.Location = new System.Drawing.Point(0, 643);
this.label16.TabIndex = 302; this.statusStrip.Name = "statusStrip";
this.label16.Text = "卡尺宽:"; this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
this.statusStrip.Size = new System.Drawing.Size(1112, 22);
this.statusStrip.TabIndex = 4;
// //
// label14 // lb_RunStatus
// //
this.label14.AutoSize = true; this.lb_RunStatus.Name = "lb_RunStatus";
this.label14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lb_RunStatus.Size = new System.Drawing.Size(0, 17);
this.label14.Location = new System.Drawing.Point(19, 38);
this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(65, 20);
this.label14.TabIndex = 302;
this.label14.Text = "卡尺长:";
// //
// label15 // toolStripStatusLabel1
// //
this.label15.AutoSize = true; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
this.label15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.toolStripStatusLabel1.Size = new System.Drawing.Size(16, 17);
this.label15.Location = new System.Drawing.Point(21, 138); this.toolStripStatusLabel1.Text = " ";
this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(54, 20);
this.label15.TabIndex = 310;
this.label15.Text = "Sigma:";
// //
// label13 // lb_RunTime
// //
this.label13.AutoSize = true; this.lb_RunTime.Name = "lb_RunTime";
this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lb_RunTime.Size = new System.Drawing.Size(0, 17);
this.label13.Location = new System.Drawing.Point(19, 105);
this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(51, 20);
this.label13.TabIndex = 310;
this.label13.Text = "阈值:";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.Location = new System.Drawing.Point(19, 171);
this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(51, 20);
this.label11.TabIndex = 298;
this.label11.Text = "极性:";
//
// tbx_caliperLength2
//
this.tbx_caliperLength2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_caliperLength2.Location = new System.Drawing.Point(109, 68);
this.tbx_caliperLength2.Margin = new System.Windows.Forms.Padding(2);
this.tbx_caliperLength2.Name = "tbx_caliperLength2";
this.tbx_caliperLength2.Size = new System.Drawing.Size(92, 26);
this.tbx_caliperLength2.TabIndex = 301;
//
// tbx_Sigma
//
this.tbx_Sigma.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_Sigma.Location = new System.Drawing.Point(111, 135);
this.tbx_Sigma.Margin = new System.Windows.Forms.Padding(2);
this.tbx_Sigma.Name = "tbx_Sigma";
this.tbx_Sigma.Size = new System.Drawing.Size(92, 26);
this.tbx_Sigma.TabIndex = 309;
//
// tbx_caliperLength1
//
this.tbx_caliperLength1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_caliperLength1.Location = new System.Drawing.Point(109, 35);
this.tbx_caliperLength1.Margin = new System.Windows.Forms.Padding(2);
this.tbx_caliperLength1.Name = "tbx_caliperLength1";
this.tbx_caliperLength1.Size = new System.Drawing.Size(92, 26);
this.tbx_caliperLength1.TabIndex = 301;
//
// tbx_threshold
//
this.tbx_threshold.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_threshold.Location = new System.Drawing.Point(109, 102);
this.tbx_threshold.Margin = new System.Windows.Forms.Padding(2);
this.tbx_threshold.Name = "tbx_threshold";
this.tbx_threshold.Size = new System.Drawing.Size(92, 26);
this.tbx_threshold.TabIndex = 309;
//
// cbx_polarity
//
this.cbx_polarity.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbx_polarity.FormattingEnabled = true;
this.cbx_polarity.Items.AddRange(new object[] {
"从明到暗",
"从暗到明"});
this.cbx_polarity.Location = new System.Drawing.Point(109, 168);
this.cbx_polarity.Name = "cbx_polarity";
this.cbx_polarity.Size = new System.Drawing.Size(92, 28);
this.cbx_polarity.TabIndex = 314;
this.cbx_polarity.Text = "从明到暗";
//
// btn_runCaliperool
//
this.btn_runCaliperool.BackColor = System.Drawing.Color.White;
this.btn_runCaliperool.Location = new System.Drawing.Point(430, 355);
this.btn_runCaliperool.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btn_runCaliperool.Name = "btn_runCaliperool";
this.btn_runCaliperool.Size = new System.Drawing.Size(90, 48);
this.btn_runCaliperool.TabIndex = 270;
this.btn_runCaliperool.Text = "运行";
this.btn_runCaliperool.UseVisualStyleBackColor = false;
this.btn_runCaliperool.Click += new System.EventHandler(this.btn_runCaliperool_Click);
//
// btn_moveCliperRegion
//
this.btn_moveCliperRegion.BackColor = System.Drawing.Color.White;
this.btn_moveCliperRegion.Location = new System.Drawing.Point(296, 355);
this.btn_moveCliperRegion.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btn_moveCliperRegion.Name = "btn_moveCliperRegion";
this.btn_moveCliperRegion.Size = new System.Drawing.Size(90, 48);
this.btn_moveCliperRegion.TabIndex = 269;
this.btn_moveCliperRegion.Text = "编辑卡尺";
this.btn_moveCliperRegion.UseVisualStyleBackColor = false;
this.btn_moveCliperRegion.Click += new System.EventHandler(this.btn_moveCliperRegion_Click);
//
// cbx_edgeSelect
//
this.cbx_edgeSelect.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbx_edgeSelect.FormattingEnabled = true;
this.cbx_edgeSelect.Items.AddRange(new object[] {
"all",
"first",
"last"});
this.cbx_edgeSelect.Location = new System.Drawing.Point(109, 199);
this.cbx_edgeSelect.Name = "cbx_edgeSelect";
this.cbx_edgeSelect.Size = new System.Drawing.Size(92, 28);
this.cbx_edgeSelect.TabIndex = 317;
this.cbx_edgeSelect.Text = "all";
//
// tbx_resultStartCol
//
this.tbx_resultStartCol.Location = new System.Drawing.Point(98, 61);
this.tbx_resultStartCol.Margin = new System.Windows.Forms.Padding(2);
this.tbx_resultStartCol.Name = "tbx_resultStartCol";
this.tbx_resultStartCol.Size = new System.Drawing.Size(71, 21);
this.tbx_resultStartCol.TabIndex = 104;
// //
// splitContainer1 // splitContainer1
// //
this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
| System.Windows.Forms.AnchorStyles.Left) this.splitContainer1.Location = new System.Drawing.Point(0, 32);
| System.Windows.Forms.AnchorStyles.Right))); this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.splitContainer1.Location = new System.Drawing.Point(1, 2);
this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Name = "splitContainer1";
// //
// splitContainer1.Panel1 // splitContainer1.Panel1
@@ -261,25 +140,67 @@ namespace CaliperTool
// //
// splitContainer1.Panel2 // splitContainer1.Panel2
// //
this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White; this.splitContainer1.Panel2.Controls.Add(this.tabControl1);
this.splitContainer1.Panel2.Controls.Add(this.panel2); this.splitContainer1.Size = new System.Drawing.Size(1112, 611);
this.splitContainer1.Panel2.Controls.Add(this.groupBox4); this.splitContainer1.SplitterDistance = 642;
this.splitContainer1.Panel2.Controls.Add(this.groupBox3); this.splitContainer1.SplitterWidth = 5;
this.splitContainer1.Panel2.Controls.Add(this.groupBox1); this.splitContainer1.TabIndex = 6;
this.splitContainer1.Panel2.Controls.Add(this.groupBox2);
this.splitContainer1.Panel2.Controls.Add(this.btn_runCaliperool);
this.splitContainer1.Panel2.Controls.Add(this.btn_moveCliperRegion);
this.splitContainer1.Size = new System.Drawing.Size(1127, 479);
this.splitContainer1.SplitterDistance = 562;
this.splitContainer1.TabIndex = 275;
// //
// panel1 // panel1
// //
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(562, 479); this.panel1.Size = new System.Drawing.Size(642, 611);
this.panel1.TabIndex = 272; this.panel1.TabIndex = 0;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(465, 611);
this.tabControl1.TabIndex = 0;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage1.Size = new System.Drawing.Size(457, 581);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "参数设置";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.groupBox3);
this.tabPage2.Location = new System.Drawing.Point(4, 26);
this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage2.Size = new System.Drawing.Size(457, 581);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "图形显示";
this.tabPage2.UseVisualStyleBackColor = true;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.groupBox2);
this.tabPage3.Location = new System.Drawing.Point(4, 26);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(457, 581);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "结果";
this.tabPage3.UseVisualStyleBackColor = true;
// //
// groupBox4 // groupBox4
// //
@@ -295,22 +216,169 @@ namespace CaliperTool
this.groupBox4.Controls.Add(this.label15); this.groupBox4.Controls.Add(this.label15);
this.groupBox4.Controls.Add(this.label11); this.groupBox4.Controls.Add(this.label11);
this.groupBox4.Controls.Add(this.label13); this.groupBox4.Controls.Add(this.label13);
this.groupBox4.Location = new System.Drawing.Point(14, 166); this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox4.Location = new System.Drawing.Point(3, 4);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(224, 271); this.groupBox4.Size = new System.Drawing.Size(451, 573);
this.groupBox4.TabIndex = 320; this.groupBox4.TabIndex = 321;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "卡尺参数"; this.groupBox4.Text = "卡尺参数";
// //
// label14
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.Location = new System.Drawing.Point(19, 38);
this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(65, 20);
this.label14.TabIndex = 302;
this.label14.Text = "卡尺长:";
//
// cbx_edgeSelect
//
this.cbx_edgeSelect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cbx_edgeSelect.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbx_edgeSelect.FormattingEnabled = true;
this.cbx_edgeSelect.Items.AddRange(new object[] {
"all",
"first",
"last"});
this.cbx_edgeSelect.Location = new System.Drawing.Point(109, 199);
this.cbx_edgeSelect.Name = "cbx_edgeSelect";
this.cbx_edgeSelect.Size = new System.Drawing.Size(282, 28);
this.cbx_edgeSelect.TabIndex = 317;
this.cbx_edgeSelect.Text = "all";
//
// cbx_polarity
//
this.cbx_polarity.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cbx_polarity.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cbx_polarity.FormattingEnabled = true;
this.cbx_polarity.Items.AddRange(new object[] {
"从明到暗",
"从暗到明"});
this.cbx_polarity.Location = new System.Drawing.Point(109, 168);
this.cbx_polarity.Name = "cbx_polarity";
this.cbx_polarity.Size = new System.Drawing.Size(282, 28);
this.cbx_polarity.TabIndex = 314;
this.cbx_polarity.Text = "从明到暗";
//
// tbx_threshold
//
this.tbx_threshold.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tbx_threshold.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_threshold.Location = new System.Drawing.Point(109, 102);
this.tbx_threshold.Margin = new System.Windows.Forms.Padding(2);
this.tbx_threshold.Name = "tbx_threshold";
this.tbx_threshold.Size = new System.Drawing.Size(282, 26);
this.tbx_threshold.TabIndex = 309;
this.tbx_threshold.Text = "5";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(19, 201);
this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(79, 20);
this.label5.TabIndex = 279;
this.label5.Text = "结果选择:";
//
// tbx_caliperLength1
//
this.tbx_caliperLength1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tbx_caliperLength1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_caliperLength1.Location = new System.Drawing.Point(109, 35);
this.tbx_caliperLength1.Margin = new System.Windows.Forms.Padding(2);
this.tbx_caliperLength1.Name = "tbx_caliperLength1";
this.tbx_caliperLength1.Size = new System.Drawing.Size(282, 26);
this.tbx_caliperLength1.TabIndex = 301;
this.tbx_caliperLength1.Text = "50";
//
// label16
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label16.Location = new System.Drawing.Point(19, 71);
this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(65, 20);
this.label16.TabIndex = 302;
this.label16.Text = "卡尺宽:";
//
// tbx_Sigma
//
this.tbx_Sigma.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tbx_Sigma.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_Sigma.Location = new System.Drawing.Point(111, 135);
this.tbx_Sigma.Margin = new System.Windows.Forms.Padding(2);
this.tbx_Sigma.Name = "tbx_Sigma";
this.tbx_Sigma.Size = new System.Drawing.Size(280, 26);
this.tbx_Sigma.TabIndex = 309;
this.tbx_Sigma.Text = "2";
//
// tbx_caliperLength2
//
this.tbx_caliperLength2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tbx_caliperLength2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tbx_caliperLength2.Location = new System.Drawing.Point(109, 68);
this.tbx_caliperLength2.Margin = new System.Windows.Forms.Padding(2);
this.tbx_caliperLength2.Name = "tbx_caliperLength2";
this.tbx_caliperLength2.Size = new System.Drawing.Size(282, 26);
this.tbx_caliperLength2.TabIndex = 301;
this.tbx_caliperLength2.Text = "10";
//
// label15
//
this.label15.AutoSize = true;
this.label15.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.Location = new System.Drawing.Point(21, 138);
this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(54, 20);
this.label15.TabIndex = 310;
this.label15.Text = "Sigma:";
//
// label11
//
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.Location = new System.Drawing.Point(19, 171);
this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(51, 20);
this.label11.TabIndex = 298;
this.label11.Text = "极性:";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.Location = new System.Drawing.Point(19, 105);
this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(51, 20);
this.label13.TabIndex = 310;
this.label13.Text = "阈值:";
//
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.chBDispCaliperROI); this.groupBox3.Controls.Add(this.chBDispCaliperROI);
this.groupBox3.Controls.Add(this.chBDispCross); this.groupBox3.Controls.Add(this.chBDispCross);
this.groupBox3.Controls.Add(this.chBDispRec); this.groupBox3.Controls.Add(this.chBDispRec);
this.groupBox3.Location = new System.Drawing.Point(296, 170); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox3.Location = new System.Drawing.Point(3, 4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(213, 124); this.groupBox3.Size = new System.Drawing.Size(451, 166);
this.groupBox3.TabIndex = 319; this.groupBox3.TabIndex = 320;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "显示"; this.groupBox3.Text = "显示";
// //
@@ -319,7 +387,7 @@ namespace CaliperTool
this.chBDispCaliperROI.AutoSize = true; this.chBDispCaliperROI.AutoSize = true;
this.chBDispCaliperROI.Location = new System.Drawing.Point(29, 92); this.chBDispCaliperROI.Location = new System.Drawing.Point(29, 92);
this.chBDispCaliperROI.Name = "chBDispCaliperROI"; this.chBDispCaliperROI.Name = "chBDispCaliperROI";
this.chBDispCaliperROI.Size = new System.Drawing.Size(96, 16); this.chBDispCaliperROI.Size = new System.Drawing.Size(99, 21);
this.chBDispCaliperROI.TabIndex = 0; this.chBDispCaliperROI.TabIndex = 0;
this.chBDispCaliperROI.Text = "结果显示交点"; this.chBDispCaliperROI.Text = "结果显示交点";
this.chBDispCaliperROI.UseVisualStyleBackColor = true; this.chBDispCaliperROI.UseVisualStyleBackColor = true;
@@ -329,7 +397,7 @@ namespace CaliperTool
this.chBDispCross.AutoSize = true; this.chBDispCross.AutoSize = true;
this.chBDispCross.Location = new System.Drawing.Point(29, 60); this.chBDispCross.Location = new System.Drawing.Point(29, 60);
this.chBDispCross.Name = "chBDispCross"; this.chBDispCross.Name = "chBDispCross";
this.chBDispCross.Size = new System.Drawing.Size(96, 16); this.chBDispCross.Size = new System.Drawing.Size(99, 21);
this.chBDispCross.TabIndex = 0; this.chBDispCross.TabIndex = 0;
this.chBDispCross.Text = "结果显示交点"; this.chBDispCross.Text = "结果显示交点";
this.chBDispCross.UseVisualStyleBackColor = true; this.chBDispCross.UseVisualStyleBackColor = true;
@@ -339,102 +407,50 @@ namespace CaliperTool
this.chBDispRec.AutoSize = true; this.chBDispRec.AutoSize = true;
this.chBDispRec.Location = new System.Drawing.Point(29, 29); this.chBDispRec.Location = new System.Drawing.Point(29, 29);
this.chBDispRec.Name = "chBDispRec"; this.chBDispRec.Name = "chBDispRec";
this.chBDispRec.Size = new System.Drawing.Size(108, 16); this.chBDispRec.Size = new System.Drawing.Size(111, 21);
this.chBDispRec.TabIndex = 0; this.chBDispRec.TabIndex = 0;
this.chBDispRec.Text = "结果显示矩形框"; this.chBDispRec.Text = "结果显示矩形框";
this.chBDispRec.UseVisualStyleBackColor = true; this.chBDispRec.UseVisualStyleBackColor = true;
// //
// groupBox1
//
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.tbx_expectPhi);
this.groupBox1.Controls.Add(this.tbx_expectCenterCol);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.tbx_expectCenterRow);
this.groupBox1.Location = new System.Drawing.Point(14, 19);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(224, 127);
this.groupBox1.TabIndex = 318;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "输入坐标";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(22, 89);
this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 12);
this.label3.TabIndex = 276;
this.label3.Text = "卡尺角度:";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(22, 31);
this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(77, 12);
this.label1.TabIndex = 272;
this.label1.Text = "中心行坐标:";
//
// tbx_expectPhi
//
this.tbx_expectPhi.Location = new System.Drawing.Point(131, 86);
this.tbx_expectPhi.Margin = new System.Windows.Forms.Padding(2);
this.tbx_expectPhi.Name = "tbx_expectPhi";
this.tbx_expectPhi.Size = new System.Drawing.Size(71, 21);
this.tbx_expectPhi.TabIndex = 275;
//
// tbx_expectCenterCol
//
this.tbx_expectCenterCol.Location = new System.Drawing.Point(131, 57);
this.tbx_expectCenterCol.Margin = new System.Windows.Forms.Padding(2);
this.tbx_expectCenterCol.Name = "tbx_expectCenterCol";
this.tbx_expectCenterCol.Size = new System.Drawing.Size(71, 21);
this.tbx_expectCenterCol.TabIndex = 273;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(22, 60);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(77, 12);
this.label2.TabIndex = 274;
this.label2.Text = "中心列坐标:";
//
// tbx_expectCenterRow
//
this.tbx_expectCenterRow.Location = new System.Drawing.Point(131, 28);
this.tbx_expectCenterRow.Margin = new System.Windows.Forms.Padding(2);
this.tbx_expectCenterRow.Name = "tbx_expectCenterRow";
this.tbx_expectCenterRow.Size = new System.Drawing.Size(71, 21);
this.tbx_expectCenterRow.TabIndex = 271;
//
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.tbx_resultStartRow); this.groupBox2.Controls.Add(this.tbx_resultStartRow);
this.groupBox2.Controls.Add(this.tbx_resultStartCol); this.groupBox2.Controls.Add(this.tbx_resultStartCol);
this.groupBox2.Controls.Add(this.label7); this.groupBox2.Controls.Add(this.label7);
this.groupBox2.Controls.Add(this.label9); this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Location = new System.Drawing.Point(296, 19); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox2.Location = new System.Drawing.Point(0, 0);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2); this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2); this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
this.groupBox2.Size = new System.Drawing.Size(201, 127); this.groupBox2.Size = new System.Drawing.Size(457, 127);
this.groupBox2.TabIndex = 297; this.groupBox2.TabIndex = 299;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "结果点"; this.groupBox2.Text = "结果点";
// //
// tbx_resultStartRow
//
this.tbx_resultStartRow.Location = new System.Drawing.Point(98, 28);
this.tbx_resultStartRow.Margin = new System.Windows.Forms.Padding(2);
this.tbx_resultStartRow.Name = "tbx_resultStartRow";
this.tbx_resultStartRow.Size = new System.Drawing.Size(71, 23);
this.tbx_resultStartRow.TabIndex = 102;
//
// tbx_resultStartCol
//
this.tbx_resultStartCol.Location = new System.Drawing.Point(98, 61);
this.tbx_resultStartCol.Margin = new System.Windows.Forms.Padding(2);
this.tbx_resultStartCol.Name = "tbx_resultStartCol";
this.tbx_resultStartCol.Size = new System.Drawing.Size(71, 23);
this.tbx_resultStartCol.TabIndex = 104;
//
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(22, 31); this.label7.Location = new System.Drawing.Point(22, 31);
this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(77, 12); this.label7.Size = new System.Drawing.Size(80, 17);
this.label7.TabIndex = 103; this.label7.TabIndex = 103;
this.label7.Text = "中心行坐标:"; this.label7.Text = "中心行坐标:";
// //
@@ -444,115 +460,82 @@ namespace CaliperTool
this.label9.Location = new System.Drawing.Point(22, 64); this.label9.Location = new System.Drawing.Point(22, 64);
this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label9.Name = "label9"; this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(77, 12); this.label9.Size = new System.Drawing.Size(80, 17);
this.label9.TabIndex = 105; this.label9.TabIndex = 105;
this.label9.Text = "中心列坐标:"; this.label9.Text = "中心列坐标:";
// //
// panel2
//
this.panel2.Location = new System.Drawing.Point(-566, 485);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1127, 25);
this.panel2.TabIndex = 276;
//
// statusStrip
//
this.statusStrip.BackColor = System.Drawing.Color.White;
this.statusStrip.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.lb_RunStatus,
this.lb_Split,
this.lb_RunTime});
this.statusStrip.Location = new System.Drawing.Point(0, 485);
this.statusStrip.Name = "statusStrip";
this.statusStrip.Size = new System.Drawing.Size(1132, 24);
this.statusStrip.TabIndex = 276;
this.statusStrip.Text = "statusStrip1";
//
// lb_RunStatus
//
this.lb_RunStatus.Name = "lb_RunStatus";
this.lb_RunStatus.Size = new System.Drawing.Size(0, 19);
//
// lb_Split
//
this.lb_Split.Name = "lb_Split";
this.lb_Split.Size = new System.Drawing.Size(189, 19);
this.lb_Split.Text = " ";
//
// lb_RunTime
//
this.lb_RunTime.Name = "lb_RunTime";
this.lb_RunTime.Size = new System.Drawing.Size(0, 19);
//
// FormCaliper // FormCaliper
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1132, 509); this.ClientSize = new System.Drawing.Size(1112, 665);
this.Controls.Add(this.statusStrip);
this.Controls.Add(this.splitContainer1); this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.statusStrip);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "FormCaliper"; this.Name = "FormCaliper";
this.Text = "卡尺工具"; this.Text = "卡尺工具";
this.Load += new System.EventHandler(this.FormCaliper_Load); this.Load += new System.EventHandler(this.FormCaliper_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.statusStrip.ResumeLayout(false);
this.statusStrip.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false); this.splitContainer1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.groupBox4.ResumeLayout(false); this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout(); this.groupBox4.PerformLayout();
this.groupBox3.ResumeLayout(false); this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout(); this.groupBox3.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
this.statusStrip.ResumeLayout(false);
this.statusStrip.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
} }
#endregion #endregion
public System.Windows.Forms.TextBox tbx_resultStartRow;
private System.Windows.Forms.Label label5; private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.Label label16; private System.Windows.Forms.ToolStripButton tsbtRunTool;
private System.Windows.Forms.Label label14; private System.Windows.Forms.ToolStripStatusLabel lb_RunStatus;
private System.Windows.Forms.Label label15; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.Label label13; private System.Windows.Forms.ToolStripStatusLabel lb_RunTime;
private System.Windows.Forms.Label label11;
public System.Windows.Forms.TextBox tbx_caliperLength2;
public System.Windows.Forms.TextBox tbx_Sigma;
public System.Windows.Forms.TextBox tbx_caliperLength1;
public System.Windows.Forms.TextBox tbx_threshold;
public System.Windows.Forms.ComboBox cbx_polarity;
public System.Windows.Forms.Button btn_runCaliperool;
private System.Windows.Forms.Button btn_moveCliperRegion;
public System.Windows.Forms.ComboBox cbx_edgeSelect;
public System.Windows.Forms.TextBox tbx_resultStartCol;
private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.Label label14;
public System.Windows.Forms.ComboBox cbx_edgeSelect;
public System.Windows.Forms.ComboBox cbx_polarity;
public System.Windows.Forms.TextBox tbx_threshold;
private System.Windows.Forms.Label label5;
public System.Windows.Forms.TextBox tbx_caliperLength1;
private System.Windows.Forms.Label label16;
public System.Windows.Forms.TextBox tbx_Sigma;
public System.Windows.Forms.TextBox tbx_caliperLength2;
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox chBDispCaliperROI;
private System.Windows.Forms.CheckBox chBDispCross; private System.Windows.Forms.CheckBox chBDispCross;
private System.Windows.Forms.CheckBox chBDispRec; private System.Windows.Forms.CheckBox chBDispRec;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label1;
public System.Windows.Forms.TextBox tbx_expectPhi;
public System.Windows.Forms.TextBox tbx_expectCenterCol;
private System.Windows.Forms.Label label2;
public System.Windows.Forms.TextBox tbx_expectCenterRow;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
public System.Windows.Forms.TextBox tbx_resultStartRow;
public System.Windows.Forms.TextBox tbx_resultStartCol;
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.CheckBox chBDispCaliperROI;
private System.Windows.Forms.Panel panel2;
public System.Windows.Forms.StatusStrip statusStrip; public System.Windows.Forms.StatusStrip statusStrip;
public System.Windows.Forms.ToolStripStatusLabel lb_RunStatus;
private System.Windows.Forms.ToolStripStatusLabel lb_Split;
public System.Windows.Forms.ToolStripStatusLabel lb_RunTime;
} }
} }

View File

@@ -69,12 +69,7 @@ namespace CaliperTool
private void InitTool() private void InitTool()
{ {
this.Text = myToolInfo.toolName; this.Text = myToolInfo.toolName;
btn_runCaliperool.Focus();
Application.DoEvents(); Application.DoEvents();
// 预期设定值
tbx_expectCenterRow.Text = myCaliper.expectRecStartRow.ToString();
tbx_expectCenterCol.Text = myCaliper.expectRecStartColumn.ToString();
tbx_expectPhi.Text = myCaliper.expectAngle.ToString();
// 预期参数 // 预期参数
tbx_caliperLength1.Text = myCaliper.length1.ToString(); tbx_caliperLength1.Text = myCaliper.length1.ToString();
tbx_caliperLength2.Text = myCaliper.length2.ToString(); tbx_caliperLength2.Text = myCaliper.length2.ToString();
@@ -96,10 +91,6 @@ namespace CaliperTool
private void btn_runCaliperool_Click(object sender, EventArgs e) private void btn_runCaliperool_Click(object sender, EventArgs e)
{ {
// 更改界面中参数,实时更新类中参数
myCaliper.expectRecStartRow = Convert.ToDouble(tbx_expectCenterRow.Text.Trim());
myCaliper.expectRecStartColumn = Convert.ToDouble(tbx_expectCenterCol.Text.Trim());
myCaliper.expectAngle = Convert.ToDouble(tbx_expectPhi.Text.Trim());
// 运行参数 // 运行参数
myCaliper.threshold = Convert.ToInt16(tbx_threshold.Text.Trim()); myCaliper.threshold = Convert.ToInt16(tbx_threshold.Text.Trim());
myCaliper.length1 = Convert.ToDouble(tbx_caliperLength1.Text.Trim()); myCaliper.length1 = Convert.ToDouble(tbx_caliperLength1.Text.Trim());
@@ -133,5 +124,10 @@ namespace CaliperTool
} }
} }
} }
private void tsbtRunTool_Click(object sender, EventArgs e)
{
}
} }
} }

View File

@@ -117,10 +117,85 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>225, 19</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tsbtRunTool.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>335, 19</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAEAIyAAAAEAIACoEgAAFgAAACgAAAAjAAAAQAAAAAEAIAAAAAAAgBEAAAAAAAAAAAAAAAAAAAAA AAABAAEAIyAAAAEAIACoEgAAFgAAACgAAAAjAAAAQAAAAAEAIAAAAAAAgBEAAAAAAAAAAAAAAAAAAAAA

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -77,11 +77,11 @@ namespace ViewROI
this.grayValueLable.BackColor = System.Drawing.Color.Transparent; this.grayValueLable.BackColor = System.Drawing.Color.Transparent;
this.grayValueLable.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.grayValueLable.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.grayValueLable.IsScaled = false; this.grayValueLable.IsScaled = false;
this.grayValueLable.Location = new System.Drawing.Point(3, 430); this.grayValueLable.Location = new System.Drawing.Point(3, 432);
this.grayValueLable.MinimumSize = new System.Drawing.Size(1, 1); this.grayValueLable.MinimumSize = new System.Drawing.Size(1, 1);
this.grayValueLable.Name = "grayValueLable"; this.grayValueLable.Name = "grayValueLable";
this.grayValueLable.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); this.grayValueLable.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0);
this.grayValueLable.Size = new System.Drawing.Size(260, 26); this.grayValueLable.Size = new System.Drawing.Size(260, 24);
this.grayValueLable.Symbol = 61483; this.grayValueLable.Symbol = 61483;
this.grayValueLable.TabIndex = 4; this.grayValueLable.TabIndex = 4;
this.grayValueLable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.grayValueLable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

View File

@@ -7,6 +7,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using HalconDotNet; using HalconDotNet;
using System.Diagnostics;
namespace ViewROI namespace ViewROI
{ {
@@ -80,16 +81,15 @@ namespace ViewROI
{ {
try try
{ {
int button_state;
double positionX, positionY; double positionX, positionY;
string str_value; string str_value;
string str_position; string str_position;
bool _isXOut = true, _isYOut = true; bool _isXOut = true, _isYOut = true;
HTuple channel_count; HTuple channel_count;
HOperatorSet.CountChannels(hv_Image, out channel_count); HOperatorSet.CountChannels(hv_Image, out channel_count);
//SmartWindow.HalconWindow.GetMpositionSubPix(out positionY, out positionX, out button_state);
SmartWindow.HalconWindow.GetMpositionSubPix(out positionY, out positionX, out button_state); positionY = e.Y;
positionX = e.X;
str_position = String.Format("RC: {0:0},{1:0}", positionY, positionX); str_position = String.Format("RC: {0:0},{1:0}", positionY, positionX);
_isXOut = (positionX < 0 || positionX >= hv_Width); _isXOut = (positionX < 0 || positionX >= hv_Width);

View File

@@ -50,7 +50,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

View File

@@ -120,11 +120,11 @@ namespace PMAlignTool
this.ckb_showCross = new System.Windows.Forms.CheckBox(); this.ckb_showCross = new System.Windows.Forms.CheckBox();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.dgv_matchResult = new System.Windows.Forms.DataGridView(); this.dgv_matchResult = new System.Windows.Forms.DataGridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.statusStrip.SuspendLayout(); this.statusStrip.SuspendLayout();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -1546,44 +1546,62 @@ namespace PMAlignTool
// //
// dgv_matchResult // dgv_matchResult
// //
this.dgv_matchResult.AllowDrop = true;
this.dgv_matchResult.AllowUserToAddRows = false;
this.dgv_matchResult.AllowUserToDeleteRows = false;
this.dgv_matchResult.AllowUserToResizeRows = false;
this.dgv_matchResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgv_matchResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgv_matchResult.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgv_matchResult.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column1, this.Column7,
this.Column2, this.Column8,
this.Column3, this.Column9,
this.Column4, this.Column10,
this.Column5}); this.Column12});
this.dgv_matchResult.Dock = System.Windows.Forms.DockStyle.Fill; this.dgv_matchResult.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgv_matchResult.Location = new System.Drawing.Point(0, 0); this.dgv_matchResult.Location = new System.Drawing.Point(0, 0);
this.dgv_matchResult.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.dgv_matchResult.Name = "dgv_matchResult"; this.dgv_matchResult.Name = "dgv_matchResult";
this.dgv_matchResult.ReadOnly = true;
this.dgv_matchResult.RowHeadersVisible = false;
this.dgv_matchResult.RowTemplate.Height = 23; this.dgv_matchResult.RowTemplate.Height = 23;
this.dgv_matchResult.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgv_matchResult.Size = new System.Drawing.Size(392, 568); this.dgv_matchResult.Size = new System.Drawing.Size(392, 568);
this.dgv_matchResult.TabIndex = 0; this.dgv_matchResult.TabIndex = 15;
// //
// Column1 // Column7
// //
this.Column1.HeaderText = "号"; this.Column7.HeaderText = "号";
this.Column1.Name = "Column1"; this.Column7.Name = "Column7";
this.Column7.ReadOnly = true;
this.Column7.Width = 70;
// //
// Column2 // Column8
// //
this.Column2.HeaderText = "分"; this.Column8.HeaderText = "分";
this.Column2.Name = "Column2"; this.Column8.Name = "Column8";
this.Column8.ReadOnly = true;
this.Column8.Width = 75;
// //
// Column3 // Column9
// //
this.Column3.HeaderText = "行"; this.Column9.HeaderText = "行";
this.Column3.Name = "Column3"; this.Column9.Name = "Column9";
this.Column9.ReadOnly = true;
this.Column9.Width = 70;
// //
// Column4 // Column10
// //
this.Column4.HeaderText = "列"; this.Column10.HeaderText = "列";
this.Column4.Name = "Column4"; this.Column10.Name = "Column10";
this.Column10.ReadOnly = true;
this.Column10.Width = 70;
// //
// Column5 // Column12
// //
this.Column5.HeaderText = "角度"; this.Column12.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.Column5.Name = "Column5"; this.Column12.HeaderText = "角度(°)";
this.Column12.Name = "Column12";
this.Column12.ReadOnly = true;
// //
// FormPMAlignTool // FormPMAlignTool
// //
@@ -1739,11 +1757,11 @@ namespace PMAlignTool
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.ToolStripStatusLabel lb_RunTime; private System.Windows.Forms.ToolStripStatusLabel lb_RunTime;
private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1; internal System.Windows.Forms.DataGridView dgv_matchResult;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
private System.Windows.Forms.DataGridViewTextBoxColumn Column5; private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
public System.Windows.Forms.DataGridView dgv_matchResult; private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
} }
} }

View File

@@ -36,6 +36,7 @@ namespace PMAlignTool
myPMAlign.toolName = myToolInfo.toolName; myPMAlign.toolName = myToolInfo.toolName;
myPMAlign.bingdingJobName = myToolInfo.bingingJobName; myPMAlign.bingdingJobName = myToolInfo.bingingJobName;
myPMAlign.DispImage(); myPMAlign.DispImage();
myPMAlign.InitTool();
} }
} }
@@ -103,11 +104,22 @@ namespace PMAlignTool
nud_ScaleRange.Value = myPMAlign.maxScale; nud_ScaleRange.Value = myPMAlign.maxScale;
tkb_contrast.Value = myPMAlign.contrast; tkb_contrast.Value = myPMAlign.contrast;
#endregion #endregion
if(myPMAlign.modelPartImage != null)
if (myPMAlign.oldTrainImage == null && File.Exists(myPMAlign.trainImgPath) && File.Exists(myPMAlign.trainModelPath))
{
try
{
HOperatorSet.ReadImage(out myPMAlign.oldTrainImage, myPMAlign.trainImgPath);
HOperatorSet.ReadImage(out myPMAlign.modelPartImage, myPMAlign.trainModelPath);
}
catch (Exception)
{
}
}
if (myPMAlign.modelPartImage != null)
{ {
hWindowTool_Smart1.DispImage(myPMAlign.modelPartImage); hWindowTool_Smart1.DispImage(myPMAlign.modelPartImage);
} }
// myHwindow.DispHWindow.AttachDrawingObjectToWindow(serachRegion_drawing_object);
tsbtRunTool_Click(null, null); tsbtRunTool_Click(null, null);
isInitTool = false; isInitTool = false;
} }
@@ -321,14 +333,27 @@ namespace PMAlignTool
private void btnChangeModel_Click(object sender, EventArgs e) private void btnChangeModel_Click(object sender, EventArgs e)
{ {
if(!File.Exists(myPMAlign.pmaModelName + ".ShapeModel")) if(!File.Exists(myPMAlign.trainShmPath))
{ {
MessageBox.Show("还未创建过模板,请先进行创建!"); MessageBox.Show("无已训练好的模型,请先创建模型");
return; return;
} }
else
{
if (myPMAlign.oldTrainImage == null && File.Exists(myPMAlign.trainImgPath) && File.Exists(myPMAlign.trainModelPath))
{
try
{
HOperatorSet.ReadImage(out myPMAlign.oldTrainImage, myPMAlign.trainImgPath);
HOperatorSet.ReadImage(out myPMAlign.modelPartImage, myPMAlign.trainModelPath);
}
catch (Exception)
{
}
}
myPMAlign.inputImage = myPMAlign.oldTrainImage; myPMAlign.inputImage = myPMAlign.oldTrainImage;
myPMAlign.Run(SoftwareRunState.Debug); myPMAlign.Run(SoftwareRunState.Debug);
}
} }
private void cbx_searchRegionType_SelectedIndexChanged() private void cbx_searchRegionType_SelectedIndexChanged()

View File

@@ -196,19 +196,19 @@
n4H40MZzWKY2esaEIAiCIAiCIKrhy5f/A2/46JDXUARZAAAAAElFTkSuQmCC n4H40MZzWKY2esaEIAiCIAiCIKrhy5f/A2/46JDXUARZAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -173,8 +173,20 @@ namespace PMAlignTool
public bool isAutoConstants { get; set; } public bool isAutoConstants { get; set; }
public string modelFilePath { get; set; } public string modelFilePath { get; set; }
public RegionType searchRegionType { get; set; } public RegionType searchRegionType { get; set; }
/// <summary>
/// 文件存储路径
/// </summary>
public string trainImgPath, trainShmPath, trainModelPath, dataDirectory;
[NonSerialized] [NonSerialized]
public HObject SearchRegion; public HObject SearchRegion;
public void InitTool()
{
trainImgPath = ConfigData.ConfigPath + $"\\{bingdingJobName}\\{toolName}_{pmaModelName}_TrainImage.bmp";
trainShmPath = ConfigData.ConfigPath + $"\\{bingdingJobName}\\{toolName}_{pmaModelName}.Shm";
trainModelPath = ConfigData.ConfigPath + $"\\{bingdingJobName}\\{toolName}_{pmaModelName}_ModelImage.bmp";
dataDirectory = ConfigData.ConfigPath + $"\\{bingdingJobName}\\";
}
public override void Run(SoftwareRunState softwareState) public override void Run(SoftwareRunState softwareState)
{ {
Stopwatch sw = new Stopwatch(); Stopwatch sw = new Stopwatch();
@@ -372,9 +384,10 @@ namespace PMAlignTool
} }
isCreateModel = true; isCreateModel = true;
// 模板句柄信息 // 模板句柄信息
Directory.CreateDirectory(ConfigData.ConfigPath + $"\\{bingdingJobName}\\"); Directory.CreateDirectory(dataDirectory);
HOperatorSet.WriteShapeModel(modelID, ConfigData.ConfigPath + $"\\{bingdingJobName}\\{toolName}_{pmaModelName}.Shm"); HOperatorSet.WriteShapeModel(modelID, trainShmPath);
HOperatorSet.WriteImage(inputImage, "bmp", 0, trainImgPath);
HOperatorSet.WriteImage(modelPartImage, "bmp", 0, trainModelPath);
if (scores != null && scores.Type != HTupleType.EMPTY) if (scores != null && scores.Type != HTupleType.EMPTY)
{ {
templatePose = new PosXYU { X = rows[0].D, Y = cols[0].D , U = angles[0].D }; templatePose = new PosXYU { X = rows[0].D, Y = cols[0].D , U = angles[0].D };
@@ -397,12 +410,12 @@ namespace PMAlignTool
public int FindModelTemplate(HObject findModelImage) public int FindModelTemplate(HObject findModelImage)
{ {
if (!File.Exists(ConfigData.ConfigPath + $"\\{bingdingJobName}\\{toolName}_{pmaModelName}.Shm")) if (!File.Exists(trainShmPath))
{ {
LoggerClass.WriteLog($"{toolName}未创建或加载模板", MsgLevel.Exception); LoggerClass.WriteLog($"{toolName}未创建或加载模板", MsgLevel.Exception);
return -1; return -1;
} }
HOperatorSet.ReadShapeModel(ConfigData.ConfigPath + $"\\{bingdingJobName}\\{toolName}_{pmaModelName}.Shm", out modelID); HOperatorSet.ReadShapeModel(trainShmPath, out modelID);
HObject image; HObject image;
if (searchRegionType == RegionType.AllImage) if (searchRegionType == RegionType.AllImage)
{ {

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -55,6 +55,7 @@ namespace PMAlignTool
} }
} }
} }
myPMAlign.InitTool();
myPMAlign.Run(SoftwareRunState.Release); myPMAlign.Run(SoftwareRunState.Release);
if (myPMAlign.toolRunStatu != ToolRunStatu.Succeed) if (myPMAlign.toolRunStatu != ToolRunStatu.Succeed)
{ {

View File

@@ -16,7 +16,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\VisionEdit\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

View File

@@ -82,30 +82,32 @@ namespace VisionJobFactory
{ {
if (bShouldCrossAssembly) if (bShouldCrossAssembly)
{ {
//Assembly[] Assemblys = AppDomain.CurrentDomain.GetAssemblies();
//if (Assemblys != null)
//{ Assembly[] Assemblys = AppDomain.CurrentDomain.GetAssemblies();
// for (int i = 0, len = Assemblys.Length; i < len; i++) if (Assemblys != null)
// { {
// CheckInAssembly(Assemblys[i], bIgnoreAbstract, bInheritAttribute); for (int i = 0, len = Assemblys.Length; i < len; i++)
// } {
//} CheckInAssembly(Assemblys[i], bIgnoreAbstract, bInheritAttribute);
List<Assembly> allAssemblies = new List<Assembly>(); }
string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); }
string[] FILES = Directory.GetFiles(path, "*.dll"); //List<Assembly> allAssemblies = new List<Assembly>();
foreach (string dll in Directory.GetFiles(path, "*.dll")) //string path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
allAssemblies.Add(Assembly.LoadFile(dll)); //string[] FILES = Directory.GetFiles(path, "*.dll");
//foreach (string dll in Directory.GetFiles(path, "*.dll"))
// allAssemblies.Add(Assembly.LoadFile(dll));
// 手动寻找该dll若dll名称改变需要重新编译不智能 // 手动寻找该dll若dll名称改变需要重新编译不智能
// Assembly assem = Assembly.LoadFile($"{AppDomain.CurrentDomain.BaseDirectory}ToolLib.VisionToolList.dll"); // Assembly assem = Assembly.LoadFile($"{AppDomain.CurrentDomain.BaseDirectory}ToolLib.VisionToolList.dll");
if (allAssemblies != null) //if (allAssemblies != null)
{ //{
for (int i = 0; i < allAssemblies.Count; i++) // for (int i = 0; i < allAssemblies.Count; i++)
{ // {
CheckInAssembly(allAssemblies[i], bIgnoreAbstract, bInheritAttribute); // CheckInAssembly(allAssemblies[i], bIgnoreAbstract, bInheritAttribute);
} // }
} //}
} }
else else

File diff suppressed because it is too large Load Diff

View File

@@ -34,8 +34,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon> <ApplicationIcon>favicon%281%29.ico</ApplicationIcon>
</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="halcondotnet, Version=17.12.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL"> <Reference Include="halcondotnet, Version=17.12.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8, processorArchitecture=MSIL">
@@ -157,7 +156,7 @@
<None Include="Resources\新建2.png" /> <None Include="Resources\新建2.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="几何.ico" /> <Content Include="favicon%281%29.ico" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

BIN
VisionEdit/favicon(1).ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.