diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6a89af5..c723884 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -1995,19 +1995,18 @@ ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); } if((i+1)%3==0){ - double dMin=0,dMax=0; - for(int k=i-2;k outList; + for(int k=i-2;k<=i;k++){ QStringList item = dataRes[k]; - if(item[idx]!=""){ - if(k==i-2){ - dMin = dMax = item[idx].toDouble(); - }else{ - dMin = qMin(dMin,item[idx].toDouble()); - dMax = qMax(dMax,item[idx].toDouble()); - } - } + outList.append(item); } - + std::sort(outList.begin(),outList.end(),[idx2](const QStringList &outA,const QStringList &outB){return outA[idx2].toDouble()tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdError)); - - int idx2=getIndexByHeader(sLabel,QStrTranQStrList("调压器输出值")); - double dTmp = dataRes[i][idx2].toDouble(); idx= getIndexByHeader(sLabel,QStrTranQStrList("电源电压调整率")); if(idx!=-1){ - dError = dError/dTmp; + dError = dError/dMid; newdError=TranDecimals(sLabel,dataRes[i],dError)+"%"; dataRes[i][idx] = newdError; ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdError));