Skip to content

李娜 / Line-Smart-Workstation

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

工作界面调整

1 个父辈 c0f10589
全部展开
内嵌 并排
正在显示 4 个修改的文件 包含 37 行增加 和 11 行删除
TSA-V/Properties/Resource.en-US.resx
...@@ -2713,7 +2713,7 @@ ...@@ -2713,7 +2713,7 @@
<data name = "SureDeleteSel" xml:space = "preserve"> <value> OK to delete the selected data？ </value> </data> <data name = "SureDeleteSel" xml:space = "preserve"> <value> OK to delete the selected data？ </value> </data>
<data name = "FrmBomViewer_linkDelete_Text" xml:space = "preserve"> <value> Batch Delete </value> </data> <data name = "FrmBomViewer_linkDelete_Text" xml:space = "preserve"> <value> Batch Delete </value> </data>
<data name = "Column_ISUpdate" xml:space = "preserve"> <value> modified </value> </data> <data name = "Column_ISUpdate" xml:space = "preserve"> <value> modified </value> </data>
<data name = "FrmWork_groupHand_Text" xml:space = "preserve"> <value> hand gesture monitoring </value> </data> <data name = "FrmWork_groupHand_Text" xml:space = "preserve"> <value> Hand gesture monitoring </value> </data>
<data name = "handWork" xml:space = "preserve"> <value> Assembling </value> </data> <data name = "handWork" xml:space = "preserve"> <value> Assembling </value> </data>
<data name = "handCount" xml:space = "preserve"> <value> Number </value> </data> <data name = "handCount" xml:space = "preserve"> <value> Number </value> </data>
<data name = "handTime" xml:space = "preserve"> <value> Total Time </value> </data> <data name = "handTime" xml:space = "preserve"> <value> Total Time </value> </data>
......
TSA-V/workForm/FrmAOICheck.cs
...@@ -53,11 +53,31 @@ namespace TSA_V ...@@ -53,11 +53,31 @@ namespace TSA_V
this.Close(); this.Close();
return; return;
} }
else
{
string currProjectName = BoardManager.CurrBoard.GetAoiFileName();
//string filePath = Application.StartupPath + @"\config\\AOIConfig" + currProjectName + "bmp";
string extension = Path.GetExtension(currProjectName);
string filename = currProjectName.Replace(extension, ".bmp");
ShowBaseImg(filename,"Base");
}
lblCurrWorkTime.Text = ResourceCulture.GetString("{0}秒后自动检测", "{0}秒后自动检测", waitSeconds.ToString()); lblCurrWorkTime.Text = ResourceCulture.GetString("{0}秒后自动检测", "{0}秒后自动检测", waitSeconds.ToString());
修正ToolStripMenuItem.Text = ResourceCulture.GetString("FrmAOICheck_btnUpdateImg_Text", "修正"); 修正ToolStripMenuItem.Text = ResourceCulture.GetString("FrmAOICheck_btnUpdateImg_Text", "修正");
// this.picResult.Image = CurrProject.standardImage; // this.picResult.Image = CurrProject.standardImage;
} }
private void ShowBaseImg(string filePath,string Text)
{
if (File.Exists(filePath))
{
var bmp = new Bitmap(filePath);
this.picResult.Image= Eyemlib.DeepClone(bmp);
bmp.Dispose();
}
}
private void FormStatus(bool open) private void FormStatus(bool open)
{ {
} }
......
TSA-V/workForm/FrmTSAV.cs
...@@ -250,6 +250,7 @@ namespace TSA_V ...@@ -250,6 +250,7 @@ namespace TSA_V
if (!str.Equals("")) if (!str.Equals(""))
{ {
lblMsg.Text = ResourceCulture.GetString(ResourceCulture.StartError, "启动失败") + "：" + str; lblMsg.Text = ResourceCulture.GetString(ResourceCulture.StartError, "启动失败") + "：" + str;
lblMsg.ForeColor = Color.Red;
LogUtil.error("启动失败：" + str); LogUtil.error("启动失败：" + str);
needShowMsg += ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str; needShowMsg += ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str;
//MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str); //MessageBox.Show(ResourceCulture.GetString(ResourceCulture.StartError, "启动失败：") + str);
...@@ -310,6 +311,7 @@ namespace TSA_V ...@@ -310,6 +311,7 @@ namespace TSA_V
} }
FormStatus(); FormStatus();
lblMsg.Text = TSAVBean.GetShowMsg(); lblMsg.Text = TSAVBean.GetShowMsg();
lblMsg.ForeColor = Color.Red;
if (TSAVBean.Status.Equals(TSAVStatus.Runing)) if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ {
...@@ -415,7 +417,7 @@ namespace TSA_V ...@@ -415,7 +417,7 @@ namespace TSA_V
} }
private void FormStatus() private void FormStatus()
{ {
btnSave.Visible = false ; btnSave.Visible = txtCount.Visible ;
btnGoHome.Visible = true; btnGoHome.Visible = true;
if (TSAVBean.Status <= (TSAVStatus.Wait)) if (TSAVBean.Status <= (TSAVStatus.Wait))
{ {
...@@ -489,15 +491,15 @@ namespace TSA_V ...@@ -489,15 +491,15 @@ namespace TSA_V
{ {
SetSkin(this); SetSkin(this);
//lblMsg.ForeColor = Color.Red; //lblMsg.ForeColor = Color.Red;
lblNotices.ForeColor = Color.Red; lblNotices.ForeColor = Color.White;
label2.ForeColor = Color.Red; label2.ForeColor = Color.White;
lblComNotices.ForeColor = Color.Red; lblComNotices.ForeColor = Color.White;
BoardInfo board = BoardManager.CurrBoard; label3.ForeColor = Color.White;
label3.ForeColor = Color.Red; this.lblPointName.ForeColor = Color.White;
this.lblPointName.ForeColor = Color.Red; label4.ForeColor = Color.White;
label4.ForeColor = Color.Red; lblPositionNum.ForeColor = Color.White;
lblPositionNum.ForeColor = Color.Red;
BoardInfo board = BoardManager.CurrBoard;
display.SetPic(picBoard, panBoard); display.SetPic(picBoard, panBoard);
if (board != null) if (board != null)
{ {
...@@ -779,6 +781,8 @@ namespace TSA_V ...@@ -779,6 +781,8 @@ namespace TSA_V
lblStart.Visible = false; lblStart.Visible = false;
lblLast.Visible = false; lblLast.Visible = false;
} }
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblStart.ForeColor = System.Drawing.Color.Olive;
if (leftCount > 0) if (leftCount > 0)
{ {
lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount); lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount);
...@@ -921,6 +925,8 @@ namespace TSA_V ...@@ -921,6 +925,8 @@ namespace TSA_V
lblLast.Visible = false; lblLast.Visible = false;
} }
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblStart.ForeColor = System.Drawing.Color.Olive;
if (leftCount > 0) if (leftCount > 0)
{ {
lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount); lblBoardPoint.Text = ResourceCulture.GetString(ResourceCulture.PointInfoMsg, "当前：第{0}步，剩余{1}步", (preIndex + 1).ToString(), leftCount);
...@@ -1196,7 +1202,7 @@ namespace TSA_V ...@@ -1196,7 +1202,7 @@ namespace TSA_V
} }
string curr = (HandRecordManager.currHasPoint ? ResourceCulture.GetString("handWork","组装中" ):""); string curr = (HandRecordManager.currHasPoint ? ResourceCulture.GetString("handWork","组装中" ):"");
lblHandInfo.ForeColor = Color.Cyan; //lblHandInfo.ForeColor = Color.Cyan;
lblHandInfo.Text = $"{ResourceCulture.GetString("handCount","次数")}: {HandRecordManager.recordCount},\t" + lblHandInfo.Text = $"{ResourceCulture.GetString("handCount","次数")}: {HandRecordManager.recordCount},\t" +
$" {ResourceCulture.GetString("handTime", "总时长")}:{FormUtil.GetSpanStr(HandRecordManager.recordSpan)} \t {curr}"; $" {ResourceCulture.GetString("handTime", "总时长")}:{FormUtil.GetSpanStr(HandRecordManager.recordSpan)} \t {curr}";
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!