diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index c0a9da5..44a6262 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3300,7 +3300,7 @@ }; return DataMapList; } - +//根据设备id查询 不同头数据 QList BaseCommonApi::searchStatus(QString deviceId) { QList result; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index c0a9da5..44a6262 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -3300,7 +3300,7 @@ }; return DataMapList; } - +//根据设备id查询 不同头数据 QList BaseCommonApi::searchStatus(QString deviceId) { QList result; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6e9fd04..09f4c71 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -969,7 +969,7 @@ } } } - +//压力测试 数据表格同步 计算改变 void CheckWindow::gageDataChange(){ QLineEdit *pushButton_ = dynamic_cast(this->sender()); if(NULL == pushButton_) @@ -1016,7 +1016,77 @@ } caliDataList.insert(sLabel,dataRes); } +//下一步 +bool isBack = false; // 是否处于倒序状态 +int lastSelectedIndex = -1; // 记录上一次选中的行号 +void CheckWindow::on_pushButton_next_clicked() +{ + QBrush brush; + QTableWidgetItem *currentItem; + + if (ui->tableWidgetCheck->rowCount() > 0) { + if (!isBack) { + for (int i = 0; i < ui->tableWidgetCheck->rowCount(); ++i) { + QTableWidgetItem *item = ui->tableWidgetCheck->item(i, 0); + if (item->isSelected()) { + lastSelectedIndex = i; + break; + } + } + if (lastSelectedIndex == -1) { + lastSelectedIndex = 0; + } + int nextIndex = (lastSelectedIndex + 1) % ui->tableWidgetCheck->rowCount(); + if(lastSelectedIndex == ui-> tableWidgetCheck->rowCount() - 1 ){ + nextIndex = (lastSelectedIndex) % ui->tableWidgetCheck->rowCount(); + } + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + brush = QBrush(Qt::green); + currentItem->setBackground(brush); + if (lastSelectedIndex != -1) { + QTableWidgetItem *previousItem = ui->tableWidgetCheck->item(lastSelectedIndex, 0); + previousItem->setSelected(false); +// previousItem->setBackground(Qt::NoBrush); + } + if(lastSelectedIndex == ui->tableWidgetCheck->rowCount() - 1){ + isBack =!isBack; + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + } + } else { + for (int i = ui->tableWidgetCheck->rowCount() - 1; i >= 0; --i) { + QTableWidgetItem *item = ui->tableWidgetCheck->item(i, 0); + if (item->isSelected()) { + lastSelectedIndex = i; + break; + } + } + if (lastSelectedIndex == -1) { + lastSelectedIndex = ui->tableWidgetCheck->rowCount() - 1; + } + int nextIndex = (lastSelectedIndex == 0) ? ui->tableWidgetCheck->rowCount() - 1 : lastSelectedIndex - 1; + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + brush = QBrush(Qt::blue); + currentItem->setBackground(brush); + + // 取消之前选中项的选中状态 + if (lastSelectedIndex != -1) { + QTableWidgetItem *previousItem = ui->tableWidgetCheck->item(lastSelectedIndex, 0); + previousItem->setSelected(false); +// previousItem->setBackground(Qt::NoBrush); + } + if(lastSelectedIndex == 1){ + isBack = !isBack; + } + } + ui->tableWidgetCheck->scrollToItem(currentItem); + } +} + +//压力测试 用于控制数据是增加还是减少 void CheckWindow::addGageData(bool bAdd){ QPushButton *pushButton_ = dynamic_cast(this->sender()); if(NULL == pushButton_) @@ -1261,7 +1331,6 @@ connectDevice(); for(int i=0;i BaseCommonApi::searchStatus(QString deviceId) { QList result; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6e9fd04..09f4c71 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -969,7 +969,7 @@ } } } - +//压力测试 数据表格同步 计算改变 void CheckWindow::gageDataChange(){ QLineEdit *pushButton_ = dynamic_cast(this->sender()); if(NULL == pushButton_) @@ -1016,7 +1016,77 @@ } caliDataList.insert(sLabel,dataRes); } +//下一步 +bool isBack = false; // 是否处于倒序状态 +int lastSelectedIndex = -1; // 记录上一次选中的行号 +void CheckWindow::on_pushButton_next_clicked() +{ + QBrush brush; + QTableWidgetItem *currentItem; + + if (ui->tableWidgetCheck->rowCount() > 0) { + if (!isBack) { + for (int i = 0; i < ui->tableWidgetCheck->rowCount(); ++i) { + QTableWidgetItem *item = ui->tableWidgetCheck->item(i, 0); + if (item->isSelected()) { + lastSelectedIndex = i; + break; + } + } + if (lastSelectedIndex == -1) { + lastSelectedIndex = 0; + } + int nextIndex = (lastSelectedIndex + 1) % ui->tableWidgetCheck->rowCount(); + if(lastSelectedIndex == ui-> tableWidgetCheck->rowCount() - 1 ){ + nextIndex = (lastSelectedIndex) % ui->tableWidgetCheck->rowCount(); + } + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + brush = QBrush(Qt::green); + currentItem->setBackground(brush); + if (lastSelectedIndex != -1) { + QTableWidgetItem *previousItem = ui->tableWidgetCheck->item(lastSelectedIndex, 0); + previousItem->setSelected(false); +// previousItem->setBackground(Qt::NoBrush); + } + if(lastSelectedIndex == ui->tableWidgetCheck->rowCount() - 1){ + isBack =!isBack; + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + } + } else { + for (int i = ui->tableWidgetCheck->rowCount() - 1; i >= 0; --i) { + QTableWidgetItem *item = ui->tableWidgetCheck->item(i, 0); + if (item->isSelected()) { + lastSelectedIndex = i; + break; + } + } + if (lastSelectedIndex == -1) { + lastSelectedIndex = ui->tableWidgetCheck->rowCount() - 1; + } + int nextIndex = (lastSelectedIndex == 0) ? ui->tableWidgetCheck->rowCount() - 1 : lastSelectedIndex - 1; + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + brush = QBrush(Qt::blue); + currentItem->setBackground(brush); + + // 取消之前选中项的选中状态 + if (lastSelectedIndex != -1) { + QTableWidgetItem *previousItem = ui->tableWidgetCheck->item(lastSelectedIndex, 0); + previousItem->setSelected(false); +// previousItem->setBackground(Qt::NoBrush); + } + if(lastSelectedIndex == 1){ + isBack = !isBack; + } + } + ui->tableWidgetCheck->scrollToItem(currentItem); + } +} + +//压力测试 用于控制数据是增加还是减少 void CheckWindow::addGageData(bool bAdd){ QPushButton *pushButton_ = dynamic_cast(this->sender()); if(NULL == pushButton_) @@ -1261,7 +1331,6 @@ connectDevice(); for(int i=0;i BaseCommonApi::searchStatus(QString deviceId) { QList result; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 6e9fd04..09f4c71 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -969,7 +969,7 @@ } } } - +//压力测试 数据表格同步 计算改变 void CheckWindow::gageDataChange(){ QLineEdit *pushButton_ = dynamic_cast(this->sender()); if(NULL == pushButton_) @@ -1016,7 +1016,77 @@ } caliDataList.insert(sLabel,dataRes); } +//下一步 +bool isBack = false; // 是否处于倒序状态 +int lastSelectedIndex = -1; // 记录上一次选中的行号 +void CheckWindow::on_pushButton_next_clicked() +{ + QBrush brush; + QTableWidgetItem *currentItem; + + if (ui->tableWidgetCheck->rowCount() > 0) { + if (!isBack) { + for (int i = 0; i < ui->tableWidgetCheck->rowCount(); ++i) { + QTableWidgetItem *item = ui->tableWidgetCheck->item(i, 0); + if (item->isSelected()) { + lastSelectedIndex = i; + break; + } + } + if (lastSelectedIndex == -1) { + lastSelectedIndex = 0; + } + int nextIndex = (lastSelectedIndex + 1) % ui->tableWidgetCheck->rowCount(); + if(lastSelectedIndex == ui-> tableWidgetCheck->rowCount() - 1 ){ + nextIndex = (lastSelectedIndex) % ui->tableWidgetCheck->rowCount(); + } + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + brush = QBrush(Qt::green); + currentItem->setBackground(brush); + if (lastSelectedIndex != -1) { + QTableWidgetItem *previousItem = ui->tableWidgetCheck->item(lastSelectedIndex, 0); + previousItem->setSelected(false); +// previousItem->setBackground(Qt::NoBrush); + } + if(lastSelectedIndex == ui->tableWidgetCheck->rowCount() - 1){ + isBack =!isBack; + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + } + } else { + for (int i = ui->tableWidgetCheck->rowCount() - 1; i >= 0; --i) { + QTableWidgetItem *item = ui->tableWidgetCheck->item(i, 0); + if (item->isSelected()) { + lastSelectedIndex = i; + break; + } + } + if (lastSelectedIndex == -1) { + lastSelectedIndex = ui->tableWidgetCheck->rowCount() - 1; + } + int nextIndex = (lastSelectedIndex == 0) ? ui->tableWidgetCheck->rowCount() - 1 : lastSelectedIndex - 1; + currentItem = ui->tableWidgetCheck->item(nextIndex, 0); + currentItem->setSelected(true); + brush = QBrush(Qt::blue); + currentItem->setBackground(brush); + + // 取消之前选中项的选中状态 + if (lastSelectedIndex != -1) { + QTableWidgetItem *previousItem = ui->tableWidgetCheck->item(lastSelectedIndex, 0); + previousItem->setSelected(false); +// previousItem->setBackground(Qt::NoBrush); + } + if(lastSelectedIndex == 1){ + isBack = !isBack; + } + } + ui->tableWidgetCheck->scrollToItem(currentItem); + } +} + +//压力测试 用于控制数据是增加还是减少 void CheckWindow::addGageData(bool bAdd){ QPushButton *pushButton_ = dynamic_cast(this->sender()); if(NULL == pushButton_) @@ -1261,7 +1331,6 @@ connectDevice(); for(int i=0;i + + + 下一步 + + + +