Skip to content

李娜 / Line-Smart-Workstation

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

增加简洁模式，简洁模式界面调整

1 个父辈 48d97930
内嵌 并排
正在显示 40 个修改的文件 包含 297 行增加 和 121 行删除
20241025-组装工作站修改.docx 0 → 100644
此文件类型无法预览
TSA-V/FrmBase.Designer.cs
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase));
this.SuspendLayout(); this.SuspendLayout();
// //
// FrmBase // FrmBase
......
TSA-V/FrmBase.cs
...@@ -90,7 +90,15 @@ namespace TSA_V ...@@ -90,7 +90,15 @@ namespace TSA_V
if (partentControl is FrmLogin || partentControl is FrmMenu || partentControl is FrmMaintenance) if (partentControl is FrmLogin || partentControl is FrmMenu || partentControl is FrmMaintenance)
{ {
partentControl.BackgroundImage = global::TSA_V.Properties.Resources.背景图dark; if (Setting_NInit.Device_SoftMode)
{
partentControl.BackgroundImage = ImageManager.Menu_US_Bg;
}
else
{
partentControl.BackgroundImage = global::TSA_V.Properties.Resources.背景图dark;
}
} }
...@@ -116,6 +124,10 @@ namespace TSA_V ...@@ -116,6 +124,10 @@ namespace TSA_V
{ {
} }
else if (con.BackColor.Equals(Color.Transparent))
{
con.ForeColor = Color.White;
}
else else
{ {
con.BackColor = Color.Black; //Color.FromArgb(53, 67, 88); con.BackColor = Color.Black; //Color.FromArgb(53, 67, 88);
......
TSA-V/FrmBase.resx
此文件的差异太大，无法显示。
TSA-V/FrmLogin.Designer.cs
...@@ -110,6 +110,7 @@ namespace TSA_V ...@@ -110,6 +110,7 @@ namespace TSA_V
// //
// pictureBox1 // pictureBox1
// //
this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NS; this.pictureBox1.Image = global::TSA_V.Properties.Resources.NS;
this.pictureBox1.Location = new System.Drawing.Point(12, 12); this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
...@@ -120,6 +121,7 @@ namespace TSA_V ...@@ -120,6 +121,7 @@ namespace TSA_V
// //
// label3 // label3
// //
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.label3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -127,7 +129,7 @@ namespace TSA_V ...@@ -127,7 +129,7 @@ namespace TSA_V
this.label3.ForeColor = System.Drawing.Color.Black; this.label3.ForeColor = System.Drawing.Color.Black;
this.label3.Location = new System.Drawing.Point(68, 24); this.label3.Location = new System.Drawing.Point(68, 24);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(200, 30); this.label3.Size = new System.Drawing.Size(132, 28);
this.label3.TabIndex = 26; this.label3.TabIndex = 26;
this.label3.Text = "Neo Station"; this.label3.Text = "Neo Station";
// //
...@@ -136,7 +138,6 @@ namespace TSA_V ...@@ -136,7 +138,6 @@ namespace TSA_V
this.AcceptButton = this.BtnLogin; this.AcceptButton = this.BtnLogin;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = global::TSA_V.Properties.Resources.背景图1;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.CancelButton = this.BtnExit; this.CancelButton = this.BtnExit;
this.ClientSize = new System.Drawing.Size(533, 310); this.ClientSize = new System.Drawing.Size(533, 310);
...@@ -153,6 +154,7 @@ namespace TSA_V ...@@ -153,6 +154,7 @@ namespace TSA_V
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmLogin"; this.Name = "FrmLogin";
this.Text = "登录"; this.Text = "登录";
this.Load += new System.EventHandler(this.FrmLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
......
TSA-V/FrmLogin.cs
...@@ -58,5 +58,13 @@ namespace TSA_V ...@@ -58,5 +58,13 @@ namespace TSA_V
{ {
DialogResult = DialogResult.Cancel; DialogResult = DialogResult.Cancel;
} }
private void FrmLogin_Load(object sender, EventArgs e)
{
if (Setting_NInit.Device_SoftMode)
{
this.BackgroundImage = ImageManager.Menu_US_Bg;
}
}
} }
} }
TSA-V/FrmLogin.resx
此文件的差异太大，无法显示。
TSA-V/FrmMaintenance.Designer.cs
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
// //
this.button1.BackColor = System.Drawing.Color.SteelBlue; this.button1.BackColor = System.Drawing.Color.SteelBlue;
this.button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("button1.BackgroundImage"))); this.button1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("button1.BackgroundImage")));
this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatAppearance.BorderSize = 0;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 18F); this.button1.Font = new System.Drawing.Font("微软雅黑", 18F);
...@@ -64,11 +65,12 @@ ...@@ -64,11 +65,12 @@
// //
this.btnDeviceSelect.BackColor = System.Drawing.Color.RosyBrown; this.btnDeviceSelect.BackColor = System.Drawing.Color.RosyBrown;
this.btnDeviceSelect.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnDeviceSelect.BackgroundImage"))); this.btnDeviceSelect.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnDeviceSelect.BackgroundImage")));
this.btnDeviceSelect.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btnDeviceSelect.FlatAppearance.BorderSize = 0; this.btnDeviceSelect.FlatAppearance.BorderSize = 0;
this.btnDeviceSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDeviceSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDeviceSelect.Font = new System.Drawing.Font("微软雅黑", 18F); this.btnDeviceSelect.Font = new System.Drawing.Font("微软雅黑", 18F);
this.btnDeviceSelect.ForeColor = System.Drawing.Color.White; this.btnDeviceSelect.ForeColor = System.Drawing.Color.White;
this.btnDeviceSelect.Location = new System.Drawing.Point(181, 174); this.btnDeviceSelect.Location = new System.Drawing.Point(181, 172);
this.btnDeviceSelect.Name = "btnDeviceSelect"; this.btnDeviceSelect.Name = "btnDeviceSelect";
this.btnDeviceSelect.Size = new System.Drawing.Size(240, 70); this.btnDeviceSelect.Size = new System.Drawing.Size(240, 70);
this.btnDeviceSelect.TabIndex = 12; this.btnDeviceSelect.TabIndex = 12;
...@@ -80,11 +82,12 @@ ...@@ -80,11 +82,12 @@
// //
this.btnLanguage.BackColor = System.Drawing.Color.Goldenrod; this.btnLanguage.BackColor = System.Drawing.Color.Goldenrod;
this.btnLanguage.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnLanguage.BackgroundImage"))); this.btnLanguage.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnLanguage.BackgroundImage")));
this.btnLanguage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btnLanguage.FlatAppearance.BorderSize = 0; this.btnLanguage.FlatAppearance.BorderSize = 0;
this.btnLanguage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLanguage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLanguage.Font = new System.Drawing.Font("微软雅黑", 18F); this.btnLanguage.Font = new System.Drawing.Font("微软雅黑", 18F);
this.btnLanguage.ForeColor = System.Drawing.Color.White; this.btnLanguage.ForeColor = System.Drawing.Color.White;
this.btnLanguage.Location = new System.Drawing.Point(181, 322); this.btnLanguage.Location = new System.Drawing.Point(181, 320);
this.btnLanguage.Name = "btnLanguage"; this.btnLanguage.Name = "btnLanguage";
this.btnLanguage.Size = new System.Drawing.Size(240, 70); this.btnLanguage.Size = new System.Drawing.Size(240, 70);
this.btnLanguage.TabIndex = 11; this.btnLanguage.TabIndex = 11;
...@@ -116,7 +119,7 @@ ...@@ -116,7 +119,7 @@
this.btnPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPosition.Font = new System.Drawing.Font("微软雅黑", 18F); this.btnPosition.Font = new System.Drawing.Font("微软雅黑", 18F);
this.btnPosition.ForeColor = System.Drawing.Color.White; this.btnPosition.ForeColor = System.Drawing.Color.White;
this.btnPosition.Location = new System.Drawing.Point(427, 173); this.btnPosition.Location = new System.Drawing.Point(427, 172);
this.btnPosition.Name = "btnPosition"; this.btnPosition.Name = "btnPosition";
this.btnPosition.Size = new System.Drawing.Size(240, 70); this.btnPosition.Size = new System.Drawing.Size(240, 70);
this.btnPosition.TabIndex = 6; this.btnPosition.TabIndex = 6;
...@@ -132,7 +135,7 @@ ...@@ -132,7 +135,7 @@
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Font = new System.Drawing.Font("微软雅黑", 18F); this.btnDebug.Font = new System.Drawing.Font("微软雅黑", 18F);
this.btnDebug.ForeColor = System.Drawing.Color.White; this.btnDebug.ForeColor = System.Drawing.Color.White;
this.btnDebug.Location = new System.Drawing.Point(427, 249); this.btnDebug.Location = new System.Drawing.Point(427, 246);
this.btnDebug.Name = "btnDebug"; this.btnDebug.Name = "btnDebug";
this.btnDebug.Size = new System.Drawing.Size(240, 70); this.btnDebug.Size = new System.Drawing.Size(240, 70);
this.btnDebug.TabIndex = 5; this.btnDebug.TabIndex = 5;
...@@ -144,11 +147,12 @@ ...@@ -144,11 +147,12 @@
// //
this.btnPwdUpdate.BackColor = System.Drawing.Color.MediumPurple; this.btnPwdUpdate.BackColor = System.Drawing.Color.MediumPurple;
this.btnPwdUpdate.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnPwdUpdate.BackgroundImage"))); this.btnPwdUpdate.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnPwdUpdate.BackgroundImage")));
this.btnPwdUpdate.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btnPwdUpdate.FlatAppearance.BorderSize = 0; this.btnPwdUpdate.FlatAppearance.BorderSize = 0;
this.btnPwdUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnPwdUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPwdUpdate.Font = new System.Drawing.Font("微软雅黑", 18F); this.btnPwdUpdate.Font = new System.Drawing.Font("微软雅黑", 18F);
this.btnPwdUpdate.ForeColor = System.Drawing.Color.White; this.btnPwdUpdate.ForeColor = System.Drawing.Color.White;
this.btnPwdUpdate.Location = new System.Drawing.Point(181, 250); this.btnPwdUpdate.Location = new System.Drawing.Point(181, 246);
this.btnPwdUpdate.Name = "btnPwdUpdate"; this.btnPwdUpdate.Name = "btnPwdUpdate";
this.btnPwdUpdate.Size = new System.Drawing.Size(240, 70); this.btnPwdUpdate.Size = new System.Drawing.Size(240, 70);
this.btnPwdUpdate.TabIndex = 19; this.btnPwdUpdate.TabIndex = 19;
...@@ -195,7 +199,7 @@ ...@@ -195,7 +199,7 @@
// //
// pictureBox1 // pictureBox1
// //
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NS; this.pictureBox1.Image = global::TSA_V.Properties.Resources.neo;
this.pictureBox1.Location = new System.Drawing.Point(12, 12); this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50); this.pictureBox1.Size = new System.Drawing.Size(50, 50);
...@@ -223,15 +227,15 @@ ...@@ -223,15 +227,15 @@
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(861, 453); this.ClientSize = new System.Drawing.Size(861, 453);
this.Controls.Add(this.btnPwdUpdate);
this.Controls.Add(this.button1);
this.Controls.Add(this.btnDeviceSelect);
this.Controls.Add(this.btnLanguage);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.LblUserName); this.Controls.Add(this.LblUserName);
this.Controls.Add(this.lblVersion); this.Controls.Add(this.lblVersion);
this.Controls.Add(this.btnWidthC); this.Controls.Add(this.btnWidthC);
this.Controls.Add(this.btnPwdUpdate);
this.Controls.Add(this.button1);
this.Controls.Add(this.btnDeviceSelect);
this.Controls.Add(this.btnLanguage);
this.Controls.Add(this.btnExit); this.Controls.Add(this.btnExit);
this.Controls.Add(this.btnPosition); this.Controls.Add(this.btnPosition);
this.Controls.Add(this.btnDebug); this.Controls.Add(this.btnDebug);
......
TSA-V/FrmMaintenance.cs
...@@ -102,6 +102,18 @@ namespace TSA_V ...@@ -102,6 +102,18 @@ namespace TSA_V
System.Reflection.AssemblyName assemblyName = System.Reflection.Assembly.GetExecutingAssembly().GetName(); System.Reflection.AssemblyName assemblyName = System.Reflection.Assembly.GetExecutingAssembly().GetName();
lblVersion.Text ="V"+ assemblyName.Version.ToString() ; lblVersion.Text ="V"+ assemblyName.Version.ToString() ;
LblUserName.Text = FormManager.UserInfo.Name + "/" + FormManager.UserInfo.Limit; LblUserName.Text = FormManager.UserInfo.Name + "/" + FormManager.UserInfo.Limit;
btnWidthC.Visible = !Setting_NInit.Device_SoftMode;
btnPosition.Visible = !Setting_NInit.Device_SoftMode;
btnDebug.Visible = !Setting_NInit.Device_SoftMode;
if (Setting_NInit.Device_SoftMode)
{
button1.Size = new Size(400, 70);
btnDeviceSelect.Size = new Size(400, 70);
btnLanguage.Size = new Size(400, 70);
btnPwdUpdate.Size = new Size(400, 70);
this.BackgroundImage = ImageManager.Menu_US_Bg;
}
LanguageProcess(); LanguageProcess();
if (IOBase.NoLine) if (IOBase.NoLine)
...@@ -136,9 +148,6 @@ namespace TSA_V ...@@ -136,9 +148,6 @@ namespace TSA_V
btnLanguage.Visible = false; btnLanguage.Visible = false;
} }
btnWidthC.Visible = !Setting_NInit.Device_SoftMode;
btnPosition.Visible = !Setting_NInit.Device_SoftMode;
btnDebug.Visible = !Setting_NInit.Device_SoftMode;
} }
private void btnDeviceSelect_Click(object sender, EventArgs e) private void btnDeviceSelect_Click(object sender, EventArgs e)
{ {
......
TSA-V/FrmMaintenance.resx
...@@ -997,7 +997,7 @@ ...@@ -997,7 +997,7 @@
RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAA9UFJREFUeF7snYd620jT j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAA9UFJREFUeF7snYd620jT
rM/9X9v/7VpizsiZlC/hvNUNUrQs2RJJKO3U06YhhIndEwqDnv9X1u3h4eFnQMC7A8Wr233ZdPxerIQ8 rM/9X9v/7VpizsiZlC/hvNUNUrQs2RJJKO3U06YhhIndEwqDnv9X1u3h4eFnQMC7A8Wr233ZdPxerIQ8
yeNV010cBs/FZbtM20XaLbL9LG03eUOAFwTHEySDZ0kSwfZnAwJ+BXrS7Q9F3W6zepXWcdGibv21l4FG yeNV010cBs/FZbtM20XaLbL9LG03eUOAFwTHEySDZ0kSwfZnAwJ+BXrS7Q9F3W6zepXWcdGibv21l4FG
pWW3TOpFXO3yGsO5WMdIADGi9vO4Gm/LeUwauro7DKGzWERSNKR5tiuV8qwu6q7bP1xmrQEBHw7sru32 pWW3TOpFXO3yGsO5WMdIADGi9vO4Gm/LeUwauro7DKGzWERSNKR5tiuV8qwu6q7bP1xmrQEBHw7sru32
......
TSA-V/FrmMenu.Designer.cs
...@@ -73,7 +73,6 @@ namespace TSA_V ...@@ -73,7 +73,6 @@ namespace TSA_V
// btnExit // btnExit
// //
this.btnExit.BackColor = System.Drawing.Color.Transparent; this.btnExit.BackColor = System.Drawing.Color.Transparent;
this.btnExit.BackgroundImage = global::TSA_V.Properties.Resources.退出;
this.btnExit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btnExit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btnExit.FlatAppearance.BorderSize = 0; this.btnExit.FlatAppearance.BorderSize = 0;
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -131,21 +130,22 @@ namespace TSA_V ...@@ -131,21 +130,22 @@ namespace TSA_V
// //
// pictureBox1 // pictureBox1
// //
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NS; this.pictureBox1.Image = global::TSA_V.Properties.Resources.neo;
this.pictureBox1.Location = new System.Drawing.Point(12, 12); this.pictureBox1.Location = new System.Drawing.Point(3, 12);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50); this.pictureBox1.Size = new System.Drawing.Size(62, 50);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 22; this.pictureBox1.TabIndex = 10;
this.pictureBox1.TabStop = false; this.pictureBox1.TabStop = false;
// //
// lblMsg // lblMsg
// //
this.lblMsg.AutoSize = true;
this.lblMsg.BackColor = System.Drawing.Color.Transparent; this.lblMsg.BackColor = System.Drawing.Color.Transparent;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.Location = new System.Drawing.Point(261, 477); this.lblMsg.Location = new System.Drawing.Point(116, 470);
this.lblMsg.Name = "lblMsg"; this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(636, 60); this.lblMsg.Size = new System.Drawing.Size(75, 17);
this.lblMsg.TabIndex = 21; this.lblMsg.TabIndex = 21;
this.lblMsg.Text = "版本号 1.1.2"; this.lblMsg.Text = "版本号 1.1.2";
this.lblMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -329,7 +329,6 @@ namespace TSA_V ...@@ -329,7 +329,6 @@ namespace TSA_V
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = global::TSA_V.Properties.Resources.背景;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(909, 546); this.ClientSize = new System.Drawing.Size(909, 546);
this.ControlBox = false; this.ControlBox = false;
......
TSA-V/FrmMenu.cs
...@@ -115,7 +115,7 @@ namespace TSA_V ...@@ -115,7 +115,7 @@ namespace TSA_V
} }
private bool useLed = false; private bool useLed = false;
private System.Timers.Timer timer = new System.Timers.Timer(); private System.Timers.Timer timer = new System.Timers.Timer();
private void FrmMenu_Load(object sender, EventArgs e) private void FrmMenu_Load(object sender, EventArgs e)
{ {
DB.userName = FormManager.UserInfo.Name; DB.userName = FormManager.UserInfo.Name;
...@@ -142,7 +142,7 @@ namespace TSA_V ...@@ -142,7 +142,7 @@ namespace TSA_V
LoadCSVLibrary.CSVPositionReader<TSAVPosition>.LoadFile(positionFileName, CSVPositionReader<TSAVPosition>.getLabelPositionFilePath()); LoadCSVLibrary.CSVPositionReader<TSAVPosition>.LoadFile(positionFileName, CSVPositionReader<TSAVPosition>.getLabelPositionFilePath());
CSVBomManager.LoadAllCom(); CSVBomManager.LoadAllCom();
//加载设备信息 //加载设备信息
TSAVBean.LoadTSAV(); TSAVBean.LoadTSAV();
//需要链接IO //需要链接IO
timer.AutoReset = true; timer.AutoReset = true;
timer.Interval = 1000; timer.Interval = 1000;
...@@ -176,11 +176,11 @@ namespace TSA_V ...@@ -176,11 +176,11 @@ namespace TSA_V
try try
{ {
if (Setting_NInit.Device_AutoGuoBan) if (Setting_NInit.Device_AutoGuoBan)
{ {
LogUtil.info("离线编程模式：不加载相机" ); LogUtil.info("离线编程模式：不加载相机");
} }
else else
{ {
AccAOI.camera.CameraManager.LoadCamera(); AccAOI.camera.CameraManager.LoadCamera();
LogUtil.info("加载到相机：" + string.Join(";", AccAOI.camera.CameraManager.hikNameList.ToArray())); LogUtil.info("加载到相机：" + string.Join(";", AccAOI.camera.CameraManager.hikNameList.ToArray()));
this.Focus(); this.Focus();
...@@ -192,9 +192,10 @@ namespace TSA_V ...@@ -192,9 +192,10 @@ namespace TSA_V
LogUtil.error("加载相机出错：" + ex.ToString()); LogUtil.error("加载相机出错：" + ex.ToString());
} }
MouseManager.Start(); MouseManager.Start();
btnReplenish.Visible = !Setting_NInit.Device_SoftMode; btnReplenish.Visible = !Setting_NInit.Device_SoftMode;
btnCom.Visible = !Setting_NInit.Device_SoftMode; btnCom.Visible = !Setting_NInit.Device_SoftMode;
btnHistory.Visible = !Setting_NInit.Device_SoftMode;
} }
private void WorkModeUtil_checkModeEndEvent() private void WorkModeUtil_checkModeEndEvent()
...@@ -209,7 +210,34 @@ namespace TSA_V ...@@ -209,7 +210,34 @@ namespace TSA_V
public void LoadBackImage() public void LoadBackImage()
{ {
if (CurrLanguage.Equals(ResourceCulture.English)) if (Setting_NInit.Device_SoftMode)
{
btnMaintenance.Location = new Point(btnAOI.Location.X, btnAOI.Location.Y+btnAOI.Size.Height+8);
this.btnMaintenance.Size = new Size(284, 100);
this.btnProduct.Size = new Size(284, 100);
this.btnAOI.Size = new Size(284, 100);
if (CurrLanguage.Equals(ResourceCulture.English))
{
this.panel1.BackgroundImage = ImageManager.Menu_US_Bg;
btnExit.BackgroundImage = ImageManager.Menu_US_exit;
this.btnWork.BackgroundImage = ImageManager.Menu_US_sart;
this.btnMaintenance.BackgroundImage = ImageManager.Menu_US_config;
this.btnProduct.BackgroundImage = ImageManager.Menu_US_program;
this.btnAOI.BackgroundImage = ImageManager.Menu_US_aoi;
}
else
{
this.panel1.BackgroundImage = ImageManager.Menu_US_Bg;
btnExit.BackgroundImage = ImageManager.Menu_exit;
this.btnMaintenance.BackgroundImage = ImageManager.Menu_config;
this.btnWork.BackgroundImage = ImageManager.Menu_sart;
this.btnProduct.BackgroundImage = ImageManager.Menu_program;
this.btnAOI.BackgroundImage = ImageManager.Menu_aoi;
}
}
else if (CurrLanguage.Equals(ResourceCulture.English))
{ {
this.panel1.BackgroundImage = ImageManager.frm_背景图; this.panel1.BackgroundImage = ImageManager.frm_背景图;
......
TSA-V/Properties/Resource.en-US.resx
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<value>Initiliazation</value> <value>Initiliazation</value>
</data> </data>
<data name="FrmWork_btnStop_Text" xml:space="preserve"> <data name="FrmWork_btnStop_Text" xml:space="preserve">
<value>End</value> <value>Complete</value>
</data> </data>
<data name="FrmComponentList_Text" xml:space="preserve"> <data name="FrmComponentList_Text" xml:space="preserve">
<value>Component</value> <value>Component</value>
...@@ -1895,13 +1895,13 @@ ...@@ -1895,13 +1895,13 @@
<value>Perform Testing</value> <value>Perform Testing</value>
</data> </data>
<data name="FrmCameraAOI_Text" xml:space="preserve"> <data name="FrmCameraAOI_Text" xml:space="preserve">
<value>AOI Inspection</value> <value>Inspection</value>
</data> </data>
<data name="FrmMaintenance_btnTest_Text" xml:space="preserve"> <data name="FrmMaintenance_btnTest_Text" xml:space="preserve">
<value>Stop Image Loop</value> <value>Stop Image Loop</value>
</data> </data>
<data name="FrmWork_btnCamera_Text" xml:space="preserve"> <data name="FrmWork_btnCamera_Text" xml:space="preserve">
<value>AOI</value> <value>Inspection</value>
</data> </data>
<data name="{0}秒后自动完成" xml:space="preserve"> <data name="{0}秒后自动完成" xml:space="preserve">
<value>Automatically complete after {0} seconds</value> <value>Automatically complete after {0} seconds</value>
...@@ -2715,9 +2715,9 @@ ...@@ -2715,9 +2715,9 @@
<data name = "Column_ISUpdate" xml:space = "preserve"> <value> modified </value> </data> <data name = "Column_ISUpdate" xml:space = "preserve"> <value> modified </value> </data>
<data name = "FrmWork_groupHand_Text" xml:space = "preserve"> <value> Hand gesture monitoring </value> </data> <data name = "FrmWork_groupHand_Text" xml:space = "preserve"> <value> Hand gesture monitoring </value> </data>
<data name = "handWork" xml:space = "preserve"> <value> Assembling </value> </data> <data name = "handWork" xml:space = "preserve"> <value> Assembling </value> </data>
<data name = "handCount" xml:space = "preserve"> <value> Number </value> </data> <data name = "handCount" xml:space = "preserve"> <value> Times </value> </data>
<data name = "handTime" xml:space = "preserve"> <value> Total Time </value> </data> <data name = "handTime" xml:space = "preserve"> <value> Total Time </value> </data>
<data name = "FrmWork_linkLabel1_Text" xml:space = "preserve"> <value> reduction </value> </data> <data name = "FrmWork_linkLabel1_Text" xml:space = "preserve"> <value> Reset </value> </data>
<data name="查询出错" xml:space="preserve"> <data name="查询出错" xml:space="preserve">
<value>Query Error</value> <value>Query Error</value>
...@@ -2739,6 +2739,7 @@ ...@@ -2739,6 +2739,7 @@
</data> </data>
<data name = "comInitError" xml:space = "preserve"> <value> {0}Initialization failure </value> </data> <data name = "comInitError" xml:space = "preserve"> <value> {0}Initialization failure </value> </data>
<data name = "comOpenFail" xml:space = "preserve"> <value> Serial port {0} open failed </value> </data> <data name = "comOpenFail" xml:space = "preserve"> <value> Serial port {0} open failed </value> </data>
<data name = "FrmBoardSelect_chbSoftMode_Text" xml:space = "preserve"> <value> simplicity mode </value> </data> <data name = "FrmBoardSelect_chbSoftMode_Text" xml:space = "preserve"> <value> Lite Mode </value> </data>
<data name = "isRestart" xml:space = "preserve"> <value> Changing this mode requires reloading the device, whether to restart the software now? </value> </data> <data name = "isRestart" xml:space = "preserve"> <value> Changing this mode requires reloading the device, whether to restart the software now? </value> </data>
<data name = "FrmWork_btnResetAOI_Text" xml:space = "preserve"> <value> Reset </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2719,4 +2719,5 @@ ...@@ -2719,4 +2719,5 @@
<data name = "comOpenFail" xml:space = "preserve"> <value> 串口{0}打开失败 </value> </data> <data name = "comOpenFail" xml:space = "preserve"> <value> 串口{0}打开失败 </value> </data>
<data name = "FrmBoardSelect_chbSoftMode_Text" xml:space = "preserve"> <value> 简洁模式 </value> </data> <data name = "FrmBoardSelect_chbSoftMode_Text" xml:space = "preserve"> <value> 简洁模式 </value> </data>
<data name = "isRestart" xml:space = "preserve"> <value> 更改此模式需要重新加载设备，是否现在重启软件? </value> </data> <data name = "isRestart" xml:space = "preserve"> <value> 更改此模式需要重新加载设备，是否现在重启软件? </value> </data>
<data name = "FrmWork_btnResetAOI_Text" xml:space = "preserve"> <value> 还原 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2894,4 +2894,5 @@ ...@@ -2894,4 +2894,5 @@
<data name = "comOpenFail" xml:space = "preserve"> <value> 串口{0}打开失败 </value> </data> <data name = "comOpenFail" xml:space = "preserve"> <value> 串口{0}打开失败 </value> </data>
<data name = "FrmBoardSelect_chbSoftMode_Text" xml:space = "preserve"> <value> 简洁模式 </value> </data> <data name = "FrmBoardSelect_chbSoftMode_Text" xml:space = "preserve"> <value> 简洁模式 </value> </data>
<data name = "isRestart" xml:space = "preserve"> <value> 更改此模式需要重新加载设备，是否现在重启软件? </value> </data> <data name = "isRestart" xml:space = "preserve"> <value> 更改此模式需要重新加载设备，是否现在重启软件? </value> </data>
<data name = "FrmWork_btnResetAOI_Text" xml:space = "preserve"> <value> 还原 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resources.Designer.cs
...@@ -133,6 +133,16 @@ namespace TSA_V.Properties { ...@@ -133,6 +133,16 @@ namespace TSA_V.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap neo {
get {
object obj = ResourceManager.GetObject("neo", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap NEO_STATION { internal static System.Drawing.Bitmap NEO_STATION {
get { get {
object obj = ResourceManager.GetObject("NEO_STATION", resourceCulture); object obj = ResourceManager.GetObject("NEO_STATION", resourceCulture);
......
TSA-V/Properties/Resources.resx
...@@ -136,9 +136,6 @@ ...@@ -136,9 +136,6 @@
<data name="neo_station1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="neo_station1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\neo station.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\neo station.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="z+" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\z+.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
...@@ -181,6 +178,9 @@ ...@@ -181,6 +178,9 @@
<data name="背景图" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="背景图" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\背景图.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\背景图.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="退出背景" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\退出背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="智能工作站" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="智能工作站" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\智能工作站.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\智能工作站.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
...@@ -193,8 +193,8 @@ ...@@ -193,8 +193,8 @@
<data name="axisbg" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="axisbg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\axisbg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\axisbg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="退出背景" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="z+" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\退出背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\z+.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="设备配置" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="设备配置" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\设备配置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\设备配置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
...@@ -220,4 +220,7 @@ ...@@ -220,4 +220,7 @@
<data name="元器件信息" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="元器件信息" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\元器件信息.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\元器件信息.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="neo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\US_Lite\neo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Smart-Workstation.csproj
...@@ -309,6 +309,11 @@ ...@@ -309,6 +309,11 @@
<Compile Include="projector\FrmScreenTest.Designer.cs"> <Compile Include="projector\FrmScreenTest.Designer.cs">
<DependentUpon>FrmScreenTest.cs</DependentUpon> <DependentUpon>FrmScreenTest.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="workForm\FrmAOICheck.cs"> <Compile Include="workForm\FrmAOICheck.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -564,14 +569,9 @@ ...@@ -564,14 +569,9 @@
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType> <SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="deviceDebug\FrmPusicanTest.resx"> <EmbeddedResource Include="deviceDebug\FrmPusicanTest.resx">
<DependentUpon>FrmPusicanTest.cs</DependentUpon> <DependentUpon>FrmPusicanTest.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
...@@ -637,6 +637,40 @@ ...@@ -637,6 +637,40 @@
<Content Include="image\form\type3.png"> <Content Include="image\form\type3.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="image\US_Lite\aoi.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\CN_Lite\aoi.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\US_Lite\bg.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\US_Lite\configuration.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\CN_Lite\configuration.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\US_Lite\exit.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\CN_Lite\program.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="image\US_Lite\neo.png" />
<Content Include="image\US_Lite\program.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\US_Lite\start.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\CN_Lite\start.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\CN_Lite\exit.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="image\wait.gif"> <Content Include="image\wait.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
TSA-V/manager/ImageManager.cs
...@@ -61,6 +61,20 @@ namespace TSA_V ...@@ -61,6 +61,20 @@ namespace TSA_V
public static Image Menu_US_光学检测; public static Image Menu_US_光学检测;
public static Image Menu_US_补料; public static Image Menu_US_补料;
public static Image Menu_US_Bg;
public static Image Menu_US_sart;
public static Image Menu_US_program;
public static Image Menu_US_aoi;
public static Image Menu_US_config;
public static Image Menu_US_exit;
public static Image Menu_sart;
public static Image Menu_program;
public static Image Menu_aoi;
public static Image Menu_config;
public static Image Menu_exit;
public static Image imgAlarm; public static Image imgAlarm;
/// <summary> /// <summary>
/// 是否已经初始化过了 /// 是否已经初始化过了
...@@ -107,9 +121,9 @@ namespace TSA_V ...@@ -107,9 +121,9 @@ namespace TSA_V
//Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg"); //Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg");
//Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg"); //Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg");
//Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg"); //Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg");
Main_历史记录=GetImage(Application.StartupPath+ "\\image\\CN\\历史记录.png"); Main_历史记录 = GetImage(Application.StartupPath + "\\image\\CN\\历史记录.png");
Menu_光学检测=GetImage(Application.StartupPath+ "\\image\\CN\\光学检测.png"); Menu_光学检测 = GetImage(Application.StartupPath + "\\image\\CN\\光学检测.png");
Menu_补料=GetImage(Application.StartupPath+ "\\image\\CN\\补料.png"); Menu_补料 = GetImage(Application.StartupPath + "\\image\\CN\\补料.png");
Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\Component Lib.png"); Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\Component Lib.png");
...@@ -117,7 +131,7 @@ namespace TSA_V ...@@ -117,7 +131,7 @@ namespace TSA_V
Main_US_开始工作 = GetImage(Application.StartupPath + "\\image\\US\\Star.png"); Main_US_开始工作 = GetImage(Application.StartupPath + "\\image\\US\\Star.png");
Main_US_设备配置 = GetImage(Application.StartupPath + "\\image\\US\\Configuration.png"); Main_US_设备配置 = GetImage(Application.StartupPath + "\\image\\US\\Configuration.png");
Main_US_统计系统 = GetImage(Application.StartupPath + "\\image\\US\\统计系统.gif"); Main_US_统计系统 = GetImage(Application.StartupPath + "\\image\\US\\统计系统.gif");
Main_US_退出 = GetImage(Application.StartupPath + "\\image\\US\\Exit.png"); Main_US_退出 = GetImage(Application.StartupPath + "\\image\\US\\Exit.png");
Main_US_智能工作站 = GetImage(Application.StartupPath + "\\image\\US\\智能工作站.gif"); Main_US_智能工作站 = GetImage(Application.StartupPath + "\\image\\US\\智能工作站.gif");
Menu_US_焊接 = GetImage(Application.StartupPath + "\\image\\US\\焊接.gif"); Menu_US_焊接 = GetImage(Application.StartupPath + "\\image\\US\\焊接.gif");
...@@ -130,10 +144,27 @@ namespace TSA_V ...@@ -130,10 +144,27 @@ namespace TSA_V
Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif"); Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif");
Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif"); Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif");
Main_US_历史记录 = GetImage(Application.StartupPath + "\\image\\US\\History.png"); Main_US_历史记录 = GetImage(Application.StartupPath + "\\image\\US\\History.png");
Menu_US_光学检测 = GetImage(Application.StartupPath+ "\\image\\US\\AOI.png"); Menu_US_光学检测 = GetImage(Application.StartupPath + "\\image\\US\\AOI.png");
Menu_US_补料 = GetImage(Application.StartupPath+ "\\image\\US\\Replenish.png"); Menu_US_补料 = GetImage(Application.StartupPath + "\\image\\US\\Replenish.png");
imgAlarm = Image.FromFile(Application.StartupPath + "\\image\\alarm.gif"); imgAlarm = Image.FromFile(Application.StartupPath + "\\image\\alarm.gif");
Menu_US_Bg = GetImage(Application.StartupPath + "\\image\\US_Lite\\bg.png");
Menu_US_sart = GetImage(Application.StartupPath + "\\image\\US_Lite\\start.png");
Menu_US_program = GetImage(Application.StartupPath + "\\image\\US_Lite\\program.png");
Menu_US_aoi = GetImage(Application.StartupPath + "\\image\\US_Lite\\aoi.png");
Menu_US_config = GetImage(Application.StartupPath + "\\image\\US_Lite\\configuration.png");
Menu_US_exit = GetImage(Application.StartupPath + "\\image\\US_Lite\\exit.png");
Menu_sart = GetImage(Application.StartupPath + "\\image\\CN_Lite\\start.png");
Menu_program = GetImage(Application.StartupPath + "\\image\\CN_Lite\\program.png");
Menu_aoi = GetImage(Application.StartupPath + "\\image\\CN_Lite\\aoi.png");
Menu_config = GetImage(Application.StartupPath + "\\image\\CN_Lite\\configuration.png");
Menu_exit = GetImage(Application.StartupPath + "\\image\\CN_Lite\\exit.png");
} }
catch (Exception ex) catch (Exception ex)
{ {
......
TSA-V/projector/FrmProjectorScreen.Designer.cs
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmProjectorScreen"; this.Name = "FrmProjectorScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "显示测试"; this.Text = "Projection display";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmScreenTest_Load); this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown); this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
......
TSA-V/projector/FrmScreenTest.Designer.cs
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.btnColor = new System.Windows.Forms.Button();
this.comboBox1 = new System.Windows.Forms.ComboBox(); this.comboBox1 = new System.Windows.Forms.ComboBox();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.txtSize = new System.Windows.Forms.TextBox(); this.txtSize = new System.Windows.Forms.TextBox();
...@@ -40,7 +41,6 @@ ...@@ -40,7 +41,6 @@
this.btnExit = new System.Windows.Forms.Button(); this.btnExit = new System.Windows.Forms.Button();
this.btnDraw = new System.Windows.Forms.Button(); this.btnDraw = new System.Windows.Forms.Button();
this.colorDialog1 = new System.Windows.Forms.ColorDialog(); this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.btnColor = new System.Windows.Forms.Button();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -64,6 +64,19 @@ ...@@ -64,6 +64,19 @@
this.panel1.Size = new System.Drawing.Size(800, 633); this.panel1.Size = new System.Drawing.Size(800, 633);
this.panel1.TabIndex = 0; this.panel1.TabIndex = 0;
// //
// btnColor
//
this.btnColor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnColor.BackColor = System.Drawing.Color.Lime;
this.btnColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnColor.Location = new System.Drawing.Point(627, 228);
this.btnColor.Name = "btnColor";
this.btnColor.Size = new System.Drawing.Size(149, 32);
this.btnColor.TabIndex = 11;
this.btnColor.Text = "颜色";
this.btnColor.UseVisualStyleBackColor = false;
this.btnColor.Click += new System.EventHandler(this.btnColor_Click);
//
// comboBox1 // comboBox1
// //
this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
...@@ -190,19 +203,6 @@ ...@@ -190,19 +203,6 @@
this.btnDraw.UseVisualStyleBackColor = false; this.btnDraw.UseVisualStyleBackColor = false;
this.btnDraw.Click += new System.EventHandler(this.button1_Click); this.btnDraw.Click += new System.EventHandler(this.button1_Click);
// //
// btnColor
//
this.btnColor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnColor.BackColor = System.Drawing.Color.Lime;
this.btnColor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnColor.Location = new System.Drawing.Point(627, 228);
this.btnColor.Name = "btnColor";
this.btnColor.Size = new System.Drawing.Size(149, 32);
this.btnColor.TabIndex = 11;
this.btnColor.Text = "颜色";
this.btnColor.UseVisualStyleBackColor = false;
this.btnColor.Click += new System.EventHandler(this.btnColor_Click);
//
// FrmScreenTest // FrmScreenTest
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmScreenTest"; this.Name = "FrmScreenTest";
this.Text = "显示测试"; this.Text = "Projection display";
this.Load += new System.EventHandler(this.FrmScreenTest_Load); this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown); this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
......
TSA-V/projector/FrmViewScreen.Designer.cs
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmViewScreen"; this.Name = "FrmViewScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "显示测试"; this.Text = "Projection display";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmScreenTest_Load); this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown); this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
......
TSA-V/workForm/FrmBoardSelect.Designer.cs
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
// txtCode // txtCode
// //
this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCode.Location = new System.Drawing.Point(151, 59); this.txtCode.Location = new System.Drawing.Point(151, 107);
this.txtCode.MaxLength = 40; this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode"; this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(246, 29); this.txtCode.Size = new System.Drawing.Size(246, 29);
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
this.cmbBoardList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbBoardList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBoardList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbBoardList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbBoardList.FormattingEnabled = true; this.cmbBoardList.FormattingEnabled = true;
this.cmbBoardList.Location = new System.Drawing.Point(151, 109); this.cmbBoardList.Location = new System.Drawing.Point(151, 60);
this.cmbBoardList.Name = "cmbBoardList"; this.cmbBoardList.Name = "cmbBoardList";
this.cmbBoardList.Size = new System.Drawing.Size(246, 29); this.cmbBoardList.Size = new System.Drawing.Size(246, 29);
this.cmbBoardList.TabIndex = 6; this.cmbBoardList.TabIndex = 6;
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
// //
this.lblWait.BackColor = System.Drawing.Color.Transparent; this.lblWait.BackColor = System.Drawing.Color.Transparent;
this.lblWait.Image = ((System.Drawing.Image)(resources.GetObject("lblWait.Image"))); this.lblWait.Image = ((System.Drawing.Image)(resources.GetObject("lblWait.Image")));
this.lblWait.Location = new System.Drawing.Point(101, 30); this.lblWait.Location = new System.Drawing.Point(111, 26);
this.lblWait.Name = "lblWait"; this.lblWait.Name = "lblWait";
this.lblWait.Size = new System.Drawing.Size(331, 110); this.lblWait.Size = new System.Drawing.Size(331, 110);
this.lblWait.TabIndex = 278; this.lblWait.TabIndex = 278;
......
TSA-V/workForm/FrmBoardSelect.cs
...@@ -350,11 +350,11 @@ namespace TSA_V ...@@ -350,11 +350,11 @@ namespace TSA_V
if (chbGuoban.Checked) if (chbGuoban.Checked)
{ {
chbWorkSingleStart.Checked = false; chbWorkSingleStart.Checked = false;
chbWorkSingleStart.Visible = false; chbWorkSingleStart.Checked = false;
chbOffLine.Checked = false;
chbOffLine.Visible = false;
chbSoftMode.Checked = false; chbSoftMode.Checked = false;
chbSoftMode.Visible = false; //chbWorkSingleStart.Visible = false;
//chbOffLine.Visible = false;
//chbSoftMode.Visible = false;
} }
else else
{ {
...@@ -365,9 +365,9 @@ namespace TSA_V ...@@ -365,9 +365,9 @@ namespace TSA_V
chbGuoban.Checked = true; chbGuoban.Checked = true;
return; return;
} }
chbWorkSingleStart.Visible = true; //chbWorkSingleStart.Visible = true;
chbOffLine.Visible = true; //chbOffLine.Visible = true;
chbSoftMode.Visible = true ; //chbSoftMode.Visible = true ;
} }
} }
...@@ -441,16 +441,16 @@ namespace TSA_V ...@@ -441,16 +441,16 @@ namespace TSA_V
chbOffLine.Checked = false; chbOffLine.Checked = false;
chbWorkSingleStart.Checked = false; chbWorkSingleStart.Checked = false;
chbGuoban.Visible = false; //chbGuoban.Visible = false;
chbOffLine.Visible = false; //chbOffLine.Visible = false;
chbWorkSingleStart.Visible = false; //chbWorkSingleStart.Visible = false;
} }
else else
{ {
chbGuoban.Visible = true; //chbGuoban.Visible = true;
chbOffLine.Visible = true; //chbOffLine.Visible = true;
chbWorkSingleStart.Visible = true; //chbWorkSingleStart.Visible = true;
} }
if (!IsInitOk) if (!IsInitOk)
{ {
......
TSA-V/workForm/FrmTSAV.Designer.cs
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
this.btnUpateCount = new System.Windows.Forms.Button(); this.btnUpateCount = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.lblCount = new System.Windows.Forms.Label(); this.lblCount = new System.Windows.Forms.Label();
this.lblBoardPoint = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
...@@ -97,8 +98,8 @@ ...@@ -97,8 +98,8 @@
this.料格编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.料格编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.系统ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.系统ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.退出ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lblBoardPoint = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btnResetAOI = new System.Windows.Forms.Button();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -143,7 +144,7 @@ ...@@ -143,7 +144,7 @@
this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control; this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control;
this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCodeTest.Location = new System.Drawing.Point(744, 583); this.btnCodeTest.Location = new System.Drawing.Point(618, 583);
this.btnCodeTest.Name = "btnCodeTest"; this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(120, 60); this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279; this.btnCodeTest.TabIndex = 279;
...@@ -283,7 +284,7 @@ ...@@ -283,7 +284,7 @@
this.btnTest.BackColor = System.Drawing.SystemColors.Control; this.btnTest.BackColor = System.Drawing.SystemColors.Control;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(744, 583); this.btnTest.Location = new System.Drawing.Point(618, 583);
this.btnTest.Name = "btnTest"; this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(120, 60); this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272; this.btnTest.TabIndex = 272;
...@@ -323,6 +324,7 @@ ...@@ -323,6 +324,7 @@
this.groupBox1.Controls.Add(this.btnUpateCount); this.groupBox1.Controls.Add(this.btnUpateCount);
this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.lblCount); this.groupBox1.Controls.Add(this.lblCount);
this.groupBox1.Controls.Add(this.lblBoardPoint);
this.groupBox1.Controls.Add(this.label4); this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.label2); this.groupBox1.Controls.Add(this.label2);
...@@ -330,7 +332,7 @@ ...@@ -330,7 +332,7 @@
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(12, 94); this.groupBox1.Location = new System.Drawing.Point(12, 94);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(641, 175); this.groupBox1.Size = new System.Drawing.Size(641, 208);
this.groupBox1.TabIndex = 2; this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息："; this.groupBox1.Text = "组装信息：";
...@@ -511,6 +513,16 @@ ...@@ -511,6 +513,16 @@
this.lblCount.Text = "暂无"; this.lblCount.Text = "暂无";
this.lblCount.DoubleClick += new System.EventHandler(this.lblCount_DoubleClick); this.lblCount.DoubleClick += new System.EventHandler(this.lblCount_DoubleClick);
// //
// lblBoardPoint
//
this.lblBoardPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblBoardPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBoardPoint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardPoint.Location = new System.Drawing.Point(17, 177);
this.lblBoardPoint.Name = "lblBoardPoint";
this.lblBoardPoint.Size = new System.Drawing.Size(609, 23);
this.lblBoardPoint.TabIndex = 272;
//
// label4 // label4
// //
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -664,33 +676,31 @@ ...@@ -664,33 +676,31 @@
this.groupHand.Controls.Add(this.panHand); this.groupHand.Controls.Add(this.panHand);
this.groupHand.Controls.Add(this.panel1); this.groupHand.Controls.Add(this.panel1);
this.groupHand.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupHand.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupHand.Location = new System.Drawing.Point(11, 275); this.groupHand.Location = new System.Drawing.Point(11, 308);
this.groupHand.Name = "groupHand"; this.groupHand.Name = "groupHand";
this.groupHand.Size = new System.Drawing.Size(642, 299); this.groupHand.Size = new System.Drawing.Size(642, 266);
this.groupHand.TabIndex = 4; this.groupHand.TabIndex = 4;
this.groupHand.TabStop = false; this.groupHand.TabStop = false;
this.groupHand.Text = "手势监控"; this.groupHand.Text = "手势监控";
// //
// panHand // panHand
// //
this.panHand.Controls.Add(this.lblHandInfo);
this.panHand.Controls.Add(this.picHandsVideo); this.panHand.Controls.Add(this.picHandsVideo);
this.panHand.Controls.Add(this.lblNotices); this.panHand.Controls.Add(this.lblNotices);
this.panHand.Dock = System.Windows.Forms.DockStyle.Fill; this.panHand.Dock = System.Windows.Forms.DockStyle.Fill;
this.panHand.Location = new System.Drawing.Point(3, 19); this.panHand.Location = new System.Drawing.Point(3, 19);
this.panHand.Name = "panHand"; this.panHand.Name = "panHand";
this.panHand.Size = new System.Drawing.Size(636, 277); this.panHand.Size = new System.Drawing.Size(636, 244);
this.panHand.TabIndex = 0; this.panHand.TabIndex = 0;
// //
// lblHandInfo // lblHandInfo
// //
this.lblHandInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblHandInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
| System.Windows.Forms.AnchorStyles.Right)));
this.lblHandInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblHandInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHandInfo.ForeColor = System.Drawing.Color.White; this.lblHandInfo.ForeColor = System.Drawing.Color.White;
this.lblHandInfo.Location = new System.Drawing.Point(3, 3); this.lblHandInfo.Location = new System.Drawing.Point(12, 583);
this.lblHandInfo.Name = "lblHandInfo"; this.lblHandInfo.Name = "lblHandInfo";
this.lblHandInfo.Size = new System.Drawing.Size(630, 23); this.lblHandInfo.Size = new System.Drawing.Size(460, 23);
this.lblHandInfo.TabIndex = 278; this.lblHandInfo.TabIndex = 278;
// //
// picHandsVideo // picHandsVideo
...@@ -698,9 +708,9 @@ ...@@ -698,9 +708,9 @@
this.picHandsVideo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.picHandsVideo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.picHandsVideo.Location = new System.Drawing.Point(0, 29); this.picHandsVideo.Location = new System.Drawing.Point(0, 3);
this.picHandsVideo.Name = "picHandsVideo"; this.picHandsVideo.Name = "picHandsVideo";
this.picHandsVideo.Size = new System.Drawing.Size(636, 245); this.picHandsVideo.Size = new System.Drawing.Size(636, 238);
this.picHandsVideo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picHandsVideo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picHandsVideo.TabIndex = 277; this.picHandsVideo.TabIndex = 277;
this.picHandsVideo.TabStop = false; this.picHandsVideo.TabStop = false;
...@@ -714,7 +724,7 @@ ...@@ -714,7 +724,7 @@
this.lblNotices.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblNotices.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblNotices.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblNotices.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblNotices.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.lblNotices.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblNotices.Location = new System.Drawing.Point(573, 81); this.lblNotices.Location = new System.Drawing.Point(573, 48);
this.lblNotices.Name = "lblNotices"; this.lblNotices.Name = "lblNotices";
this.lblNotices.Size = new System.Drawing.Size(60, 23); this.lblNotices.Size = new System.Drawing.Size(60, 23);
this.lblNotices.TabIndex = 276; this.lblNotices.TabIndex = 276;
...@@ -723,7 +733,7 @@ ...@@ -723,7 +733,7 @@
// panel1 // panel1
// //
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.panel1.Location = new System.Drawing.Point(513, 299); this.panel1.Location = new System.Drawing.Point(513, 266);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(28, 63); this.panel1.Size = new System.Drawing.Size(28, 63);
this.panel1.TabIndex = 269; this.panel1.TabIndex = 269;
...@@ -900,16 +910,6 @@ ...@@ -900,16 +910,6 @@
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(100, 22); this.退出ToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
this.退出ToolStripMenuItem.Text = "退出"; this.退出ToolStripMenuItem.Text = "退出";
// //
// lblBoardPoint
//
this.lblBoardPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblBoardPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBoardPoint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardPoint.Location = new System.Drawing.Point(9, 597);
this.lblBoardPoint.Name = "lblBoardPoint";
this.lblBoardPoint.Size = new System.Drawing.Size(609, 23);
this.lblBoardPoint.TabIndex = 272;
//
// linkLabel1 // linkLabel1
// //
this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
...@@ -921,13 +921,30 @@ ...@@ -921,13 +921,30 @@
this.linkLabel1.TabIndex = 281; this.linkLabel1.TabIndex = 281;
this.linkLabel1.TabStop = true; this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "reduction "; this.linkLabel1.Text = "reduction ";
this.linkLabel1.Visible = false;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
// //
// btnResetAOI
//
this.btnResetAOI.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnResetAOI.BackColor = System.Drawing.SystemColors.Control;
this.btnResetAOI.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnResetAOI.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnResetAOI.Location = new System.Drawing.Point(492, 583);
this.btnResetAOI.Name = "btnResetAOI";
this.btnResetAOI.Size = new System.Drawing.Size(120, 60);
this.btnResetAOI.TabIndex = 282;
this.btnResetAOI.Text = "还原";
this.btnResetAOI.UseVisualStyleBackColor = false;
this.btnResetAOI.Click += new System.EventHandler(this.btnResetAOI_Click);
//
// FrmWork // FrmWork
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1479, 652); this.ClientSize = new System.Drawing.Size(1479, 652);
this.Controls.Add(this.btnResetAOI);
this.Controls.Add(this.lblHandInfo);
this.Controls.Add(this.linkLabel1); this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.groupBoard); this.Controls.Add(this.groupBoard);
this.Controls.Add(this.btnWorkInfo); this.Controls.Add(this.btnWorkInfo);
...@@ -943,7 +960,6 @@ ...@@ -943,7 +960,6 @@
this.Controls.Add(this.btnPrePoint); this.Controls.Add(this.btnPrePoint);
this.Controls.Add(this.btnNextPoint); this.Controls.Add(this.btnNextPoint);
this.Controls.Add(this.btnStop); this.Controls.Add(this.btnStop);
this.Controls.Add(this.lblBoardPoint);
this.Controls.Add(this.btnCamera); this.Controls.Add(this.btnCamera);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.lblMsg); this.Controls.Add(this.lblMsg);
...@@ -1049,5 +1065,6 @@ ...@@ -1049,5 +1065,6 @@
private System.Windows.Forms.PictureBox picHandsVideo; private System.Windows.Forms.PictureBox picHandsVideo;
private System.Windows.Forms.Label lblHandInfo; private System.Windows.Forms.Label lblHandInfo;
private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Button btnResetAOI;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/workForm/FrmTSAV.cs
...@@ -10,6 +10,7 @@ using TSA_V.LoadCSVLibrary; ...@@ -10,6 +10,7 @@ using TSA_V.LoadCSVLibrary;
using AOI; using AOI;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
namespace TSA_V namespace TSA_V
{ {
...@@ -41,7 +42,13 @@ namespace TSA_V ...@@ -41,7 +42,13 @@ namespace TSA_V
{ {
string modeStr = ""; string modeStr = "";
lblGuoBan.Visible = false; lblGuoBan.Visible = false;
if (TSAVBean.OnlyGuoBan) if (Setting_NInit.Device_SoftMode)
{
modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbSoftMode_Text", "简洁模式");
lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbSoftMode_Text", "简洁模式");
lblGuoBan.Visible = true;
}
else if (TSAVBean.OnlyGuoBan)
{ {
modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式"); modeStr = "-" + ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式");
lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式"); lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式");
...@@ -128,7 +135,7 @@ namespace TSA_V ...@@ -128,7 +135,7 @@ namespace TSA_V
btnPrePoint.Visible = Visible; btnPrePoint.Visible = Visible;
btnNextPoint.Visible = Visible; btnNextPoint.Visible = Visible;
btnGoHome.Visible = Visible; btnGoHome.Visible = Visible;
} }
HandRecordManager.Reset(); HandRecordManager.Reset();
isInitOk = true; isInitOk = true;
// string ip = ConfigAppSettings.GetValue(Setting_Init.StatusServerIp); // string ip = ConfigAppSettings.GetValue(Setting_Init.StatusServerIp);
...@@ -144,11 +151,13 @@ namespace TSA_V ...@@ -144,11 +151,13 @@ namespace TSA_V
{ {
groupHand.Visible = true; groupHand.Visible = true;
groupBoard.Visible = true; groupBoard.Visible = true;
linkLabel1.Visible = true; linkLabel1.Visible = false ;
btnResetAOI.Visible = true;
} }
else else
{ {
btnResetAOI.Visible = false;
linkLabel1.Visible = false; linkLabel1.Visible = false;
groupHand.Visible = false; groupHand.Visible = false;
groupBoard.Visible = true; groupBoard.Visible = true;
...@@ -1356,5 +1365,12 @@ namespace TSA_V ...@@ -1356,5 +1365,12 @@ namespace TSA_V
} }
} }
} }
private void btnResetAOI_Click(object sender, EventArgs e)
{
cutImg = false;
selectedRectangle = new Rectangle(0, 0, 0, 0);
}
} }
} }
~$241025-组装工作站修改.docx 0 → 100644
此文件类型无法预览
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!