Skip to content

李娜 / Line-Smart-Workstation

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

点顺序可更改

1 个父辈 cf6517fe
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 101 行增加 和 57 行删除
DeviceLibrary/bean/ConfigIO.cs
...@@ -45,20 +45,23 @@ namespace TSA_V.DeviceLibrary ...@@ -45,20 +45,23 @@ namespace TSA_V.DeviceLibrary
/// 设备名称 /// 设备名称
/// </summary> /// </summary>
public string DeviceName { get; set; } public string DeviceName { get; set; }
public string DisplayUSStr public string DisplayStr
{ {
get get
{ {
return Explain.Substring(0, 3) + "_" + ProName; if (ResourceControl.GetLanguage().Equals(ResourceControl.China))
} {
} return Explain + "_" + ProName;
public string DisplayCnStr }
{ else
get {
{
return Explain + "_" + ProName ; return Explain.Substring(0, 3) + "_" + ProName;
}
} }
} }
public override string ToString() public override string ToString()
{ {
return "ConfigIO。" + ProType + "," + Explain + "," + ProName + "，属性值：" + IOIndex ; return "ConfigIO。" + ProType + "," + Explain + "," + ProName + "，属性值：" + IOIndex ;
......
DeviceLibrary/manager/ResourceControl.cs
...@@ -13,11 +13,17 @@ namespace TSA_V ...@@ -13,11 +13,17 @@ namespace TSA_V
{ {
public class ResourceControl public class ResourceControl
{ {
public static string China = "zh-CN";
public static string English = "en-US";
public delegate string GetStrDelegate(string id, string defaultStr ); public delegate string GetStrDelegate(string id, string defaultStr );
public static event GetStrDelegate GetStrEvent; public static event GetStrDelegate GetStrEvent;
public delegate string GetStringDelegate(string id, string defaultStr, params object[] param); public delegate string GetStringDelegate(string id, string defaultStr, params object[] param);
public static event GetStringDelegate GetStringEvent; public static event GetStringDelegate GetStringEvent;
public delegate string GetLanDelegate();
public static event GetLanDelegate GetLanEvent;
public static string GetString(string id,string defaultStr) public static string GetString(string id,string defaultStr)
{ {
string result = GetStrEvent?.Invoke(id, defaultStr); string result = GetStrEvent?.Invoke(id, defaultStr);
...@@ -28,7 +34,11 @@ namespace TSA_V ...@@ -28,7 +34,11 @@ namespace TSA_V
string result = GetStringEvent?.Invoke(id, defaultStr,param); string result = GetStringEvent?.Invoke(id, defaultStr,param);
return result; return result;
} }
public static string GetLanguage( )
{
string result = GetLanEvent?.Invoke();
return result;
}
/// <summary> /// <summary>
/// 宽度 /// 宽度
/// </summary> /// </summary>
......
DeviceLibrary/manager/TSAVStatus.cs
...@@ -93,7 +93,8 @@ namespace TSA_V.DeviceLibrary ...@@ -93,7 +93,8 @@ namespace TSA_V.DeviceLibrary
} }
else if (WaitType.Equals(WaitTypeEnum.IOSingle_6)) else if (WaitType.Equals(WaitTypeEnum.IOSingle_6))
{ {
return "IO等待[" + IoType + "]=[" + IoValue + "]"; ConfigIO io = IOManager.getWaitIO(IoType);
return "IO等待[" + io.DisplayStr + "]=[" + IoValue + "]";
} }
else if (WaitType.Equals(WaitTypeEnum.Time_3)) else if (WaitType.Equals(WaitTypeEnum.Time_3))
{ {
......
TSA-V/FrmBoardInfo.cs
...@@ -67,7 +67,7 @@ namespace TSA_V ...@@ -67,7 +67,7 @@ namespace TSA_V
if (isNew == false) if (isNew == false)
{ {
AOIManager.LoadAOIFile(cmbAOIFile,updateBoardInfo.AOIProName); AOIManager.LoadAOIFile(cmbAOIFile, updateBoardInfo.AOIProName);
LoadBoardInfo(); LoadBoardInfo();
} }
else else
...@@ -93,7 +93,12 @@ namespace TSA_V ...@@ -93,7 +93,12 @@ namespace TSA_V
TSAVBean.IsCanStepMove = true; TSAVBean.IsCanStepMove = true;
timer1.Start(); timer1.Start();
isFinishLoad = true; isFinishLoad = true;
if (dgvList.Rows.Count > 0)
{
int index = dgvList.Rows.Count - 1;
dgvList.Rows[0].Selected = true;
}
} }
private void LanguagePro() private void LanguagePro()
{ {
...@@ -129,8 +134,12 @@ namespace TSA_V ...@@ -129,8 +134,12 @@ namespace TSA_V
this.Column_Del.Text = 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.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); //this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降"); //this.Column_Up.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Up.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
//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.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用"); this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
} }
...@@ -377,15 +386,12 @@ namespace TSA_V ...@@ -377,15 +386,12 @@ namespace TSA_V
{ {
try try
{ {
if (rowIndex >= dgvList.Rows.Count - 1) isFinishLoad = false;
{ if ( rowIndex >= dgvList.Rows.Count - 1)
return;
}
DataGridViewRow row = dgvList.Rows[rowIndex];
if (rowIndex < 0)
{ {
return; return;
} }
DataGridViewRow row = dgvList.Rows[rowIndex];
dgvList.Rows.Remove(dgvList.Rows[rowIndex]); dgvList.Rows.Remove(dgvList.Rows[rowIndex]);
if (rowIndex >= dgvList.Rows.Count - 1) if (rowIndex >= dgvList.Rows.Count - 1)
...@@ -395,30 +401,41 @@ namespace TSA_V ...@@ -395,30 +401,41 @@ namespace TSA_V
else else
{ {
dgvList.Rows.Insert(rowIndex + 1, row); dgvList.Rows.Insert(rowIndex + 1, row);
} };
dgvList.Rows[rowIndex + 1].Selected = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("行下降出错：" + ex.ToString()); LogUtil.error("行下降出错：" + ex.ToString());
} }
finally
{
isFinishLoad = true;
}
} }
private void RowUp(int rowIndex) private void RowUp(int rowIndex)
{ {
try try
{ {
DataGridViewRow row = dgvList.Rows[rowIndex]; isFinishLoad = false;
if (rowIndex <= 0) if (rowIndex <= 0)
{ {
return; return;
} }
DataGridViewRow row = dgvList.Rows[rowIndex];
dgvList.Rows.Remove(dgvList.Rows[rowIndex]); dgvList.Rows.Remove(dgvList.Rows[rowIndex]);
dgvList.Rows.Insert(rowIndex - 1, row); dgvList.Rows.Insert(rowIndex - 1, row);
dgvList.Rows[rowIndex - 1].Selected = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("行上升出错：" + ex.ToString()); LogUtil.error("行上升出错：" + ex.ToString());
} }
finally
{
isFinishLoad = true;
}
} }
...@@ -940,6 +957,7 @@ namespace TSA_V ...@@ -940,6 +957,7 @@ namespace TSA_V
private int GetRowFromPoint(int x, int y) private int GetRowFromPoint(int x, int y)
{ {
y = y + VerticalScrollIndex;
for (int i = 0; i < dgvList.RowCount; i++) for (int i = 0; i < dgvList.RowCount; i++)
{ {
Rectangle rec = dgvList.GetRowDisplayRectangle(i, false); Rectangle rec = dgvList.GetRowDisplayRectangle(i, false);
...@@ -949,14 +967,39 @@ namespace TSA_V ...@@ -949,14 +967,39 @@ namespace TSA_V
} }
return -1; return -1;
} }
int VerticalScrollIndex = 0, HorizontalOffset = 0;
private void dgvList_Scroll(object sender, ScrollEventArgs e)
{
try
{
if (e.ScrollOrientation == ScrollOrientation.VerticalScroll)
{
VerticalScrollIndex = e.NewValue;
}
else if (e.ScrollOrientation == ScrollOrientation.HorizontalScroll)
{
HorizontalOffset = e.NewValue;
}
}
catch { }
}
private void dgvList_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) private void dgvList_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
{ {
if (selectionIdx > -1) try
{ {
dgvList.Rows[selectionIdx].Selected = true; if (selectionIdx > -1 && selectIndex <= (dgvList.Rows.Count - 1))
dgvList.CurrentCell = dgvList.Rows[selectionIdx].Cells[0]; {
selectionIdx = -1; dgvList.Rows[selectionIdx].Selected = true;
dgvList.CurrentCell = dgvList.Rows[selectionIdx].Cells[0];
selectionIdx = -1;
}
}
catch (Exception ex)
{
} }
} }
...@@ -1107,15 +1150,17 @@ namespace TSA_V ...@@ -1107,15 +1150,17 @@ namespace TSA_V
private void dgvList_SelectionChanged(object sender, EventArgs e) private void dgvList_SelectionChanged(object sender, EventArgs e)
{ {
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0) if (isFinishLoad)
{ {
int rowIndex = dgvList.SelectedRows[0].Index; if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
string partNum = dgvList.Rows[rowIndex].Cells[this.Column_PartNum.Name].Value.ToString(); {
string name = dgvList.Rows[rowIndex].Cells[this.Column_Name.Name].Value.ToString(); int rowIndex = dgvList.SelectedRows[0].Index;
记录为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemTextUpdateP, "更新为【{0}-{1}】的位置", partNum, name); string partNum = dgvList.Rows[rowIndex].Cells[this.Column_PartNum.Name].Value.ToString();
string name = dgvList.Rows[rowIndex].Cells[this.Column_Name.Name].Value.ToString();
记录为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemTextUpdateP, "更新为【{0}-{1}】的位置", partNum, name);
UpdateSelPoint(rowIndex);
UpdateSelPoint(rowIndex);
}
} }
} }
...@@ -1323,5 +1368,6 @@ namespace TSA_V ...@@ -1323,5 +1368,6 @@ namespace TSA_V
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true ; dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true ;
} }
} }
} }
} }
TSA-V/FrmBoardInfo.resx
...@@ -225,29 +225,9 @@ ...@@ -225,29 +225,9 @@
<metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="Column_Up.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="Column_Down.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>82</value> <value>82</value>
</metadata> </metadata>
......
TSA-V/ResourceCulture.cs
...@@ -25,7 +25,8 @@ namespace TSA_V ...@@ -25,7 +25,8 @@ namespace TSA_V
public static void SetCurrentCulture(string name) public static void SetCurrentCulture(string name)
{ {
ResourceControl.GetStrEvent += GetString; ResourceControl.GetStrEvent += GetString;
ResourceControl.GetStringEvent += GetString; ResourceControl.GetStringEvent += GetString;
ResourceControl.GetLanEvent += GetLanguage;
UserFromControl.UserControlResource.GetStrEvent += GetString; UserFromControl.UserControlResource.GetStrEvent += GetString;
UserFromControl.UserControlResource.GetStringEvent += GetString; UserFromControl.UserControlResource.GetStringEvent += GetString;
...@@ -36,7 +37,10 @@ namespace TSA_V ...@@ -36,7 +37,10 @@ namespace TSA_V
CurrLanguage = name; CurrLanguage = name;
Thread.CurrentThread.CurrentCulture = new CultureInfo(name); Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
} }
public static string GetLanguage()
{
return CurrLanguage;
}
public static string GetString(string id, params object[] param) public static string GetString(string id, params object[] param)
{ {
return GetString(id, id,param); return GetString(id, id,param);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!