Commit 83a094cb authored by wangjunqiang's avatar wangjunqiang

修复柱箱默认保护温度

parent c4156cc6
...@@ -142,7 +142,7 @@ namespace GcDevicePc.Common ...@@ -142,7 +142,7 @@ namespace GcDevicePc.Common
{ {
case 1: //进度 case 1: //进度
{ {
if ((ushort) SharedSpace.Data.typesint == 2 || (ushort) SharedSpace.Data.typesint == 3) if ((ushort) SharedSpace.Data.typesint == 1 || (ushort) SharedSpace.Data.typesint == 2)
{ {
value = (ushort)((globaldata.m_hmibuffer.gcinfo.batruncount *1.0f)/ value = (ushort)((globaldata.m_hmibuffer.gcinfo.batruncount *1.0f)/
(ushort)(SharedSpace.MControl.dateend/SharedSpace.MControl.zhouqi)*1000); (ushort)(SharedSpace.MControl.dateend/SharedSpace.MControl.zhouqi)*1000);
......
...@@ -62,7 +62,9 @@ namespace GcDevicePc.ConfigMethod ...@@ -62,7 +62,9 @@ namespace GcDevicePc.ConfigMethod
int ProNum = this.methodconfig.col.u16ColProNum; int ProNum = this.methodconfig.col.u16ColProNum;
OSetTemp.Text = this.methodconfig.col.fColTempSet.ToString(); OSetTemp.Text = this.methodconfig.col.fColTempSet.ToString();
OActTemp.Text = this.methodconfig.col.fColTempActual.ToString(); OActTemp.Text = this.methodconfig.col.fColTempActual.ToString();
OMAXTemp.Text = this.methodconfig.col.fHigestTemp.ToString(); OMAXTemp.Text = (this.methodconfig.col.fHigestTemp == 0.0f)
? this.hwconfig.hwconfiginfo.u16ColPTemp.ToString()
: this.methodconfig.col.fHigestTemp.ToString();
OBalTime.Text = this.methodconfig.col.fBalanceTime.ToString(); OBalTime.Text = this.methodconfig.col.fBalanceTime.ToString();
tb后运行温度.Text = this.methodconfig.col.fBehindRunTemp.ToString(); tb后运行温度.Text = this.methodconfig.col.fBehindRunTemp.ToString();
tb后运行时间.Text = this.methodconfig.col.fBehindRunTime.ToString(); tb后运行时间.Text = this.methodconfig.col.fBehindRunTime.ToString();
......
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