diff --git a/Rs.DeweyTester/TestFrm.Designer.cs b/Rs.DeweyTester/TestFrm.Designer.cs index 4b423a0..c909000 100644 --- a/Rs.DeweyTester/TestFrm.Designer.cs +++ b/Rs.DeweyTester/TestFrm.Designer.cs @@ -56,23 +56,24 @@ this.label1 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.button1 = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button6 = new System.Windows.Forms.Button(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.button7 = new System.Windows.Forms.Button(); - this.button8 = new System.Windows.Forms.Button(); this.button9 = new System.Windows.Forms.Button(); - this.button10 = new System.Windows.Forms.Button(); - this.button12 = new System.Windows.Forms.Button(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.label8 = new System.Windows.Forms.Label(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); this.SuspendLayout(); // // button24 @@ -419,157 +420,162 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "相机"; // - // button1 + // button9 + // + this.button9.ForeColor = System.Drawing.Color.Black; + this.button9.Location = new System.Drawing.Point(96, 31); + this.button9.Name = "button9"; + this.button9.Size = new System.Drawing.Size(128, 45); + this.button9.TabIndex = 38; + this.button9.Text = "产品搬运"; + this.button9.UseVisualStyleBackColor = true; + this.button9.Click += new System.EventHandler(this.button9_Click); // - this.button1.Location = new System.Drawing.Point(29, 339); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(190, 68); - this.button1.TabIndex = 33; - this.button1.Text = "5个产品单拍测试"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click_2); + // groupBox4 + // + this.groupBox4.Controls.Add(this.comboBox3); + this.groupBox4.Controls.Add(this.comboBox2); + this.groupBox4.Controls.Add(this.label8); + this.groupBox4.Controls.Add(this.textBox3); + this.groupBox4.Controls.Add(this.label7); + this.groupBox4.Controls.Add(this.label4); + this.groupBox4.Controls.Add(this.button9); + this.groupBox4.Controls.Add(this.textBox6); + this.groupBox4.Controls.Add(this.textBox2); + this.groupBox4.Controls.Add(this.label6); + this.groupBox4.Controls.Add(this.label3); + this.groupBox4.Controls.Add(this.textBox5); + this.groupBox4.Controls.Add(this.label5); + this.groupBox4.ForeColor = System.Drawing.Color.White; + this.groupBox4.Location = new System.Drawing.Point(29, 241); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(336, 122); + this.groupBox4.TabIndex = 41; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "产品搬运"; + // + // comboBox3 + // + this.comboBox3.FormattingEnabled = true; + this.comboBox3.Location = new System.Drawing.Point(211, 114); + this.comboBox3.Name = "comboBox3"; + this.comboBox3.Size = new System.Drawing.Size(86, 20); + this.comboBox3.TabIndex = 39; + this.comboBox3.Visible = false; + // + // comboBox2 + // + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Location = new System.Drawing.Point(57, 114); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(86, 20); + this.comboBox2.TabIndex = 39; + this.comboBox2.Visible = false; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.ForeColor = System.Drawing.Color.White; + this.label8.Location = new System.Drawing.Point(179, 117); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(17, 12); + this.label8.TabIndex = 28; + this.label8.Text = "到"; + this.label8.Visible = false; // - // label3 + // textBox3 // - this.label3.AutoSize = true; - this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(39, 238); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(41, 12); - this.label3.TabIndex = 28; - this.label3.Text = "X偏移:"; + this.textBox3.Location = new System.Drawing.Point(242, 75); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(55, 21); + this.textBox3.TabIndex = 29; + this.textBox3.Visible = false; // - // textBox2 + // label7 // - this.textBox2.Location = new System.Drawing.Point(92, 238); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(100, 21); - this.textBox2.TabIndex = 34; + this.label7.AutoSize = true; + this.label7.ForeColor = System.Drawing.Color.White; + this.label7.Location = new System.Drawing.Point(25, 117); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(17, 12); + this.label7.TabIndex = 28; + this.label7.Text = "从"; + this.label7.Visible = false; // // label4 // this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(39, 285); + this.label4.Location = new System.Drawing.Point(177, 78); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(41, 12); + this.label4.Size = new System.Drawing.Size(65, 12); this.label4.TabIndex = 28; - this.label4.Text = "Y偏移:"; + this.label4.Text = "放料偏移Y:"; + this.label4.Visible = false; // - // textBox3 + // textBox6 // - this.textBox3.Location = new System.Drawing.Point(92, 285); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(100, 21); - this.textBox3.TabIndex = 34; - // - // button2 - // - this.button2.Location = new System.Drawing.Point(280, 235); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(128, 52); - this.button2.TabIndex = 35; - this.button2.Text = "夹住料盘"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Visible = false; - this.button2.Click += new System.EventHandler(this.button2_Click_2); - // - // button3 - // - this.button3.Location = new System.Drawing.Point(434, 235); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(128, 52); - this.button3.TabIndex = 35; - this.button3.Text = "松开料盘"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Visible = false; - this.button3.Click += new System.EventHandler(this.button3_Click); - // - // button6 - // - this.button6.Location = new System.Drawing.Point(80, 555); - this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(198, 91); - this.button6.TabIndex = 36; - this.button6.Text = "button6"; - this.button6.UseVisualStyleBackColor = true; - this.button6.Click += new System.EventHandler(this.button6_Click_1); - // - // textBox4 - // - this.textBox4.Location = new System.Drawing.Point(92, 493); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(100, 21); - this.textBox4.TabIndex = 34; - // - // button7 - // - this.button7.Location = new System.Drawing.Point(322, 622); - this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(75, 23); - this.button7.TabIndex = 37; - this.button7.Text = "button7"; - this.button7.UseVisualStyleBackColor = true; - this.button7.Click += new System.EventHandler(this.button7_Click); - // - // button8 - // - this.button8.Location = new System.Drawing.Point(434, 623); - this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(75, 23); - this.button8.TabIndex = 37; - this.button8.Text = "button7"; - this.button8.UseVisualStyleBackColor = true; + this.textBox6.Location = new System.Drawing.Point(242, 28); + this.textBox6.Name = "textBox6"; + this.textBox6.Size = new System.Drawing.Size(55, 21); + this.textBox6.TabIndex = 29; + this.textBox6.Visible = false; // - // button9 + // textBox2 // - this.button9.Location = new System.Drawing.Point(434, 362); - this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(180, 106); - this.button9.TabIndex = 38; - this.button9.Text = "产品搬运"; - this.button9.UseVisualStyleBackColor = true; - this.button9.Click += new System.EventHandler(this.button9_Click); + this.textBox2.Location = new System.Drawing.Point(90, 72); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(66, 21); + this.textBox2.TabIndex = 29; + this.textBox2.Visible = false; // - // button10 + // label6 // - this.button10.Location = new System.Drawing.Point(853, 371); - this.button10.Name = "button10"; - this.button10.Size = new System.Drawing.Size(75, 23); - this.button10.TabIndex = 39; - this.button10.Text = "button10"; - this.button10.UseVisualStyleBackColor = true; - this.button10.Click += new System.EventHandler(this.button10_Click); + this.label6.AutoSize = true; + this.label6.ForeColor = System.Drawing.Color.White; + this.label6.Location = new System.Drawing.Point(177, 31); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(65, 12); + this.label6.TabIndex = 28; + this.label6.Text = "取料偏移Y:"; + this.label6.Visible = false; // - // button12 + // label3 // - this.button12.Location = new System.Drawing.Point(966, 555); - this.button12.Name = "button12"; - this.button12.Size = new System.Drawing.Size(75, 23); - this.button12.TabIndex = 40; - this.button12.Text = "button12"; - this.button12.UseVisualStyleBackColor = true; - this.button12.Click += new System.EventHandler(this.button12_Click); + this.label3.AutoSize = true; + this.label3.ForeColor = System.Drawing.Color.White; + this.label3.Location = new System.Drawing.Point(25, 75); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(65, 12); + this.label3.TabIndex = 28; + this.label3.Text = "放料偏移X:"; + this.label3.Visible = false; + // + // textBox5 + // + this.textBox5.Location = new System.Drawing.Point(90, 28); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(66, 21); + this.textBox5.TabIndex = 29; + this.textBox5.Visible = false; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.ForeColor = System.Drawing.Color.White; + this.label5.Location = new System.Drawing.Point(25, 31); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(65, 12); + this.label5.TabIndex = 28; + this.label5.Text = "取料偏移X:"; + this.label5.Visible = false; // // TestFrm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1336, 854); - this.Controls.Add(this.button12); - this.Controls.Add(this.button10); - this.Controls.Add(this.button9); - this.Controls.Add(this.button8); - this.Controls.Add(this.button7); - this.Controls.Add(this.button6); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.textBox4); - this.Controls.Add(this.textBox3); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.label4); - this.Controls.Add(this.button1); - this.Controls.Add(this.label3); + this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -580,8 +586,9 @@ this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); this.groupBox3.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); + this.groupBox4.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -614,19 +621,19 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button6; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Button button7; - private System.Windows.Forms.Button button8; private System.Windows.Forms.Button button9; - private System.Windows.Forms.Button button10; - private System.Windows.Forms.Button button12; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.ComboBox comboBox3; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.Label label8; } } \ No newline at end of file diff --git a/Rs.DeweyTester/TestFrm.cs b/Rs.DeweyTester/TestFrm.cs index e5122fa..0bcc30f 100644 --- a/Rs.DeweyTester/TestFrm.cs +++ b/Rs.DeweyTester/TestFrm.cs @@ -248,71 +248,8 @@ namespace Rs.MotionPlat }); } - private void button1_Click_2(object sender, EventArgs e) - { - FiveProductTestFlow.Instance.Init(); - FiveProductTestFlow.Instance.Start(); - } - - private void button2_Click_2(object sender, EventArgs e) - { - - //料仓夹磁气缸{0}夹|料仓夹磁气缸{0}开 - - IoManager.Instance.WriteOut("料仓夹磁气缸1关", 1); - Thread.Sleep(500); - IoManager.Instance.WriteOut("料仓夹磁气缸1开", 0); - //Ops.Off("料仓夹磁气缸1开"); - //Thread.Sleep(500); - //Ops.On("料仓夹磁气缸1关"); - //Thread.Sleep(500); - - - - //Ops.On("料仓夹磁气缸2开"); - //Thread.Sleep(100); - //Ops.Off("料仓夹磁气缸2关"); - } - - private void button3_Click(object sender, EventArgs e) - { - Ops.On("料仓夹磁气缸1开"); - Thread.Sleep(500); - Ops.Off("料仓夹磁气缸1关"); - Thread.Sleep(500); - - - //Ops.Off("料仓夹磁气缸2开"); - //Thread.Sleep(500); - //Ops.On("料仓夹磁气缸2关"); - } - - bool bStop = false; - private void button6_Click_1(object sender, EventArgs e) - { - //for(int i=1;i<6;i++) - //{ - - //} - Task.Run(() => { - - for(int j=0;j<20;j++) - { - for (int i = 1; i < 6; i++) - { - StockTakeFlow.Instance.Take(ETrayType.Input, i, 1); - DischargeModuleGoSafePosFlow.Instance.GoSafePostion(); - StockPlaceFlow.Instance.Place(ETrayType.Input, i, 1); - } - } - }); - - } + - private void button7_Click(object sender, EventArgs e) - { - DischargeModuleGoSafePosFlow.Instance.GoSafePostion(); - } private void button9_Click(object sender, EventArgs e) { @@ -344,18 +281,6 @@ namespace Rs.MotionPlat }); } - private void button10_Click(object sender, EventArgs e) - { - ThreePointLocationFlow.Instance.CalcTrayRunPoint2(ETrayType.Ng); - - //TrayPointManager.GetAllSlotPoint(ETrayType.Ng); - //StockLocationFlow.Instance.Grab(ETrayType.Grr, 1); - } - - private void button12_Click(object sender, EventArgs e) - { - ThreePointLocationFlow.Instance.CalcTrayRunPoint2(ETrayType.Ng); - } } }