Commit 537fb05f authored by wangwanxh@sina.com's avatar wangwanxh@sina.com

Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

parents e60a026a 745fbdc6
......@@ -144,8 +144,17 @@ namespace GcDevicePc.Common
{
if ((ushort) SharedSpace.Data.typesint == 1 || (ushort) SharedSpace.Data.typesint == 2)
{
value = (ushort)((globaldata.m_hmibuffer.gcinfo.batruncount *1.0f)/
(ushort)(SharedSpace.MControl.dateend/SharedSpace.MControl.zhouqi)*1000);
if (SharedSpace.MControl.dateend != 0 && SharedSpace.MControl.zhouqi != 0)
{
value = (ushort) ((globaldata.m_hmibuffer.gcinfo.batruncount * 1.0f) /
(ushort) (SharedSpace.MControl.dateend * 1.0f /
SharedSpace.MControl.zhouqi) * 1000);
}
else
{
value = 0;
}
}
else
{
......
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