Skip to content

刘韬 / 1053_CycleLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit afbbb753 由 刘韬
选项

1

1 个父辈 bd6dcba0
内嵌 并排
正在显示 16 个修改的文件 包含 131 行增加 和 76 行删除
DeviceLibrary/theMachine/DeviceBase.cs
......@@ -20,11 +20,13 @@ namespace DeviceLibrary
{
//runStatus = RunStatus.Stop;
MoveInfo.List.ForEach((m)=> { m.EndMove(); });
AxisBean.StopMultiAxis(AxisBean.List[GroupName]);
if (AxisBean.List.ContainsKey(GroupName))
AxisBean.StopMultiAxis(AxisBean.List[GroupName]);
if (ServoOff)
{
AxisBean.CloseMultiAxis(AxisBean.List[GroupName]);
if (AxisBean.List.ContainsKey(GroupName))
AxisBean.CloseMultiAxis(AxisBean.List[GroupName]);
}
}
public void OpenAllServo()
......
DeviceLibrary/theMachine/RobotManage.cs
......@@ -54,7 +54,7 @@ namespace DeviceLibrary
msg += m;
}
//Thread.Sleep(5000);
if (true || !IOManager.ConnectionIOList(new List<string>()))
if (!IOManager.ConnectionIOList(new List<string>()))
{
IsLoadOk = false;
msg += crc.GetString("Res0181","IO板卡初始化失败")+ "\n";
......@@ -62,7 +62,7 @@ namespace DeviceLibrary
//IsLoadOk = true;
}
catch (Exception ex) {
LoadFinishEvent?.Invoke(false, ex.Message);
......
DeviceLibrary/theMachine/sub/SideMove.cs
......@@ -44,7 +44,7 @@ namespace DeviceLibrary
{
RFID_1 = new PuYueRFID_C2S(DeviceGroup.RFID_1);
if (!RFID_1.Open()) {
msg += DeviceGroup.DeviceType + " RFID 1:" + DeviceGroup.RFID_1 +","+crc.GetString("Res0183","打开失败")+ "\r\n";
msg += DeviceGroup.GroupName + " RFID 1:" + DeviceGroup.RFID_1 +","+crc.GetString("Res0183","打开失败")+ "\r\n";
}
}
if (!string.IsNullOrEmpty(DeviceGroup.RFID_2))
......@@ -52,7 +52,7 @@ namespace DeviceLibrary
RFID_2 = new PuYueRFID_C2S(DeviceGroup.RFID_2);
if (!RFID_2.Open())
{
msg += DeviceGroup.DeviceType + " RFID 2:" + DeviceGroup.RFID_2 + "," + crc.GetString("Res0183","打开失败") + "\r\n";
msg += DeviceGroup.GroupName + " RFID 2:" + DeviceGroup.RFID_2 + "," + crc.GetString("Res0183","打开失败") + "\r\n";
}
}
if (RobotManage.Config.DOList[device.GroupName].ContainsKey(IO_Type.Ls_A_LineRwd))
......
DeviceLibrary/theMachine/sub/TransplantMove.cs
......@@ -43,7 +43,7 @@ namespace DeviceLibrary
{
RFID_1 = new PuYueRFID_C2S(DeviceGroup.RFID_1);
if (!RFID_1.Open()) {
msg += DeviceGroup.DeviceType + " RFID 1:" + DeviceGroup.RFID_1 +","+crc.GetString("Res0183","打开失败")+ "\r\n";
msg += DeviceGroup.GroupName + " RFID 1:" + DeviceGroup.RFID_1 +","+crc.GetString("Res0183","打开失败")+ "\r\n";
}
}
if (!string.IsNullOrEmpty(DeviceGroup.RFID_2))
......@@ -51,7 +51,7 @@ namespace DeviceLibrary
RFID_2 = new PuYueRFID_C2S(DeviceGroup.RFID_2);
if (!RFID_2.Open())
{
msg += DeviceGroup.DeviceType + " RFID 2:" + DeviceGroup.RFID_2 + "," + crc.GetString("Res0183","打开失败") + "\r\n";
msg += DeviceGroup.GroupName + " RFID 2:" + DeviceGroup.RFID_2 + "," + crc.GetString("Res0183","打开失败") + "\r\n";
}
}
var axisc = RobotManage.Config.moveAxisList.Find(ma => ma.GetAxisValue() == RobotManage.DeviceGroup[GroupName].AxisID);
......
DeviceLibrary/theMachine/sub/TrayStop.cs
......@@ -43,7 +43,7 @@ namespace DeviceLibrary
{
RFID_1 = new PuYueRFID_C2S(DeviceGroup.RFID_1);
if (!RFID_1.Open()) {
msg += DeviceGroup.DeviceType + " RFID 1:" + DeviceGroup.RFID_1 +","+crc.GetString("Res0183","打开失败")+ "\r\n";
msg += DeviceGroup.GroupName + " RFID 1:" + DeviceGroup.RFID_1 +","+crc.GetString("Res0183","打开失败")+ "\r\n";
}
}
if (!string.IsNullOrEmpty(DeviceGroup.RFID_2))
......@@ -51,7 +51,7 @@ namespace DeviceLibrary
RFID_2 = new PuYueRFID_C2S(DeviceGroup.RFID_2);
if (!RFID_2.Open())
{
msg += DeviceGroup.DeviceType + " RFID 2:" + DeviceGroup.RFID_2 + "," + crc.GetString("Res0183","打开失败") + "\r\n";
msg += DeviceGroup.GroupName + " RFID 2:" + DeviceGroup.RFID_2 + "," + crc.GetString("Res0183","打开失败") + "\r\n";
}
}
var axisc = RobotManage.Config.moveAxisList.Find(ma => ma.GetAxisValue() == RobotManage.DeviceGroup[device.GroupName].AxisID);
......
LoadCVSLibrary/storeConfig/config/Robot_Config.cs
......@@ -116,7 +116,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("AMH_RoboComp_P1_speed")]
public int AMH_RoboComp_P1_speed { get; set; }
/// <summary>
/// PRO,50,托盘旋转轴每度脉冲,AMH_Route_PoToMM,1000,,,,,,,,,,,,
/// </summary>
[ConfigProAttribute("AMH_Route_PoToMM")]
public int AMH_Route_PoToMM { get; set; }
public ConfigIO GetWaitIO(string ioType,string device="root")
{
if (DIList[device].ContainsKey(ioType))
......
TheMachine/AxisControl.cs
......@@ -40,8 +40,8 @@ namespace TheMachine
return;
}
if (!state)
return;
//if (!state)
// return;
if (!AxisBean.List.ContainsKey("root"))
AxisBean.List.Add("root", new List<AxisBean>());
axisMoveControl1.LoadData(AxisBean.List["root"]);
......
TheMachine/Form1.cs
......@@ -75,9 +75,9 @@ namespace TheMachine
this.Height = Screen.PrimaryScreen.WorkingArea.Height;//获取主显⽰设备的桌⾯⾼度
if (this.Width > 1366)
this.Width = 1366;
this.Width = 1024;
if (this.Height > 900)
this.Height = 900;
this.Height = 748;
List<CodeInfo> codeInfos = new List<CodeInfo>();
//codeInfos.Add(new CodeInfo("", 528, 406));
......@@ -161,7 +161,7 @@ namespace TheMachine
e.NewWidth = (sender as ListView).Columns[e.ColumnIndex].Width;
e.Cancel = true;
}
const int tabpagecount = 4;
const int tabpagecount = 5;
void addTablePage() {
AddForm("tab_io","I/O", ioc);
AddForm("tab_sidemove", hy.DeviceName, hy);
......@@ -263,7 +263,8 @@ namespace TheMachine
});
return;
}
启用调试模式ToolStripMenuItem.Enabled = true;
pnl.Enabled = true;
if (state)
{
......@@ -272,10 +273,13 @@ namespace TheMachine
RobotManage.mainMachine.ProcessMsgEvent += MainMachine_ProcessMsgEvent;
}
ioc.Config = RobotManage.Config;
hy.Init("LS");
yz.Init("SISO");
ts.Init("RT");
ioc.Config = RobotManage.Config;
addTablePage();
var lm = new List<Msg>();
foreach (string ms in msg.Split(new char[] { '\n' },StringSplitOptions.RemoveEmptyEntries))
{
......@@ -286,6 +290,18 @@ namespace TheMachine
lm.Add(m);
}
SetMsg(lm);
//启用调试模式ToolStripMenuItem.Enabled = true;
//启用调试模式ToolStripMenuItem_Click(启用调试模式ToolStripMenuItem, EventArgs.Empty);
//RobotManage.LoadDebug();
Task.Run(()=> {
Task.Delay(100).Wait();
this.Invoke((EventHandler)delegate
{
});
});
}
void SetMsg(List<Msg> msgs)
{
......
TheMachine/SettingControl.cs
......@@ -31,8 +31,8 @@ namespace TheMachine
private void RobotManage_LoadFinishEvent(bool state, string msg)
{
if (!state)
return;
//if (!state)
// return;
uC_LedConfig1.Config = RobotManage.Config;
}
......
TheMachine/UC/ConfigControl.cs
......@@ -48,8 +48,8 @@ namespace TheMachine
void LoadPosList()
{
if (!this.Created)
return;
//if (!this.Created)
// return;
if (this.InvokeRequired)
{
......
TheMachine/UC/CylinderButton.cs
......@@ -93,11 +93,12 @@ namespace TheMachine
set
{
devicetype = value;
DataUpdate();
}
}
void DataUpdate() {
if (string.IsNullOrEmpty(io_high) && !RobotManage.Config.DOList[devicetype].ContainsKey(io_high))
if (string.IsNullOrEmpty(io_high) || !RobotManage.Config.DOList[devicetype].ContainsKey(io_high))
this.Text = $"IO {io_high} Not Find";
else
{
......@@ -121,6 +122,9 @@ namespace TheMachine
}
void StateUpdate()
{
if (configio_high == null)
return;
io_state = IOManager.GetDOValue(configio_high.DeviceName, configio_high.SlaveID, configio_high.GetIOAddr());
if (configio_low != null)
{
......
TheMachine/device/TransplantControl.Designer.cs
......@@ -42,18 +42,21 @@ namespace TheMachine
this.cylinderButton6 = new TheMachine.CylinderButton();
this.cylinderButton1 = new TheMachine.CylinderButton();
this.ioControl1 = new TheMachine.IOControl();
this.panel1 = new System.Windows.Forms.Panel();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(0, 226);
this.axisMoveControl1.Location = new System.Drawing.Point(3, 227);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(558, 402);
this.axisMoveControl1.TabIndex = 6;
this.axisMoveControl1.Tag = "not";
//
// button_save
//
this.button_save.Location = new System.Drawing.Point(761, 551);
this.button_save.Location = new System.Drawing.Point(758, 571);
this.button_save.Name = "button_save";
this.button_save.Size = new System.Drawing.Size(100, 23);
this.button_save.TabIndex = 7;
......@@ -63,21 +66,21 @@ namespace TheMachine
//
// textBox_p2
//
this.textBox_p2.Location = new System.Drawing.Point(761, 486);
this.textBox_p2.Location = new System.Drawing.Point(761, 492);
this.textBox_p2.Name = "textBox_p2";
this.textBox_p2.Size = new System.Drawing.Size(100, 21);
this.textBox_p2.TabIndex = 8;
//
// textBox_p3
//
this.textBox_p3.Location = new System.Drawing.Point(761, 515);
this.textBox_p3.Location = new System.Drawing.Point(758, 535);
this.textBox_p3.Name = "textBox_p3";
this.textBox_p3.Size = new System.Drawing.Size(100, 21);
this.textBox_p3.TabIndex = 8;
//
// button_p2
//
this.button_p2.Location = new System.Drawing.Point(584, 484);
this.button_p2.Location = new System.Drawing.Point(584, 490);
this.button_p2.Name = "button_p2";
this.button_p2.Size = new System.Drawing.Size(162, 23);
this.button_p2.TabIndex = 9;
......@@ -87,7 +90,7 @@ namespace TheMachine
//
// button_p3
//
this.button_p3.Location = new System.Drawing.Point(584, 513);
this.button_p3.Location = new System.Drawing.Point(581, 533);
this.button_p3.Name = "button_p3";
this.button_p3.Size = new System.Drawing.Size(162, 23);
this.button_p3.TabIndex = 9;
......@@ -97,7 +100,7 @@ namespace TheMachine
//
// button_p1
//
this.button_p1.Location = new System.Drawing.Point(584, 455);
this.button_p1.Location = new System.Drawing.Point(584, 461);
this.button_p1.Name = "button_p1";
this.button_p1.Size = new System.Drawing.Size(162, 23);
this.button_p1.TabIndex = 9;
......@@ -112,7 +115,7 @@ namespace TheMachine
this.cylinderButton8.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton8.IO_HIGH = "AMH_Front_Stop";
this.cylinderButton8.IO_LOW = "";
this.cylinderButton8.Location = new System.Drawing.Point(618, 354);
this.cylinderButton8.Location = new System.Drawing.Point(618, 360);
this.cylinderButton8.Name = "cylinderButton8";
this.cylinderButton8.Size = new System.Drawing.Size(181, 38);
this.cylinderButton8.TabIndex = 2;
......@@ -127,7 +130,7 @@ namespace TheMachine
this.cylinderButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton2.IO_HIGH = "AMH_Sucker";
this.cylinderButton2.IO_LOW = "";
this.cylinderButton2.Location = new System.Drawing.Point(618, 398);
this.cylinderButton2.Location = new System.Drawing.Point(618, 404);
this.cylinderButton2.Name = "cylinderButton2";
this.cylinderButton2.Size = new System.Drawing.Size(181, 38);
this.cylinderButton2.TabIndex = 3;
......@@ -142,7 +145,7 @@ namespace TheMachine
this.cylinderButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton7.IO_HIGH = "AMH_Sucker";
this.cylinderButton7.IO_LOW = "";
this.cylinderButton7.Location = new System.Drawing.Point(618, 313);
this.cylinderButton7.Location = new System.Drawing.Point(618, 319);
this.cylinderButton7.Name = "cylinderButton7";
this.cylinderButton7.Size = new System.Drawing.Size(181, 38);
this.cylinderButton7.TabIndex = 3;
......@@ -157,7 +160,7 @@ namespace TheMachine
this.cylinderButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton6.IO_HIGH = "AMH_Trans_Fwd";
this.cylinderButton6.IO_LOW = "AMH_Trans_Bwd";
this.cylinderButton6.Location = new System.Drawing.Point(618, 269);
this.cylinderButton6.Location = new System.Drawing.Point(618, 275);
this.cylinderButton6.Name = "cylinderButton6";
this.cylinderButton6.Size = new System.Drawing.Size(181, 38);
this.cylinderButton6.TabIndex = 4;
......@@ -172,7 +175,7 @@ namespace TheMachine
this.cylinderButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton1.IO_HIGH = "AMH_Location_Up";
this.cylinderButton1.IO_LOW = "AMH_Location_Down";
this.cylinderButton1.Location = new System.Drawing.Point(618, 225);
this.cylinderButton1.Location = new System.Drawing.Point(618, 231);
this.cylinderButton1.Name = "cylinderButton1";
this.cylinderButton1.Size = new System.Drawing.Size(181, 38);
this.cylinderButton1.TabIndex = 5;
......@@ -182,33 +185,44 @@ namespace TheMachine
//
// ioControl1
//
this.ioControl1.Location = new System.Drawing.Point(0, 0);
this.ioControl1.Location = new System.Drawing.Point(3, -1);
this.ioControl1.Name = "ioControl1";
this.ioControl1.Size = new System.Drawing.Size(936, 220);
this.ioControl1.Size = new System.Drawing.Size(936, 228);
this.ioControl1.TabIndex = 1;
this.ioControl1.Tag = "not";
//
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.button_p3);
this.panel1.Controls.Add(this.ioControl1);
this.panel1.Controls.Add(this.button_p1);
this.panel1.Controls.Add(this.axisMoveControl1);
this.panel1.Controls.Add(this.button_p2);
this.panel1.Controls.Add(this.cylinderButton2);
this.panel1.Controls.Add(this.textBox_p3);
this.panel1.Controls.Add(this.cylinderButton1);
this.panel1.Controls.Add(this.textBox_p2);
this.panel1.Controls.Add(this.cylinderButton6);
this.panel1.Controls.Add(this.button_save);
this.panel1.Controls.Add(this.cylinderButton7);
this.panel1.Controls.Add(this.cylinderButton8);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1021, 621);
this.panel1.TabIndex = 10;
//
// TransplantControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.button_p3);
this.Controls.Add(this.button_p1);
this.Controls.Add(this.button_p2);
this.Controls.Add(this.textBox_p3);
this.Controls.Add(this.textBox_p2);
this.Controls.Add(this.button_save);
this.Controls.Add(this.axisMoveControl1);
this.Controls.Add(this.cylinderButton8);
this.Controls.Add(this.cylinderButton2);
this.Controls.Add(this.cylinderButton7);
this.Controls.Add(this.cylinderButton6);
this.Controls.Add(this.cylinderButton1);
this.Controls.Add(this.ioControl1);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "TransplantControl";
this.Size = new System.Drawing.Size(1021, 621);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
......@@ -227,5 +241,6 @@ namespace TheMachine
private System.Windows.Forms.Button button_p2;
private System.Windows.Forms.Button button_p3;
private System.Windows.Forms.Button button_p1;
private System.Windows.Forms.Panel panel1;
}
}
TheMachine/device/TransplantControl.cs
......@@ -28,7 +28,7 @@ namespace TheMachine
{
this.DeviceGroupName = deviceGroupName;
foreach (var c in this.Controls)
foreach (var c in panel1.Controls)
{
if (!(c is CylinderButton))
continue;
......
TheMachine/device/TrayStopControl.Designer.cs
......@@ -39,6 +39,8 @@ namespace TheMachine
this.textBox_p3 = new System.Windows.Forms.TextBox();
this.button_p3 = new System.Windows.Forms.Button();
this.button_p1 = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// cylinderButton8
......@@ -48,7 +50,7 @@ namespace TheMachine
this.cylinderButton8.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton8.IO_HIGH = "MI_Robot_Light";
this.cylinderButton8.IO_LOW = "";
this.cylinderButton8.Location = new System.Drawing.Point(618, 354);
this.cylinderButton8.Location = new System.Drawing.Point(624, 375);
this.cylinderButton8.Name = "cylinderButton8";
this.cylinderButton8.Size = new System.Drawing.Size(181, 38);
this.cylinderButton8.TabIndex = 2;
......@@ -63,7 +65,7 @@ namespace TheMachine
this.cylinderButton7.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton7.IO_HIGH = "AMH_Tray_Stop";
this.cylinderButton7.IO_LOW = "";
this.cylinderButton7.Location = new System.Drawing.Point(618, 313);
this.cylinderButton7.Location = new System.Drawing.Point(624, 334);
this.cylinderButton7.Name = "cylinderButton7";
this.cylinderButton7.Size = new System.Drawing.Size(181, 38);
this.cylinderButton7.TabIndex = 3;
......@@ -78,7 +80,7 @@ namespace TheMachine
this.cylinderButton6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton6.IO_HIGH = "AMH_Front_Stop";
this.cylinderButton6.IO_LOW = "";
this.cylinderButton6.Location = new System.Drawing.Point(618, 269);
this.cylinderButton6.Location = new System.Drawing.Point(624, 290);
this.cylinderButton6.Name = "cylinderButton6";
this.cylinderButton6.Size = new System.Drawing.Size(181, 38);
this.cylinderButton6.TabIndex = 4;
......@@ -93,7 +95,7 @@ namespace TheMachine
this.cylinderButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.cylinderButton1.IO_HIGH = "MI_Location_Up";
this.cylinderButton1.IO_LOW = "MI_Location_Down";
this.cylinderButton1.Location = new System.Drawing.Point(618, 225);
this.cylinderButton1.Location = new System.Drawing.Point(624, 246);
this.cylinderButton1.Name = "cylinderButton1";
this.cylinderButton1.Size = new System.Drawing.Size(181, 38);
this.cylinderButton1.TabIndex = 5;
......@@ -103,15 +105,15 @@ namespace TheMachine
//
// ioControl1
//
this.ioControl1.Location = new System.Drawing.Point(0, 0);
this.ioControl1.Location = new System.Drawing.Point(3, 3);
this.ioControl1.Name = "ioControl1";
this.ioControl1.Size = new System.Drawing.Size(936, 220);
this.ioControl1.Size = new System.Drawing.Size(936, 213);
this.ioControl1.TabIndex = 1;
this.ioControl1.Tag = "not";
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(0, 226);
this.axisMoveControl1.Location = new System.Drawing.Point(3, 222);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(558, 402);
this.axisMoveControl1.TabIndex = 6;
......@@ -119,7 +121,7 @@ namespace TheMachine
//
// button_save
//
this.button_save.Location = new System.Drawing.Point(761, 522);
this.button_save.Location = new System.Drawing.Point(767, 543);
this.button_save.Name = "button_save";
this.button_save.Size = new System.Drawing.Size(100, 23);
this.button_save.TabIndex = 7;
......@@ -129,14 +131,14 @@ namespace TheMachine
//
// textBox_p3
//
this.textBox_p3.Location = new System.Drawing.Point(761, 486);
this.textBox_p3.Location = new System.Drawing.Point(767, 507);
this.textBox_p3.Name = "textBox_p3";
this.textBox_p3.Size = new System.Drawing.Size(100, 21);
this.textBox_p3.TabIndex = 8;
//
// button_p3
//
this.button_p3.Location = new System.Drawing.Point(584, 484);
this.button_p3.Location = new System.Drawing.Point(590, 505);
this.button_p3.Name = "button_p3";
this.button_p3.Size = new System.Drawing.Size(162, 23);
this.button_p3.TabIndex = 9;
......@@ -146,7 +148,7 @@ namespace TheMachine
//
// button_p1
//
this.button_p1.Location = new System.Drawing.Point(584, 455);
this.button_p1.Location = new System.Drawing.Point(590, 476);
this.button_p1.Name = "button_p1";
this.button_p1.Size = new System.Drawing.Size(162, 23);
this.button_p1.TabIndex = 9;
......@@ -154,24 +156,35 @@ namespace TheMachine
this.button_p1.UseVisualStyleBackColor = true;
this.button_p1.Click += new System.EventHandler(this.button_p1_Click);
//
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.button_p3);
this.panel1.Controls.Add(this.ioControl1);
this.panel1.Controls.Add(this.button_p1);
this.panel1.Controls.Add(this.axisMoveControl1);
this.panel1.Controls.Add(this.textBox_p3);
this.panel1.Controls.Add(this.cylinderButton7);
this.panel1.Controls.Add(this.button_save);
this.panel1.Controls.Add(this.cylinderButton1);
this.panel1.Controls.Add(this.cylinderButton8);
this.panel1.Controls.Add(this.cylinderButton6);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1020, 621);
this.panel1.TabIndex = 10;
//
// TrayStopControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.ioControl1);
this.Controls.Add(this.button_p3);
this.Controls.Add(this.button_p1);
this.Controls.Add(this.textBox_p3);
this.Controls.Add(this.button_save);
this.Controls.Add(this.axisMoveControl1);
this.Controls.Add(this.cylinderButton8);
this.Controls.Add(this.cylinderButton7);
this.Controls.Add(this.cylinderButton6);
this.Controls.Add(this.cylinderButton1);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "TrayStopControl";
this.Size = new System.Drawing.Size(1021, 621);
this.Size = new System.Drawing.Size(1020, 621);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
......@@ -187,5 +200,6 @@ namespace TheMachine
private System.Windows.Forms.TextBox textBox_p3;
private System.Windows.Forms.Button button_p3;
private System.Windows.Forms.Button button_p1;
private System.Windows.Forms.Panel panel1;
}
}
TheMachine/device/TrayStopControl.cs
......@@ -28,7 +28,7 @@ namespace TheMachine
{
this.DeviceGroupName = deviceGroupName;
foreach (var c in this.Controls)
foreach (var c in panel1.Controls)
{
if (!(c is CylinderButton))
continue;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!