diff --git a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui index a01024e..4ca3afa 100644 --- a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui +++ b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui @@ -284,7 +284,7 @@ 0 - 50 + 100 @@ -316,7 +316,7 @@ 0 - 100 + 50 diff --git a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui index a01024e..4ca3afa 100644 --- a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui +++ b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui @@ -284,7 +284,7 @@ 0 - 50 + 100 @@ -316,7 +316,7 @@ 0 - 100 + 50 diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 28f454e..e106131 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -493,6 +493,7 @@ for(int i=ui->tableWidget->rowCount()-1;i>=0;i--){ if(ui->tableWidget->item(i,0)->checkState()==Qt::Checked){ ui->tableWidget->removeRow(i); + idList.removeAt(i); } } programInfo.standard_device_id = idList.join(","); diff --git a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui index a01024e..4ca3afa 100644 --- a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui +++ b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui @@ -284,7 +284,7 @@ 0 - 50 + 100 @@ -316,7 +316,7 @@ 0 - 100 + 50 diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 28f454e..e106131 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -493,6 +493,7 @@ for(int i=ui->tableWidget->rowCount()-1;i>=0;i--){ if(ui->tableWidget->item(i,0)->checkState()==Qt::Checked){ ui->tableWidget->removeRow(i); + idList.removeAt(i); } } programInfo.standard_device_id = idList.join(","); diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp index 87a1ded..79736b1 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.cpp +++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp @@ -301,31 +301,6 @@ int rowCount=0; int row=0; connectList.clear(); - if(stdId!="") - { - selectStdIds = stdId; - idList = stdId.split(","); - for(const QString& id : idList) - { - ConnectInfo info; - info.id = id; - info.state="未连接"; - info.type = 1; - QList result = BaseCommonApi::getCatDeviceInfor(id); - if(result.length()>0){ - info.deviceName = result[0].equipment_name; - } - result.clear(); - QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); - if(addrList.length()>0){ - info.programInterface = addrList[0]; - } - info.cmdList = BaseCommonApi::getInstructionLib(id); - connectList.append(info); - addrList.clear(); - } - idList.clear(); - } if(bizId!=""){ selectBizIds =bizId; @@ -354,18 +329,44 @@ } idList.clear(); } - for(const ConnectInfo& info : connectList){ - rowCount = ui->tableWidget_3->rowCount(); - ui->tableWidget_3->insertRow(rowCount); - ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName)); - ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 - ui->tableWidget_Standard->insertRow(rowCount); - ui->tableWidget_Standard->setItem(row, 0, new QTableWidgetItem(info.deviceName)); - ui->tableWidget_Standard->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 - row++; - } - ui->tableWidget_3->selectRow(0); + if(stdId!="") + { + selectStdIds = stdId; + idList = stdId.split(","); + for(const QString& id : idList) + { + ConnectInfo info; + info.id = id; + info.state="未连接"; + info.type = 1; + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + info.deviceName = result[0].equipment_name; + } + result.clear(); + QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); + if(addrList.length()>0){ + info.programInterface = addrList[0]; + } + info.cmdList = BaseCommonApi::getInstructionLib(id); + connectList.append(info); + addrList.clear(); + } + idList.clear(); + } + for(const ConnectInfo& info : connectList){ + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 + + ui->tableWidget_Standard->insertRow(rowCount); + ui->tableWidget_Standard->setItem(row, 0, new QTableWidgetItem(info.deviceName)); + ui->tableWidget_Standard->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 + row++; + } + ui->tableWidget_3->selectRow(0); } @@ -947,17 +948,17 @@ if(abs(dVal)>=1) return QString::number(dVal,'f',2); else{ - QString sVal = QString::number(dVal); - int idx=0; - for(int i=0;itaskList =selectTaskList; //dlg->deviceId = selectTaskList[0].sample_id; dlg->setData(iEquipType,&veriDataMapList,&veriHeadList,&programInfo,selectStdIds,selectBizIds); + dlg->setWindowState(Qt::WindowMaximized); dlg->setModal(true); dlg->show(); } @@ -1475,18 +1477,24 @@ for(int i=0;itableWidgetStd->rowCount();i++){ Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState(); if(state == Qt::Checked){ - sId = stdIdList[i]; - break; + //sId = stdIdList[i]; + //break; + if(sId=="") + sId = stdIdList[i]; + else + sId =QString("%1,%2").arg(sId).arg(stdIdList[i]); } } QString sBizId=""; for(int i=0;itableWidgetBiz->rowCount();i++){ Qt::CheckState state = ui->tableWidgetBiz->item(i,0)->checkState(); if(state == Qt::Checked){ - if(sBizId=="") - sBizId = bizIdList[i]; - else - sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]); + sBizId = bizIdList[i]; + break; +// if(sBizId=="") +// sBizId = bizIdList[i]; +// else +// sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]); } } if(sId==""){ @@ -1530,16 +1538,16 @@ void VerifyWindow::on_tableWidgetStd_cellChanged(int row, int column) { - Qt::CheckState state = ui->tableWidgetStd->item(row,0)->checkState(); - if(state == Qt::Checked) - { - for(int i=0;itableWidgetStd->rowCount();i++){ - if(i!=row) - { - ui->tableWidgetStd->item(i,0)->setCheckState(Qt::Unchecked); - } - } - } +// Qt::CheckState state = ui->tableWidgetStd->item(row,0)->checkState(); +// if(state == Qt::Checked) +// { +// for(int i=0;itableWidgetStd->rowCount();i++){ +// if(i!=row) +// { +// ui->tableWidgetStd->item(i,0)->setCheckState(Qt::Unchecked); +// } +// } +// } } void VerifyWindow::getCheckItemData(){ @@ -1564,3 +1572,17 @@ break; } } + +void VerifyWindow::on_tableWidgetBiz_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetBiz->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetBiz->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetBiz->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} diff --git a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui index a01024e..4ca3afa 100644 --- a/softwareDirectory/AutoVerScheme/dialogverifyresult.ui +++ b/softwareDirectory/AutoVerScheme/dialogverifyresult.ui @@ -284,7 +284,7 @@ 0 - 50 + 100 @@ -316,7 +316,7 @@ 0 - 100 + 50 diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 28f454e..e106131 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -493,6 +493,7 @@ for(int i=ui->tableWidget->rowCount()-1;i>=0;i--){ if(ui->tableWidget->item(i,0)->checkState()==Qt::Checked){ ui->tableWidget->removeRow(i); + idList.removeAt(i); } } programInfo.standard_device_id = idList.join(","); diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp index 87a1ded..79736b1 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.cpp +++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp @@ -301,31 +301,6 @@ int rowCount=0; int row=0; connectList.clear(); - if(stdId!="") - { - selectStdIds = stdId; - idList = stdId.split(","); - for(const QString& id : idList) - { - ConnectInfo info; - info.id = id; - info.state="未连接"; - info.type = 1; - QList result = BaseCommonApi::getCatDeviceInfor(id); - if(result.length()>0){ - info.deviceName = result[0].equipment_name; - } - result.clear(); - QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); - if(addrList.length()>0){ - info.programInterface = addrList[0]; - } - info.cmdList = BaseCommonApi::getInstructionLib(id); - connectList.append(info); - addrList.clear(); - } - idList.clear(); - } if(bizId!=""){ selectBizIds =bizId; @@ -354,18 +329,44 @@ } idList.clear(); } - for(const ConnectInfo& info : connectList){ - rowCount = ui->tableWidget_3->rowCount(); - ui->tableWidget_3->insertRow(rowCount); - ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName)); - ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 - ui->tableWidget_Standard->insertRow(rowCount); - ui->tableWidget_Standard->setItem(row, 0, new QTableWidgetItem(info.deviceName)); - ui->tableWidget_Standard->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 - row++; - } - ui->tableWidget_3->selectRow(0); + if(stdId!="") + { + selectStdIds = stdId; + idList = stdId.split(","); + for(const QString& id : idList) + { + ConnectInfo info; + info.id = id; + info.state="未连接"; + info.type = 1; + QList result = BaseCommonApi::getCatDeviceInfor(id); + if(result.length()>0){ + info.deviceName = result[0].equipment_name; + } + result.clear(); + QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); + if(addrList.length()>0){ + info.programInterface = addrList[0]; + } + info.cmdList = BaseCommonApi::getInstructionLib(id); + connectList.append(info); + addrList.clear(); + } + idList.clear(); + } + for(const ConnectInfo& info : connectList){ + rowCount = ui->tableWidget_3->rowCount(); + ui->tableWidget_3->insertRow(rowCount); + ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName)); + ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 + + ui->tableWidget_Standard->insertRow(rowCount); + ui->tableWidget_Standard->setItem(row, 0, new QTableWidgetItem(info.deviceName)); + ui->tableWidget_Standard->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据 + row++; + } + ui->tableWidget_3->selectRow(0); } @@ -947,17 +948,17 @@ if(abs(dVal)>=1) return QString::number(dVal,'f',2); else{ - QString sVal = QString::number(dVal); - int idx=0; - for(int i=0;itaskList =selectTaskList; //dlg->deviceId = selectTaskList[0].sample_id; dlg->setData(iEquipType,&veriDataMapList,&veriHeadList,&programInfo,selectStdIds,selectBizIds); + dlg->setWindowState(Qt::WindowMaximized); dlg->setModal(true); dlg->show(); } @@ -1475,18 +1477,24 @@ for(int i=0;itableWidgetStd->rowCount();i++){ Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState(); if(state == Qt::Checked){ - sId = stdIdList[i]; - break; + //sId = stdIdList[i]; + //break; + if(sId=="") + sId = stdIdList[i]; + else + sId =QString("%1,%2").arg(sId).arg(stdIdList[i]); } } QString sBizId=""; for(int i=0;itableWidgetBiz->rowCount();i++){ Qt::CheckState state = ui->tableWidgetBiz->item(i,0)->checkState(); if(state == Qt::Checked){ - if(sBizId=="") - sBizId = bizIdList[i]; - else - sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]); + sBizId = bizIdList[i]; + break; +// if(sBizId=="") +// sBizId = bizIdList[i]; +// else +// sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]); } } if(sId==""){ @@ -1530,16 +1538,16 @@ void VerifyWindow::on_tableWidgetStd_cellChanged(int row, int column) { - Qt::CheckState state = ui->tableWidgetStd->item(row,0)->checkState(); - if(state == Qt::Checked) - { - for(int i=0;itableWidgetStd->rowCount();i++){ - if(i!=row) - { - ui->tableWidgetStd->item(i,0)->setCheckState(Qt::Unchecked); - } - } - } +// Qt::CheckState state = ui->tableWidgetStd->item(row,0)->checkState(); +// if(state == Qt::Checked) +// { +// for(int i=0;itableWidgetStd->rowCount();i++){ +// if(i!=row) +// { +// ui->tableWidgetStd->item(i,0)->setCheckState(Qt::Unchecked); +// } +// } +// } } void VerifyWindow::getCheckItemData(){ @@ -1564,3 +1572,17 @@ break; } } + +void VerifyWindow::on_tableWidgetBiz_cellChanged(int row, int column) +{ + Qt::CheckState state = ui->tableWidgetBiz->item(row,0)->checkState(); + if(state == Qt::Checked) + { + for(int i=0;itableWidgetBiz->rowCount();i++){ + if(i!=row) + { + ui->tableWidgetBiz->item(i,0)->setCheckState(Qt::Unchecked); + } + } + } +} diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h index 50eda78..d367467 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.h +++ b/softwareDirectory/AutoVerScheme/verifywindow.h @@ -86,6 +86,8 @@ void on_tableWidgetStd_cellChanged(int row, int column); + void on_tableWidgetBiz_cellChanged(int row, int column); + private: Ui::VerifyWindow *ui; QList programList;