Skip to content

孙克 / ACSingleStore

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

修改bug:界面上的关闭仓门无效

1 个父辈 d311146a
内嵌 并排
正在显示 2 个修改的文件 包含 90 行增加 和 83 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -207,17 +207,18 @@ ...@@ -207,17 +207,18 @@
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupHistory = new System.Windows.Forms.GroupBox();
this.txtHistoryTemp = new System.Windows.Forms.TextBox();
this.btnSelHistory = new System.Windows.Forms.Button(); this.btnSelHistory = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
this.txtHistoryTime = new System.Windows.Forms.TextBox(); this.txtHistoryTime = new System.Windows.Forms.TextBox();
this.txtHistoryCount = new System.Windows.Forms.TextBox();
this.label30 = new System.Windows.Forms.Label(); this.label30 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.txtHistoryHum = new System.Windows.Forms.TextBox(); this.txtHistoryHum = new System.Windows.Forms.TextBox();
this.txtCurrCount = new System.Windows.Forms.TextBox();
this.label26 = new System.Windows.Forms.Label(); this.label26 = new System.Windows.Forms.Label();
this.txtHistoryTemp = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label();
this.txtCurrCount = new System.Windows.Forms.TextBox();
this.label23 = new System.Windows.Forms.Label();
this.txtHistoryCount = new System.Windows.Forms.TextBox();
this.label24 = new System.Windows.Forms.Label();
this.btnSelTemp = new System.Windows.Forms.Button(); this.btnSelTemp = new System.Windows.Forms.Button();
this.txtHum = new System.Windows.Forms.TextBox(); this.txtHum = new System.Windows.Forms.TextBox();
this.label29 = new System.Windows.Forms.Label(); this.label29 = new System.Windows.Forms.Label();
...@@ -246,7 +247,6 @@ ...@@ -246,7 +247,6 @@
this.button4 = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button();
this.btnClearL = new System.Windows.Forms.Button(); this.btnClearL = new System.Windows.Forms.Button();
this.btnLogDebug = new System.Windows.Forms.Button(); this.btnLogDebug = new System.Windows.Forms.Button();
this.groupHistory = new System.Windows.Forms.GroupBox();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
...@@ -259,11 +259,11 @@ ...@@ -259,11 +259,11 @@
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox7.SuspendLayout(); this.groupBox7.SuspendLayout();
this.groupHistory.SuspendLayout();
this.tabControl2.SuspendLayout(); this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout(); this.tabPage4.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.tabPage6.SuspendLayout(); this.tabPage6.SuspendLayout();
this.groupHistory.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
...@@ -2351,6 +2351,7 @@ ...@@ -2351,6 +2351,7 @@
this.btnCloseDoor.TabIndex = 258; this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门"; this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = true; this.btnCloseDoor.UseVisualStyleBackColor = true;
this.btnCloseDoor.Click += new System.EventHandler(this.btnCloseDoor_Click);
// //
// btnOpenDoor // btnOpenDoor
// //
...@@ -2407,6 +2408,36 @@ ...@@ -2407,6 +2408,36 @@
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
this.groupBox7.Text = "温控器调试"; this.groupBox7.Text = "温控器调试";
// //
// groupHistory
//
this.groupHistory.Controls.Add(this.txtHistoryTemp);
this.groupHistory.Controls.Add(this.btnSelHistory);
this.groupHistory.Controls.Add(this.label24);
this.groupHistory.Controls.Add(this.txtHistoryTime);
this.groupHistory.Controls.Add(this.txtHistoryCount);
this.groupHistory.Controls.Add(this.label30);
this.groupHistory.Controls.Add(this.label23);
this.groupHistory.Controls.Add(this.txtHistoryHum);
this.groupHistory.Controls.Add(this.txtCurrCount);
this.groupHistory.Controls.Add(this.label26);
this.groupHistory.Controls.Add(this.label22);
this.groupHistory.Location = new System.Drawing.Point(6, 138);
this.groupHistory.Name = "groupHistory";
this.groupHistory.Size = new System.Drawing.Size(532, 177);
this.groupHistory.TabIndex = 260;
this.groupHistory.TabStop = false;
this.groupHistory.Text = "历史记录";
//
// txtHistoryTemp
//
this.txtHistoryTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHistoryTemp.Location = new System.Drawing.Point(103, 25);
this.txtHistoryTemp.MaxLength = 10;
this.txtHistoryTemp.Name = "txtHistoryTemp";
this.txtHistoryTemp.Size = new System.Drawing.Size(87, 26);
this.txtHistoryTemp.TabIndex = 254;
this.txtHistoryTemp.Text = "0";
//
// btnSelHistory // btnSelHistory
// //
this.btnSelHistory.Location = new System.Drawing.Point(369, 106); this.btnSelHistory.Location = new System.Drawing.Point(369, 106);
...@@ -2417,6 +2448,18 @@ ...@@ -2417,6 +2448,18 @@
this.btnSelHistory.UseVisualStyleBackColor = true; this.btnSelHistory.UseVisualStyleBackColor = true;
this.btnSelHistory.Click += new System.EventHandler(this.btnSelHistory_Click); this.btnSelHistory.Click += new System.EventHandler(this.btnSelHistory_Click);
// //
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label24.Location = new System.Drawing.Point(226, 32);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(80, 17);
this.label24.TabIndex = 249;
this.label24.Text = "记录总条数：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtHistoryTime // txtHistoryTime
// //
this.txtHistoryTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHistoryTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -2427,6 +2470,16 @@ ...@@ -2427,6 +2470,16 @@
this.txtHistoryTime.TabIndex = 258; this.txtHistoryTime.TabIndex = 258;
this.txtHistoryTime.Text = "0"; this.txtHistoryTime.Text = "0";
// //
// txtHistoryCount
//
this.txtHistoryCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHistoryCount.Location = new System.Drawing.Point(324, 23);
this.txtHistoryCount.MaxLength = 10;
this.txtHistoryCount.Name = "txtHistoryCount";
this.txtHistoryCount.Size = new System.Drawing.Size(87, 26);
this.txtHistoryCount.TabIndex = 250;
this.txtHistoryCount.Text = "0";
//
// label30 // label30
// //
this.label30.AutoSize = true; this.label30.AutoSize = true;
...@@ -2439,6 +2492,18 @@ ...@@ -2439,6 +2492,18 @@
this.label30.Text = "记录时间："; this.label30.Text = "记录时间：";
this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label30.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// label23
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label23.Location = new System.Drawing.Point(226, 68);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(92, 17);
this.label23.TabIndex = 251;
this.label23.Text = "当前指针位置：";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtHistoryHum // txtHistoryHum
// //
this.txtHistoryHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHistoryHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -2449,6 +2514,16 @@ ...@@ -2449,6 +2514,16 @@
this.txtHistoryHum.TabIndex = 256; this.txtHistoryHum.TabIndex = 256;
this.txtHistoryHum.Text = "0"; this.txtHistoryHum.Text = "0";
// //
// txtCurrCount
//
this.txtCurrCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCurrCount.Location = new System.Drawing.Point(324, 64);
this.txtCurrCount.MaxLength = 10;
this.txtCurrCount.Name = "txtCurrCount";
this.txtCurrCount.Size = new System.Drawing.Size(87, 26);
this.txtCurrCount.TabIndex = 252;
this.txtCurrCount.Text = "0";
//
// label26 // label26
// //
this.label26.AutoSize = true; this.label26.AutoSize = true;
...@@ -2461,16 +2536,6 @@ ...@@ -2461,16 +2536,6 @@
this.label26.Text = "记录湿度值："; this.label26.Text = "记录湿度值：";
this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label26.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtHistoryTemp
//
this.txtHistoryTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHistoryTemp.Location = new System.Drawing.Point(103, 25);
this.txtHistoryTemp.MaxLength = 10;
this.txtHistoryTemp.Name = "txtHistoryTemp";
this.txtHistoryTemp.Size = new System.Drawing.Size(87, 26);
this.txtHistoryTemp.TabIndex = 254;
this.txtHistoryTemp.Text = "0";
//
// label22 // label22
// //
this.label22.AutoSize = true; this.label22.AutoSize = true;
...@@ -2483,50 +2548,6 @@ ...@@ -2483,50 +2548,6 @@
this.label22.Text = "记录温度值："; this.label22.Text = "记录温度值：";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtCurrCount
//
this.txtCurrCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCurrCount.Location = new System.Drawing.Point(324, 64);
this.txtCurrCount.MaxLength = 10;
this.txtCurrCount.Name = "txtCurrCount";
this.txtCurrCount.Size = new System.Drawing.Size(87, 26);
this.txtCurrCount.TabIndex = 252;
this.txtCurrCount.Text = "0";
//
// label23
//
this.label23.AutoSize = true;
this.label23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label23.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label23.Location = new System.Drawing.Point(226, 68);
this.label23.Name = "label23";
this.label23.Size = new System.Drawing.Size(92, 17);
this.label23.TabIndex = 251;
this.label23.Text = "当前指针位置：";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtHistoryCount
//
this.txtHistoryCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHistoryCount.Location = new System.Drawing.Point(324, 23);
this.txtHistoryCount.MaxLength = 10;
this.txtHistoryCount.Name = "txtHistoryCount";
this.txtHistoryCount.Size = new System.Drawing.Size(87, 26);
this.txtHistoryCount.TabIndex = 250;
this.txtHistoryCount.Text = "0";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label24.Location = new System.Drawing.Point(226, 32);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(80, 17);
this.label24.TabIndex = 249;
this.label24.Text = "记录总条数：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnSelTemp // btnSelTemp
// //
this.btnSelTemp.Location = new System.Drawing.Point(212, 82); this.btnSelTemp.Location = new System.Drawing.Point(212, 82);
...@@ -2847,26 +2868,6 @@ ...@@ -2847,26 +2868,6 @@
this.btnLogDebug.UseVisualStyleBackColor = true; this.btnLogDebug.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click); this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
// //
// groupHistory
//
this.groupHistory.Controls.Add(this.txtHistoryTemp);
this.groupHistory.Controls.Add(this.btnSelHistory);
this.groupHistory.Controls.Add(this.label24);
this.groupHistory.Controls.Add(this.txtHistoryTime);
this.groupHistory.Controls.Add(this.txtHistoryCount);
this.groupHistory.Controls.Add(this.label30);
this.groupHistory.Controls.Add(this.label23);
this.groupHistory.Controls.Add(this.txtHistoryHum);
this.groupHistory.Controls.Add(this.txtCurrCount);
this.groupHistory.Controls.Add(this.label26);
this.groupHistory.Controls.Add(this.label22);
this.groupHistory.Location = new System.Drawing.Point(6, 138);
this.groupHistory.Name = "groupHistory";
this.groupHistory.Size = new System.Drawing.Size(532, 177);
this.groupHistory.TabIndex = 260;
this.groupHistory.TabStop = false;
this.groupHistory.Text = "历史记录";
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
...@@ -2906,13 +2907,13 @@ ...@@ -2906,13 +2907,13 @@
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout(); this.groupBox7.PerformLayout();
this.groupHistory.ResumeLayout(false);
this.groupHistory.PerformLayout();
this.tabControl2.ResumeLayout(false); this.tabControl2.ResumeLayout(false);
this.tabPage4.ResumeLayout(false); this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout(); this.tabPage4.PerformLayout();
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
this.tabPage6.ResumeLayout(false); this.tabPage6.ResumeLayout(false);
this.groupHistory.ResumeLayout(false);
this.groupHistory.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -1482,5 +1482,11 @@ namespace OnlineStore.ACSingleStore ...@@ -1482,5 +1482,11 @@ namespace OnlineStore.ACSingleStore
txtHistoryTime.Text = data[2].ToString(); txtHistoryTime.Text = data[2].ToString();
} }
} }
private void btnCloseDoor_Click(object sender, EventArgs e)
{
store.KNDIOMove(IO_Type.Door_Up, IO_VALUE.LOW);
store.KNDIOMove(IO_Type.Door_Down, IO_VALUE.HIGH);
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!