diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e75cd04..28f454e 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -34,6 +34,14 @@ if(methodId!="") { programInfo = BaseCommonApi::getCheckProgramManageById(methodId); + + ui->comboBoxEquipment->setCurrentIndex(programInfo.belong_standard_equipment.toInt()-1); + for (int i = 0; i < catList.length(); ++i) { + if (catList[i].id == programInfo.equipment_type) { + ui->comboBoxCategory->setCurrentIndex(i); // 找到匹配项,返回 true + break; + } + } ui->lineEditName->setText(programInfo.check_name); ui->lineEditUser->setText(programInfo.create_name); ui->dateEditTime->setDateTime(programInfo.create_time); @@ -404,6 +412,7 @@ programInfo.id = QString::number(id); programInfo.check_name = ui->lineEditName->text(); programInfo.belong_standard_equipment = QString::number(ui->comboBoxEquipment->currentIndex()+1); + programInfo.belong_standard_equipment_name=ui->comboBoxEquipment->currentText(); int idx = ui->comboBoxCategory->currentIndex(); if(idx>=0&&idxlineEditName->text(); programInfo.belong_standard_equipment = QString::number(ui->comboBoxEquipment->currentIndex()+1); + programInfo.belong_standard_equipment_name=ui->comboBoxEquipment->currentText(); int idx = ui->comboBoxCategory->currentIndex(); if(idx>=0&&idxcomboBoxEquipment->setCurrentIndex(programInfo.belong_standard_equipment.toInt()-1); + for (int i = 0; i < catList.length(); ++i) { + if (catList[i].id == programInfo.equipment_type) { + ui->comboBoxCategory->setCurrentIndex(i); // 找到匹配项,返回 true + break; + } + } ui->lineEditName->setText(programInfo.check_name); ui->lineEditUser->setText(programInfo.create_name); ui->dateEditTime->setDateTime(programInfo.create_time); @@ -404,6 +412,7 @@ programInfo.id = QString::number(id); programInfo.check_name = ui->lineEditName->text(); programInfo.belong_standard_equipment = QString::number(ui->comboBoxEquipment->currentIndex()+1); + programInfo.belong_standard_equipment_name=ui->comboBoxEquipment->currentText(); int idx = ui->comboBoxCategory->currentIndex(); if(idx>=0&&idxlineEditName->text(); programInfo.belong_standard_equipment = QString::number(ui->comboBoxEquipment->currentIndex()+1); + programInfo.belong_standard_equipment_name=ui->comboBoxEquipment->currentText(); int idx = ui->comboBoxCategory->currentIndex(); if(idx>=0&&idx=1) + return QString::number(dVal,'f',2); + else{ + QString sVal = QString::number(dVal); + int idx=0; + for(int i=0;i& dataRes,QMap>& veriData){ //double dError; QString newdStdValue,newdError,Value; @@ -955,7 +977,7 @@ // ItemUnitSplit //newdStdValue= TranDecimals(sLabel, dataRes[i],dStdValue); - newdStdValue=QString::number(dStdValue,'f',4); + newdStdValue=FormatDecimals(dStdValue); //QStringList ResultName=getsParambyHeader(sParam); int idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList(header)); if(idx!=-1) @@ -972,7 +994,7 @@ dMean += dataRes[i][idx].toDouble(); } dMean /=readItems.count(); - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); idx= getIndexByHeader(sLabel,labelItem,{"算数平均值","平均值"}); if(idx!=-1) { @@ -986,7 +1008,7 @@ dStdErr += pow(dataRes[i][idx].toDouble()-dMean,2); } dStdErr = sqrt(dStdErr/(readItems.count()-1)); - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelItem,{"标准偏差S(X)","标准偏差"}); if(idx!=-1) { @@ -994,7 +1016,7 @@ ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); } //计算相对重复性 - newdStdValue=QString::number(dStdErr/dMean,'f',4); + newdStdValue=FormatDecimals(dStdErr/dMean); idx= getIndexByHeader(sLabel,labelItem,{"相对重复性","相对标准偏差"}); if(idx!=-1) { @@ -1007,7 +1029,7 @@ //auto veriData = veriDataMapList.value(constsLable); QList dataStable = veriData.value(labelStable); idx= getIndexByHeader(sLabel,labelStable,{"算数平均值","平均值"}); - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); if(idx!=-1) { dataStable[i][idx-1] = newdStdValue; @@ -1028,7 +1050,7 @@ } if(cnt>=4){ dMean/=cnt; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); dataStable[i][idx] = newdStdValue; dStdErr = 0; if(cnt==4){ @@ -1041,14 +1063,14 @@ } dStdErr = sqrt(dStdErr/5); } - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelStable,{"标准偏差S(X)","标准偏差"}); if(idx!=-1) { dataStable[i][idx] = newdStdValue; } //计算相对重复性 - newdStdValue=QString::number(dStdErr/dMean,'f',4); + newdStdValue=FormatDecimals(dStdErr/dMean); idx= getIndexByHeader(sLabel,labelStable,{"相对重复性","相对标准偏差"}); if(idx!=-1) { @@ -1085,7 +1107,7 @@ dStdErr = dataRes[i][idx2].toDouble()-dataRes[i][idx].toDouble(); errList.append(dStdErr); dMean+=dStdErr; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); idx2 = getIndexByHeader(sLabel,labelItem,QStrTranQStrList(stdItems.value(key))); if(idx2!=-1) { @@ -1094,7 +1116,7 @@ } } dMean/=6; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("算数平均值")); if(idx!=-1) { @@ -1108,7 +1130,7 @@ } dStdErr = sqrt(dStdErr/(errList.count()-1)); errList.clear(); - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("重复性S(x)")); if(idx!=-1) { @@ -1121,7 +1143,7 @@ //auto veriData = veriDataMapList.value(constsLable); QList dataStable = veriData.value(labelStable); idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("平均值")); - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); if(idx!=-1) { dataStable[i][idx-1] = newdStdValue; @@ -1142,7 +1164,7 @@ } if(cnt>=4){ dMean/=cnt; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); dataStable[i][idx] = newdStdValue; dStdErr = 0; if(cnt==4){ @@ -1155,7 +1177,7 @@ } dStdErr = sqrt(dStdErr/5); } - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("Sm")); if(idx!=-1) { diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index e75cd04..28f454e 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -34,6 +34,14 @@ if(methodId!="") { programInfo = BaseCommonApi::getCheckProgramManageById(methodId); + + ui->comboBoxEquipment->setCurrentIndex(programInfo.belong_standard_equipment.toInt()-1); + for (int i = 0; i < catList.length(); ++i) { + if (catList[i].id == programInfo.equipment_type) { + ui->comboBoxCategory->setCurrentIndex(i); // 找到匹配项,返回 true + break; + } + } ui->lineEditName->setText(programInfo.check_name); ui->lineEditUser->setText(programInfo.create_name); ui->dateEditTime->setDateTime(programInfo.create_time); @@ -404,6 +412,7 @@ programInfo.id = QString::number(id); programInfo.check_name = ui->lineEditName->text(); programInfo.belong_standard_equipment = QString::number(ui->comboBoxEquipment->currentIndex()+1); + programInfo.belong_standard_equipment_name=ui->comboBoxEquipment->currentText(); int idx = ui->comboBoxCategory->currentIndex(); if(idx>=0&&idxlineEditName->text(); programInfo.belong_standard_equipment = QString::number(ui->comboBoxEquipment->currentIndex()+1); + programInfo.belong_standard_equipment_name=ui->comboBoxEquipment->currentText(); int idx = ui->comboBoxCategory->currentIndex(); if(idx>=0&&idx=1) + return QString::number(dVal,'f',2); + else{ + QString sVal = QString::number(dVal); + int idx=0; + for(int i=0;i& dataRes,QMap>& veriData){ //double dError; QString newdStdValue,newdError,Value; @@ -955,7 +977,7 @@ // ItemUnitSplit //newdStdValue= TranDecimals(sLabel, dataRes[i],dStdValue); - newdStdValue=QString::number(dStdValue,'f',4); + newdStdValue=FormatDecimals(dStdValue); //QStringList ResultName=getsParambyHeader(sParam); int idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList(header)); if(idx!=-1) @@ -972,7 +994,7 @@ dMean += dataRes[i][idx].toDouble(); } dMean /=readItems.count(); - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); idx= getIndexByHeader(sLabel,labelItem,{"算数平均值","平均值"}); if(idx!=-1) { @@ -986,7 +1008,7 @@ dStdErr += pow(dataRes[i][idx].toDouble()-dMean,2); } dStdErr = sqrt(dStdErr/(readItems.count()-1)); - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelItem,{"标准偏差S(X)","标准偏差"}); if(idx!=-1) { @@ -994,7 +1016,7 @@ ui->tableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); } //计算相对重复性 - newdStdValue=QString::number(dStdErr/dMean,'f',4); + newdStdValue=FormatDecimals(dStdErr/dMean); idx= getIndexByHeader(sLabel,labelItem,{"相对重复性","相对标准偏差"}); if(idx!=-1) { @@ -1007,7 +1029,7 @@ //auto veriData = veriDataMapList.value(constsLable); QList dataStable = veriData.value(labelStable); idx= getIndexByHeader(sLabel,labelStable,{"算数平均值","平均值"}); - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); if(idx!=-1) { dataStable[i][idx-1] = newdStdValue; @@ -1028,7 +1050,7 @@ } if(cnt>=4){ dMean/=cnt; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); dataStable[i][idx] = newdStdValue; dStdErr = 0; if(cnt==4){ @@ -1041,14 +1063,14 @@ } dStdErr = sqrt(dStdErr/5); } - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelStable,{"标准偏差S(X)","标准偏差"}); if(idx!=-1) { dataStable[i][idx] = newdStdValue; } //计算相对重复性 - newdStdValue=QString::number(dStdErr/dMean,'f',4); + newdStdValue=FormatDecimals(dStdErr/dMean); idx= getIndexByHeader(sLabel,labelStable,{"相对重复性","相对标准偏差"}); if(idx!=-1) { @@ -1085,7 +1107,7 @@ dStdErr = dataRes[i][idx2].toDouble()-dataRes[i][idx].toDouble(); errList.append(dStdErr); dMean+=dStdErr; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); idx2 = getIndexByHeader(sLabel,labelItem,QStrTranQStrList(stdItems.value(key))); if(idx2!=-1) { @@ -1094,7 +1116,7 @@ } } dMean/=6; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("算数平均值")); if(idx!=-1) { @@ -1108,7 +1130,7 @@ } dStdErr = sqrt(dStdErr/(errList.count()-1)); errList.clear(); - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("重复性S(x)")); if(idx!=-1) { @@ -1121,7 +1143,7 @@ //auto veriData = veriDataMapList.value(constsLable); QList dataStable = veriData.value(labelStable); idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("平均值")); - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); if(idx!=-1) { dataStable[i][idx-1] = newdStdValue; @@ -1142,7 +1164,7 @@ } if(cnt>=4){ dMean/=cnt; - newdStdValue=QString::number(dMean,'f',4); + newdStdValue=FormatDecimals(dMean); dataStable[i][idx] = newdStdValue; dStdErr = 0; if(cnt==4){ @@ -1155,7 +1177,7 @@ } dStdErr = sqrt(dStdErr/5); } - newdStdValue=QString::number(dStdErr,'f',4); + newdStdValue=FormatDecimals(dStdErr); idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("Sm")); if(idx!=-1) { diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h index a75b5e3..50eda78 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.h +++ b/softwareDirectory/AutoVerScheme/verifywindow.h @@ -46,6 +46,7 @@ void ItemUnitSplit(QString Value,QString &data,QString &unit); void CheckBackColorUpdate(bool State,int row); VisaCommonEngine* getVisaEngineByIdx(int idx); + QString FormatDecimals(double dVal,int pos=-1); private slots: void showDevice(); void on_editButton_clicked();