Skip to content

刘韬 / 1069_MIMO_PlUS

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

1

1 个父辈 00f6e9ef
内嵌 并排
正在显示 6 个修改的文件 包含 21 行增加 和 18 行删除
TheMachine/AxisControl.Designer.cs
...@@ -59,7 +59,7 @@ namespace TheMachine ...@@ -59,7 +59,7 @@ namespace TheMachine
this.configControl1.Config = null; this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3); this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Name = "configControl1"; this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(647, 590); this.configControl1.Size = new System.Drawing.Size(647, 559);
this.configControl1.TabIndex = 1; this.configControl1.TabIndex = 1;
this.configControl1.Tag = "not"; this.configControl1.Tag = "not";
// //
......
TheMachine/Form1.Designer.cs
...@@ -156,7 +156,7 @@ namespace TheMachine ...@@ -156,7 +156,7 @@ namespace TheMachine
// englishToolStripMenuItem // englishToolStripMenuItem
// //
this.englishToolStripMenuItem.Name = "englishToolStripMenuItem"; this.englishToolStripMenuItem.Name = "englishToolStripMenuItem";
this.englishToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.englishToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.englishToolStripMenuItem.Tag = "not"; this.englishToolStripMenuItem.Tag = "not";
this.englishToolStripMenuItem.Text = "English"; this.englishToolStripMenuItem.Text = "English";
this.englishToolStripMenuItem.Visible = false; this.englishToolStripMenuItem.Visible = false;
...@@ -177,10 +177,10 @@ namespace TheMachine ...@@ -177,10 +177,10 @@ namespace TheMachine
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabc.Controls.Add(this.tabP1); this.tabc.Controls.Add(this.tabP1);
this.tabc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabc.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabc.Location = new System.Drawing.Point(0, 90); this.tabc.Location = new System.Drawing.Point(0, 116);
this.tabc.Name = "tabc"; this.tabc.Name = "tabc";
this.tabc.SelectedIndex = 0; this.tabc.SelectedIndex = 0;
this.tabc.Size = new System.Drawing.Size(1008, 639); this.tabc.Size = new System.Drawing.Size(1008, 613);
this.tabc.TabIndex = 1; this.tabc.TabIndex = 1;
// //
// tabP1 // tabP1
...@@ -188,7 +188,7 @@ namespace TheMachine ...@@ -188,7 +188,7 @@ namespace TheMachine
this.tabP1.Controls.Add(this.pnl); this.tabP1.Controls.Add(this.pnl);
this.tabP1.Location = new System.Drawing.Point(4, 30); this.tabP1.Location = new System.Drawing.Point(4, 30);
this.tabP1.Name = "tabP1"; this.tabP1.Name = "tabP1";
this.tabP1.Size = new System.Drawing.Size(1000, 605); this.tabP1.Size = new System.Drawing.Size(1000, 579);
this.tabP1.TabIndex = 0; this.tabP1.TabIndex = 0;
this.tabP1.Text = "信息"; this.tabP1.Text = "信息";
this.tabP1.UseVisualStyleBackColor = true; this.tabP1.UseVisualStyleBackColor = true;
...@@ -207,7 +207,7 @@ namespace TheMachine ...@@ -207,7 +207,7 @@ namespace TheMachine
this.pnl.Dock = System.Windows.Forms.DockStyle.Fill; this.pnl.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnl.Location = new System.Drawing.Point(0, 0); this.pnl.Location = new System.Drawing.Point(0, 0);
this.pnl.Name = "pnl"; this.pnl.Name = "pnl";
this.pnl.Size = new System.Drawing.Size(1000, 605); this.pnl.Size = new System.Drawing.Size(1000, 579);
this.pnl.TabIndex = 273; this.pnl.TabIndex = 273;
// //
// groupBox1 // groupBox1
...@@ -334,11 +334,11 @@ namespace TheMachine ...@@ -334,11 +334,11 @@ namespace TheMachine
this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.listView1.HideSelection = false; this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(411, 0); this.listView1.Location = new System.Drawing.Point(328, 0);
this.listView1.MultiSelect = false; this.listView1.MultiSelect = false;
this.listView1.Name = "listView1"; this.listView1.Name = "listView1";
this.listView1.ShowGroups = false; this.listView1.ShowGroups = false;
this.listView1.Size = new System.Drawing.Size(597, 118); this.listView1.Size = new System.Drawing.Size(680, 118);
this.listView1.TabIndex = 2; this.listView1.TabIndex = 2;
this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.UseCompatibleStateImageBehavior = false;
// //
...@@ -346,9 +346,9 @@ namespace TheMachine ...@@ -346,9 +346,9 @@ namespace TheMachine
// //
this.btn_stop.Enabled = false; this.btn_stop.Enabled = false;
this.btn_stop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_stop.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_stop.Location = new System.Drawing.Point(149, 42); this.btn_stop.Location = new System.Drawing.Point(154, 42);
this.btn_stop.Name = "btn_stop"; this.btn_stop.Name = "btn_stop";
this.btn_stop.Size = new System.Drawing.Size(105, 37); this.btn_stop.Size = new System.Drawing.Size(105, 55);
this.btn_stop.TabIndex = 3; this.btn_stop.TabIndex = 3;
this.btn_stop.Text = "停止"; this.btn_stop.Text = "停止";
this.btn_stop.UseVisualStyleBackColor = true; this.btn_stop.UseVisualStyleBackColor = true;
...@@ -359,7 +359,7 @@ namespace TheMachine ...@@ -359,7 +359,7 @@ namespace TheMachine
this.btn_run.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_run.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_run.Location = new System.Drawing.Point(25, 42); this.btn_run.Location = new System.Drawing.Point(25, 42);
this.btn_run.Name = "btn_run"; this.btn_run.Name = "btn_run";
this.btn_run.Size = new System.Drawing.Size(105, 37); this.btn_run.Size = new System.Drawing.Size(105, 55);
this.btn_run.TabIndex = 4; this.btn_run.TabIndex = 4;
this.btn_run.Text = "启动"; this.btn_run.Text = "启动";
this.btn_run.UseVisualStyleBackColor = true; this.btn_run.UseVisualStyleBackColor = true;
......
TheMachine/Form1.cs
...@@ -82,7 +82,7 @@ namespace TheMachine ...@@ -82,7 +82,7 @@ namespace TheMachine
emptycol.Width = 0; emptycol.Width = 0;
ColumnHeader msgcol = new ColumnHeader(); ColumnHeader msgcol = new ColumnHeader();
msgcol.Text = "信息"; msgcol.Text = "信息";
msgcol.Width = 600; msgcol.Width = 530;
ColumnHeader timecol = new ColumnHeader(); ColumnHeader timecol = new ColumnHeader();
timecol.Text = "时间"; timecol.Text = "时间";
timecol.Width = 150; timecol.Width = 150;
......
TheMachine/SettingControl.Designer.cs
...@@ -61,7 +61,7 @@ namespace TheMachine ...@@ -61,7 +61,7 @@ namespace TheMachine
this.cb_tempsensorport.Name = "cb_tempsensorport"; this.cb_tempsensorport.Name = "cb_tempsensorport";
this.cb_tempsensorport.Size = new System.Drawing.Size(121, 20); this.cb_tempsensorport.Size = new System.Drawing.Size(121, 20);
this.cb_tempsensorport.TabIndex = 2; this.cb_tempsensorport.TabIndex = 2;
this.cb_tempsensorport.SelectedIndexChanged += new System.EventHandler(this.cb_tempsensorport_SelectedIndexChanged); this.cb_tempsensorport.Tag = "not";
// //
// label_tempsensor // label_tempsensor
// //
......
TheMachine/SettingControl.cs
...@@ -28,6 +28,12 @@ namespace TheMachine ...@@ -28,6 +28,12 @@ namespace TheMachine
chbAutoRun.Checked = Convert.ToBoolean(ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun)); chbAutoRun.Checked = Convert.ToBoolean(ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun));
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged); this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
//chbAutoRun.Enabled = true; //chbAutoRun.Enabled = true;
for (int i = 0; i < 20; i++)
{
cb_tempsensorport.Items.Add("COM" + i);
}
this.cb_tempsensorport.SelectedIndexChanged += new System.EventHandler(this.cb_tempsensorport_SelectedIndexChanged);
} }
private void RobotManage_LoadFinishEvent(bool state, string msg) private void RobotManage_LoadFinishEvent(bool state, string msg)
...@@ -39,10 +45,7 @@ namespace TheMachine ...@@ -39,10 +45,7 @@ namespace TheMachine
private void SettingControl_Load(object sender, EventArgs e) private void SettingControl_Load(object sender, EventArgs e)
{ {
for (int i = 0; i < 20; i++)
{
cb_tempsensorport.Items.Add("COM" + i);
}
Config.PropertyBind("Device_Humiture_Port", cb_tempsensorport, "SelectedItem", "SelectedIndexChanged"); Config.PropertyBind("Device_Humiture_Port", cb_tempsensorport, "SelectedItem", "SelectedIndexChanged");
} }
......
TheMachine/UC/uc_boxdebug.Designer.cs
...@@ -155,7 +155,7 @@ namespace TheMachine ...@@ -155,7 +155,7 @@ namespace TheMachine
this.dataGridView1.ShowCellToolTips = false; this.dataGridView1.ShowCellToolTips = false;
this.dataGridView1.ShowEditingIcon = false; this.dataGridView1.ShowEditingIcon = false;
this.dataGridView1.ShowRowErrors = false; this.dataGridView1.ShowRowErrors = false;
this.dataGridView1.Size = new System.Drawing.Size(981, 250); this.dataGridView1.Size = new System.Drawing.Size(981, 308);
this.dataGridView1.TabIndex = 103; this.dataGridView1.TabIndex = 103;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown); this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!