Skip to content

G
GC_Branch
Commit 4e2bed0e authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

修改温度显示为一个小数点

parent b6ab6dae
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
GcDevicePc/DataState.cs
View file @ 4e2bed0e
...@@ -192,10 +192,10 @@ namespace GcDevicePc ...@@ -192,10 +192,10 @@ namespace GcDevicePc
tempshow.Text = "前进样口"; tempshow.Text = "前进样口";
if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
} }
...@@ -206,10 +206,10 @@ namespace GcDevicePc ...@@ -206,10 +206,10 @@ namespace GcDevicePc
tempshow.Text = "后进样口"; tempshow.Text = "后进样口";
if (globaldata.m_dpbuffer.ShowList.showtemp.BPSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.BPSetTemp == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.BPSetTemp.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.BPSetTemp.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
...@@ -221,10 +221,10 @@ namespace GcDevicePc ...@@ -221,10 +221,10 @@ namespace GcDevicePc
tempshow.Text = "柱箱"; tempshow.Text = "柱箱";
if (globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.ColSetTemp.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
...@@ -246,10 +246,10 @@ namespace GcDevicePc ...@@ -246,10 +246,10 @@ namespace GcDevicePc
} }
if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
} }
...@@ -271,10 +271,10 @@ namespace GcDevicePc ...@@ -271,10 +271,10 @@ namespace GcDevicePc
} }
if (globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
...@@ -295,12 +295,12 @@ namespace GcDevicePc ...@@ -295,12 +295,12 @@ namespace GcDevicePc
if (globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp == 0.0f)
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp.ToString("#0.0") + " / " + "等待读取");
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.bDetActualTemp.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
...@@ -318,10 +318,10 @@ namespace GcDevicePc ...@@ -318,10 +318,10 @@ namespace GcDevicePc
tempshow.Text = "未命名"; tempshow.Text = "未命名";
if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1 == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1 == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
...@@ -337,10 +337,10 @@ namespace GcDevicePc ...@@ -337,10 +337,10 @@ namespace GcDevicePc
tempshow.Text = "未命名"; tempshow.Text = "未命名";
if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2 == 0.0f) if (globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2 == 0.0f)
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.00") + " / " + "等待读取"); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.0") + " / " + "等待读取");
else else
{ {
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2.ToString("0")); tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.0") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2.ToString("0"));
this.datalist.Items.Add(tempshow); this.datalist.Items.Add(tempshow);
} }
} }
......
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