Skip to content

G
GC_Branch
Commit 1961b0e8 authored by 周磊's avatar 周磊
Browse files
Options

1.版本变更为1.8.8 

2.TCD桥流显示状态
3.增加HMI更新mac区分
4.温度改为一个小数
5.优化联机和hmi更新搜索
6扩展epc,支持6路(前进样,后进样,检测1,检测2,检测3,辅助)
7.添加物联接口
parent c533fa80
Expand all Show whitespace changes
Inline Side-by-side
Showing with 8315 additions and 2670 deletions
GcDevicePc/CK_UI/InfoBarUser.cs
View file @ 1961b0e8
...@@ -216,13 +216,13 @@ namespace GcDevicePc.CK_UI ...@@ -216,13 +216,13 @@ namespace GcDevicePc.CK_UI
if (globaldata.m_hwconfig.hwconfiginfo.u16StartType != 2) if (globaldata.m_hwconfig.hwconfiginfo.u16StartType != 2)
{ {
hflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC1_2_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC1_2_Set / 10.0f).ToString("#0"); hflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC_Det1_2_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC_Det1_2_Set / 10.0f).ToString("#0");
hflow.BackColor = waringcolor; hflow.BackColor = waringcolor;
airflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC1_3_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC1_3_Set / 10.0f).ToString("#0"); airflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC_Det1_3_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC_Det1_3_Set / 10.0f).ToString("#0");
airflow.BackColor = waringcolor; airflow.BackColor = waringcolor;
foneflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC2_1_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC2_1_Set / 10.0f).ToString("#0"); foneflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC_Aux1_1_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC_Aux1_1_Set / 10.0f).ToString("#0");
foneflow.BackColor = waringcolor; foneflow.BackColor = waringcolor;
ftwoflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC2_2_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC2_2_Set / 10.0f).ToString("#0"); ftwoflow.Text = (globaldata.m_dpbuffer.ShowList.showepc.EPC_Aux1_2_Cur / 10.0f).ToString("#0.0") + "/" + (globaldata.m_dpbuffer.ShowList.showepc.EPC_Aux1_2_Set / 10.0f).ToString("#0");
ftwoflow.BackColor = waringcolor; ftwoflow.BackColor = waringcolor;
} }
else else
......
GcDevicePc/CK_UI/UserCtl.cs
View file @ 1961b0e8
...@@ -120,7 +120,7 @@ namespace GcDevicePc.CK_UI ...@@ -120,7 +120,7 @@ namespace GcDevicePc.CK_UI
fAutoDisO2Slope = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenSlope()); fAutoDisO2Slope = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenSlope());
fAutoDisO2Intercept = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenIntercept()); fAutoDisO2Intercept = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenIntercept());
fAutoDisO2Input = Convert.ToDouble( Sys_ini.Get_Sys_OxyCpdCount_OxyValue()); fAutoDisO2Input = Convert.ToDouble(Sys_ini.Get_Sys_OxyCpdCount_OxyValue());
if (fAutoDisO2Input == 21) if (fAutoDisO2Input == 21)
{ {
fAutoDisO2Product = 1; fAutoDisO2Product = 1;
...@@ -412,8 +412,137 @@ namespace GcDevicePc.CK_UI ...@@ -412,8 +412,137 @@ namespace GcDevicePc.CK_UI
for (int i = 0; i < CKVocAnalyzer.GlobalCKV.vocparamlist.Count; i++) for (int i = 0; i < CKVocAnalyzer.GlobalCKV.vocparamlist.Count; i++)
{ {
//嵌套for循环,解决"CKVocAnalyzer.GlobalCKV.IngredientList"直接定值索引引起的越界问题
for (int j = 0; j < CKVocAnalyzer.GlobalCKV.IngredientList.Count; j++)
{
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[j].name&&listTHC.Count>=1&&listCH4.Count>=1)
{
switch (j)
{
case 0:
if (isppm)
{
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else
{//此处计算成mg/m3 nmhc
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[0].name) if (listNmoc[listNmoc.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
{
textBox1.BackColor = waringcolor;
}
else
textBox1.BackColor = zcolor;
break;
case 1:
if (isppm)
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
}
else
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
//textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listTHC[listTHC.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
{
textBox2.BackColor = waringcolor;
}
else
textBox2.BackColor = zcolor;
break;
case 2:
if (isppm)
{
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else
{
textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y, 2).ToString();
//textBox3.Text = Math.Round(listCH4[listCH4.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listCH4[listCH4.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
{
textBox3.BackColor = waringcolor;
}
else
textBox3.BackColor = zcolor;
break;
case 3:
if (isppm)
{
textBox4.Text = Math.Round(listben[listben.Count - 1].Y, 2).ToString();
}
else
{
textBox4.Text = Math.Round(listben[listben.Count - 1].Y, 2).ToString();
//textBox4.Text = Math.Round(listben[listben.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listben[listben.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
{
textBox4.BackColor = waringcolor;
}
else
textBox4.BackColor = zcolor;
break;
case 4:
if (isppm)
{
textBox5.Text = Math.Round(listjiaben[listjiaben.Count - 1].Y, 2).ToString();
}
else
{
textBox5.Text = Math.Round(listjiaben[listjiaben.Count - 1].Y, 2).ToString();
//textBox5.Text = Math.Round(listjiaben[listjiaben.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listjiaben[listjiaben.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
{
textBox5.BackColor = waringcolor;
}
else
textBox5.BackColor = zcolor;
break;
case 5:
if (isppm)
{
textBox6.Text = Math.Round(listerjiaben[listerjiaben.Count - 1].Y, 2).ToString();
}
else
{
textBox6.Text = Math.Round(listerjiaben[listerjiaben.Count - 1].Y, 2).ToString();
//textBox6.Text = Math.Round(listerjiaben[listerjiaben.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
if (listerjiaben[listerjiaben.Count - 1].Y >= CKVocAnalyzer.GlobalCKV.vocparamlist[i].WaringValue)
{
textBox6.BackColor = waringcolor;
}
else
textBox6.BackColor = zcolor;
break;
default:
break;
}
}
}
#region 旧版本
/*
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[0].name&&listTHC.Count!=0&&listCH4.Count!=0)
{ {
if (isppm) if (isppm)
{ {
...@@ -548,6 +677,8 @@ namespace GcDevicePc.CK_UI ...@@ -548,6 +677,8 @@ namespace GcDevicePc.CK_UI
else else
textBox6.BackColor = zcolor; textBox6.BackColor = zcolor;
} }
*/
#endregion
} }
if (mster != null && mster.PaneList != null) if (mster != null && mster.PaneList != null)
......
GcDevicePc/CloudBox/DataInstance.cs 0 → 100644
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/CloudBox/GCData.cs 0 → 100644
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/Common/MoudbusOperation.cs
View file @ 1961b0e8
...@@ -587,7 +587,7 @@ namespace GcDevicePc.Common ...@@ -587,7 +587,7 @@ namespace GcDevicePc.Common
int ret = -1; int ret = -1;
try try
{ {
ret = GetEPCHoldingReg(700, 16, ref data); ret = GetEPCHoldingReg(700, 48, ref data);
} }
catch (Exception e) catch (Exception e)
{ {
......
GcDevicePc/Common/NModbusSlave.cs
View file @ 1961b0e8
...@@ -461,10 +461,10 @@ namespace GcDevicePc.Common ...@@ -461,10 +461,10 @@ namespace GcDevicePc.Common
} }
break; break;
case 1001: case 1001:
value = globaldata.m_dpbuffer.ShowList.showepc.EPC1_2_Cur; value = globaldata.m_dpbuffer.ShowList.showepc.EPC_Det1_2_Cur;
break; break;
case 1002: case 1002:
value = globaldata.m_dpbuffer.ShowList.showepc.EPC1_3_Cur; value = globaldata.m_dpbuffer.ShowList.showepc.EPC_Det1_3_Cur;
break; break;
case 1003: case 1003:
//value = CKVocAnalyzer.GlobalCKV.adjustTwo.; //value = CKVocAnalyzer.GlobalCKV.adjustTwo.;
...@@ -523,6 +523,54 @@ namespace GcDevicePc.Common ...@@ -523,6 +523,54 @@ namespace GcDevicePc.Common
case 1507: case 1507:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[14]; value = globaldata.m_hmibuffer.gcinfo.EPCStatus[14];
break; break;
case 1511:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[16];
break;
case 1512:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[18];
break;
case 1513:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[20];
break;
case 1514:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[22];
break;
case 1515:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[24];
break;
case 1516:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[26];
break;
case 1517:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[28];
break;
case 1518:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[30];
break;
case 1519:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[32];
break;
case 1520:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[34];
break;
case 1521:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[36];
break;
case 1522:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[38];
break;
case 1523:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[40];
break;
case 1524:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[42];
break;
case 1525:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[44];
break;
case 1526:
value = globaldata.m_hmibuffer.gcinfo.EPCStatus[46];
break;
case 1508: case 1508:
value = globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0]; value = globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0];
break; break;
...@@ -1381,8 +1429,8 @@ namespace GcDevicePc.Common ...@@ -1381,8 +1429,8 @@ namespace GcDevicePc.Common
double fAutoDisO2Input; double fAutoDisO2Input;
double fAutoDisO2Product; double fAutoDisO2Product;
fAutoDisO2Slope = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenSlope()); fAutoDisO2Slope = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenSlope());
fAutoDisO2Intercept =Convert.ToDouble( Sys_ini.Get_Sys_CpdCount_OxygenIntercept()); fAutoDisO2Intercept = Convert.ToDouble(Sys_ini.Get_Sys_CpdCount_OxygenIntercept());
fAutoDisO2Input =Convert.ToDouble( Sys_ini.Get_Sys_OxyCpdCount_OxyValue()); fAutoDisO2Input = Convert.ToDouble(Sys_ini.Get_Sys_OxyCpdCount_OxyValue());
if (fAutoDisO2Input == 21) if (fAutoDisO2Input == 21)
{ {
fAutoDisO2Product = 1; fAutoDisO2Product = 1;
......
GcDevicePc/ConfigDlg/RealColDlg.cs
View file @ 1961b0e8
...@@ -423,6 +423,7 @@ namespace GcDevicePc.ConfigDlg ...@@ -423,6 +423,7 @@ namespace GcDevicePc.ConfigDlg
else else
{ {
MessageBox.Show("删除失败，不能删除第一行！"); MessageBox.Show("删除失败，不能删除第一行！");
return;
} }
string[] sStage = new string[5]; string[] sStage = new string[5];
......
GcDevicePc/ConfigMethod/FID.cs
View file @ 1961b0e8
...@@ -202,11 +202,11 @@ namespace GcDevicePc.ConfigMethod ...@@ -202,11 +202,11 @@ namespace GcDevicePc.ConfigMethod
if (!string.IsNullOrEmpty((sender as TextBox).Text)) if (!string.IsNullOrEmpty((sender as TextBox).Text))
{ {
double nextnum = Convert.ToDouble((sender as TextBox).Text); double nextnum = Convert.ToDouble((sender as TextBox).Text);
if (nextnum < 5) //if (nextnum < 5)
{ //{
MessageBox.Show("流量设置不能小于5"); // MessageBox.Show("流量设置不能小于5");
(sender as TextBox).Text = hlastnum.ToString(); // (sender as TextBox).Text = hlastnum.ToString();
} //}
if (nextnum > 200) if (nextnum > 200)
{ {
MessageBox.Show("流量设置不能大于200"); MessageBox.Show("流量设置不能大于200");
......
GcDevicePc/ConfigMethod/RealColTab.cs
View file @ 1961b0e8
...@@ -302,19 +302,29 @@ namespace GcDevicePc.ConfigMethod ...@@ -302,19 +302,29 @@ namespace GcDevicePc.ConfigMethod
{ {
ProUpTab.Rows[i].Cells[2].Value = dData < 0 ? "0.00" : globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp.ToString(); ProUpTab.Rows[i].Cells[2].Value = dData < 0 ? "0.00" : globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp.ToString();
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内"); MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内");
}
else else
{
MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}"); MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}");
} }
return;
}
} }
else if(ProUpTab.Rows[i].Cells[2].Value.ToString() != "") else if(ProUpTab.Rows[i].Cells[2].Value.ToString() != "")
{ {
ProUpTab.Rows[i].Cells[2].Value = "0.00"; ProUpTab.Rows[i].Cells[2].Value = "0.00";
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show($"输入值不在0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内"); MessageBox.Show($"输入值不在0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}的区间内");
}
else else
{
MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}"); MessageBox.Show($"The input value is 0-{globaldata.m_hwconfig.hwconfiginfo.u16ColPTemp}");
} }
return;
}
} }
if (ProUpTab.Rows[i].Cells[3].Value != null ) if (ProUpTab.Rows[i].Cells[3].Value != null )
{ {
...@@ -329,19 +339,30 @@ namespace GcDevicePc.ConfigMethod ...@@ -329,19 +339,30 @@ namespace GcDevicePc.ConfigMethod
{ {
ProUpTab.Rows[i].Cells[3].Value = dData < 0 ? "0.00" : "1080.00"; ProUpTab.Rows[i].Cells[3].Value = dData < 0 ? "0.00" : "1080.00";
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show("输入值不在0-1080的区间内"); MessageBox.Show("输入值不在0-1080的区间内");
}
else else
{
MessageBox.Show("The input value is not in the range of 0 to 1080"); MessageBox.Show("The input value is not in the range of 0 to 1080");
} }
return;
}
} }
else if(ProUpTab.Rows[i].Cells[3].Value.ToString() != "") else if(ProUpTab.Rows[i].Cells[3].Value.ToString() != "")
{ {
ProUpTab.Rows[i].Cells[3].Value = "0.00"; ProUpTab.Rows[i].Cells[3].Value = "0.00";
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show("输入值不在0-1080的区间内"); MessageBox.Show("输入值不在0-1080的区间内");
}
else else
{
MessageBox.Show("The input value is not in the range of 0 to 1080"); MessageBox.Show("The input value is not in the range of 0 to 1080");
} }
return;
}
} }
if (ProUpTab.Rows[i].Cells[3].Value != null && ProUpTab.Rows[i].Cells[2].Value != null && ProUpTab.Rows[i].Cells[1].Value != null) if (ProUpTab.Rows[i].Cells[3].Value != null && ProUpTab.Rows[i].Cells[2].Value != null && ProUpTab.Rows[i].Cells[1].Value != null)
{ {
...@@ -388,10 +409,15 @@ namespace GcDevicePc.ConfigMethod ...@@ -388,10 +409,15 @@ namespace GcDevicePc.ConfigMethod
catch catch
{ {
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show("请检查程升表中的数据是否正确！"); MessageBox.Show("请检查程升表中的数据是否正确！");
}
else else
{
MessageBox.Show("Please check if the data in the rise chart is correct"); MessageBox.Show("Please check if the data in the rise chart is correct");
} }
return;
}
try try
{ {
...@@ -462,10 +488,16 @@ namespace GcDevicePc.ConfigMethod ...@@ -462,10 +488,16 @@ namespace GcDevicePc.ConfigMethod
else else
{ {
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show("删除失败，不能删除第一行！"); MessageBox.Show("删除失败，不能删除第一行！");
}
else else
{
MessageBox.Show("Delete failed. The first row cannot be deleted"); MessageBox.Show("Delete failed. The first row cannot be deleted");
} }
return;
}
string[] sStage = new string[5]; string[] sStage = new string[5];
sStage[0] = "Init"; sStage[0] = "Init";
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.cs
View file @ 1961b0e8
...@@ -399,22 +399,34 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -399,22 +399,34 @@ namespace GcDevicePc.ConfigMethod.injectionport
if (!string.IsNullOrEmpty((sender as TextBox).Text)) if (!string.IsNullOrEmpty((sender as TextBox).Text))
{ {
double nextnum = Convert.ToDouble((sender as TextBox).Text); double nextnum = Convert.ToDouble((sender as TextBox).Text);
if (nextnum < 5) //if (nextnum < 5)
{ //{
if(bEnglishLanguage == false) // if(bEnglishLanguage == false)
MessageBox.Show("流量设置不能小于5"); // {
else // MessageBox.Show("流量设置不能小于5");
MessageBox.Show("The flow setting cannot be less than 5"); // }
(sender as TextBox).Text = lastnum.ToString(); // else
} // {
// MessageBox.Show("The flow setting cannot be less than 5");
// }
// (sender as TextBox).Text = lastnum.ToString();
// return;
//}
if (nextnum > 200) if (nextnum > 200)
{ {
if(bEnglishLanguage == false) if(bEnglishLanguage == false)
{
MessageBox.Show("流量设置不能大于200"); MessageBox.Show("流量设置不能大于200");
(sender as TextBox).Text = lastnum.ToString();
}
else else
{
MessageBox.Show("The flow setting cannot be greater than 200"); MessageBox.Show("The flow setting cannot be greater than 200");
(sender as TextBox).Text = lastnum.ToString(); (sender as TextBox).Text = lastnum.ToString();
} }
return;
}
} }
} }
private void vInput_Limit_TextChange(object sender, EventArgs e) private void vInput_Limit_TextChange(object sender, EventArgs e)
......
GcDevicePc/DataState.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Auxiliary.cs
View file @ 1961b0e8
...@@ -39,10 +39,16 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -39,10 +39,16 @@ namespace GcDevicePc.DeviceConfigUI
{ {
//this.AuxHeaterNum.SelectedIndex = this.hWConfig.hwconfiginfo.u16AuxHeaterNum; //this.AuxHeaterNum.SelectedIndex = this.hWConfig.hwconfiginfo.u16AuxHeaterNum;
this.AuxHeater1.Checked = this.hWConfig.hwconfiginfo.u16AuxHeater1 == 1 ? true : false; this.AuxHeater1.Checked = this.hWConfig.hwconfiginfo.u16AuxHeater1 == 1 ? true : false;
this.checkBox_EPC_AUX1_1.Checked=this.hWConfig.hwconfiginfo.u16Aux1Epc1== 1 ? true : false;
this.checkBox_EPC_AUX1_2.Checked=this.hWConfig.hwconfiginfo.u16Aux1Epc2== 1 ? true : false;
this.checkBox_EPC_AUX1_3.Checked=this.hWConfig.hwconfiginfo.u16Aux1Epc3== 1 ? true : false;
this.AuxHeaterName1.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterName1; this.AuxHeaterName1.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterName1;
this.AuxHeaterPTemp1.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp1.ToString(); this.AuxHeaterPTemp1.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp1.ToString();
this.AuxHeater2.Checked = this.hWConfig.hwconfiginfo.u16AuxHeater2 == 1 ? true : false; this.AuxHeater2.Checked = this.hWConfig.hwconfiginfo.u16AuxHeater2 == 1 ? true : false;
this.checkBox_EPC_AUX2_1.Checked=this.hWConfig.hwconfiginfo.u16Aux2Epc1== 1 ? true : false;
this.checkBox_EPC_AUX2_2.Checked=this.hWConfig.hwconfiginfo.u16Aux2Epc2== 1 ? true : false;
this.checkBox_EPC_AUX2_3.Checked=this.hWConfig.hwconfiginfo.u16Aux2Epc3== 1 ? true : false;
this.AuxHeaterName2.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterName2; this.AuxHeaterName2.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterName2;
this.AuxHeaterPTemp2.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp2.ToString(); this.AuxHeaterPTemp2.Text = this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp2.ToString();
...@@ -63,9 +69,15 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -63,9 +69,15 @@ namespace GcDevicePc.DeviceConfigUI
this.hWConfig.hwconfiginfo.u16AuxHeaterNum = (this.AuxHeater1.Checked ? 1 : 0) + (this.AuxHeater2.Checked ? 1 : 0); this.hWConfig.hwconfiginfo.u16AuxHeaterNum = (this.AuxHeater1.Checked ? 1 : 0) + (this.AuxHeater2.Checked ? 1 : 0);
this.hWConfig.hwconfiginfo.u16AuxHeater1 = this.AuxHeater1.Checked ? 1 : 0; this.hWConfig.hwconfiginfo.u16AuxHeater1 = this.AuxHeater1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux1Epc1 = this.checkBox_EPC_AUX1_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux1Epc2 = this.checkBox_EPC_AUX1_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux1Epc3 = this.checkBox_EPC_AUX1_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16AuxHeaterName1 = this.AuxHeaterName1.Text; this.hWConfig.hwconfiginfo.u16AuxHeaterName1 = this.AuxHeaterName1.Text;
this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp1 = int.Parse(this.AuxHeaterPTemp1.Text); this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp1 = int.Parse(this.AuxHeaterPTemp1.Text);
this.hWConfig.hwconfiginfo.u16AuxHeater2 = this.AuxHeater2.Checked ? 1 : 0; this.hWConfig.hwconfiginfo.u16AuxHeater2 = this.AuxHeater2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2Epc1 = this.checkBox_EPC_AUX2_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2Epc2 = this.checkBox_EPC_AUX2_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Aux2Epc3 = this.checkBox_EPC_AUX2_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16AuxHeaterName2 = this.AuxHeaterName2.Text; this.hWConfig.hwconfiginfo.u16AuxHeaterName2 = this.AuxHeaterName2.Text;
this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp2 = int.Parse(this.AuxHeaterPTemp2.Text); this.hWConfig.hwconfiginfo.u16AuxHeaterPTemp2 = int.Parse(this.AuxHeaterPTemp2.Text);
} }
......
GcDevicePc/DeviceConfigUI/Auxiliary.en.resx
View file @ 1961b0e8
...@@ -117,7 +117,135 @@ ...@@ -117,7 +117,135 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="checkBox_EPC_AUX2_3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="checkBox_EPC_AUX2_3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="checkBox_EPC_AUX2_3.Location" type="System.Drawing.Point, System.Drawing">
<value>551, 157</value>
</data>
<data name="checkBox_EPC_AUX2_3.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 19</value>
</data>
<data name="checkBox_EPC_AUX2_3.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
</data>
<data name="checkBox_EPC_AUX2_3.Text" xml:space="preserve">
<value>flow3</value>
</data>
<data name="checkBox_EPC_AUX2_3.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBox_EPC_AUX2_2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBox_EPC_AUX2_2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox_EPC_AUX2_2.Location" type="System.Drawing.Point, System.Drawing">
<value>459, 157</value>
</data>
<data name="checkBox_EPC_AUX2_2.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 19</value>
</data>
<data name="checkBox_EPC_AUX2_2.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="checkBox_EPC_AUX2_2.Text" xml:space="preserve">
<value>flow2</value>
</data>
<data name="checkBox_EPC_AUX2_2.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBox_EPC_AUX2_1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBox_EPC_AUX2_1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox_EPC_AUX2_1.Location" type="System.Drawing.Point, System.Drawing">
<value>367, 157</value>
</data>
<data name="checkBox_EPC_AUX2_1.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 19</value>
</data>
<data name="checkBox_EPC_AUX2_1.TabIndex" type="System.Int32, mscorlib">
<value>16</value>
</data>
<data name="checkBox_EPC_AUX2_1.Text" xml:space="preserve">
<value>flow1</value>
</data>
<data name="checkBox_EPC_AUX2_1.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBox_EPC_AUX1_3.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBox_EPC_AUX1_3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox_EPC_AUX1_3.Location" type="System.Drawing.Point, System.Drawing">
<value>206, 157</value>
</data>
<data name="checkBox_EPC_AUX1_3.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 19</value>
</data>
<data name="checkBox_EPC_AUX1_3.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
</data>
<data name="checkBox_EPC_AUX1_3.Text" xml:space="preserve">
<value>flow3</value>
</data>
<data name="checkBox_EPC_AUX1_3.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBox_EPC_AUX1_2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBox_EPC_AUX1_2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox_EPC_AUX1_2.Location" type="System.Drawing.Point, System.Drawing">
<value>114, 157</value>
</data>
<data name="checkBox_EPC_AUX1_2.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 19</value>
</data>
<data name="checkBox_EPC_AUX1_2.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="checkBox_EPC_AUX1_2.Text" xml:space="preserve">
<value>flow2</value>
</data>
<data name="checkBox_EPC_AUX1_2.ToolTip" xml:space="preserve">
<value />
</data>
<data name="checkBox_EPC_AUX1_1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="checkBox_EPC_AUX1_1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="checkBox_EPC_AUX1_1.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 157</value>
</data>
<data name="checkBox_EPC_AUX1_1.Size" type="System.Drawing.Size, System.Drawing">
<value>66, 19</value>
</data>
<data name="checkBox_EPC_AUX1_1.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="checkBox_EPC_AUX1_1.Text" xml:space="preserve">
<value>flow1</value>
</data>
<data name="checkBox_EPC_AUX1_1.ToolTip" xml:space="preserve">
<value />
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing"> <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>346, 53</value> <value>346, 53</value>
</data> </data>
......
GcDevicePc/DeviceConfigUI/Auxiliary.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Detection.cs
View file @ 1961b0e8
...@@ -17,7 +17,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -17,7 +17,7 @@ namespace GcDevicePc.DeviceConfigUI
#region 私有变量 #region 私有变量
private HWConfig hWConfig; private HWConfig hWConfig;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false; private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false;
#endregion #endregion
#region 构造函数 #region 构造函数
...@@ -41,16 +41,25 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -41,16 +41,25 @@ namespace GcDevicePc.DeviceConfigUI
{ {
this.DetNum.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetNum; this.DetNum.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetNum;
this.DetFront.Checked = this.hWConfig.hwconfiginfo.u16DetFront == 1 ? true : false; this.DetFront.Checked = this.hWConfig.hwconfiginfo.u16DetFront == 1 ? true : false;
this.checkBox_EPC_DET1_1.Checked = this.hWConfig.hwconfiginfo.u16Det1Epc1 == 1 ? true : false;
this.checkBox_EPC_DET1_2.Checked = this.hWConfig.hwconfiginfo.u16Det1Epc2 == 1 ? true : false;
this.checkBox_EPC_DET1_3.Checked = this.hWConfig.hwconfiginfo.u16Det1Epc3 == 1 ? true : false;
this.DetFrontType.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetFrontType; this.DetFrontType.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetFrontType;
this.DetFrontPTemp.Text = this.hWConfig.hwconfiginfo.u16DetFrontPTemp.ToString(); this.DetFrontPTemp.Text = this.hWConfig.hwconfiginfo.u16DetFrontPTemp.ToString();
this.DetFrontAisle.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetFrontAisle; this.DetFrontAisle.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetFrontAisle;
this.DetInter.Checked = this.hWConfig.hwconfiginfo.u16DetInter == 1 ? true : false; this.DetInter.Checked = this.hWConfig.hwconfiginfo.u16DetInter == 1 ? true : false;
this.checkBox_EPC_DET2_1.Checked = this.hWConfig.hwconfiginfo.u16Det2Epc1 == 1 ? true : false;
this.checkBox_EPC_DET2_2.Checked = this.hWConfig.hwconfiginfo.u16Det2Epc2 == 1 ? true : false;
this.checkBox_EPC_DET2_3.Checked = this.hWConfig.hwconfiginfo.u16Det2Epc3 == 1 ? true : false;
this.DetInterType.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetInterType; this.DetInterType.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetInterType;
this.DetInterPTemp.Text = this.hWConfig.hwconfiginfo.u16DetInterPTemp.ToString(); this.DetInterPTemp.Text = this.hWConfig.hwconfiginfo.u16DetInterPTemp.ToString();
this.DetInterAisle.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetInterAisle; this.DetInterAisle.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetInterAisle;
this.DetBehind.Checked = this.hWConfig.hwconfiginfo.u16DetBehind == 1 ? true : false; this.DetBehind.Checked = this.hWConfig.hwconfiginfo.u16DetBehind == 1 ? true : false;
this.checkBox_EPC_DET3_1.Checked = this.hWConfig.hwconfiginfo.u16Det3Epc1 == 1 ? true : false;
this.checkBox_EPC_DET3_2.Checked = this.hWConfig.hwconfiginfo.u16Det3Epc2 == 1 ? true : false;
this.checkBox_EPC_DET3_3.Checked = this.hWConfig.hwconfiginfo.u16Det3Epc3 == 1 ? true : false;
this.DetBehindType.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetBehindType; this.DetBehindType.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetBehindType;
this.DetBehindPTemp.Text = this.hWConfig.hwconfiginfo.u16DetBehindPTemp.ToString(); this.DetBehindPTemp.Text = this.hWConfig.hwconfiginfo.u16DetBehindPTemp.ToString();
this.DetBehindAisle.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetBehindAisle; this.DetBehindAisle.SelectedIndex = this.hWConfig.hwconfiginfo.u16DetBehindAisle;
...@@ -64,7 +73,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -64,7 +73,7 @@ namespace GcDevicePc.DeviceConfigUI
//{ //{
// DeTextBox.Text = "0"; // DeTextBox.Text = "0";
//} //}
ToolTip1.Show("",DeTextBox,3000); ToolTip1.Show("", DeTextBox, 3000);
} }
private void vInput_Integer_Limit_TextChange(object sender, EventArgs e) private void vInput_Integer_Limit_TextChange(object sender, EventArgs e)
...@@ -73,7 +82,7 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -73,7 +82,7 @@ namespace GcDevicePc.DeviceConfigUI
ushort usData; ushort usData;
ushort usMaxValue = 400; ushort usMaxValue = 400;
ushort usMinValue = 0; ushort usMinValue = 0;
if(TempTextBox.Text.IndexOf(".") > -1) if (TempTextBox.Text.IndexOf(".") > -1)
{ {
string strData = TempTextBox.Text; string strData = TempTextBox.Text;
if (bEnglishLanguage == false) if (bEnglishLanguage == false)
...@@ -81,25 +90,25 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -81,25 +90,25 @@ namespace GcDevicePc.DeviceConfigUI
else else
ToolTip1.Show("The input value should be an integer", TempTextBox, 3000); ToolTip1.Show("The input value should be an integer", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(strData.Substring(0,strData.Length -1)); TempTextBox.AppendText(strData.Substring(0, strData.Length - 1));
} }
if (ushort.TryParse(TempTextBox.Text, out usData)) if (ushort.TryParse(TempTextBox.Text, out usData))
{ {
if (usData > usMaxValue) if (usData > usMaxValue)
{ {
if(bEnglishLanguage == false) if (bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内", TempTextBox, 3000);
else else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000); ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMaxValue.ToString()); TempTextBox.AppendText(usMaxValue.ToString());
} }
else if(usData < usMinValue) else if (usData < usMinValue)
{ {
if(bEnglishLanguage == false) if (bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内", TempTextBox, 3000);
else else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000); ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(usMinValue.ToString()); TempTextBox.AppendText(usMinValue.ToString());
} }
...@@ -109,19 +118,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -109,19 +118,19 @@ namespace GcDevicePc.DeviceConfigUI
TempTextBox.AppendText(usData.ToString()); TempTextBox.AppendText(usData.ToString());
} }
} }
else if(usMinValue < 0 && TempTextBox.Text == "-") else if (usMinValue < 0 && TempTextBox.Text == "-")
{ {
} }
else if(TempTextBox.Text != "" && TempTextBox.Text.Length != 0) else if (TempTextBox.Text != "" && TempTextBox.Text.Length != 0)
{ {
string str = TempTextBox.Text; string str = TempTextBox.Text;
if(bEnglishLanguage == false) if (bEnglishLanguage == false)
ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内",TempTextBox,3000); ToolTip1.Show($"输入值为{usMinValue}-{usMaxValue}的区间内", TempTextBox, 3000);
else else
ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}",TempTextBox,3000); ToolTip1.Show($"The input value is {usMinValue}-{usMaxValue}", TempTextBox, 3000);
TempTextBox.Clear(); TempTextBox.Clear();
TempTextBox.AppendText(str.Substring(0,str.Length -1)); TempTextBox.AppendText(str.Substring(0, str.Length - 1));
} }
} }
#endregion #endregion
...@@ -134,16 +143,25 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -134,16 +143,25 @@ namespace GcDevicePc.DeviceConfigUI
this.hWConfig.hwconfiginfo.u16DetNum = (this.DetFront.Checked ? 1 : 0) + (this.DetInter.Checked ? 1 : 0) + (this.DetBehind.Checked ? 1 : 0); this.hWConfig.hwconfiginfo.u16DetNum = (this.DetFront.Checked ? 1 : 0) + (this.DetInter.Checked ? 1 : 0) + (this.DetBehind.Checked ? 1 : 0);
this.hWConfig.hwconfiginfo.u16DetFront = this.DetFront.Checked ? 1 : 0; this.hWConfig.hwconfiginfo.u16DetFront = this.DetFront.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det1Epc1 = this.checkBox_EPC_DET1_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det1Epc2 = this.checkBox_EPC_DET1_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det1Epc3 = this.checkBox_EPC_DET1_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16DetFrontType = this.DetFrontType.SelectedIndex; this.hWConfig.hwconfiginfo.u16DetFrontType = this.DetFrontType.SelectedIndex;
this.hWConfig.hwconfiginfo.u16DetFrontPTemp = int.Parse(this.DetFrontPTemp.Text); this.hWConfig.hwconfiginfo.u16DetFrontPTemp = int.Parse(this.DetFrontPTemp.Text);
this.hWConfig.hwconfiginfo.u16DetFrontAisle = this.DetFrontAisle.SelectedIndex; this.hWConfig.hwconfiginfo.u16DetFrontAisle = this.DetFrontAisle.SelectedIndex;
this.hWConfig.hwconfiginfo.u16DetInter = this.DetInter.Checked ? 1 : 0; this.hWConfig.hwconfiginfo.u16DetInter = this.DetInter.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det2Epc1 = this.checkBox_EPC_DET2_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det2Epc2 = this.checkBox_EPC_DET2_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det2Epc3 = this.checkBox_EPC_DET2_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16DetInterType = this.DetInterType.SelectedIndex; this.hWConfig.hwconfiginfo.u16DetInterType = this.DetInterType.SelectedIndex;
this.hWConfig.hwconfiginfo.u16DetInterPTemp = int.Parse(this.DetInterPTemp.Text); this.hWConfig.hwconfiginfo.u16DetInterPTemp = int.Parse(this.DetInterPTemp.Text);
this.hWConfig.hwconfiginfo.u16DetInterAisle = this.DetInterAisle.SelectedIndex; this.hWConfig.hwconfiginfo.u16DetInterAisle = this.DetInterAisle.SelectedIndex;
this.hWConfig.hwconfiginfo.u16DetBehind = this.DetBehind.Checked ? 1 : 0; this.hWConfig.hwconfiginfo.u16DetBehind = this.DetBehind.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det3Epc1 = this.checkBox_EPC_DET3_1.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det3Epc2 = this.checkBox_EPC_DET3_2.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16Det3Epc3 = this.checkBox_EPC_DET3_3.Checked ? 1 : 0;
this.hWConfig.hwconfiginfo.u16DetBehindType = this.DetBehindType.SelectedIndex; this.hWConfig.hwconfiginfo.u16DetBehindType = this.DetBehindType.SelectedIndex;
this.hWConfig.hwconfiginfo.u16DetBehindPTemp = int.Parse(this.DetBehindPTemp.Text); this.hWConfig.hwconfiginfo.u16DetBehindPTemp = int.Parse(this.DetBehindPTemp.Text);
this.hWConfig.hwconfiginfo.u16DetBehindAisle = this.DetBehindAisle.SelectedIndex; this.hWConfig.hwconfiginfo.u16DetBehindAisle = this.DetBehindAisle.SelectedIndex;
......
GcDevicePc/DeviceConfigUI/Detection.en.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Detection.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Device.byn.resx 0 → 100644
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Device.cs
View file @ 1961b0e8
...@@ -42,7 +42,8 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -42,7 +42,8 @@ namespace GcDevicePc.DeviceConfigUI
{ {
this.GCNum.Text = ((globaldata.DeviceInfo)globaldata.DeviceList[0]).MacAddr; this.GCNum.Text = ((globaldata.DeviceInfo)globaldata.DeviceList[0]).MacAddr;
this.GCName.Text = this.hWConfig.hwconfiginfo.GCName; this.GCName.Text = this.hWConfig.hwconfiginfo.GCName;
this.GCAddress.Text = this.hWConfig.hwconfiginfo.GCAddress;
this.textBox_InjectorName.Text = this.hWConfig.hwconfiginfo.InjectorName;
switch (this.hWConfig.hwconfiginfo.u16StartType) switch (this.hWConfig.hwconfiginfo.u16StartType)
{ {
case 1: case 1:
...@@ -100,7 +101,8 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -100,7 +101,8 @@ namespace GcDevicePc.DeviceConfigUI
{ {
this.hWConfig.hwconfiginfo.GCNum = this.GCNum.Text; this.hWConfig.hwconfiginfo.GCNum = this.GCNum.Text;
this.hWConfig.hwconfiginfo.GCName = this.GCName.Text; this.hWConfig.hwconfiginfo.GCName = this.GCName.Text;
this.hWConfig.hwconfiginfo.GCAddress = this.GCAddress.Text;
this.hWConfig.hwconfiginfo.InjectorName =textBox_InjectorName.Text;
if (this.radioButton1.Checked) if (this.radioButton1.Checked)
{ {
this.hWConfig.hwconfiginfo.u16StartType = 1; this.hWConfig.hwconfiginfo.u16StartType = 1;
......
GcDevicePc/DeviceConfigUI/Device.en.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Device.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Sampling.cs
View file @ 1961b0e8
...@@ -80,11 +80,17 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -80,11 +80,17 @@ namespace GcDevicePc.DeviceConfigUI
//进样口 //进样口
this.InjPortFront.Checked = this.hWConfig.hwconfiginfo.u16InjPortFront == 1 ? true : false; this.InjPortFront.Checked = this.hWConfig.hwconfiginfo.u16InjPortFront == 1 ? true : false;
this.checkBox_EPC_INj1_1.Checked = this.hWConfig.hwconfiginfo.u16Inj1Epc1 == 1 ? true : false;
this.checkBox_EPC_INj1_2.Checked = this.hWConfig.hwconfiginfo.u16Inj1Epc2 == 1 ? true : false;
this.checkBox_EPC_INj1_3.Checked = this.hWConfig.hwconfiginfo.u16Inj1Epc3 == 1 ? true : false;
this.InjPortFPTemp.Text = this.hWConfig.hwconfiginfo.u16InjPortFPTemp.ToString(); this.InjPortFPTemp.Text = this.hWConfig.hwconfiginfo.u16InjPortFPTemp.ToString();
this.InjPortType_Front.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortType_Front; this.InjPortType_Front.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortType_Front;
this.InjPortLoadGas_Front.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Front; this.InjPortLoadGas_Front.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Front;
this.InjPortBehind.Checked = this.hWConfig.hwconfiginfo.u16InjPortBehind == 1 ? true : false; this.InjPortBehind.Checked = this.hWConfig.hwconfiginfo.u16InjPortBehind == 1 ? true : false;
this.checkBox_EPC_INj2_1.Checked = this.hWConfig.hwconfiginfo.u16Inj2Epc1 == 1 ? true : false;
this.checkBox_EPC_INj2_2.Checked = this.hWConfig.hwconfiginfo.u16Inj2Epc2 == 1 ? true : false;
this.checkBox_EPC_INj2_3.Checked = this.hWConfig.hwconfiginfo.u16Inj2Epc3 == 1 ? true : false;
this.InjPortBPTemp.Text = this.hWConfig.hwconfiginfo.u16InjPortBPTemp.ToString(); this.InjPortBPTemp.Text = this.hWConfig.hwconfiginfo.u16InjPortBPTemp.ToString();
this.InjPortType_Behind.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortType_Behind; this.InjPortType_Behind.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortType_Behind;
this.InjPortLoadGas_Behind.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Behind; this.InjPortLoadGas_Behind.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Behind;
...@@ -138,11 +144,19 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -138,11 +144,19 @@ namespace GcDevicePc.DeviceConfigUI
} }
this.hWConfig.hwconfiginfo.u16InjPortNum = num; this.hWConfig.hwconfiginfo.u16InjPortNum = num;
this.hWConfig.hwconfiginfo.u16InjPortFront = this.InjPortFront.Checked? 1: 0; this.hWConfig.hwconfiginfo.u16InjPortFront = this.InjPortFront.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16Inj1Epc1 = this.checkBox_EPC_INj1_1.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16Inj1Epc2 = this.checkBox_EPC_INj1_2.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16Inj1Epc3 = this.checkBox_EPC_INj1_3.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16InjPortFPTemp = int.Parse(this.InjPortFPTemp.Text); this.hWConfig.hwconfiginfo.u16InjPortFPTemp = int.Parse(this.InjPortFPTemp.Text);
this.hWConfig.hwconfiginfo.u16InjPortType_Front = this.InjPortType_Front.SelectedIndex; this.hWConfig.hwconfiginfo.u16InjPortType_Front = this.InjPortType_Front.SelectedIndex;
this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Front = this.InjPortLoadGas_Front.SelectedIndex; this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Front = this.InjPortLoadGas_Front.SelectedIndex;
this.hWConfig.hwconfiginfo.u16InjPortBehind = this.InjPortBehind.Checked? 1 : 0; this.hWConfig.hwconfiginfo.u16InjPortBehind = this.InjPortBehind.Checked? 1 : 0;
this.hWConfig.hwconfiginfo.u16Inj2Epc1 = this.checkBox_EPC_INj2_1.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16Inj2Epc2 = this.checkBox_EPC_INj2_2.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16Inj2Epc3 = this.checkBox_EPC_INj2_3.Checked? 1: 0;
this.hWConfig.hwconfiginfo.u16InjPortBPTemp = int.Parse(this.InjPortBPTemp.Text); this.hWConfig.hwconfiginfo.u16InjPortBPTemp = int.Parse(this.InjPortBPTemp.Text);
this.hWConfig.hwconfiginfo.u16InjPortType_Behind = this.InjPortType_Behind.SelectedIndex; this.hWConfig.hwconfiginfo.u16InjPortType_Behind = this.InjPortType_Behind.SelectedIndex;
this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Behind = this.InjPortLoadGas_Behind.SelectedIndex; this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Behind = this.InjPortLoadGas_Behind.SelectedIndex;
......
GcDevicePc/DeviceConfigUI/Sampling.en.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/Sampling.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/FileServerClient.cs
View file @ 1961b0e8
...@@ -255,8 +255,11 @@ namespace GcDevicePc ...@@ -255,8 +255,11 @@ namespace GcDevicePc
wrappedAction.EndInvoke(result); wrappedAction.EndInvoke(result);
} }
else else
{
if (threadToKill!=null)
{ {
threadToKill.Abort(); threadToKill.Abort();
}
throw new TimeoutException(); throw new TimeoutException();
} }
} }
......
GcDevicePc/Formdebug.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/GCBuffer/DPBuffer.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/GCBuffer/GCMethodConfig.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/GCBuffer/HMIBuffer.cs
View file @ 1961b0e8
...@@ -88,7 +88,7 @@ namespace GcDevicePc.GCBuffer ...@@ -88,7 +88,7 @@ namespace GcDevicePc.GCBuffer
gcinfo.ErrorStatus = new byte[9]; gcinfo.ErrorStatus = new byte[9];
gcinfo.hmioffline = false; gcinfo.hmioffline = false;
gcinfo.HMIMac = new ushort[3] { 0, 0, 0 }; gcinfo.HMIMac = new ushort[3] { 0, 0, 0 };
gcinfo.EPCStatus = new ushort[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; gcinfo.EPCStatus = new ushort[48] ;
gcinfo.HmiAbnormal = new ushort[4] { 0, 0, 0 ,0}; gcinfo.HmiAbnormal = new ushort[4] { 0, 0, 0 ,0};
gcadjust.executefun = 0; gcadjust.executefun = 0;
......
GcDevicePc/GCBuffer/HWConfig.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/GcDevicePc.csproj
View file @ 1961b0e8
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
</Reference> </Reference>
<Reference Include="CKVocAnalyzer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="CKVocAnalyzer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>C:\Users\a\Desktop\色谱仪\新建文件夹\gcdevicepc_nmoc8-16\CKVocAnalyzer\bin\Debug\CKVocAnalyzer.dll</HintPath> <HintPath>..\dll\CKVocAnalyzer.dll</HintPath>
</Reference> </Reference>
<Reference Include="Ini.Net, Version=1.0.5531.18665, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Ini.Net, Version=1.0.5531.18665, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ini.net.1.1.0\lib\net20\Ini.Net.dll</HintPath> <HintPath>..\packages\ini.net.1.1.0\lib\net20\Ini.Net.dll</HintPath>
...@@ -257,6 +257,8 @@ ...@@ -257,6 +257,8 @@
<Compile Include="CK_UI\WaveTotalForm.Designer.cs"> <Compile Include="CK_UI\WaveTotalForm.Designer.cs">
<DependentUpon>WaveTotalForm.cs</DependentUpon> <DependentUpon>WaveTotalForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="CloudBox\DataInstance.cs" />
<Compile Include="CloudBox\GCData.cs" />
<Compile Include="Common\FileTools.cs" /> <Compile Include="Common\FileTools.cs" />
<Compile Include="Common\FileTransfer.cs" /> <Compile Include="Common\FileTransfer.cs" />
<Compile Include="Common\GCModbus.cs" /> <Compile Include="Common\GCModbus.cs" />
...@@ -1037,6 +1039,9 @@ ...@@ -1037,6 +1039,9 @@
<EmbeddedResource Include="DeviceConfigUI\Detection.resx"> <EmbeddedResource Include="DeviceConfigUI\Detection.resx">
<DependentUpon>Detection.cs</DependentUpon> <DependentUpon>Detection.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="DeviceConfigUI\Device.byn.resx">
<DependentUpon>Device.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DeviceConfigUI\Device.en.resx"> <EmbeddedResource Include="DeviceConfigUI\Device.en.resx">
<DependentUpon>Device.cs</DependentUpon> <DependentUpon>Device.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
GcDevicePc/IniParam/Device.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/IniParam/IniOp.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/MDIBase.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/ProThread/GcDataTh.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/ProThread/HMISearch.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/ProThread/SendDataToSum.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/StartForm.cs
View file @ 1961b0e8
...@@ -360,7 +360,7 @@ namespace GcDevicePc ...@@ -360,7 +360,7 @@ namespace GcDevicePc
HMISearch mysearch = new HMISearch(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.hmimac); HMISearch mysearch = new HMISearch(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.hmimac);
// mysearch.bSearch_Bind_HMI(); // mysearch.bSearch_Bind_HMI();
bStartSearchOK = true; bStartSearchOK = true;
mysearch.ThStart(); mysearch.ThStart(true);
// mysearch.ThStart(); // mysearch.ThStart();
if (globaldata.DeviceList.Count < 1) if (globaldata.DeviceList.Count < 1)
{ {
...@@ -371,7 +371,7 @@ namespace GcDevicePc ...@@ -371,7 +371,7 @@ namespace GcDevicePc
{ {
while (!bWaitOver) while (!bWaitOver)
{ {
mysearch.ThStart(); mysearch.ThStart(true);
} }
} }
} }
......
GcDevicePc/SysConfig.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/SysConfig.en.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/SysConfig.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/auxtool.Designer.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/auxtool.cs
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/auxtool.en.resx
View file @ 1961b0e8
This diff is collapsed.
GcDevicePc/auxtool.resx
View file @ 1961b0e8
This diff is collapsed.
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 1961b0e8
This diff is collapsed.
VocsSetup/GC_Control/CKVocAnalyzer.dll
View file @ 1961b0e8
This diff is collapsed.
VocsSetup/GC_User/ResultData/Record2.db
View file @ 1961b0e8
This diff is collapsed.
dll/CKVocAnalyzer.dll
View file @ 1961b0e8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment