From 4223e514019294c1796ee42c6e8c504e4e61ef8c Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 9 Jan 2023 14:23:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8C=89=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8F=B7=E5=88=9B=E5=BB=BA=E6=96=87=E4=BB=B6=E5=A4=B9=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/HGProductionTool/form_maininterface.cpp | 81 ++++++++++++--------- app/HGProductionTool/form_maininterface.h | 3 + 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index 126b6b2..e02f280 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -29,8 +29,10 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn:: , m_devType(devType) , m_devName(devName) , m_devFwNum(devFwNum) + , m_curItemName("") , m_isTesting(false) , m_multiIndex(-1) + , m_curNameIndex(1) { ui->setupUi(this); @@ -99,6 +101,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn:: Form_mainInterface::~Form_mainInterface() { m_multiIndex = -1; + m_curNameIndex = 1; m_list_images.clear(); QDir dir(getCachePath()); if (dir.exists()) @@ -175,10 +178,10 @@ void Form_mainInterface::on_testResultImg(void *img) { HGImage image = (HGImage)img; - std::string filename = getStdString(getCacheFileName()); - HGImgFmt_SaveImage(image, 0, 0, filename.c_str()); + QString filename = getCacheFileName(); + HGImgFmt_SaveImage(image, 0, 0, getStdString(filename).c_str()); - m_list_images.push_back(QString::fromStdString(filename)); + m_list_images.push_back(filename); m_multiIndex = m_list_images.size() - 1; ui->stackedWidget->setCurrentWidget(m_view); @@ -193,7 +196,7 @@ void Form_mainInterface::on_testResultImg(void *img) void Form_mainInterface::on_testDistortion(float value) { - ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(value, 'f', 4)); + ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(value, 'f')); updateImgPixelInfo(); updateUiEnabled(true); @@ -424,15 +427,22 @@ QString Form_mainInterface::getCachePath() QString Form_mainInterface::getCacheFileName() { QString cachePath = getCachePath(); - HGBase_CreateDir(getStdString(cachePath).c_str()); + cachePath.append(m_serialNum); + cachePath.append("/"); + cachePath.append(m_curItemName); + cachePath.append("/"); + HGBase_CreateDir(getStdString(getStdFileName(cachePath)).c_str()); - char uuid[256] = {0}; - HGBase_GetUuid(uuid, 256); QString suffix = ".jpg"; - QString fileName = getStdFileName(cachePath + uuid + suffix); + QString fileName = getStdFileName(cachePath + QString::number(m_curNameIndex++) + suffix); return fileName; } +QString Form_mainInterface::getCurItemName() +{ + return m_curItemName; +} + void Form_mainInterface::updateUiEnabled(bool enable) { ui->tableWidget->setEnabled(enable); @@ -528,6 +538,7 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur QTableWidgetItem *item2 = ui->tableWidget->item(row, 1); QString title = item2->text(); + m_curItemName = title; if (nullptr == m_handle) { @@ -552,6 +563,7 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur } m_multiIndex = -1; + m_curNameIndex = 1; m_list_images.clear(); QDir dir(getCachePath()); if (dir.exists()) @@ -562,6 +574,7 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur void Form_mainInterface::on_pbtn_start_clicked() { m_multiIndex = -1; + m_curNameIndex = 1; m_list_images.clear(); QDir dir(getCachePath()); if (dir.exists()) @@ -586,32 +599,32 @@ void Form_mainInterface::on_pbtn_start_clicked() void Form_mainInterface::on_pbtn_showImg_clicked() { - QString fileName = getCacheFileName(); +// QString fileName = getCacheFileName(); - 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(); - HGResult ret = HGPdtToolDb_DownloadDeviceEntryImage(m_pdtToolDbDevice, name.c_str(), m_mainwnd->m_ftpHost.toStdString().c_str(), - m_mainwnd->m_ftpPort, 0, fileName.toStdString().c_str()); - if(ret == HGBASE_ERR_OK) - { - m_list_images.push_back(fileName); +// 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(); +// HGResult ret = HGPdtToolDb_DownloadDeviceEntryImage(m_pdtToolDbDevice, name.c_str(), m_mainwnd->m_ftpHost.toStdString().c_str(), +// m_mainwnd->m_ftpPort, 0, fileName.toStdString().c_str()); +// if(ret == HGBASE_ERR_OK) +// { +// m_list_images.push_back(fileName); - ui->pbtn_leftRotate->setVisible(true); - ui->pbtn_rightRotate->setVisible(true); - ui->pbtn_prePage->setVisible(true); - ui->pbtn_nextPage->setVisible(true); - ui->stackedWidget->setCurrentWidget(m_view); - HGImage img = nullptr; - HGImgFmt_LoadImage(fileName.toStdString().c_str(), 0, 0, 0, 0, &img); - m_view->addImage(img); - m_multiIndex++; - } - else - { - QMessageBox::information(this, tr("tips"), tr("no image")); - } +// ui->pbtn_leftRotate->setVisible(true); +// ui->pbtn_rightRotate->setVisible(true); +// ui->pbtn_prePage->setVisible(true); +// ui->pbtn_nextPage->setVisible(true); +// ui->stackedWidget->setCurrentWidget(m_view); +// HGImage img = nullptr; +// HGImgFmt_LoadImage(fileName.toStdString().c_str(), 0, 0, 0, 0, &img); +// m_view->addImage(img); +// m_multiIndex++; +// } +// else +// { +// QMessageBox::information(this, tr("tips"), tr("no image")); +// } } void Form_mainInterface::on_pbtn_leftRotate_clicked() @@ -631,7 +644,7 @@ void Form_mainInterface::on_pbtn_prePage_clicked() HGImage img = nullptr; QString filename = m_list_images.at(m_multiIndex); - HGImgFmt_LoadImage(filename.toStdString().c_str(), 0, 0, 0, 0, &img); + HGImgFmt_LoadImage(getStdString(filename).c_str(), 0, 0, 0, 0, &img); if (nullptr != img) { m_view->addImage(img); @@ -645,7 +658,7 @@ void Form_mainInterface::on_pbtn_nextPage_clicked() ++m_multiIndex; HGImage img = nullptr; QString filename = m_list_images.at(m_multiIndex); - HGImgFmt_LoadImage(filename.toStdString().c_str(), 0, 0, 0, 0, &img); + HGImgFmt_LoadImage(getStdString(filename).c_str(), 0, 0, 0, 0, &img); if (nullptr != img) { m_view->addImage(img); diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h index 30f8cf7..6866f72 100644 --- a/app/HGProductionTool/form_maininterface.h +++ b/app/HGProductionTool/form_maininterface.h @@ -79,6 +79,7 @@ private: QString getItemStatusStr(HGUInt status); QString getCachePath(); QString getCacheFileName(); + QString getCurItemName(); void updateUiEnabled(bool enable); void updateImgPixelInfo(); QString getSpeedMode(SANE_Int speedMode); @@ -114,8 +115,10 @@ private: QString m_devType; QString m_devName; QString m_devFwNum; + QString m_curItemName; bool m_isTesting; int m_multiIndex; + int m_curNameIndex; QStringList m_list_images; QMap m_map_title_name;