diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 5d199a0..7b26e4b 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -988,6 +988,32 @@ ui->tableWidgetCheck->cellWidget(nextGageIndex,4)->setStyleSheet("color:white;background-color:rgb(1,10,128);"); } } + if(iEquipType==5){ + if(sLabel=="波动性测试"){ + for(int i=0;itableWidgetCheck->rowCount()/8;i++){ + ui->tableWidgetCheck->setSpan(i*8,1,8,2); + QString sLimit; + if(dataRes[i*8][1]!="") + sLimit = dataRes[i*8][1]; + else + sLimit = dataRes[i*8][2]; + ui->tableWidgetCheck->item(i*8,1)->setText(sLimit); + ui->tableWidgetCheck->setSpan(i*8,3,8,1); + ui->tableWidgetCheck->setSpan(i*8,19,8,1); + ui->tableWidgetCheck->setSpan(i*8,20,8,1); + ui->tableWidgetCheck->setSpan(i*8,21,8,1); + } + }else if(sLabel=="均匀性测试"){ + for(int i=0;itableWidgetCheck->rowCount()/8;i++){ + ui->tableWidgetCheck->setSpan(i*8,1,8,1); + ui->tableWidgetCheck->setSpan(i*8,2,8,2); + ui->tableWidgetCheck->setSpan(i*8,15,8,1); + ui->tableWidgetCheck->setSpan(i*8,16,8,1); + ui->tableWidgetCheck->setSpan(i*8,17,8,1); + ui->tableWidgetCheck->setSpan(i*8,18,8,1); + } + } + } } //压力测试 数据表格同步 计算改变 void CheckWindow::gageDataChange(){ @@ -2393,17 +2419,52 @@ if(currentItem==nullptr||currentItem->column()<4||currentItem->column()>18){ ui->tableWidgetCheck->setCurrentCell(0,4); } + currentItem=ui->tableWidgetCheck->currentItem(); + int row = currentItem->row(); + int col = currentItem->column(); + 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; + for(int k=i*8;ktableWidgetCheck->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(dMax)); + dataRes[i*8][idx] = QString::number(dMax); + idx =getIndexByHeader(sLabel,QStrTranQStrList("最小值")); + ui->tableWidgetCheck->item(i*8,idx)->setText(QString::number(dMin)); + dataRes[i*8][idx] = QString::number(dMin); + 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); }else if(sLabel=="均匀性测试"){ QTableWidgetItem *currentItem=ui->tableWidgetCheck->currentItem(); if(currentItem==nullptr||currentItem->column()<5||currentItem->column()>14){ ui->tableWidgetCheck->setCurrentCell(0,5); } + currentItem=ui->tableWidgetCheck->currentItem(); + int row = currentItem->row(); + int col = currentItem->column(); + currentItem->setText(sData); + QList dataRes = caliDataList->value(sLabel); + dataRes[row][col] = sData; + caliDataList->insert(sLabel,dataRes); } - QTableWidgetItem *currentItem=ui->tableWidgetCheck->currentItem(); - int row = currentItem->row(); - int col = currentItem->column(); - currentItem->setText(sData); - QList dataRes = caliDataList->value(sLabel); - dataRes[row][col] = sData; - caliDataList->insert(sLabel,dataRes); }