Skip to content

李娜 / SO664-HCSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 98c296df 由 LN
选项

增加按钮

1 个父辈 f5be1dfc
内嵌 并排
正在显示 5 个修改的文件 包含 98 行增加 和 14 行删除
source/HCSingleStore/App.config
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" /> <add key="Box_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_SA" /> <add key="Store_Type" value="RC_AC_SA" />
<add key="Store_CID" value="D1" /> <add key="Store_CID" value="D1" />
<add key="Store_CID_1" value="line-ac-05" /> <add key="Store_CID_1" value="line-ac-01" />
<add key="Store_CID_2" value="line-ac-06" /> <add key="Store_CID_2" value="line-ac-02" />
<!--end one store config--> <!--end one store config-->
<add key="ACBaudRate" value="115200" /> <add key="ACBaudRate" value="115200" />
<add key="InOutDefaultPosition" value="5000" /> <add key="InOutDefaultPosition" value="5000" />
......
source/HCSingleStore/FrmBox.Designer.cs
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(11, 424); this.groupBox1.Location = new System.Drawing.Point(11, 428);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(476, 136); this.groupBox1.Size = new System.Drawing.Size(476, 136);
this.groupBox1.TabIndex = 217; this.groupBox1.TabIndex = 217;
...@@ -493,7 +493,7 @@ ...@@ -493,7 +493,7 @@
this.groupBox2.Controls.Add(this.button6); this.groupBox2.Controls.Add(this.button6);
this.groupBox2.Controls.Add(this.button3); this.groupBox2.Controls.Add(this.button3);
this.groupBox2.Controls.Add(this.button5); this.groupBox2.Controls.Add(this.button5);
this.groupBox2.Location = new System.Drawing.Point(11, 340); this.groupBox2.Location = new System.Drawing.Point(11, 344);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(476, 78); this.groupBox2.Size = new System.Drawing.Size(476, 78);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
...@@ -666,10 +666,10 @@ ...@@ -666,10 +666,10 @@
// //
this.tabPage5.Controls.Add(this.picAxis4); this.tabPage5.Controls.Add(this.picAxis4);
this.tabPage5.Controls.Add(this.picPPoint); this.tabPage5.Controls.Add(this.picPPoint);
this.tabPage5.Location = new System.Drawing.Point(4, 29); this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5"; this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3); this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(573, 551); this.tabPage5.Size = new System.Drawing.Size(573, 558);
this.tabPage5.TabIndex = 1; this.tabPage5.TabIndex = 1;
this.tabPage5.Text = "点位示意图"; this.tabPage5.Text = "点位示意图";
this.tabPage5.UseVisualStyleBackColor = true; this.tabPage5.UseVisualStyleBackColor = true;
...@@ -1432,10 +1432,10 @@ ...@@ -1432,10 +1432,10 @@
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.panel1); this.tabPage1.Controls.Add(this.panel1);
this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(192, 74); this.tabPage1.Size = new System.Drawing.Size(1091, 607);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO调试 "; this.tabPage1.Text = " IO调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
......
source/HCSingleStore/FrmInOutStore.cs
...@@ -115,7 +115,7 @@ namespace OnlineStore.ACSingleStore ...@@ -115,7 +115,7 @@ namespace OnlineStore.ACSingleStore
{ {
InitializeComponent(); InitializeComponent();
this.store = store; this.store = store;
this.Text = "D"+store.Config.GetStoreId()+" 自动跑位"; this.Text = StoreManager.Store.Config.CID+"_"+store.Name+" 自动跑位";
lastStageInOutStep = new LastStageInOutStep(); lastStageInOutStep = new LastStageInOutStep();
generalInOutStep = new GeneralInOutStep(); generalInOutStep = new GeneralInOutStep();
moveToStartPosStep = new MoveToStartPosStep(); moveToStartPosStep = new MoveToStartPosStep();
......
source/HCSingleStore/FrmStore.Designer.cs
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmStore)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmStore));
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.btnOpenLed = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.lblServerMsg = new System.Windows.Forms.Label(); this.lblServerMsg = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
...@@ -61,6 +63,9 @@ ...@@ -61,6 +63,9 @@
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.板卡调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.板卡调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.打开设备照明ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.关闭设备照明ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
...@@ -101,6 +106,8 @@ ...@@ -101,6 +106,8 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.btnOpenLed);
this.tabPage1.Controls.Add(this.btnCloseLed);
this.tabPage1.Controls.Add(this.lblServerMsg); this.tabPage1.Controls.Add(this.lblServerMsg);
this.tabPage1.Controls.Add(this.groupBox4); this.tabPage1.Controls.Add(this.groupBox4);
this.tabPage1.Controls.Add(this.groupBox3); this.tabPage1.Controls.Add(this.groupBox3);
...@@ -112,6 +119,30 @@ ...@@ -112,6 +119,30 @@
this.tabPage1.Text = " 日志信息 "; this.tabPage1.Text = " 日志信息 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
// //
// btnOpenLed
//
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(11, 341);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(123, 35);
this.btnOpenLed.TabIndex = 250;
this.btnOpenLed.Text = "打开设备照明";
this.btnOpenLed.UseVisualStyleBackColor = true;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
//
// btnCloseLed
//
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(11, 381);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(123, 35);
this.btnCloseLed.TabIndex = 251;
this.btnCloseLed.Text = "关闭设备照明";
this.btnCloseLed.UseVisualStyleBackColor = true;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
//
// lblServerMsg // lblServerMsg
// //
this.lblServerMsg.AutoSize = true; this.lblServerMsg.AutoSize = true;
...@@ -333,7 +364,10 @@ ...@@ -333,7 +364,10 @@
this.toolStripMenuItem2, this.toolStripMenuItem2,
this.toolStripSeparator6, this.toolStripSeparator6,
this.板卡调试ToolStripMenuItem, this.板卡调试ToolStripMenuItem,
this.toolStripSeparator7}); this.toolStripSeparator7,
this.打开设备照明ToolStripMenuItem,
this.toolStripSeparator14,
this.关闭设备照明ToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem"; this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25); this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
this.设置TToolStripMenuItem.Text = "设备调试 "; this.设置TToolStripMenuItem.Text = "设备调试 ";
...@@ -341,19 +375,19 @@ ...@@ -341,19 +375,19 @@
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26);
this.toolStripMenuItem2.Text = "启用调试"; this.toolStripMenuItem2.Text = "启用调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6);
// //
// 板卡调试ToolStripMenuItem // 板卡调试ToolStripMenuItem
// //
this.板卡调试ToolStripMenuItem.Name = "板卡调试ToolStripMenuItem"; this.板卡调试ToolStripMenuItem.Name = "板卡调试ToolStripMenuItem";
this.板卡调试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.板卡调试ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.板卡调试ToolStripMenuItem.Text = "板卡调试"; this.板卡调试ToolStripMenuItem.Text = "板卡调试";
this.板卡调试ToolStripMenuItem.Visible = false; this.板卡调试ToolStripMenuItem.Visible = false;
this.板卡调试ToolStripMenuItem.Click += new System.EventHandler(this.板卡调试ToolStripMenuItem_Click); this.板卡调试ToolStripMenuItem.Click += new System.EventHandler(this.板卡调试ToolStripMenuItem_Click);
...@@ -361,9 +395,28 @@ ...@@ -361,9 +395,28 @@
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator7.Visible = false; this.toolStripSeparator7.Visible = false;
// //
// 打开设备照明ToolStripMenuItem
//
this.打开设备照明ToolStripMenuItem.Name = "打开设备照明ToolStripMenuItem";
this.打开设备照明ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.打开设备照明ToolStripMenuItem.Text = "打开设备照明";
this.打开设备照明ToolStripMenuItem.Click += new System.EventHandler(this.打开设备照明ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6);
//
// 关闭设备照明ToolStripMenuItem
//
this.关闭设备照明ToolStripMenuItem.Name = "关闭设备照明ToolStripMenuItem";
this.关闭设备照明ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.关闭设备照明ToolStripMenuItem.Text = "关闭设备照明";
this.关闭设备照明ToolStripMenuItem.Click += new System.EventHandler(this.关闭设备照明ToolStripMenuItem_Click);
//
// 帮助ToolStripMenuItem // 帮助ToolStripMenuItem
// //
this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.帮助ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
...@@ -541,6 +594,11 @@ ...@@ -541,6 +594,11 @@
private System.Windows.Forms.ToolStripMenuItem 复制日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 复制日志ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripMenuItem 清空日志ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 清空日志ToolStripMenuItem;
private System.Windows.Forms.Button btnOpenLed;
private System.Windows.Forms.Button btnCloseLed;
private System.Windows.Forms.ToolStripMenuItem 打开设备照明ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
private System.Windows.Forms.ToolStripMenuItem 关闭设备照明ToolStripMenuItem;
} }
} }
source/HCSingleStore/FrmStore.cs
...@@ -635,5 +635,31 @@ namespace OnlineStore.ACSingleStore ...@@ -635,5 +635,31 @@ namespace OnlineStore.ACSingleStore
{ {
LogUtil.ClearLog(); LogUtil.ClearLog();
} }
private void btnOpenLed_Click(object sender, EventArgs e)
{
foreach(BoxBean box in store.BoxMap.Values)
{
box.IOMove(IO_Type.Device_Led, IO_VALUE.HIGH);
}
}
private void btnCloseLed_Click(object sender, EventArgs e)
{
foreach (BoxBean box in store.BoxMap.Values)
{
box.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
}
}
private void 打开设备照明ToolStripMenuItem_Click(object sender, EventArgs e)
{
btnOpenLed_Click(null, null);
}
private void 关闭设备照明ToolStripMenuItem_Click(object sender, EventArgs e)
{
btnCloseLed_Click(null, null);
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!