From eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期二, 29 九月 2020 13:27:50 +0800 Subject: [PATCH] 1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M071流程显式Copy,原来是为了避免内存泄漏,但目前来看不是这方面原因 5. Gocator驱动添加GoDataSet之类KObject资源显式回收,怀疑其中也有非托管对象资源,测试确实起到内存回收作用 --- src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs | 407 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 210 insertions(+), 197 deletions(-) diff --git a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs index 7b55454..0e3e8f1 100644 --- a/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs +++ b/src/Bro.UI.Device.Winform/MotionCard/CtrlMotionCardAxisOperation.Designer.cs @@ -28,46 +28,46 @@ /// </summary> private void InitializeComponent() { - this.groupBoxAxisStatus = new System.Windows.Forms.GroupBox(); + this.groupBoxAxisOperration = new System.Windows.Forms.GroupBox(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.panel1 = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); + this.buttonStop = new System.Windows.Forms.Button(); + this.buttonStart = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.buttonClearStatus = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label6 = new System.Windows.Forms.Label(); - this.textBox4 = new System.Windows.Forms.TextBox(); + this.textBoxP2PVel = new System.Windows.Forms.TextBox(); + this.textBoxP2PPrfPosition = new System.Windows.Forms.TextBox(); + this.textBoxP2PDec = new System.Windows.Forms.TextBox(); + this.textBoxP2PAcc = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.label8 = new System.Windows.Forms.Label(); - this.textBox6 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); - this.textBox7 = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.groupBoxAxisStatus.SuspendLayout(); + this.label8 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.buttonNegative = new System.Windows.Forms.Button(); + this.textBoxJogDec = new System.Windows.Forms.TextBox(); + this.buttonPositive = new System.Windows.Forms.Button(); + this.textBoxJogAcc = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.textBoxJogVel = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.groupBoxAxisOperration.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); - this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // - // groupBoxAxisStatus + // groupBoxAxisOperration // - this.groupBoxAxisStatus.Controls.Add(this.tableLayoutPanel1); - this.groupBoxAxisStatus.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBoxAxisStatus.Location = new System.Drawing.Point(0, 0); - this.groupBoxAxisStatus.Name = "groupBoxAxisStatus"; - this.groupBoxAxisStatus.Size = new System.Drawing.Size(547, 148); - this.groupBoxAxisStatus.TabIndex = 5; - this.groupBoxAxisStatus.TabStop = false; - this.groupBoxAxisStatus.Text = "杞存搷浣�"; + this.groupBoxAxisOperration.Controls.Add(this.tableLayoutPanel1); + this.groupBoxAxisOperration.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBoxAxisOperration.Location = new System.Drawing.Point(0, 0); + this.groupBoxAxisOperration.Name = "groupBoxAxisOperration"; + this.groupBoxAxisOperration.Size = new System.Drawing.Size(547, 148); + this.groupBoxAxisOperration.TabIndex = 5; + this.groupBoxAxisOperration.TabStop = false; + this.groupBoxAxisOperration.Text = "杞存搷浣�"; // // tableLayoutPanel1 // @@ -86,45 +86,15 @@ this.tableLayoutPanel1.Size = new System.Drawing.Size(541, 128); this.tableLayoutPanel1.TabIndex = 0; // - // panel1 - // - this.panel1.Controls.Add(this.button1); - this.panel1.Controls.Add(this.textBox3); - this.panel1.Controls.Add(this.buttonClearStatus); - this.panel1.Controls.Add(this.textBox2); - this.panel1.Controls.Add(this.label5); - this.panel1.Controls.Add(this.textBox1); - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.label2); - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(3, 3); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(535, 58); - this.panel1.TabIndex = 2; - // - // label2 - // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(0, 21); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(77, 19); - this.label2.TabIndex = 2; - this.label2.Text = "Jog妯″紡"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // panel2 // - this.panel2.Controls.Add(this.button3); - this.panel2.Controls.Add(this.button2); + this.panel2.Controls.Add(this.buttonStop); + this.panel2.Controls.Add(this.buttonStart); this.panel2.Controls.Add(this.label1); - this.panel2.Controls.Add(this.textBox5); - this.panel2.Controls.Add(this.textBox4); - this.panel2.Controls.Add(this.textBox7); - this.panel2.Controls.Add(this.textBox6); + this.panel2.Controls.Add(this.textBoxP2PVel); + this.panel2.Controls.Add(this.textBoxP2PPrfPosition); + this.panel2.Controls.Add(this.textBoxP2PDec); + this.panel2.Controls.Add(this.textBoxP2PAcc); this.panel2.Controls.Add(this.label7); this.panel2.Controls.Add(this.label6); this.panel2.Controls.Add(this.label9); @@ -134,6 +104,26 @@ this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(535, 58); this.panel2.TabIndex = 3; + // + // buttonStop + // + this.buttonStop.Location = new System.Drawing.Point(462, 31); + this.buttonStop.Name = "buttonStop"; + this.buttonStop.Size = new System.Drawing.Size(70, 25); + this.buttonStop.TabIndex = 6; + this.buttonStop.Text = "鍋滄"; + this.buttonStop.UseVisualStyleBackColor = true; + this.buttonStop.Click += new System.EventHandler(this.buttonStop_Click); + // + // buttonStart + // + this.buttonStart.Location = new System.Drawing.Point(462, 3); + this.buttonStart.Name = "buttonStart"; + this.buttonStart.Size = new System.Drawing.Size(70, 25); + this.buttonStart.TabIndex = 6; + this.buttonStart.Text = "寮�濮�"; + this.buttonStart.UseVisualStyleBackColor = true; + this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click); // // label1 // @@ -148,71 +138,46 @@ this.label1.Text = "P2P妯″紡"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // textBox1 + // textBoxP2PVel // - this.textBox1.Location = new System.Drawing.Point(154, 4); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(116, 21); - this.textBox1.TabIndex = 5; + this.textBoxP2PVel.Location = new System.Drawing.Point(340, 7); + this.textBoxP2PVel.Name = "textBoxP2PVel"; + this.textBoxP2PVel.Size = new System.Drawing.Size(116, 21); + this.textBoxP2PVel.TabIndex = 5; + this.textBoxP2PVel.Text = "50"; // - // label3 + // textBoxP2PPrfPosition // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(92, 7); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(41, 12); - this.label3.TabIndex = 4; - this.label3.Text = "閫熷害锛�"; + this.textBoxP2PPrfPosition.Location = new System.Drawing.Point(154, 4); + this.textBoxP2PPrfPosition.Name = "textBoxP2PPrfPosition"; + this.textBoxP2PPrfPosition.Size = new System.Drawing.Size(116, 21); + this.textBoxP2PPrfPosition.TabIndex = 5; + this.textBoxP2PPrfPosition.Text = "20000"; // - // label4 + // textBoxP2PDec // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(92, 38); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(53, 12); - this.label4.TabIndex = 4; - this.label4.Text = "鍔犻�熷害锛�"; + this.textBoxP2PDec.Location = new System.Drawing.Point(340, 34); + this.textBoxP2PDec.Name = "textBoxP2PDec"; + this.textBoxP2PDec.Size = new System.Drawing.Size(116, 21); + this.textBoxP2PDec.TabIndex = 5; + this.textBoxP2PDec.Text = "0.5"; // - // textBox2 + // textBoxP2PAcc // - this.textBox2.Location = new System.Drawing.Point(154, 35); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(116, 21); - this.textBox2.TabIndex = 5; + this.textBoxP2PAcc.Location = new System.Drawing.Point(154, 35); + this.textBoxP2PAcc.Name = "textBoxP2PAcc"; + this.textBoxP2PAcc.Size = new System.Drawing.Size(116, 21); + this.textBoxP2PAcc.TabIndex = 5; + this.textBoxP2PAcc.Text = "0.5"; // - // buttonClearStatus + // label7 // - this.buttonClearStatus.Location = new System.Drawing.Point(462, 3); - this.buttonClearStatus.Name = "buttonClearStatus"; - this.buttonClearStatus.Size = new System.Drawing.Size(70, 25); - this.buttonClearStatus.TabIndex = 6; - this.buttonClearStatus.Text = "姝e悜"; - this.buttonClearStatus.UseVisualStyleBackColor = true; - // - // button1 - // - this.button1.Location = new System.Drawing.Point(462, 33); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(70, 25); - this.button1.TabIndex = 6; - this.button1.Text = "璐熷悜"; - this.button1.UseVisualStyleBackColor = true; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(278, 7); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 12); - this.label5.TabIndex = 4; - this.label5.Text = "鍑忛�熷害锛�"; - // - // textBox3 - // - this.textBox3.Location = new System.Drawing.Point(340, 4); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(116, 21); - this.textBox3.TabIndex = 5; + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(278, 10); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(41, 12); + this.label7.TabIndex = 4; + this.label7.Text = "閫熷害锛�"; // // label6 // @@ -221,46 +186,7 @@ this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 4; - this.label6.Text = "瑙勫垝浣嶇疆锛�"; - // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(154, 4); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(116, 21); - this.textBox4.TabIndex = 5; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(92, 37); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(41, 12); - this.label7.TabIndex = 4; - this.label7.Text = "閫熷害锛�"; - // - // textBox5 - // - this.textBox5.Location = new System.Drawing.Point(154, 34); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(116, 21); - this.textBox5.TabIndex = 5; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(278, 7); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(53, 12); - this.label8.TabIndex = 4; - this.label8.Text = "鍔犻�熷害锛�"; - // - // textBox6 - // - this.textBox6.Location = new System.Drawing.Point(340, 4); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(116, 21); - this.textBox6.TabIndex = 5; + this.label6.Text = "鐩爣浣嶇疆锛�"; // // label9 // @@ -271,70 +197,157 @@ this.label9.TabIndex = 4; this.label9.Text = "鍑忛�熷害锛�"; // - // textBox7 + // label8 // - this.textBox7.Location = new System.Drawing.Point(340, 34); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(116, 21); - this.textBox7.TabIndex = 5; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(92, 38); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(53, 12); + this.label8.TabIndex = 4; + this.label8.Text = "鍔犻�熷害锛�"; // - // button2 + // panel1 // - this.button2.Location = new System.Drawing.Point(462, 3); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(70, 25); - this.button2.TabIndex = 6; - this.button2.Text = "寮�濮�"; - this.button2.UseVisualStyleBackColor = true; + this.panel1.Controls.Add(this.buttonNegative); + this.panel1.Controls.Add(this.textBoxJogDec); + this.panel1.Controls.Add(this.buttonPositive); + this.panel1.Controls.Add(this.textBoxJogAcc); + this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.textBoxJogVel); + this.panel1.Controls.Add(this.label4); + this.panel1.Controls.Add(this.label3); + this.panel1.Controls.Add(this.label2); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(3, 3); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(535, 58); + this.panel1.TabIndex = 2; // - // button3 + // buttonNegative // - this.button3.Location = new System.Drawing.Point(462, 31); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(70, 25); - this.button3.TabIndex = 6; - this.button3.Text = "鍋滄"; - this.button3.UseVisualStyleBackColor = true; + this.buttonNegative.Location = new System.Drawing.Point(462, 33); + this.buttonNegative.Name = "buttonNegative"; + this.buttonNegative.Size = new System.Drawing.Size(70, 25); + this.buttonNegative.TabIndex = 6; + this.buttonNegative.Text = "璐熷悜"; + this.buttonNegative.UseVisualStyleBackColor = true; + this.buttonNegative.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseDown); + this.buttonNegative.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonNegative_MouseUp); + // + // textBoxJogDec + // + this.textBoxJogDec.Location = new System.Drawing.Point(340, 34); + this.textBoxJogDec.Name = "textBoxJogDec"; + this.textBoxJogDec.Size = new System.Drawing.Size(116, 21); + this.textBoxJogDec.TabIndex = 5; + this.textBoxJogDec.Text = "0.1"; + // + // buttonPositive + // + this.buttonPositive.Location = new System.Drawing.Point(462, 3); + this.buttonPositive.Name = "buttonPositive"; + this.buttonPositive.Size = new System.Drawing.Size(70, 25); + this.buttonPositive.TabIndex = 6; + this.buttonPositive.Text = "姝e悜"; + this.buttonPositive.UseVisualStyleBackColor = true; + this.buttonPositive.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseDown); + this.buttonPositive.MouseUp += new System.Windows.Forms.MouseEventHandler(this.buttonPositive_MouseUp); + // + // textBoxJogAcc + // + this.textBoxJogAcc.Location = new System.Drawing.Point(154, 35); + this.textBoxJogAcc.Name = "textBoxJogAcc"; + this.textBoxJogAcc.Size = new System.Drawing.Size(116, 21); + this.textBoxJogAcc.TabIndex = 5; + this.textBoxJogAcc.Text = "0.1"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(278, 37); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 12); + this.label5.TabIndex = 4; + this.label5.Text = "鍑忛�熷害锛�"; + // + // textBoxJogVel + // + this.textBoxJogVel.Location = new System.Drawing.Point(154, 4); + this.textBoxJogVel.Name = "textBoxJogVel"; + this.textBoxJogVel.Size = new System.Drawing.Size(116, 21); + this.textBoxJogVel.TabIndex = 5; + this.textBoxJogVel.Text = "50"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(92, 38); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 4; + this.label4.Text = "鍔犻�熷害锛�"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(92, 7); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(41, 12); + this.label3.TabIndex = 4; + this.label3.Text = "閫熷害锛�"; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(0, 21); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(77, 19); + this.label2.TabIndex = 2; + this.label2.Text = "Jog妯″紡"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // CtrlMotionCardAxisOperation // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.groupBoxAxisStatus); + this.Controls.Add(this.groupBoxAxisOperration); this.Name = "CtrlMotionCardAxisOperation"; this.Size = new System.Drawing.Size(547, 148); - this.groupBoxAxisStatus.ResumeLayout(false); + this.groupBoxAxisOperration.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); } #endregion - private System.Windows.Forms.GroupBox groupBoxAxisStatus; + private System.Windows.Forms.GroupBox groupBoxAxisOperration; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Label label1; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBoxJogAcc; + private System.Windows.Forms.TextBox textBoxJogVel; private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button buttonClearStatus; - private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Button buttonNegative; + private System.Windows.Forms.Button buttonPositive; + private System.Windows.Forms.TextBox textBoxJogDec; private System.Windows.Forms.Label label5; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.TextBox textBox7; - private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.Button buttonStop; + private System.Windows.Forms.Button buttonStart; + private System.Windows.Forms.TextBox textBoxP2PVel; + private System.Windows.Forms.TextBox textBoxP2PPrfPosition; + private System.Windows.Forms.TextBox textBoxP2PDec; + private System.Windows.Forms.TextBox textBoxP2PAcc; private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label9; -- Gitblit v1.8.0