Skip to content

孙克 / ACSingleStore

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

日志框默认不显示。

1 个父辈 63febf3c
内嵌 并排
正在显示 3 个修改的文件 包含 36 行增加 和 9 行删除
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
this.btnLogDebug = new System.Windows.Forms.Button(); this.btnLogDebug = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage(); this.tabPage3 = new System.Windows.Forms.TabPage();
this.chbOpenLog = new System.Windows.Forms.CheckBox();
this.btnHul = new System.Windows.Forms.Button(); this.btnHul = new System.Windows.Forms.Button();
this.btnCloseDLed = new System.Windows.Forms.Button(); this.btnCloseDLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button(); this.btnOpenDLed = new System.Windows.Forms.Button();
...@@ -252,10 +253,9 @@ ...@@ -252,10 +253,9 @@
// //
// chbIsDebug // chbIsDebug
// //
this.chbIsDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbIsDebug.AutoSize = true; this.chbIsDebug.AutoSize = true;
this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbIsDebug.Location = new System.Drawing.Point(690, 13); this.chbIsDebug.Location = new System.Drawing.Point(685, 13);
this.chbIsDebug.Name = "chbIsDebug"; this.chbIsDebug.Name = "chbIsDebug";
this.chbIsDebug.Size = new System.Drawing.Size(84, 24); this.chbIsDebug.Size = new System.Drawing.Size(84, 24);
this.chbIsDebug.TabIndex = 272; this.chbIsDebug.TabIndex = 272;
...@@ -265,10 +265,9 @@ ...@@ -265,10 +265,9 @@
// //
// chbBuzzer // chbBuzzer
// //
this.chbBuzzer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbBuzzer.AutoSize = true; this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(832, 13); this.chbBuzzer.Location = new System.Drawing.Point(803, 13);
this.chbBuzzer.Name = "chbBuzzer"; this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24); this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271; this.chbBuzzer.TabIndex = 271;
...@@ -302,10 +301,9 @@ ...@@ -302,10 +301,9 @@
// //
// chbAuto // chbAuto
// //
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAuto.AutoSize = true; this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(964, 13); this.chbAuto.Location = new System.Drawing.Point(960, 13);
this.chbAuto.Name = "chbAuto"; this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24); this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270; this.chbAuto.TabIndex = 270;
...@@ -542,6 +540,7 @@ ...@@ -542,6 +540,7 @@
// //
// tabPage3 // tabPage3
// //
this.tabPage3.Controls.Add(this.chbOpenLog);
this.tabPage3.Controls.Add(this.btnHul); this.tabPage3.Controls.Add(this.btnHul);
this.tabPage3.Controls.Add(this.btnCloseDLed); this.tabPage3.Controls.Add(this.btnCloseDLed);
this.tabPage3.Controls.Add(this.btnOpenDLed); this.tabPage3.Controls.Add(this.btnOpenDLed);
...@@ -558,6 +557,18 @@ ...@@ -558,6 +557,18 @@
this.tabPage3.Text = " 操作日志 "; this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true; this.tabPage3.UseVisualStyleBackColor = true;
// //
// chbOpenLog
//
this.chbOpenLog.AutoSize = true;
this.chbOpenLog.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbOpenLog.Location = new System.Drawing.Point(14, 105);
this.chbOpenLog.Name = "chbOpenLog";
this.chbOpenLog.Size = new System.Drawing.Size(84, 24);
this.chbOpenLog.TabIndex = 272;
this.chbOpenLog.Text = "显示日志";
this.chbOpenLog.UseVisualStyleBackColor = true;
this.chbOpenLog.CheckedChanged += new System.EventHandler(this.chbOpenLog_CheckedChanged);
//
// btnHul // btnHul
// //
this.btnHul.BackColor = System.Drawing.Color.White; this.btnHul.BackColor = System.Drawing.Color.White;
...@@ -669,9 +680,9 @@ ...@@ -669,9 +680,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 104); this.richTextBox1.Location = new System.Drawing.Point(5, 135);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(534, 513); this.richTextBox1.Size = new System.Drawing.Size(534, 482);
this.richTextBox1.TabIndex = 256; this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
this.richTextBox1.Visible = false; this.richTextBox1.Visible = false;
...@@ -1956,6 +1967,7 @@ ...@@ -1956,6 +1967,7 @@
this.tabPage6.ResumeLayout(false); this.tabPage6.ResumeLayout(false);
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage3.ResumeLayout(false); this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.groupBox7.ResumeLayout(false); this.groupBox7.ResumeLayout(false);
...@@ -2117,6 +2129,7 @@ ...@@ -2117,6 +2129,7 @@
private System.Windows.Forms.Button btnOpenDLed; private System.Windows.Forms.Button btnOpenDLed;
private System.Windows.Forms.Button btnOpenAutoInOut; private System.Windows.Forms.Button btnOpenAutoInOut;
private System.Windows.Forms.Button btnHul; private System.Windows.Forms.Button btnHul;
private System.Windows.Forms.CheckBox chbOpenLog;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -170,6 +170,7 @@ namespace OnlineStore.ACSingleStore ...@@ -170,6 +170,7 @@ namespace OnlineStore.ACSingleStore
} }
LanguageProcess(); LanguageProcess();
LanguagePro(); LanguagePro();
richTextBox1.Visible = false;
// this.tabControl1.TabPages.Remove(tabPage3); // this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false; // groupCode.Visible = false;
} }
...@@ -1235,5 +1236,17 @@ namespace OnlineStore.ACSingleStore ...@@ -1235,5 +1236,17 @@ namespace OnlineStore.ACSingleStore
bool result= store.BtnNextPro(); bool result= store.BtnNextPro();
btnHul.Visible = store.NeedShowBtn(); btnHul.Visible = store.NeedShowBtn();
} }
private void chbOpenLog_CheckedChanged(object sender, EventArgs e)
{
if (chbOpenLog.Checked)
{
richTextBox1.Visible = true;
}
else
{
richTextBox1.Visible = false;
}
}
} }
} }
source/ACSingleStore/resource/language.resource
...@@ -320,4 +320,5 @@ FrmStoreBox_btnHul_Text,忽略夹爪检测信号,Ignore the gripper detection si ...@@ -320,4 +320,5 @@ FrmStoreBox_btnHul_Text,忽略夹爪检测信号,Ignore the gripper detection si
FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text
Y11,设备照明开,Equipment lighting on Y11,设备照明开,Equipment lighting on
FrmIOStatus_btnCDLed_Text,关闭设备照明,Turn off equipment lighting FrmIOStatus_btnCDLed_Text,关闭设备照明,Turn off equipment lighting
FrmIOStatus_btnDevideLed_Text,打开设备照明,Turn on equipment lighting
\ No newline at end of file \ No newline at end of file
FrmIOStatus_btnDevideLed_Text,打开设备照明,Turn on equipment lighting
FrmStoreBox_chbOpenLog_Text,显示日志,Open Log
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!