Skip to content

李娜 / Line-Smart-Workstation

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

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

1 个父辈 48d97930
全部展开
内嵌 并排
正在显示 40 个修改的文件 包含 242 行增加 和 83 行删除
20241025-组装工作站修改.docx 0 → 100644
此文件类型无法预览
TSA-V/FrmBase.Designer.cs
......@@ -29,7 +29,7 @@
/// </summary>
private void InitializeComponent()
{
resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase));
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmBase));
this.SuspendLayout();
//
// FrmBase
......
TSA-V/FrmBase.cs
......@@ -90,7 +90,15 @@ namespace TSA_V
if (partentControl is FrmLogin || partentControl is FrmMenu || partentControl is FrmMaintenance)
{
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
{
}
else if (con.BackColor.Equals(Color.Transparent))
{
con.ForeColor = Color.White;
}
else
{
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
//
// pictureBox1
//
this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NS;
this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1";
......@@ -120,6 +121,7 @@ namespace TSA_V
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -127,7 +129,7 @@ namespace TSA_V
this.label3.ForeColor = System.Drawing.Color.Black;
this.label3.Location = new System.Drawing.Point(68, 24);
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.Text = "Neo Station";
//
......@@ -136,7 +138,6 @@ namespace TSA_V
this.AcceptButton = this.BtnLogin;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = global::TSA_V.Properties.Resources.背景图1;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.CancelButton = this.BtnExit;
this.ClientSize = new System.Drawing.Size(533, 310);
......@@ -153,6 +154,7 @@ namespace TSA_V
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmLogin";
this.Text = "登录";
this.Load += new System.EventHandler(this.FrmLogin_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
......
TSA-V/FrmLogin.cs
......@@ -58,5 +58,13 @@ namespace TSA_V
{
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 @@
//
this.button1.BackColor = System.Drawing.Color.SteelBlue;
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.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 18F);
......@@ -64,11 +65,12 @@
//
this.btnDeviceSelect.BackColor = System.Drawing.Color.RosyBrown;
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.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDeviceSelect.Font = new System.Drawing.Font("微软雅黑", 18F);
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.Size = new System.Drawing.Size(240, 70);
this.btnDeviceSelect.TabIndex = 12;
......@@ -80,11 +82,12 @@
//
this.btnLanguage.BackColor = System.Drawing.Color.Goldenrod;
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.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLanguage.Font = new System.Drawing.Font("微软雅黑", 18F);
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.Size = new System.Drawing.Size(240, 70);
this.btnLanguage.TabIndex = 11;
......@@ -116,7 +119,7 @@
this.btnPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPosition.Font = new System.Drawing.Font("微软雅黑", 18F);
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.Size = new System.Drawing.Size(240, 70);
this.btnPosition.TabIndex = 6;
......@@ -132,7 +135,7 @@
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Font = new System.Drawing.Font("微软雅黑", 18F);
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.Size = new System.Drawing.Size(240, 70);
this.btnDebug.TabIndex = 5;
......@@ -144,11 +147,12 @@
//
this.btnPwdUpdate.BackColor = System.Drawing.Color.MediumPurple;
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.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPwdUpdate.Font = new System.Drawing.Font("微软雅黑", 18F);
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.Size = new System.Drawing.Size(240, 70);
this.btnPwdUpdate.TabIndex = 19;
......@@ -195,7 +199,7 @@
//
// 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.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50);
......@@ -223,15 +227,15 @@
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
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.label1);
this.Controls.Add(this.LblUserName);
this.Controls.Add(this.lblVersion);
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.btnPosition);
this.Controls.Add(this.btnDebug);
......
TSA-V/FrmMaintenance.cs
......@@ -102,6 +102,18 @@ namespace TSA_V
System.Reflection.AssemblyName assemblyName = System.Reflection.Assembly.GetExecutingAssembly().GetName();
lblVersion.Text ="V"+ assemblyName.Version.ToString() ;
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();
if (IOBase.NoLine)
......@@ -136,9 +148,6 @@ namespace TSA_V
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)
{
......
TSA-V/FrmMaintenance.resx
......@@ -997,7 +997,7 @@
RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAA9UFJREFUeF7snYd620jT
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAA9UFJREFUeF7snYd620jT
rM/9X9v/7VpizsiZlC/hvNUNUrQs2RJJKO3U06YhhIndEwqDnv9X1u3h4eFnQMC7A8Wr233ZdPxerIQ8
yeNV010cBs/FZbtM20XaLbL9LG03eUOAFwTHEySDZ0kSwfZnAwJ+BXrS7Q9F3W6zepXWcdGibv21l4FG
pWW3TOpFXO3yGsO5WMdIADGi9vO4Gm/LeUwauro7DKGzWERSNKR5tiuV8qwu6q7bP1xmrQEBHw7sru32
......
TSA-V/FrmMenu.Designer.cs
......@@ -73,7 +73,6 @@ namespace TSA_V
// btnExit
//
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.FlatAppearance.BorderSize = 0;
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -131,21 +130,22 @@ namespace TSA_V
//
// pictureBox1
//
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NS;
this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Image = global::TSA_V.Properties.Resources.neo;
this.pictureBox1.Location = new System.Drawing.Point(3, 12);
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.TabIndex = 22;
this.pictureBox1.TabIndex = 10;
this.pictureBox1.TabStop = false;
//
// lblMsg
//
this.lblMsg.AutoSize = true;
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.Location = new System.Drawing.Point(261, 477);
this.lblMsg.Location = new System.Drawing.Point(116, 470);
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.Text = "版本号 1.1.2";
this.lblMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -329,7 +329,6 @@ namespace TSA_V
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImage = global::TSA_V.Properties.Resources.背景;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(909, 546);
this.ControlBox = false;
......
TSA-V/FrmMenu.cs
......@@ -177,7 +177,7 @@ namespace TSA_V
{
if (Setting_NInit.Device_AutoGuoBan)
{
LogUtil.info("离线编程模式：不加载相机" );
LogUtil.info("离线编程模式：不加载相机");
}
else
{
......@@ -195,6 +195,7 @@ namespace TSA_V
btnReplenish.Visible = !Setting_NInit.Device_SoftMode;
btnCom.Visible = !Setting_NInit.Device_SoftMode;
btnHistory.Visible = !Setting_NInit.Device_SoftMode;
}
private void WorkModeUtil_checkModeEndEvent()
......@@ -209,9 +210,36 @@ namespace TSA_V
public void LoadBackImage()
{
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_背景图;
// button1.BackgroundImage = ImageManager.Main_US_MOSCOT;
btnExit.BackgroundImage = ImageManager.Main_US_退出;
......
TSA-V/Properties/Resource.en-US.resx
......@@ -256,7 +256,7 @@
<value>Initiliazation</value>
</data>
<data name="FrmWork_btnStop_Text" xml:space="preserve">
<value>End</value>
<value>Complete</value>
</data>
<data name="FrmComponentList_Text" xml:space="preserve">
<value>Component</value>
......@@ -1895,13 +1895,13 @@
<value>Perform Testing</value>
</data>
<data name="FrmCameraAOI_Text" xml:space="preserve">
<value>AOI Inspection</value>
<value>Inspection</value>
</data>
<data name="FrmMaintenance_btnTest_Text" xml:space="preserve">
<value>Stop Image Loop</value>
</data>
<data name="FrmWork_btnCamera_Text" xml:space="preserve">
<value>AOI</value>
<value>Inspection</value>
</data>
<data name="{0}秒后自动完成" xml:space="preserve">
<value>Automatically complete after {0} seconds</value>
......@@ -2715,9 +2715,9 @@
<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 = "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 = "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">
<value>Query Error</value>
......@@ -2739,6 +2739,7 @@
</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 = "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 = "FrmWork_btnResetAOI_Text" xml:space = "preserve"> <value> Reset </value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
......@@ -2719,4 +2719,5 @@
<data name = "comOpenFail" xml:space = "preserve"> <value> 串口{0}打开失败 </value> </data>
<data name = "FrmBoardSelect_chbSoftMode_Text" 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>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -2894,4 +2894,5 @@
<data name = "comOpenFail" xml:space = "preserve"> <value> 串口{0}打开失败 </value> </data>
<data name = "FrmBoardSelect_chbSoftMode_Text" 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>
\ No newline at end of file
TSA-V/Properties/Resources.Designer.cs
......@@ -133,6 +133,16 @@ namespace TSA_V.Properties {
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </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 {
get {
object obj = ResourceManager.GetObject("NEO_STATION", resourceCulture);
......
TSA-V/Properties/Resources.resx
......@@ -136,9 +136,6 @@
<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>
</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">
<value>..\image\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
......@@ -181,6 +178,9 @@
<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>
</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">
<value>..\Resources\智能工作站.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
......@@ -193,8 +193,8 @@
<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>
</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 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="设备配置" 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>
......@@ -220,4 +220,7 @@
<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="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>
\ No newline at end of file
TSA-V/Smart-Workstation.csproj
......@@ -309,6 +309,11 @@
<Compile Include="projector\FrmScreenTest.Designer.cs">
<DependentUpon>FrmScreenTest.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="workForm\FrmAOICheck.cs">
<SubType>Form</SubType>
</Compile>
......@@ -564,14 +569,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="deviceDebug\FrmPusicanTest.resx">
<DependentUpon>FrmPusicanTest.cs</DependentUpon>
</EmbeddedResource>
......@@ -637,6 +637,40 @@
<Content Include="image\form\type3.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</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">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
......
TSA-V/manager/ImageManager.cs
......@@ -61,6 +61,20 @@ namespace TSA_V
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;
/// <summary>
/// 是否已经初始化过了
......@@ -107,9 +121,9 @@ namespace TSA_V
//Main_MOSCOT = GetImage(Application.StartupPath + "\\image\\CN\\MOSCOT.jpg");
//Menu_打开光源 = GetImage(Application.StartupPath + "\\image\\CN\\打开光源.jpg");
//Menu_关闭光源 = GetImage(Application.StartupPath + "\\image\\CN\\关闭光源.jpg");
Main_历史记录=GetImage(Application.StartupPath+ "\\image\\CN\\历史记录.png");
Menu_光学检测=GetImage(Application.StartupPath+ "\\image\\CN\\光学检测.png");
Menu_补料=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");
Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\Component Lib.png");
......@@ -130,10 +144,27 @@ namespace TSA_V
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");
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\\AOI.png");
Menu_US_补料 = GetImage(Application.StartupPath + "\\image\\US\\Replenish.png");
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)
{
......
TSA-V/projector/FrmProjectorScreen.Designer.cs
......@@ -87,7 +87,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmProjectorScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "显示测试";
this.Text = "Projection display";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
......
TSA-V/projector/FrmScreenTest.Designer.cs
......@@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.panel1 = new System.Windows.Forms.Panel();
this.btnColor = new System.Windows.Forms.Button();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.button1 = new System.Windows.Forms.Button();
this.txtSize = new System.Windows.Forms.TextBox();
......@@ -40,7 +41,6 @@
this.btnExit = new System.Windows.Forms.Button();
this.btnDraw = new System.Windows.Forms.Button();
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.btnColor = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -64,6 +64,19 @@
this.panel1.Size = new System.Drawing.Size(800, 633);
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
//
this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
......@@ -190,19 +203,6 @@
this.btnDraw.UseVisualStyleBackColor = false;
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -212,7 +212,7 @@
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmScreenTest";
this.Text = "显示测试";
this.Text = "Projection display";
this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
this.panel1.ResumeLayout(false);
......
TSA-V/projector/FrmViewScreen.Designer.cs
......@@ -86,7 +86,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmViewScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "显示测试";
this.Text = "Projection display";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
......
TSA-V/workForm/FrmBoardSelect.Designer.cs
......@@ -57,7 +57,7 @@
// txtCode
//
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.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(246, 29);
......@@ -104,7 +104,7 @@
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.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.Size = new System.Drawing.Size(246, 29);
this.cmbBoardList.TabIndex = 6;
......@@ -143,7 +143,7 @@
//
this.lblWait.BackColor = System.Drawing.Color.Transparent;
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.Size = new System.Drawing.Size(331, 110);
this.lblWait.TabIndex = 278;
......
TSA-V/workForm/FrmBoardSelect.cs
......@@ -350,11 +350,11 @@ namespace TSA_V
if (chbGuoban.Checked)
{
chbWorkSingleStart.Checked = false;
chbWorkSingleStart.Visible = false;
chbOffLine.Checked = false;
chbOffLine.Visible = false;
chbWorkSingleStart.Checked = false;
chbSoftMode.Checked = false;
chbSoftMode.Visible = false;
//chbWorkSingleStart.Visible = false;
//chbOffLine.Visible = false;
//chbSoftMode.Visible = false;
}
else
{
......@@ -365,9 +365,9 @@ namespace TSA_V
chbGuoban.Checked = true;
return;
}
chbWorkSingleStart.Visible = true;
chbOffLine.Visible = true;
chbSoftMode.Visible = true ;
//chbWorkSingleStart.Visible = true;
//chbOffLine.Visible = true;
//chbSoftMode.Visible = true ;
}
}
......@@ -441,16 +441,16 @@ namespace TSA_V
chbOffLine.Checked = false;
chbWorkSingleStart.Checked = false;
chbGuoban.Visible = false;
chbOffLine.Visible = false;
chbWorkSingleStart.Visible = false;
//chbGuoban.Visible = false;
//chbOffLine.Visible = false;
//chbWorkSingleStart.Visible = false;
}
else
{
chbGuoban.Visible = true;
chbOffLine.Visible = true;
chbWorkSingleStart.Visible = true;
//chbGuoban.Visible = true;
//chbOffLine.Visible = true;
//chbWorkSingleStart.Visible = true;
}
if (!IsInitOk)
{
......
TSA-V/workForm/FrmTSAV.cs
......@@ -10,6 +10,7 @@ using TSA_V.LoadCSVLibrary;
using AOI;
using System.Linq;
using System.Threading.Tasks;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
namespace TSA_V
{
......@@ -41,7 +42,13 @@ namespace TSA_V
{
string modeStr = "";
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", "过板模式");
lblGuoBan.Text = ResourceCulture.GetString("FrmBoardSelect_chbGuoban_Text", "过板模式");
......@@ -144,11 +151,13 @@ namespace TSA_V
{
groupHand.Visible = true;
groupBoard.Visible = true;
linkLabel1.Visible = true;
linkLabel1.Visible = false ;
btnResetAOI.Visible = true;
}
else
{
btnResetAOI.Visible = false;
linkLabel1.Visible = false;
groupHand.Visible = false;
groupBoard.Visible = true;
......@@ -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!