diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 4e37ef2..b335806 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -229,22 +229,26 @@ void Form_mainInterface::on_pbtn_fail_clicked() { int row = ui->tableWidget->currentRow(); QTableWidgetItem *item = ui->tableWidget->item(row, 1); - QString title = item->text(); - Dialog_ExcepDesc dlg(this); - if (dlg.exec()) + if (item != nullptr) { - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(getItemStatusStr(HGPDTTOOLDB_ENTRYSTATUS_NOTPASS))); - ui->tableWidget->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - ui->tableWidget->item(row, 2)->setBackgroundColor(QColor(255,0,0)); + QString title = item->text(); - QString str = dlg.getExcepDesc(); - std::string name = m_map_title_name.value(title).name.toStdString(); - HGPdtToolDb_SetDeviceEntryStatus(m_pdtToolDbDevice, name.c_str(), HGPDTTOOLDB_ENTRYSTATUS_NOTPASS); - HGPdtToolDb_SetDeviceEntryExcepDesc(m_pdtToolDbDevice, name.c_str(), str.toStdString().c_str()); + Dialog_ExcepDesc dlg(this); + if (dlg.exec()) + { + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(getItemStatusStr(HGPDTTOOLDB_ENTRYSTATUS_NOTPASS))); + ui->tableWidget->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + ui->tableWidget->item(row, 2)->setBackgroundColor(QColor(255,0,0)); - QTableWidgetItem *item2 = ui->tableWidget->item(row, 2); - item2->setToolTip(str); + QString str = dlg.getExcepDesc(); + std::string name = m_map_title_name.value(title).name.toStdString(); + HGPdtToolDb_SetDeviceEntryStatus(m_pdtToolDbDevice, name.c_str(), HGPDTTOOLDB_ENTRYSTATUS_NOTPASS); + HGPdtToolDb_SetDeviceEntryExcepDesc(m_pdtToolDbDevice, name.c_str(), str.toStdString().c_str()); + + QTableWidgetItem *item2 = ui->tableWidget->item(row, 2); + item2->setToolTip(str); + } } } @@ -252,17 +256,21 @@ void Form_mainInterface::on_pbtn_pass_clicked() { int row = ui->tableWidget->currentRow(); QTableWidgetItem *item = ui->tableWidget->item(row, 1); - QString title = item->text(); - std::string name = m_map_title_name.value(title).name.toStdString(); - HGPdtToolDb_SetDeviceEntryStatus(m_pdtToolDbDevice, name.c_str(), HGPDTTOOLDB_ENTRYSTATUS_PASS); - HGPdtToolDb_SetDeviceEntryExcepDesc(m_pdtToolDbDevice, name.c_str(), ""); + if (item != nullptr) + { + QString title = item->text(); + std::string name = m_map_title_name.value(title).name.toStdString(); + HGPdtToolDb_SetDeviceEntryStatus(m_pdtToolDbDevice, name.c_str(), HGPDTTOOLDB_ENTRYSTATUS_PASS); + HGPdtToolDb_SetDeviceEntryExcepDesc(m_pdtToolDbDevice, name.c_str(), ""); - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(getItemStatusStr(HGPDTTOOLDB_ENTRYSTATUS_PASS))); - ui->tableWidget->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); - ui->tableWidget->item(row, 2)->setBackgroundColor(QColor(0,255,0)); + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(getItemStatusStr(HGPDTTOOLDB_ENTRYSTATUS_PASS))); + ui->tableWidget->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + ui->tableWidget->item(row, 2)->setBackgroundColor(QColor(0,255,0)); + + QTableWidgetItem *item2 = ui->tableWidget->item(row, 2); + item2->setToolTip(""); + } - QTableWidgetItem *item2 = ui->tableWidget->item(row, 2); - item2->setToolTip(""); // HGImage img = nullptr; // m_view->getImage(&img); @@ -481,10 +489,12 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur { // ui->pbtn_showImg->setVisible(true); } - } - else - { - updateUiEnabled(false); + + m_multiIndex = -1; + m_list_images.clear(); + QDir dir(getCachePath()); + if (dir.exists()) + dir.removeRecursively(); } } @@ -498,14 +508,17 @@ void Form_mainInterface::on_pbtn_start_clicked() int row = ui->tableWidget->currentRow(); QTableWidgetItem *item = ui->tableWidget->item(row, 1); - QString title = item->text(); - QString name = m_map_title_name.value(title).name; - if (m_hg != nullptr) - func_test_go(name.toStdWString().c_str(), L"null", m_hg); + if (item != nullptr) + { + QString title = item->text(); + QString name = m_map_title_name.value(title).name; + if (m_hg != nullptr) + func_test_go(name.toStdWString().c_str(), L"null", m_hg); - updateUiEnabled(false); - m_isTesting = true; - m_mainwnd->addTestingRef(); + updateUiEnabled(false); + m_isTesting = true; + m_mainwnd->addTestingRef(); + } } void Form_mainInterface::on_pbtn_showImg_clicked()