Skip to content

李娜 / Line-Smart-Workstation

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

点位增加启用禁用功能

1 个父辈 71ebee91
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 172 行增加 和 84 行删除
DeviceLibrary/bean/BoardInfo.cs
...@@ -257,5 +257,9 @@ namespace TSA_V.DeviceLibrary ...@@ -257,5 +257,9 @@ namespace TSA_V.DeviceLibrary
public int PenWidth = 2; public int PenWidth = 2;
public string ShowText = ""; public string ShowText = "";
/// <summary>
/// 是否禁用，默认0
/// </summary>
public bool Disable = false;
} }
} }
TSA-V/FrmBoardInfo.cs
...@@ -92,15 +92,7 @@ namespace TSA_V ...@@ -92,15 +92,7 @@ namespace TSA_V
} }
TSAVBean.IsCanStepMove = true; TSAVBean.IsCanStepMove = true;
timer1.Start(); timer1.Start();
if (IOManager.ShuddenOK().Equals(false))
{
// MessageBox.Show("急停未开！");
lblMsg.Text = ResourceCulture.GetString(ResourceCulture.DeviceInSuddenStop, "急停未开");
}
else
{
lblMsg.Text = "";
}
isFinishLoad = true; isFinishLoad = true;
} }
private void LanguagePro() private void LanguagePro()
...@@ -140,6 +132,7 @@ namespace TSA_V ...@@ -140,6 +132,7 @@ namespace TSA_V
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_Down.HeaderText = 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_Check, "禁用");
} }
private void FrmBoardInfo_Load(object sender, EventArgs e) private void FrmBoardInfo_Load(object sender, EventArgs e)
{ {
...@@ -150,6 +143,19 @@ namespace TSA_V ...@@ -150,6 +143,19 @@ namespace TSA_V
lblAoi.Visible = TSAVBean.IsNeedAOI; lblAoi.Visible = TSAVBean.IsNeedAOI;
cmbAOIFile.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++)
{
if (i.Equals(Column_disable.Index))
{
dgvList.Columns[i].ReadOnly = false;
}
else
{
dgvList.Columns[i].ReadOnly = true ;
}
}
} }
protected override bool ProcessCmdKey(ref Message msg, Keys keyData) protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{ {
...@@ -271,6 +277,7 @@ namespace TSA_V ...@@ -271,6 +277,7 @@ namespace TSA_V
view.Cells[Column_PointSizeY.Index].Value = point.PointSizeY; view.Cells[Column_PointSizeY.Index].Value = point.PointSizeY;
view.Cells[Column_PenWidth.Index].Value = point.PenWidth; view.Cells[Column_PenWidth.Index].Value = point.PenWidth;
view.Cells[Column_ShowText.Index].Value = point.ShowText; view.Cells[Column_ShowText.Index].Value = point.ShowText;
view.Cells[Column_disable.Index].Value = point.Disable;
if (point.CheckOK) if (point.CheckOK)
{ {
view.DefaultCellStyle.ForeColor = Color.Red; view.DefaultCellStyle.ForeColor = Color.Red;
...@@ -290,34 +297,34 @@ namespace TSA_V ...@@ -290,34 +297,34 @@ namespace TSA_V
IsProcess = true; IsProcess = true;
if (TSAVBean.Status.Equals(TSAVStatus.Wait)) //if (TSAVBean.Status.Equals(TSAVStatus.Wait))
{ //{
string msg = ResourceCulture.GetString(ResourceCulture.DeviceNotOkMsg, "设备未连接"); // string msg = ResourceCulture.GetString(ResourceCulture.DeviceNotOkMsg, "设备未连接");
if (!lblMsg.Text.Equals(msg)) // if (!lblMsg.Text.Equals(msg))
{ // {
lblMsg.Text = msg; // lblMsg.Text = msg;
btnGoHome.Enabled = false; // btnGoHome.Enabled = false;
} // }
} //}
else if (TSAVBean.Status.Equals(TSAVStatus.Reset)) //else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
{ //{
string msg = ResourceCulture.GetString(ResourceCulture.DeviceInGohome, "设备正在原点返回中"); // string msg = ResourceCulture.GetString(ResourceCulture.DeviceInGohome, "设备正在原点返回中");
if (!lblMsg.Text.Equals(msg)) // if (!lblMsg.Text.Equals(msg))
{ // {
lblMsg.Text = msg; // lblMsg.Text = msg;
btnGoHome.Enabled = true; // btnGoHome.Enabled = true;
} // }
} //}
else if (TSAVBean.Status.Equals(TSAVStatus.Runing)) //else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ //{
string msg = ResourceCulture.GetString(ResourceCulture.DeviceInWork, "设备工作中"); // string msg = ResourceCulture.GetString(ResourceCulture.DeviceInWork, "设备工作中");
if (!lblMsg.Text.Equals(msg)) // if (!lblMsg.Text.Equals(msg))
{ // {
lblMsg.Text = msg; // lblMsg.Text = msg;
btnGoHome.Enabled = true; // btnGoHome.Enabled = true;
} // }
} //}
IsProcess = false; IsProcess = false;
} }
...@@ -486,13 +493,8 @@ namespace TSA_V ...@@ -486,13 +493,8 @@ namespace TSA_V
board.boardName = FormUtil.getValue(txtBoardName); board.boardName = FormUtil.getValue(txtBoardName);
board.boardLength = FormUtil.GetIntValue(txtBoardW); board.boardLength = FormUtil.GetIntValue(txtBoardW);
board.boardWidth = FormUtil.GetIntValue(txtBoardL); board.boardWidth = FormUtil.GetIntValue(txtBoardL);
board.LineWidth = FormUtil.GetIntValue(txtLineWidth); board.LineWidth = FormUtil.GetIntValue(txtLineWidth);
//board.originX = orgXValue; board.boardCode = FormUtil.getValue(txtCode);
//board.originY = orgYValue;
board.boardCode = FormUtil.getValue(txtCode);
//board.originX = FormUtil.GetIntValue(txtOriginX);
//board.originY = FormUtil.GetIntValue(txtOriginY);
board.orgType = orgType; board.orgType = orgType;
board.AOIProName = cmbAOIFile.Text; board.AOIProName = cmbAOIFile.Text;
...@@ -649,6 +651,7 @@ namespace TSA_V ...@@ -649,6 +651,7 @@ namespace TSA_V
point.PointType = Convert.ToInt32(row.Cells[this.Column_PointType.Name].Value.ToString()); point.PointType = Convert.ToInt32(row.Cells[this.Column_PointType.Name].Value.ToString());
point.PenWidth = Convert.ToInt32(row.Cells[this.Column_PenWidth.Name].Value.ToString()); point.PenWidth = Convert.ToInt32(row.Cells[this.Column_PenWidth.Name].Value.ToString());
point.ShowText = (row.Cells[this.Column_ShowText.Name].Value.ToString()); point.ShowText = (row.Cells[this.Column_ShowText.Name].Value.ToString());
point.Disable = Convert.ToBoolean(row.Cells[this.Column_disable.Name].Value.ToString());
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -1050,17 +1053,7 @@ namespace TSA_V ...@@ -1050,17 +1053,7 @@ namespace TSA_V
btnSetBasePoint_Click(null, null); btnSetBasePoint_Click(null, null);
} }
private void btnGoHome_Click_1(object sender, EventArgs e)
{
btnGoHome.Enabled = false;
if (TSAVBean.Status > TSAVStatus.Wait)
{
TSAVBean.StartReset();
}
btnGoHome.Enabled = true;
}
private DateTime preProTime = DateTime.Now; private DateTime preProTime = DateTime.Now;
private void picBoard_MouseMove(object sender, MouseEventArgs e) private void picBoard_MouseMove(object sender, MouseEventArgs e)
...@@ -1312,5 +1305,23 @@ namespace TSA_V ...@@ -1312,5 +1305,23 @@ namespace TSA_V
{ {
btnOpenFile_Click(null, null); btnOpenFile_Click(null, null);
} }
private void llblAllSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs 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 llblAllUSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
int cout = dgvList.Rows.Count;
for (int i = 0; i < cout; i++)
{
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true ;
}
}
} }
} }
TSA-V/FrmBoardInfo.resx
...@@ -207,6 +207,9 @@ ...@@ -207,6 +207,9 @@
<metadata name="Column_ShowText.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_ShowText.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column_disable.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2272,34 +2272,87 @@ ...@@ -2272,34 +2272,87 @@
<data name="用户名或密码错误" xml:space="preserve"> <data name="用户名或密码错误" xml:space="preserve">
<value>Incorrect user name or password</value> <value>Incorrect user name or password</value>
</data> </data>
<data name = "添加用户失败" xml:space = "preserve"> <value> Failed to add user </value> </data> <data name="添加用户失败" xml:space="preserve">
<data name = "退出" xml:space = "preserve"> <value> exit </value> </data> <value> Failed to add user </value>
<data name = "增加" xml:space = "preserve"> <value> add </value> </data> </data>
<data name = "修改" xml:space = "preserve"> <value> modify </value> </data> <data name="退出" xml:space="preserve">
<data name = "删除" xml:space = "preserve"> <value> delete </value> </data> <value> exit </value>
<data name = "用户名" xml:space = "preserve"> <value> username </value> </data> </data>
<data name = "密码" xml:space = "preserve"> <value> password </value> </data> <data name="增加" xml:space="preserve">
<data name = "权限" xml:space = "preserve"> <value> Permission </value> </data> <value> add </value>
<data name = "用户管理" xml:space = "preserve"> <value> user management </value> </data> </data>
<data name = "确认删除用户" xml:space = "preserve"> <value> Confirm to delete user </value> </data> <data name="修改" xml:space="preserve">
<data name = "用户删除成功" xml:space = "preserve"> <value> User deleted successfully </value> </data> <value> modify </value>
<data name = "用户删除失败" xml:space = "preserve"> <value> Failed to delete user </value> </data> </data>
<data name = "确定修改用户信息" xml:space = "preserve"> <value> Confirm to modify user information </value> </data> <data name="删除" xml:space="preserve">
<data name = "用户修改成功" xml:space = "preserve"> <value> Modify user successfully </value> </data> <value> delete </value>
<data name = "用户修改失败" xml:space = "preserve"> <value> Failed to modify user </value> </data> </data>
<data name = "添加用户成功" xml:space = "preserve"> <value> Added user successfully </value> </data> <data name="用户名" xml:space="preserve">
<data name = "FrmDeviceConfig_lblCode_Text" xml:space = "preserve"> <value> Barcode： </value> </data> <value> username </value>
<data name = "FrmPusicanTest_llblClearp_Text" xml:space = "preserve"> <value> Zero position </value> </data> </data>
<data name="密码" xml:space="preserve">
<value> password </value>
</data>
<data name="权限" xml:space="preserve">
<value> Permission </value>
</data>
<data name="用户管理" xml:space="preserve">
<value> user management </value>
</data>
<data name="确认删除用户" xml:space="preserve">
<value> Confirm to delete user </value>
</data>
<data name="用户删除成功" xml:space="preserve">
<value> User deleted successfully </value>
</data>
<data name="用户删除失败" xml:space="preserve">
<value> Failed to delete user </value>
</data>
<data name="确定修改用户信息" xml:space="preserve">
<value> Confirm to modify user information </value>
</data>
<data name="用户修改成功" xml:space="preserve">
<value> Modify user successfully </value>
</data>
<data name="用户修改失败" xml:space="preserve">
<value> Failed to modify user </value>
</data>
<data name="添加用户成功" xml:space="preserve">
<value> Added user successfully </value>
</data>
<data name="FrmDeviceConfig_lblCode_Text" xml:space="preserve">
<value> Barcode： </value>
</data>
<data name="FrmPusicanTest_llblClearp_Text" xml:space="preserve">
<value> Zero position </value>
</data>
<data name="LineWidth" xml:space="preserve"> <data name="LineWidth" xml:space="preserve">
<value>Line body width</value> <value>Line body width</value>
</data> </data>
<data name="WriteLineWidth" xml:space="preserve"> <data name="WriteLineWidth" xml:space="preserve">
<value>Please enter the line width</value> <value>Please enter the line width</value>
</data> </data>
<data name = "FrmBoardSelect_btnChangeW_Text" xml:space = "preserve"> <value> Adjust the line width </value> </data> <data name="FrmBoardSelect_btnChangeW_Text" xml:space="preserve">
<data name = "FrmAddBoard_label9_Text" xml:space = "preserve"> <value> mm </value> </data> <value> Adjust the line width </value>
<data name = "FrmAddBoard_lblName_Text" xml:space = "preserve"> <value> Projection words： </value> </data> </data>
<data name = "FrmBoardInfo_lblLineW_Text" xml:space = "preserve"> <value> Line body width： </value> </data> <data name="FrmAddBoard_label9_Text" xml:space="preserve">
<data name = "FrmBoardInfo_lbllinews_Text" xml:space = "preserve"> <value> mm </value> </data> <value> mm </value>
<data name = "FrmChangeWidth_btnHomeM_Text" xml:space = "preserve"> <value> The origin back </value> </data> </data>
<data name="FrmAddBoard_lblName_Text" xml:space="preserve">
<value> Projection words： </value>
</data>
<data name="FrmBoardInfo_lblLineW_Text" xml:space="preserve">
<value> Line body width： </value>
</data>
<data name="FrmBoardInfo_lbllinews_Text" xml:space="preserve">
<value> mm </value>
</data>
<data name="FrmChangeWidth_btnHomeM_Text" xml:space="preserve">
<value> The origin back </value>
</data>
<data name="禁用" xml:space="preserve">
<value>Disabled</value>
</data>
<data name = "FrmBoardInfo_llblAllUSel_Text" xml:space = "preserve"> <value> Disable all </value> </data>
<data name = "FrmBoardInfo_llblAllSel_Text" xml:space = "preserve"> <value> To enable all </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2346,10 +2346,27 @@ ...@@ -2346,10 +2346,27 @@
<data name="WriteLineWidth" xml:space="preserve"> <data name="WriteLineWidth" xml:space="preserve">
<value>请输入线体宽度</value> <value>请输入线体宽度</value>
</data> </data>
<data name = "FrmBoardSelect_btnChangeW_Text" xml:space = "preserve"> <value> 调宽 </value> </data> <data name="FrmBoardSelect_btnChangeW_Text" xml:space="preserve">
<data name = "FrmAddBoard_label9_Text" xml:space = "preserve"> <value> mm </value> </data> <value> 调宽 </value>
<data name = "FrmAddBoard_lblName_Text" xml:space = "preserve"> <value> 投影文字： </value> </data> </data>
<data name = "FrmBoardInfo_lblLineW_Text" xml:space = "preserve"> <value> 线体宽度： </value> </data> <data name="FrmAddBoard_label9_Text" xml:space="preserve">
<data name = "FrmBoardInfo_lbllinews_Text" xml:space = "preserve"> <value> mm </value> </data> <value> mm </value>
<data name = "FrmChangeWidth_btnHomeM_Text" xml:space = "preserve"> <value> 原点返回 </value> </data> </data>
<data name="FrmAddBoard_lblName_Text" xml:space="preserve">
<value> 投影文字： </value>
</data>
<data name="FrmBoardInfo_lblLineW_Text" xml:space="preserve">
<value> 线体宽度： </value>
</data>
<data name="FrmBoardInfo_lbllinews_Text" xml:space="preserve">
<value> mm </value>
</data>
<data name="FrmChangeWidth_btnHomeM_Text" xml:space="preserve">
<value> 原点返回 </value>
</data>
<data name="禁用" xml:space="preserve">
<value>禁用</value>
</data>
<data name = "FrmBoardInfo_llblAllUSel_Text" xml:space = "preserve"> <value> 全部禁用 </value> </data>
<data name = "FrmBoardInfo_llblAllSel_Text" xml:space = "preserve"> <value> 全部启用 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!