Skip to content

G
GC_Branch
Commit d0bb5a63 authored by liu's avatar liu
Browse files
Options

修改功率显示问题，主界面部分显示问题

parent 7b0a1056
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 58 deletions
GcDevicePc/DataState.cs
View file @ d0bb5a63
......@@ -1019,8 +1019,8 @@ namespace GcDevicePc
double bDetvalueold = 0;
ListViewItem tempshow;
float[] temp = new float[7]{ 0, 0, 0, 0, 0, 0, 0 };
int[] timea = new int[7] { 10, 10, 10, 10, 10, 10, 10};
float[] temp = new float[7] { 0, 0, 0, 0, 0, 0, 0 };
int[] timea = new int[7] { 10, 10, 10, 10, 10, 10, 10 };
private void dataupdate_Tick(object sender, EventArgs e)
{
......@@ -1179,8 +1179,6 @@ namespace GcDevicePc
}
tempshow = new ListViewItem();
this.datalist.Items.Add(tempshow);
......@@ -1195,7 +1193,7 @@ namespace GcDevicePc
//前进样口
if (CProfileDevice.m_DevParam.syspara.u16InjPortFront == 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp != 0.0f)
{
......@@ -1206,7 +1204,7 @@ namespace GcDevicePc
if (globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp < globaldata.m_hwconfig.hwconfiginfo.u16InjPortFPTemp + 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp>globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp - 1 && globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp < globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp + 1)
if (globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp > globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp - 1 && globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp < globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp + 1)
{
tempshow.BackColor = Color.White;
}
......@@ -1247,7 +1245,7 @@ namespace GcDevicePc
if (CProfileDevice.m_DevParam.syspara.u16InjPortBehind == 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.BPSetTemp != 0.0f)
{
......@@ -1295,7 +1293,7 @@ namespace GcDevicePc
if (CProfileDevice.m_DevParam.syspara.u16Col == 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp != 0.0f)
{
tempshow = new ListViewItem();
......@@ -1503,7 +1501,7 @@ namespace GcDevicePc
//}
//temp[4] = globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp;
}
}
}
......@@ -1558,7 +1556,7 @@ namespace GcDevicePc
if (CProfileDevice.m_DevParam.syspara.u16AuxHeater2 == 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2 != 0.0f)
{
tempshow = new ListViewItem();
......@@ -1568,7 +1566,7 @@ namespace GcDevicePc
tempshow.Text = "未命名";
tempshow.SubItems.Add(IsException(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2) + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2.ToString("0"));
if (globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2 < globaldata.m_hwconfig.hwconfiginfo.u16AuxHeaterPTemp2 + 1)
{
if (globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2 > globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2 - 1 && globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2 < globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2 + 1)
......@@ -1679,7 +1677,7 @@ namespace GcDevicePc
if (valveflag)
{
tempshow = new ListViewItem();
tempshow.Text = (i == 5 ?"IO口" :"阀" + (i + 1) + "(min)");
tempshow.Text = (i == 5 ? "IO口" : "阀" + (i + 1) + "(min)");
//tempshow.SubItems.Add(openflag ? "开" : "关");
tempshow.SubItems.Add((CProfileDevice.m_DevParam.valve.u16ValveSetTime1[i] / 100.0f).ToString("0.00") + " / " + (CProfileDevice.m_DevParam.valve.u16ValveSetTime2[i] / 100.0f).ToString("0.00"));
tempshow.SubItems[0].BackColor = openflag ? Color.LightGreen : Color.White;
......@@ -1755,14 +1753,14 @@ namespace GcDevicePc
tempshow.SubItems.Add("");
this.datalist.Items.Add(tempshow);
if (CProfileDevice.m_DevParam.syspara.u16DetFront == 1)
{
//if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0 &&
// CProfileDevice.m_DevParam.tcd[0].u16HeaterSel > 0) //TCD
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD
{
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD
{
tempshow = new ListViewItem();
tempshow.Text = "TCD1";
{
......@@ -1835,7 +1833,7 @@ namespace GcDevicePc
GetSetValue(globaldata.m_dpbuffer.ShowList.showepc.EPC1_3_Set));
this.datalist.Items.Add(tempshow);
}
tempshow = new ListViewItem();
tempshow.Text = "点火状态";
......@@ -1904,8 +1902,8 @@ namespace GcDevicePc
{
//if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0 &&
// CProfileDevice.m_DevParam.tcd[1].u16HeaterSel > 0) //TCD
if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0) //TCD
{
if (CProfileDevice.m_DevParam.syspara.u16DetInterType == 0) //TCD
{
tempshow = new ListViewItem();
tempshow.Text = "TCD2";
......@@ -1943,8 +1941,8 @@ namespace GcDevicePc
//else if ((CProfileDevice.m_DevParam.syspara.u16DetInterType == 1 ||
// CProfileDevice.m_DevParam.syspara.u16DetInterType == 3) &&
// CProfileDevice.m_DevParam.fid[1].u16KeyHeater > 0)
else if ((CProfileDevice.m_DevParam.syspara.u16DetInterType == 1 ||
CProfileDevice.m_DevParam.syspara.u16DetInterType == 3))
else if ((CProfileDevice.m_DevParam.syspara.u16DetInterType == 1 ||
CProfileDevice.m_DevParam.syspara.u16DetInterType == 3))
{
tempshow = new ListViewItem();
......@@ -2165,6 +2163,7 @@ namespace GcDevicePc
this.datalist.Items.Add(tempshow);
}
tempshow = new ListViewItem();
tempshow.SubItems.Add("");
this.datalist.Items.Add(tempshow);
......@@ -2173,7 +2172,6 @@ namespace GcDevicePc
tempshow.Font = new Font(tempshow.Font, tempshow.Font.Style | FontStyle.Bold);
tempshow.SubItems.Add("");
this.datalist.Items.Add(tempshow);
;
tempshow = new ListViewItem();
tempshow.Text = GettempName("前检测器功率");
......
GcDevicePc/MDIBase.cs
View file @ d0bb5a63
......@@ -420,6 +420,7 @@ namespace GcDevicePc
//private bool a;
private void PictureMenu1_PMSysBtnClicked(object sender, EventArgs e)
{
#region
//PictureBox picturebtn = (PictureBox)sender;
//int tagnum = Convert.ToInt32(picturebtn.Tag);
//a = !a;
......@@ -474,7 +475,7 @@ namespace GcDevicePc
// globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue = false;
// globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 0;
//}
#endregion
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
if (!OSflag)
......@@ -488,6 +489,7 @@ namespace GcDevicePc
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 2)
{
hmiopt.WriteBatVal();
}
......@@ -1461,25 +1463,7 @@ namespace GcDevicePc
{
(this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 0;
}
//if (!String.IsNullOrEmpty(globaldata.connection_ip))
//{
// if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue == 0 && globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
// {
// //(this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 4;
// }
// else
// {
// }
//}
//else
//{
// (this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 0;
//}
//tips_Show();
if (globaldata.IsStopOs)
{
......@@ -1721,26 +1705,26 @@ namespace GcDevicePc
//Console.WriteLine(flag.ToString());
if (flag!=10 && flag != 0)
{
OSflag = true;
//if (flag!=10 && flag != 0)
//{
// OSflag = true;
(this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 4;
(this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMSysbtnstatus = 1;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue = true;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 0;
// (this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 4;
// (this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMSysbtnstatus = 1;
// //globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue = true;
// //globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 0;
}
else
{
OSflag = false;
(this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 0;
(this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMSysbtnstatus = 0;
//}
//else
//{
// OSflag = false;
// (this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMOptbtnstatus = 0;
// (this.title.Controls.Find("pictureMenu1", true)[0] as PictureMenu).PMSysbtnstatus = 0;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue = false;
//globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 0;
// //globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue = false;
// //globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 0;
}
//}
if (oldflag != flag)
......@@ -3289,8 +3273,6 @@ namespace GcDevicePc
CKVocAnalyzer.FormulaTips ft;
private void 单位换算ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (ft == null)
{
ft = new CKVocAnalyzer.FormulaTips();
......
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