diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 7b26e4b..dcaa48a 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -2465,6 +2465,83 @@ currentItem->setText(sData); QList dataRes = caliDataList->value(sLabel); dataRes[row][col] = sData; + + for(int i=0;itableWidgetCheck->rowCount()/8;i++){ + double dMin=0; + double dMax=0; + double dUpErr=0; + double dDownErr=0; + for(int k=i*8;ktableWidgetCheck->item(k,idx)->setText(QString::number(dMean1)); + dataRes[k][idx] = QString::number(dMean1); + + idx =getIndexByHeader(sLabel,QStrTranQStrList("RA均值")); + ui->tableWidgetCheck->item(k,idx)->setText(QString::number(dMean2)); + dataRes[k][idx] = QString::number(dMean2); + for(int j=5;j<13;j++){ + QString sTmp = ui->tableWidgetCheck->item(k,j)->text(); + if(sTmp!=""){ + dMin = qMin(dMin,sTmp.toDouble()); + dMax = qMax(dMax,sTmp.toDouble()); + } + } + } + int idx =getIndexByHeader(sLabel,QStrTranQStrList("上水平面温差")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dUpErr)); + dataRes[i*8][idx] = QString::number(dUpErr); + idx =getIndexByHeader(sLabel,QStrTranQStrList("下水平面温差")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dDownErr)); + dataRes[i*8][idx] = QString::number(dDownErr); + idx =getIndexByHeader(sLabel,QStrTranQStrList("水平最大温差")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dUpErr-dDownErr)); + dataRes[i*8][idx] = QString::number(dUpErr-dDownErr); + + idx =getIndexByHeader(sLabel,QStrTranQStrList("工作区域最大温差")); + QString sErr = QString::number(dMax-dMin); + if(idx>=0&&idxtableWidgetCheck->item(i*8,idx)!=nullptr) + ui->tableWidgetCheck->item(i*8,idx)->setText(sErr); + else + ui->tableWidgetCheck->setItem(i*8,idx,new QTableWidgetItem(sErr)); + } + caliDataList->insert(sLabel,dataRes); } } diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 7b26e4b..dcaa48a 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -2465,6 +2465,83 @@ currentItem->setText(sData); QList dataRes = caliDataList->value(sLabel); dataRes[row][col] = sData; + + for(int i=0;itableWidgetCheck->rowCount()/8;i++){ + double dMin=0; + double dMax=0; + double dUpErr=0; + double dDownErr=0; + for(int k=i*8;ktableWidgetCheck->item(k,idx)->setText(QString::number(dMean1)); + dataRes[k][idx] = QString::number(dMean1); + + idx =getIndexByHeader(sLabel,QStrTranQStrList("RA均值")); + ui->tableWidgetCheck->item(k,idx)->setText(QString::number(dMean2)); + dataRes[k][idx] = QString::number(dMean2); + for(int j=5;j<13;j++){ + QString sTmp = ui->tableWidgetCheck->item(k,j)->text(); + if(sTmp!=""){ + dMin = qMin(dMin,sTmp.toDouble()); + dMax = qMax(dMax,sTmp.toDouble()); + } + } + } + int idx =getIndexByHeader(sLabel,QStrTranQStrList("上水平面温差")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dUpErr)); + dataRes[i*8][idx] = QString::number(dUpErr); + idx =getIndexByHeader(sLabel,QStrTranQStrList("下水平面温差")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dDownErr)); + dataRes[i*8][idx] = QString::number(dDownErr); + idx =getIndexByHeader(sLabel,QStrTranQStrList("水平最大温差")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dUpErr-dDownErr)); + dataRes[i*8][idx] = QString::number(dUpErr-dDownErr); + + idx =getIndexByHeader(sLabel,QStrTranQStrList("工作区域最大温差")); + QString sErr = QString::number(dMax-dMin); + if(idx>=0&&idxtableWidgetCheck->item(i*8,idx)!=nullptr) + ui->tableWidgetCheck->item(i*8,idx)->setText(sErr); + else + ui->tableWidgetCheck->setItem(i*8,idx,new QTableWidgetItem(sErr)); + } + caliDataList->insert(sLabel,dataRes); } } diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index 1f3f129..ca5fb00 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -389,13 +389,12 @@ DeviceMeasureDataResistanceThermometer measItem; measItem.id = QString::number(api.generateId()); measItem.data_id = measInfo.id; - if(sLabel=="示值误差"||sLabel=="回程误差"||sLabel=="轻敲位移") - measItem.data_type = "1"; - else - measItem.data_type = "2"; measItem.data_category = "1"; if(sLabel=="波动性测试"){ - //measItem.upper_lower_point = + measItem.data_type = "1"; + measItem.upper_lower_point =getValueByHeader(i,sLabel,"下限点"); + if(measItem.upper_lower_point=="") + measItem.upper_lower_point =getValueByHeader(i,sLabel,"上限点"); measItem.unit = getValueByHeader(i,sLabel,"单位"); measItem.one_value = getValueByHeader(i,sLabel,"示值1"); measItem.two_value = getValueByHeader(i,sLabel,"示值2"); @@ -416,19 +415,22 @@ measItem.min_value=getValueByHeader(i,sLabel,"最小值"); measItem.volatility=getValueByHeader(i,sLabel,"波动性"); }else if(sLabel=="均匀性测试"){ - //measItem.upper_lower_point = + measItem.data_type = "2"; + measItem.upper_lower_point =getValueByHeader(i,sLabel,"下限点"); + if(measItem.upper_lower_point=="") + measItem.upper_lower_point =getValueByHeader(i,sLabel,"上限点"); measItem.unit = getValueByHeader(i,sLabel,"单位"); -// measItem.one_value = getValueByHeader(i,sLabel,"位置"); -// measItem.two_value = getValueByHeader(i,sLabel,"示值ROA1"); -// measItem.three_value = getValueByHeader(i,sLabel,"示值RA1"); -// measItem.four_value = getValueByHeader(i,sLabel,"RA2"); -// measItem.five_value = getValueByHeader(i,sLabel,"ROA2"); -// measItem.six_value = getValueByHeader(i,sLabel,"ROA3"); -// measItem.seven_value=getValueByHeader(i,sLabel,"RA3"); -// measItem.eight_value=getValueByHeader(i,sLabel,"RA4"); -// measItem.nine_value = getValueByHeader(i,sLabel,"ROA4"); -// measItem.ten_value = getValueByHeader(i,sLabel,"ROA均值"); -// measItem.eleven_value = getValueByHeader(i,sLabel,"RA均值"); + measItem.location = getValueByHeader(i,sLabel,"位置"); + measItem.one_value = getValueByHeader(i,sLabel,"示值ROA1"); + measItem.two_value = getValueByHeader(i,sLabel,"示值RA1"); + measItem.three_value = getValueByHeader(i,sLabel,"RA2"); + measItem.four_value = getValueByHeader(i,sLabel,"ROA2"); + measItem.five_value = getValueByHeader(i,sLabel,"ROA3"); + measItem.six_value = getValueByHeader(i,sLabel,"RA3"); + measItem.seven_value=getValueByHeader(i,sLabel,"RA4"); + measItem.eight_value=getValueByHeader(i,sLabel,"ROA4"); + measItem.nine_value = getValueByHeader(i,sLabel,"ROA均值"); + measItem.ten_value = getValueByHeader(i,sLabel,"RA均值"); measItem.upper_temperature_different = getValueByHeader(i,sLabel,"上水平面温差"); measItem.lower_temperature_different = getValueByHeader(i,sLabel,"下水平面温差"); measItem.max_horizontal_temperature_different = getValueByHeader(i,sLabel,"水平最大温差");