diff --git a/CharacteristicList.cpp b/CharacteristicList.cpp index fa247eb..4974f18 100644 --- a/CharacteristicList.cpp +++ b/CharacteristicList.cpp @@ -82,7 +82,11 @@ void CCharacteristicList::DisPlayCharacteristic() }else if(g_ChannelBaseInfo[i].defaultDisplay == "峰值"){ model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].DiagnosisPeak,'f',g_Charateristic[j].ChUnitDot)); }else if(g_ChannelBaseInfo[i].defaultDisplay == "平均值"){ - model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].DCValues,'f',g_Charateristic[j].ChUnitDot)); + if(g_ChannelBaseInfo[i].channelType == "PULSE_CURRENT" && g_Charateristic[j].DiagnosisPk2Pk < 0.9 && g_Charateristic[j].DiagnosisPk2Pk > 0.4){ + model->setData(model->index(j,2,QModelIndex()),"0.0"); + }else{ + model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].DiagnosisPk2Pk,'f',g_Charateristic[j].ChUnitDot)); + } }else if(g_ChannelBaseInfo[i].defaultDisplay == "转速"){ model->setData(model->index(j,2,QModelIndex()),QString::number(g_Charateristic[j].speedRPM,'f',g_Charateristic[j].ChUnitDot)); }