Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit a4fa1854 由 刘韬
选项

界面优化

1 个父辈 475f05a1
全部展开
内嵌 并排
正在显示 46 个修改的文件 包含 494 行增加 和 135 行删除
DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
......@@ -109,7 +109,8 @@ namespace TSA_V.DeviceLibrary
bool conRes = aioBox.Connect();
LogUtil.info("开始连接：" + logName + "：" + conRes.ToString());
AIOMap.Add(ioIp, aioBox);
if (!AIOMap.ContainsKey(ioIp))
AIOMap.Add(ioIp, aioBox);
Thread.Sleep(5);
//读取所有的DO
ReadAllDI(ioIp, 0);
......
TSA-V/AOIManager.cs
......@@ -49,21 +49,16 @@ namespace TSA_V
FileList.Remove(DefaultName);
FileList.Insert(0, DefaultName);
}
cmbAoiFile.DataSource = null;
cmbAoiFile.DataSource = FileList;
//if (FileList.Count > 0)
//{
// cmbAoiFile.SelectedIndex = 0;
//}
int index = AOIManager.FileList.IndexOf(DefaultName);
if (index >= 0)
if (cmbAoiFile != null)
{
cmbAoiFile.SelectedIndex = index;
cmbAoiFile.DataSource = null;
cmbAoiFile.DataSource = FileList;
int index = AOIManager.FileList.IndexOf(DefaultName);
if (index >= 0)
{
cmbAoiFile.SelectedIndex = index;
}
}
//else
//{
// cmbAoiFile.SelectedIndex = 0;
//}
}
catch (Exception ex)
{
......
TSA-V/App.config
......@@ -137,7 +137,7 @@
</layout>
</appender>
<logger name="defaultAppender">
<level value="Info" />
<level value="All" />
<appender-ref ref="defaultAppender" />
</logger>
<logger name="MetcalLogAppender">
......
TSA-V/FrmBase.cs
......@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Runtime.InteropServices;
......@@ -74,8 +75,93 @@ namespace TSA_V
private void FrmBase_Load(object sender, EventArgs e)
{
ImageManager.frm_背景图 = global::TSA_V.Properties.Resources.背景图dark;
ProcessUI(this);
}
void ProcessUI(Control partentControl)
{
if (IsDesignMode())
return;
if (partentControl is FrmLogin || partentControl is FrmMenu || partentControl is FrmMaintenance)
{
partentControl.BackgroundImage = global::TSA_V.Properties.Resources.背景图dark;
}
if (partentControl is Form)
{
if ((partentControl as Form).WindowState == FormWindowState.Maximized)
{
(partentControl as Form).FormBorderStyle = FormBorderStyle.FixedSingle;
(partentControl as Form).WindowState = FormWindowState.Maximized;
//(partentControl as Form).Resize += FrmBase_Resize;
(partentControl as Form).Move += FrmBase_Resize;
}
(partentControl as Form).Icon = global::TSA_V.Properties.Resources.neo_station1;
(partentControl as Form).AutoScaleMode = AutoScaleMode.None;
}
partentControl.BackColor = Color.Black;//Color.FromArgb(53, 67, 88);
partentControl.ForeColor = Color.White;
foreach (Control con in partentControl.Controls)
{
con.BackColor = Color.Black; //Color.FromArgb(53, 67, 88);
con.ForeColor = Color.White;
if (con is ComboBox)
{
//(con as ComboBox).DrawMode = DrawMode.OwnerDrawVariable;
}
if (con is ComboBox || con is TextBox)
{
//con.BackColor = Color.Black;//Color.FromArgb(160, 165, 172);
//con.ForeColor = Color.White; //Color.FromArgb(0, 0, 40); ;
con.BackColor = Color.White;//Color.FromArgb(160, 165, 172);
con.ForeColor = Color.Black; //Color.FromArgb(0, 0, 40); ;
}
if (con is LinkLabel)
{
(con as LinkLabel).LinkColor = Color.White;
}
if (con is DataGridView)
{
con.ForeColor = Color.Black;
continue;
}
if (con.Controls.Count > 0)
{
ProcessUI(con);
}
}
}
private void FrmBase_Resize(object sender, EventArgs e)
{
(sender as Form).Width = Screen.PrimaryScreen.WorkingArea.Width;
(sender as Form).Height = Screen.PrimaryScreen.WorkingArea.Height;
//(sender as Form).WindowState = FormWindowState.Maximized;
}
public static bool IsDesignMode()
{
bool returnFlag = false;
if (Process.GetCurrentProcess().ProcessName == "devenv")
{
returnFlag = true;
}
return returnFlag;
}
/// <summary>
/// 引用user32.dll动态链接库（windows api），
/// 使用库中定义 API：SetCursorPos
......
TSA-V/FrmBoardInfo.cs
......@@ -111,6 +111,11 @@ namespace TSA_V
this.详情ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情");
this.测试位置ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.更新为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_UpdateN, "更新为组装位置");
this.禁用ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用/启用"); ;
this.全局ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Global, "全局");
this.全部启用ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_EnableAll, "全部启用"); ;
this.全部禁用ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_DisableAll, "全部禁用"); ;
this.自动排序ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemText_AutoSort, "自动排序"); ;
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
{
int rowIndex = dgvList.SelectedRows[0].Index;
......@@ -140,12 +145,16 @@ namespace TSA_V
this.Column_MoveTest.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.Column_MoveTest.Text = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.Column_MoveTest.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_MoveTest, "移动测试");
this.Column_MoveTest.Visible = false;
this.Column_btnDetail.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情");
this.Column_btnDetail.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Detial, "详情");
this.Column_btnDetail.Visible = false;
this.Column_Del.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.Visible = false;
this.Column_Up.Visible = false;
this.Column_Down.Visible = false;
//this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Up.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Up.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
......@@ -153,8 +162,11 @@ namespace TSA_V
//this.Column_Down.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
//this.Column_Down.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
this.Column_CheckOK.Visible = false;
this.Column_disable.Visible = false;
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
this.Column_Notes.HeaderText = ResourceCulture.GetString("注意事项", "注意事项");
this.Column_Notes.Width = 140;
this.新增ToolStripMenuItem.Text = ResourceCulture.GetString("新增组装点", "新增组装点");
}
private void FrmBoardInfo_Load(object sender, EventArgs e)
......@@ -165,7 +177,7 @@ namespace TSA_V
lblAoi.Visible = TSAVBean.IsNeedAOI;
cmbAOIFile.Visible = TSAVBean.IsNeedAOI;
btnConfigAOI.Visible = TSAVBean.IsNeedAOI;
//btnConfigAOI.Visible = TSAVBean.IsNeedAOI;
int count = dgvList.Columns.Count;
for(int i = 0; i < count; i++)
......@@ -302,6 +314,7 @@ namespace TSA_V
view.Cells[Column_PenWidth.Index].Value = point.PenWidth;
view.Cells[Column_ShowText.Index].Value = point.ShowText;
view.Cells[Column_disable.Index].Value = point.Disable;
if (updateBoardInfo != null)
{
ComponetInfo com = CSVBomManager.GetCom(updateBoardInfo.bomName, point);
......@@ -310,18 +323,22 @@ namespace TSA_V
view.Cells[Column_Notes.Index].Value = com.Notes;
}
}
if (point.CheckOK)
view.DefaultCellStyle.ForeColor = Color.Black;
view.DefaultCellStyle.BackColor = Color.White;
if (point.Disable)
{
view.DefaultCellStyle.ForeColor = Color.Red;
view.DefaultCellStyle.ForeColor = Color.Gray;
view.DefaultCellStyle.BackColor = Color.LightGray;
}
else
if (point.CheckOK)
{
view.DefaultCellStyle.ForeColor = Color.Black;
view.DefaultCellStyle.ForeColor = Color.Red;
}
return view;
}
private bool isRun = false;
private bool IsProcess = false;
private void timer_Elapsed(object sender, EventArgs e)
......@@ -1047,7 +1064,18 @@ namespace TSA_V
//liUpdateTime_LinkClicked(null, null);
}
}
private void 禁用ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
{
var row = dgvList.SelectedRows[0];
SMTPointInfo point = getRowPointInfo(row);
point.Disable = !point.Disable;
//dgvList.SelectedRows[0].Cells[Column_disable.Index].Value = true;
setPointInfo(row, point);
//liUpdateTime_LinkClicked(null, null);
}
}
private void 更新坐标ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
......@@ -1190,7 +1218,9 @@ namespace TSA_V
{
selIndex = preIndex + 1;
}
FrmSelectPoint frm = new FrmSelectPoint(pointList, selIndex);
var ls = pointList.Select((point) => { return point.TagNo + "-" + point.PN; }).ToList();
FrmSelectPoint frm = new FrmSelectPoint(ResourceCulture.GetString(ResourceCulture.smtpoint_select, "请选择组件"), ls, selIndex);
DialogResult result = frm.ShowDialog();
if (result.Equals(DialogResult.OK))
{
......@@ -1385,6 +1415,66 @@ namespace TSA_V
AddNewPoint(x, y, NodeX, NodeY);
}
private void 全部启用ToolStripMenuItem_Click(object sender, EventArgs e)
{
int cout = dgvList.Rows.Count;
for (int i = 0; i < cout; i++)
{
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = false;
}
}
private void 全部禁用ToolStripMenuItem_Click(object sender, EventArgs e)
{
int cout = dgvList.Rows.Count;
for (int i = 0; i < cout; i++)
{
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true;
}
}
private void 自动排序ToolStripMenuItem_Click(object sender, EventArgs e)
{
//根据XY排序
List<SMTPointInfo> allSmt = allPointInfo();
dgvList.Rows.Clear();
//List<SMTPointInfo> newList = (from m in allSmt orderby m.PositionX ascending, m.PositionY ascending select m).ToList<SMTPointInfo>();
List<LoadCSVLibrary.ComponetInfo> list = CSVBomManager.GetComList(updateBoardInfo.bomName);
if (list == null && list.Count <= 0)
{
LogUtil.info("未找到元器件库列表【" + updateBoardInfo.bomName + "】");
return;
}
List<SMTPointInfo> newList = new List<SMTPointInfo>();
List<string> names = new List<string>();
foreach (ComponetInfo com in list)
{
List<SMTPointInfo> smts = (from m in allSmt where m.TagNo.Equals(com.TagNo) select m).ToList<SMTPointInfo>();
if (smts.Count > 0)
{
newList.Add(smts[0]);
}
names.Add(com.TagNo);
}
foreach (SMTPointInfo s in allSmt)
{
if (!names.Contains(s.TagNo))
{
newList.Add(s);
}
}
//List<SMTPointInfo> newList = (from m in allSmt orderby m.PartNum ascending select m).ToList<SMTPointInfo>();
foreach (SMTPointInfo point in newList)
{
if (point != null)
{
dgvList.Rows.Add(setPointInfo(null, point));
}
}
}
private void llblAllUSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
int cout = dgvList.Rows.Count;
......
TSA-V/FrmBoardList.Designer.cs
......@@ -74,7 +74,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1247, 626);
this.panel1.Size = new System.Drawing.Size(1247, 485);
this.panel1.TabIndex = 2;
//
// groupBox2
......@@ -101,7 +101,7 @@
this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox2.Location = new System.Drawing.Point(8, 82);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(1230, 531);
this.groupBox2.Size = new System.Drawing.Size(1230, 390);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "程序信息";
......@@ -160,7 +160,7 @@
this.listPoint.Location = new System.Drawing.Point(10, 140);
this.listPoint.MultiSelect = false;
this.listPoint.Name = "listPoint";
this.listPoint.Size = new System.Drawing.Size(421, 376);
this.listPoint.Size = new System.Drawing.Size(421, 235);
this.listPoint.TabIndex = 34;
this.listPoint.UseCompatibleStateImageBehavior = false;
this.listPoint.View = System.Windows.Forms.View.Details;
......@@ -187,7 +187,7 @@
this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(437, 19);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(780, 499);
this.panBoard.Size = new System.Drawing.Size(780, 358);
this.panBoard.TabIndex = 10;
//
// picBoard
......@@ -294,19 +294,20 @@
//
this.btnBeiliao.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBeiliao.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBeiliao.Location = new System.Drawing.Point(757, 15);
this.btnBeiliao.Location = new System.Drawing.Point(1108, 15);
this.btnBeiliao.Name = "btnBeiliao";
this.btnBeiliao.Size = new System.Drawing.Size(109, 45);
this.btnBeiliao.TabIndex = 9;
this.btnBeiliao.Text = "备料";
this.btnBeiliao.UseVisualStyleBackColor = true;
this.btnBeiliao.Visible = false;
this.btnBeiliao.Click += new System.EventHandler(this.btnBeiliao_Click);
//
// btnImport
//
this.btnImport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnImport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnImport.Location = new System.Drawing.Point(871, 15);
this.btnImport.Location = new System.Drawing.Point(756, 15);
this.btnImport.Name = "btnImport";
this.btnImport.Size = new System.Drawing.Size(109, 45);
this.btnImport.TabIndex = 8;
......@@ -318,7 +319,7 @@
//
this.btnExport.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExport.Location = new System.Drawing.Point(985, 15);
this.btnExport.Location = new System.Drawing.Point(870, 15);
this.btnExport.Name = "btnExport";
this.btnExport.Size = new System.Drawing.Size(109, 45);
this.btnExport.TabIndex = 7;
......@@ -328,10 +329,9 @@
//
// btnBack
//
this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(1097, 15);
this.btnBack.Location = new System.Drawing.Point(982, 15);
this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(109, 45);
this.btnBack.TabIndex = 6;
......@@ -401,14 +401,14 @@
//
// FrmBoardList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoSize = true;
this.ClientSize = new System.Drawing.Size(1247, 626);
this.ClientSize = new System.Drawing.Size(1247, 485);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmBoardList";
this.Text = "程序配置";
this.Text = "程序编辑";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBoardList_FormClosing);
this.Load += new System.EventHandler(this.FrmBoard_Load);
......
TSA-V/FrmBoardList.resx
......@@ -120,9 +120,6 @@
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
......
TSA-V/FrmHistory.cs
......@@ -10,7 +10,7 @@ using System.Windows.Forms;
namespace TSA_V
{
public partial class FrmHistory : Form
public partial class FrmHistory : FrmBase
{
public FrmHistory()
{
......
TSA-V/FrmLogin.Designer.cs
......@@ -36,14 +36,16 @@ namespace TSA_V
this.TxtPassword = new System.Windows.Forms.TextBox();
this.BtnLogin = new System.Windows.Forms.Button();
this.BtnExit = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label1.Location = new System.Drawing.Point(108, 94);
this.label1.Location = new System.Drawing.Point(106, 105);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(95, 21);
this.label1.TabIndex = 0;
......@@ -54,7 +56,7 @@ namespace TSA_V
//
this.TxtUsername.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtUsername.ImeMode = System.Windows.Forms.ImeMode.Disable;
this.TxtUsername.Location = new System.Drawing.Point(209, 91);
this.TxtUsername.Location = new System.Drawing.Point(207, 102);
this.TxtUsername.Name = "TxtUsername";
this.TxtUsername.Size = new System.Drawing.Size(179, 33);
this.TxtUsername.TabIndex = 1;
......@@ -64,7 +66,7 @@ namespace TSA_V
//
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
this.label2.Location = new System.Drawing.Point(108, 149);
this.label2.Location = new System.Drawing.Point(106, 160);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(95, 21);
this.label2.TabIndex = 2;
......@@ -74,7 +76,7 @@ namespace TSA_V
// TxtPassword
//
this.TxtPassword.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TxtPassword.Location = new System.Drawing.Point(209, 146);
this.TxtPassword.Location = new System.Drawing.Point(207, 157);
this.TxtPassword.Name = "TxtPassword";
this.TxtPassword.PasswordChar = '*';
this.TxtPassword.Size = new System.Drawing.Size(179, 33);
......@@ -85,7 +87,7 @@ namespace TSA_V
//
this.BtnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnLogin.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnLogin.Location = new System.Drawing.Point(146, 217);
this.BtnLogin.Location = new System.Drawing.Point(142, 221);
this.BtnLogin.Name = "BtnLogin";
this.BtnLogin.Size = new System.Drawing.Size(120, 45);
this.BtnLogin.TabIndex = 4;
......@@ -98,7 +100,7 @@ namespace TSA_V
this.BtnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.BtnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnExit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BtnExit.Location = new System.Drawing.Point(272, 217);
this.BtnExit.Location = new System.Drawing.Point(268, 221);
this.BtnExit.Name = "BtnExit";
this.BtnExit.Size = new System.Drawing.Size(120, 45);
this.BtnExit.TabIndex = 5;
......@@ -106,21 +108,28 @@ namespace TSA_V
this.BtnExit.UseVisualStyleBackColor = true;
this.BtnExit.Click += new System.EventHandler(this.BtnExit_Click);
//
// button1
//
this.button1.BackColor = System.Drawing.Color.Transparent;
this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button1.Enabled = false;
this.button1.FlatAppearance.BorderSize = 0;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.ForeColor = System.Drawing.Color.Black;
this.button1.Location = new System.Drawing.Point(12, 12);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(235, 30);
this.button1.TabIndex = 14;
this.button1.Text = "Smart Workstation";
this.button1.UseVisualStyleBackColor = true;
// pictureBox1
//
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NEO_STATION;
this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 27;
this.pictureBox1.TabStop = false;
//
// label3
//
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.label3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label3.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
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.TabIndex = 26;
this.label3.Text = "Neo Station";
//
// FrmLogin
//
......@@ -132,7 +141,8 @@ namespace TSA_V
this.CancelButton = this.BtnExit;
this.ClientSize = new System.Drawing.Size(533, 310);
this.ControlBox = false;
this.Controls.Add(this.button1);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label3);
this.Controls.Add(this.BtnExit);
this.Controls.Add(this.BtnLogin);
this.Controls.Add(this.TxtPassword);
......@@ -143,6 +153,7 @@ namespace TSA_V
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmLogin";
this.Text = "登录";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -156,6 +167,7 @@ namespace TSA_V
private System.Windows.Forms.TextBox TxtPassword;
private System.Windows.Forms.Button BtnLogin;
private System.Windows.Forms.Button BtnExit;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
TSA-V/FrmMaintenance.Designer.cs
......@@ -37,9 +37,11 @@
this.btnDebug = new System.Windows.Forms.Button();
this.btnPwdUpdate = new System.Windows.Forms.Button();
this.btnWidthC = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.LblUserName = new System.Windows.Forms.Label();
this.lblVersion = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// button1
......@@ -170,22 +172,6 @@
this.btnWidthC.UseVisualStyleBackColor = false;
this.btnWidthC.Click += new System.EventHandler(this.btnWidthC_Click);
//
// button2
//
this.button2.BackColor = System.Drawing.Color.Transparent;
this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button2.Enabled = false;
this.button2.FlatAppearance.BorderSize = 0;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.ForeColor = System.Drawing.Color.Black;
this.button2.Location = new System.Drawing.Point(23, 23);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(200, 30);
this.button2.TabIndex = 21;
this.button2.Text = "Neo Station";
this.button2.UseVisualStyleBackColor = true;
//
// LblUserName
//
this.LblUserName.AutoSize = true;
......@@ -206,6 +192,29 @@
this.lblVersion.TabIndex = 22;
this.lblVersion.Text = "版本号 1.1.2";
//
// pictureBox1
//
this.pictureBox1.Image = global::TSA_V.Properties.Resources.NEO_STATION;
this.pictureBox1.Location = new System.Drawing.Point(12, 12);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(50, 50);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 25;
this.pictureBox1.TabStop = false;
//
// label1
//
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.label1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.label1.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Black;
this.label1.Location = new System.Drawing.Point(68, 24);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(200, 30);
this.label1.TabIndex = 24;
this.label1.Text = "Neo Station";
//
// FrmMaintenance
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -213,9 +222,10 @@
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.pictureBox1);
this.Controls.Add(this.label1);
this.Controls.Add(this.LblUserName);
this.Controls.Add(this.lblVersion);
this.Controls.Add(this.button2);
this.Controls.Add(this.btnWidthC);
this.Controls.Add(this.btnPwdUpdate);
this.Controls.Add(this.button1);
......@@ -231,6 +241,7 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMaintenance_FormClosing);
this.Load += new System.EventHandler(this.FrmMaintenance_Load);
this.Shown += new System.EventHandler(this.FrmMaintenance_Shown);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -246,8 +257,9 @@
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btnPwdUpdate;
private System.Windows.Forms.Button btnWidthC;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Label LblUserName;
private System.Windows.Forms.Label lblVersion;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
TSA-V/FrmMenu.cs
......@@ -149,7 +149,7 @@ namespace TSA_V
try
{
AccAOI.camera.CameraManager.LoadCamera();
LogUtil.info("加载到相机：" + AccAOI.camera.CameraManager.cName);
LogUtil.info("加载到相机：" + string.Join(";",AccAOI.camera.CameraManager.hikNameList.ToArray()));
this.Focus();
SetMouseAtCenterScreen();
}
......@@ -174,6 +174,8 @@ namespace TSA_V
this.btnOpenLed.BackgroundImage = ImageManager.Menu_US_打开光源;
this.btnCloseLed.BackgroundImage = ImageManager.Menu_US_关闭光源;
this.btnHistory.BackgroundImage = ImageManager.Main_US_历史记录;
this.btnAOI.BackgroundImage = ImageManager.Menu_US_光学检测;
this.btnReplenish.BackgroundImage = ImageManager.Menu_US_补料;
}
else
{
......@@ -187,6 +189,8 @@ namespace TSA_V
this.btnOpenLed.BackgroundImage = ImageManager.Menu_打开光源;
this.btnCloseLed.BackgroundImage = ImageManager.Menu_关闭光源;
this.btnHistory.BackgroundImage = ImageManager.Main_历史记录;
this.btnAOI.BackgroundImage = ImageManager.Menu_光学检测;
this.btnReplenish.BackgroundImage = ImageManager.Menu_补料;
}
}
......@@ -373,5 +377,74 @@ namespace TSA_V
//FrmHistory frm = new FrmHistory();
//frm.ShowDialog();
}
private void btnAOI_Click(object sender, EventArgs e)
{
//AccAOI.FrmAoiSetting frmAoiSetting = new FrmAoiSetting();
//frmAoiSetting.Show();
string createnew = ResourceCulture.GetString(ResourceCulture.CreateNew, "新建");
AOIManager.LoadAOIFile(null, "");
List<string> listb = new List<string>(AOIManager.FileList);
listb.Insert(0, createnew);
FrmSelectPoint frma = new FrmSelectPoint(ResourceCulture.GetString("FrmBoardSelect_Text", "请选择AOI"), listb, listb.Count>1?1:0);
DialogResult result = frma.ShowDialog();
if (result.Equals(DialogResult.OK))
{
string aoiName = listb[frma.SelectIndex];
string path = Application.StartupPath + ConfigAppSettings.GetValue(Setting_Init.AOIFileConfig);
string fileName = "";
if (!aoiName.Equals(""))
{
fileName = path + aoiName;
}
AccAOI.AOIResourceCulture.SetCurrentCulture(ResourceCulture.CurrLanguage);
if (aoiName == createnew)
fileName = "";
FrmAoiSetting frm = new FrmAoiSetting(fileName, null, path);
frm.ShowDialog();
}
}
private void btnReplenish_Click(object sender, EventArgs e)
{
List<BoardInfo> listb = new List<BoardInfo>(BoardManager.boardList);
var ls = listb.Select((point) => { return point.boardName; }).ToList();
FrmSelectPoint frma = new FrmSelectPoint(ResourceCulture.GetString("FrmBoardSelect_Text", "请选择程序"), ls, 0);
DialogResult result = frma.ShowDialog();
if (result.Equals(DialogResult.OK))
{
BoardInfo board = listb[frma.SelectIndex];
List<ComponetInfo> allList = CSVBomManager.GetComList(board.bomName);
List<SMTPointInfo> plist = (from m in board.smtList where m.Disable.Equals(false) select m).ToList();
List<ComponetInfo> list = new List<ComponetInfo>();
foreach (ComponetInfo p in allList)
{
List<SMTPointInfo> hasList = new List<SMTPointInfo>();
if (String.IsNullOrEmpty(p.TagNo))
{
hasList = (from m in plist where m.PN.Equals(p.PN) select m).ToList();
}
else
{
hasList = (from m in plist where m.TagNo.Equals(p.TagNo) select m).ToList();
}
if (hasList.Count > 0)
{
list.Add(p);
}
}
list = (from m in list orderby m.PN ascending select m).ToList();
FrmBoardPutCom frm = new FrmBoardPutCom();
if (frm.SetOperateInfo(board, board.bomName, list))
{
this.Visible = false;
frm.ShowDialog();
this.Visible = true;
}
}
}
}
}
TSA-V/FrmMenu.resx
此文件的差异太大，无法显示。
TSA-V/FrmSelectPoint.cs
......@@ -14,14 +14,16 @@ namespace TSA_V
public partial class FrmSelectPoint : FrmBase
{
private List<SMTPointInfo> pointList = new List<SMTPointInfo>();
private List<string> pointList = new List<string>();
public int SelectIndex = -1;
public int defaultIndex = 0;
public FrmSelectPoint(List<SMTPointInfo> pointList,int Index)
string Title;
public FrmSelectPoint(string title,List<string> pointList,int Index)
{
this.pointList = pointList;
InitializeComponent();
defaultIndex = Index;
Title = title;
}
private FrmSelectPoint( )
{
......@@ -43,9 +45,9 @@ namespace TSA_V
{
LanguageProcess();
this.cmbPointList.Items.Clear();
foreach (SMTPointInfo point in pointList)
foreach (var point in pointList)
{
cmbPointList.Items.Add(point.TagNo + "-" + point.PN);
cmbPointList.Items.Add(point.ToString());
}
if (cmbPointList.Items.Count > 0)
{
......@@ -56,7 +58,7 @@ namespace TSA_V
cmbPointList.SelectedIndex = defaultIndex;
}
}
Text = Title;
}
private void cmbPointList_SelectedIndexChanged(object sender, EventArgs e)
......
TSA-V/ImageManager.cs
......@@ -31,6 +31,8 @@ namespace TSA_V
public static Image Menu_自动焊接;
public static Image Menu_退出;
public static Image Menu_标题;
public static Image Menu_光学检测;
public static Image Menu_补料;
public static Image Main_历史记录;
public static Image Main_US_历史记录;
......@@ -53,6 +55,9 @@ 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_补料;
/// <summary>
/// 是否已经初始化过了
/// </summary>
......@@ -81,33 +86,35 @@ namespace TSA_V
{
IsInit = true;
Ok = GetImage(Application.StartupPath + "\\image\\ok.png");
Main_元器件 = GetImage(Application.StartupPath + "\\image\\CN\\元器件信息.jpg");
Main_程序编辑 = GetImage(Application.StartupPath + "\\image\\CN\\程序编辑.jpg");
Main_开始工作 = GetImage(Application.StartupPath + "\\image\\CN\\开始工作.jpg");
Main_设备配置 = GetImage(Application.StartupPath + "\\image\\CN\\设备配置.jpg");
Main_统计系统 = GetImage(Application.StartupPath + "\\image\\CN\\统计系统.jpg");
frm_背景图 = GetImage(Application.StartupPath + "\\image\\背景图.png");
Main_退出 = GetImage(Application.StartupPath + "\\image\\CN\\退出.jpg");
Main_元器件 = GetImage(Application.StartupPath + "\\image\\CN\\元器件.png");
Main_程序编辑 = GetImage(Application.StartupPath + "\\image\\CN\\装配程序.png");
Main_开始工作 = GetImage(Application.StartupPath + "\\image\\CN\\开始工作.png");
Main_设备配置 = GetImage(Application.StartupPath + "\\image\\CN\\设置.png");
//Main_统计系统 = GetImage(Application.StartupPath + "\\image\\CN\\统计系统.jpg");
//frm_背景图 = GetImage(Application.StartupPath + "\\image\\背景图.png");
Main_退出 = GetImage(Application.StartupPath + "\\image\\CN\\退出.png");
Main_智能工作站 = GetImage(Application.StartupPath + "\\image\\CN\\智能工作站.jpg");
Menu_焊接 = GetImage(Application.StartupPath + "\\image\\CN\\焊接.gif");
Menu_检测 = GetImage(Application.StartupPath + "\\image\\CN\\检测.gif");
Menu_组装 = GetImage(Application.StartupPath + "\\image\\CN\\组装.gif");
Menu_自动焊接 = GetImage(Application.StartupPath + "\\image\\CN\\自动焊接.gif");
Menu_退出 = GetImage(Application.StartupPath + "\\image\\CN\\退出2.jpg");
Menu_标题 = GetImage(Application.StartupPath + "\\image\\CN\\标题.jpg");
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\\历史记录.gif");
Main_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\元器件信息.gif");
Main_US_程序编辑 = GetImage(Application.StartupPath + "\\image\\US\\程序编辑.gif");
Main_US_开始工作 = GetImage(Application.StartupPath + "\\image\\US\\开始工作.gif");
Main_US_设备配置 = GetImage(Application.StartupPath + "\\image\\US\\设备配置.gif");
//Menu_焊接 = GetImage(Application.StartupPath + "\\image\\CN\\焊接.gif");
//Menu_检测 = GetImage(Application.StartupPath + "\\image\\CN\\检测.gif");
//Menu_组装 = GetImage(Application.StartupPath + "\\image\\CN\\组装.gif");
//Menu_自动焊接 = GetImage(Application.StartupPath + "\\image\\CN\\自动焊接.gif");
Menu_退出 = Main_退出;// GetImage(Application.StartupPath + "\\image\\CN\\退出2.jpg");
//Menu_标题 = GetImage(Application.StartupPath + "\\image\\CN\\标题.jpg");
//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_US_元器件 = GetImage(Application.StartupPath + "\\image\\US\\Component Lib.png");
Main_US_程序编辑 = GetImage(Application.StartupPath + "\\image\\US\\Program.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\\统计系统.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\\智能工作站.gif");
Menu_US_焊接 = GetImage(Application.StartupPath + "\\image\\US\\焊接.gif");
Menu_US_检测 = GetImage(Application.StartupPath + "\\image\\US\\检测.gif");
......@@ -118,7 +125,9 @@ namespace TSA_V
Main_US_MOSCOT = GetImage(Application.StartupPath + "\\image\\US\\MOSCOT.png");
Menu_US_打开光源 = GetImage(Application.StartupPath + "\\image\\US\\打开光源.gif");
Menu_US_关闭光源 = GetImage(Application.StartupPath + "\\image\\US\\关闭光源.gif");
Main_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");
}
catch (Exception ex)
{
......
TSA-V/Properties/Resource.zh-CN.resx
......@@ -361,7 +361,7 @@
<value>元器件库名称：</value>
</data>
<data name="FrmBoardList_Text" xml:space="preserve">
<value>程序配置</value>
<value>程序编辑</value>
</data>
<data name="FrmBoardList_groupBox2_Text" xml:space="preserve">
<value>程序信息</value>
......@@ -424,10 +424,10 @@
<value>保存程序</value>
</data>
<data name="FrmAddBoard_label5_Text" xml:space="preserve">
<value>宽度 ↑：</value>
<value>Y轴长度 ↑：</value>
</data>
<data name="FrmAddBoard_label4_Text" xml:space="preserve">
<value>长度→：</value>
<value>X轴长度 →：</value>
</data>
<data name="FrmAddBoard_label25_Text" xml:space="preserve">
<value>mm</value>
......@@ -514,13 +514,13 @@
<value>程序基本信息</value>
</data>
<data name="FrmBoardInfo_label5_Text" xml:space="preserve">
<value>宽度 ↑</value>
<value>Y轴长度 ↑</value>
</data>
<data name="FrmBoardInfo_label14_Text" xml:space="preserve">
<value>条码</value>
</data>
<data name="FrmBoardInfo_label3_Text" xml:space="preserve">
<value>长度→</value>
<value>X轴长度→</value>
</data>
<data name="FrmBoardInfo_label2_Text" xml:space="preserve">
<value>名称</value>
......@@ -591,7 +591,7 @@
<data name="FrmPointInfo_btnSave_Text" xml:space="preserve">
<value>保存</value>
</data>
<data name="FrmSelectPoint_Text" xml:space="preserve">
<data name="smtpoint_select" xml:space="preserve">
<value>请选择组件</value>
</data>
<data name="FrmSelectPoint_btnCancel_Text" xml:space="preserve">
......@@ -2377,7 +2377,7 @@
<value> 全部启用 </value>
</data>
<data name="ItemText_Disable" xml:space="preserve">
<value>禁用</value>
<value>禁用/启用</value>
</data>
<data name="FrmDeviceConfig_chbDisSideCylinder_Text" xml:space="preserve">
<value> 禁用侧挡气缸 </value>
......@@ -2535,4 +2535,22 @@
<data name="Type9" xml:space="preserve">
<value>极性_左方</value>
</data>
<data name="FrmAddBoard_groupBox_new_Text" xml:space="preserve">
<value>程序</value>
</data>
<data name="ItemText_AutoSort" xml:space="preserve">
<value>自动排序</value>
</data>
<data name="ItemText_DisableAll" xml:space="preserve">
<value>全部禁用</value>
</data>
<data name="ItemText_EnableAll" xml:space="preserve">
<value>全部启用</value>
</data>
<data name="ItemText_Global" xml:space="preserve">
<value>全局</value>
</data>
<data name="CreateNew" xml:space="preserve">
<value>新建</value>
</data>
</root>
\ No newline at end of file
TSA-V/Properties/Resources.Designer.cs
......@@ -19,7 +19,7 @@ namespace TSA_V.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......@@ -47,8 +47,8 @@ namespace TSA_V.Properties {
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性
/// 重写当前线程的 CurrentUICulture 属性。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
......@@ -63,6 +63,16 @@ namespace TSA_V.Properties {
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap axisbg {
get {
object obj = ResourceManager.GetObject("axisbg", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap backImage {
get {
object obj = ResourceManager.GetObject("backImage", resourceCulture);
......@@ -113,6 +123,26 @@ namespace TSA_V.Properties {
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap NEO_STATION {
get {
object obj = ResourceManager.GetObject("NEO_STATION", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。
/// </summary>
internal static System.Drawing.Icon neo_station1 {
get {
object obj = ResourceManager.GetObject("neo_station1", resourceCulture);
return ((System.Drawing.Icon)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap ok {
get {
object obj = ResourceManager.GetObject("ok", resourceCulture);
......@@ -303,6 +333,16 @@ namespace TSA_V.Properties {
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap 背景图dark {
get {
object obj = ResourceManager.GetObject("背景图dark", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap 设备配置 {
get {
object obj = ResourceManager.GetObject("设备配置", resourceCulture);
......
TSA-V/Properties/Resources.resx
......@@ -202,4 +202,16 @@
<data name="backImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\backImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="背景图dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\背景图dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NEO_STATION" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\NEO STATION.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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="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>
</root>
\ No newline at end of file
TSA-V/ResourceCulture.cs
......@@ -746,6 +746,11 @@ namespace TSA_V
/// 已到位
/// </summary>
internal static string Inplace= "Inplace";
internal static string ItemText_Global= "ItemText_Global";
internal static string ItemText_EnableAll = "ItemText_EnableAll";
internal static string ItemText_DisableAll = "ItemText_DisableAll";
internal static string ItemText_AutoSort = "ItemText_AutoSort";
internal static string smtpoint_select= "smtpoint_select";
/// <summary>
/// 位置【{0}】配置多个元器件【{1}】，是否确定导入？
......@@ -784,7 +789,8 @@ namespace TSA_V
/// 极性_右方
/// </summary>
internal static readonly string Type10 = "Type10";
internal static readonly string CreateNew = "CreateNew";
}
}
TSA-V/Resources/Resources.zip 0 → 100644
此文件类型无法预览
TSA-V/Smart-Workstation.csproj
......@@ -56,7 +56,7 @@
<ItemGroup>
<Reference Include="AccAOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AccAOI.dll</HintPath>
<HintPath>..\..\AccAOI\AccAOI\bin\Debug\AccAOI.dll</HintPath>
</Reference>
<Reference Include="AccImageBox, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
......@@ -64,7 +64,7 @@
</Reference>
<Reference Include="AOI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\AOI.dll</HintPath>
<HintPath>..\..\AccAOI\AOI\bin\Debug\AOI.dll</HintPath>
</Reference>
<Reference Include="Asa.Theme">
<HintPath>..\dll\Asa.Theme.dll</HintPath>
......@@ -616,7 +616,10 @@
<None Include="Resources\IMG_3500.JPG" />
<None Include="Resources\IMG_3501.JPG" />
<Content Include="neo station.ico" />
<None Include="NEO STATION.png" />
<Content Include="Properties\MOSCOT.jpg" />
<None Include="Resources\背景图dark.png" />
<None Include="Resources\axisbg.png" />
<Content Include="记录.txt" />
</ItemGroup>
<ItemGroup />
......
TSA-V/workForm/FrmAOICheck.cs
......@@ -132,6 +132,7 @@ namespace TSA_V
private int AoiCheck()
{
GC.Collect(0, GCCollectionMode.Forced);
//GC.Collect();
IsCheck = true;
btnRun.Visible = false;
......@@ -145,14 +146,15 @@ namespace TSA_V
return 0;
}
chbAllShow.Enabled = false;
string camera = ConfigAppSettings.GetValue(Setting_Init.CameraName);
Image currImage = CameraManager.GetCamerImage(camera);
if (currImage != null)
{
Bitmap bitmap = new Bitmap(currImage);
currImage.Dispose();
//Bitmap bitmap = new Bitmap(currImage);
Image outImage = null;
List<ResultBean> resultBean = CurrProject.CheckAll(bitmap, out outImage);
List<ResultBean> resultBean = CurrProject.CheckAll(currImage, out outImage);
currImage.Dispose();
ResultList = resultBean;
if (outImage != null)
{
......
TSA-V/workForm/FrmTSAV.Designer.cs
......@@ -825,6 +825,7 @@
this.Controls.Add(this.lblNotices);
this.Controls.Add(this.lblBoardPoint);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Name = "FrmWork";
......
UserFromControl/ProjectorControl.cs
......@@ -307,9 +307,9 @@ namespace UserFromControl
g.Clear(panImg.BackColor);
Pen pen = new Pen(Color.Black, lineLength);
Pen pen = new Pen(panImg.ForeColor, lineLength);
System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(Color.Black);
System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(panImg.ForeColor);
//点类型，1 = 点，2 = +，3 =|，4 = -，5 = 方形，6 = 圆圈
if (type.Equals(2))
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!