lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

取消上传图片，双击打开文件

This commit is contained in:
yangjiaxuan 2023-01-06 09:35:41 +08:00
parent 9fb38d18d0
commit 6c541cb02a
3 changed files with 69 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -709,49 +709,49 @@
<translation>下一步</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="49"/>
<location filename="form_maininterface.cpp" line="51"/>
<source>Device has connected</source>
<translation>设备已连接</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="53"/>
<location filename="form_maininterface.cpp" line="55"/>
<source>Device hasnot connected</source>
<translation>设备未连接</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="54"/>
<location filename="form_maininterface.cpp" line="56"/>
<source>Device type:</source>
<translation>设备型号：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="54"/>
<location filename="form_maininterface.cpp" line="56"/>
<source> SerialNum:</source>
<translation> 序列号：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="55"/>
<location filename="form_maininterface.cpp" line="126"/>
<location filename="form_maininterface.cpp" line="57"/>
<location filename="form_maininterface.cpp" line="130"/>
<source> connect status:</source>
<translation> 设备连接状态：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="67"/>
<location filename="form_maininterface.cpp" line="69"/>
<source>load last image which uploaded last time</source>
<translation>加载上一次上传的图片</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="125"/>
<location filename="form_maininterface.cpp" line="129"/>
<source>Device has disconnected</source>
<translation>设备已断开</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="142"/>
<location filename="form_maininterface.cpp" line="511"/>
<location filename="form_maininterface.cpp" line="146"/>
<location filename="form_maininterface.cpp" line="533"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="175"/>
<location filename="form_maininterface.cpp" line="180"/>
<source>destortion value: </source>
<translation>畸变修正值： </translation>
</message>
@ -764,47 +764,47 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="288"/>
<location filename="form_maininterface.cpp" line="305"/>
<source>ID</source>
<translation>序号</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="288"/>
<location filename="form_maininterface.cpp" line="305"/>
<source>Test items</source>
<translation>测试项</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="288"/>
<location filename="form_maininterface.cpp" line="305"/>
<source>status</source>
<translation>测试状态</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="370"/>
<location filename="form_maininterface.cpp" line="387"/>
<source>not test</source>
<translation>未测试</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="370"/>
<location filename="form_maininterface.cpp" line="387"/>
<source>not pass</source>
<translation>不通过</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="370"/>
<location filename="form_maininterface.cpp" line="387"/>
<source>not support</source>
<translation>不支持</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="370"/>
<location filename="form_maininterface.cpp" line="387"/>
<source>pass</source>
<translation>通过</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="422"/>
<location filename="form_maininterface.cpp" line="442"/>
<source>image pixel: </source>
<translation>图像像素： </translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="511"/>
<location filename="form_maininterface.cpp" line="533"/>
<source>no image</source>
<translation>无图</translation>
</message>

74
app/HGProductionTool/form_maininterface.cpp
View File

@ -34,6 +34,8 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
{
ui->setupUi(this);
ui->pbtn_showImg->setVisible(false);
QFont ft;
ft.setPointSize(15);
this->setFont(ft);
@ -66,6 +68,8 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
ui->stackedWidget->addWidget(m_view);
ui->pbtn_showImg->setToolTip(tr("load last image which uploaded last time"));
connect(m_view, SIGNAL(doubleClicked()), this, SLOT(on_viewerDblClick()));
initTableWidgetUi();
if(!m_devType.isEmpty())
@ -165,6 +169,8 @@ void Form_mainInterface::on_testResultImg(void *img)
m_view->addImage(image);
ui->pbtn_leftRotate->setVisible(true);
ui->pbtn_rightRotate->setVisible(true);
ui->pbtn_prePage->setVisible(true);
ui->pbtn_nextPage->setVisible(true);
HGBase_DestroyImage(image);
}
@ -189,6 +195,18 @@ void Form_mainInterface::on_testCorrectInfo(QString info)
m_textTips->addContent(info);
}
void Form_mainInterface::on_viewerDblClick()
{
if (m_multiIndex != -1)
{
QString strFileName = m_list_images[m_multiIndex];
QFileInfo fileInfo(strFileName);
auto pathDir = fileInfo.path();
QString strFilePath = "file:///" + pathDir;
QDesktopServices::openUrl(QUrl(strFilePath));
}
}
void Form_mainInterface::on_pbtn_preStep_clicked()
{
int row = ui->tableWidget->currentRow();
@ -246,26 +264,26 @@ void Form_mainInterface::on_pbtn_pass_clicked()
QTableWidgetItem *item2 = ui->tableWidget->item(row, 2);
item2->setToolTip("");
HGImage img = nullptr;
m_view->getImage(&img);
// HGImage img = nullptr;
// m_view->getImage(&img);
if (img != nullptr)
{
QString fileName = getCacheFileName();
HGResult ret = HGImgFmt_SaveImage(img, 0, 0, getStdString(fileName).c_str());
if(ret == HGBASE_ERR_OK)
{
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_ClearDeviceEntryImage(m_pdtToolDbDevice, name.c_str());
HGPdtToolDb_UploadDeviceEntryImage(m_pdtToolDbDevice, name.c_str(), m_mainwnd->m_ftpHost.toStdString().c_str(),
m_mainwnd->m_ftpPort, fileName.toStdString().c_str());
QFile file(fileName);
file.remove();
}
}
// if (img != nullptr)
// {
// QString fileName = getCacheFileName();
// HGResult ret = HGImgFmt_SaveImage(img, 0, 0, getStdString(fileName).c_str());
// if(ret == HGBASE_ERR_OK)
// {
// 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_ClearDeviceEntryImage(m_pdtToolDbDevice, name.c_str());
// HGPdtToolDb_UploadDeviceEntryImage(m_pdtToolDbDevice, name.c_str(), m_mainwnd->m_ftpHost.toStdString().c_str(),
// m_mainwnd->m_ftpPort, fileName.toStdString().c_str());
// QFile file(fileName);
// file.remove();
// }
// }
on_pbtn_nextStep_clicked();
}
@ -399,7 +417,7 @@ void Form_mainInterface::updateUiEnabled(bool enable)
ui->pbtn_pass->setEnabled(enable);
ui->pbtn_fail->setEnabled(enable);
ui->pbtn_start->setEnabled(enable);
ui->pbtn_showImg->setEnabled(enable);
// ui->pbtn_showImg->setEnabled(enable);
ui->pbtn_leftRotate->setEnabled(enable);
ui->pbtn_rightRotate->setEnabled(enable);
ui->pbtn_stop->setEnabled(enable);
@ -429,7 +447,7 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
(void)previous;
if (current != nullptr)
{
ui->pbtn_showImg->setVisible(false);
// ui->pbtn_showImg->setVisible(false);
ui->pbtn_leftRotate->setVisible(false);
ui->pbtn_rightRotate->setVisible(false);
ui->pbtn_prePage->setVisible(false);
@ -461,9 +479,13 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
HGPdtToolDb_GetDeviceEntryImageCount(m_pdtToolDbDevice, name.c_str(), &imageCount);
if (imageCount > 0)
{
ui->pbtn_showImg->setVisible(true);
// ui->pbtn_showImg->setVisible(true);
}
}
else
{
updateUiEnabled(false);
}
}
void Form_mainInterface::on_pbtn_start_clicked()
@ -474,9 +496,6 @@ void Form_mainInterface::on_pbtn_start_clicked()
if (dir.exists())
dir.removeRecursively();
ui->label_imgInfo->setVisible(false);
ui->label_destortionInfo->setVisible(false);
int row = ui->tableWidget->currentRow();
QTableWidgetItem *item = ui->tableWidget->item(row, 1);
QString title = item->text();
@ -501,6 +520,8 @@ void Form_mainInterface::on_pbtn_showImg_clicked()
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);
@ -509,8 +530,7 @@ void Form_mainInterface::on_pbtn_showImg_clicked()
HGImage img = nullptr;
HGImgFmt_LoadImage(fileName.toStdString().c_str(), 0, 0, 0, 0, &img);
m_view->addImage(img);
QFile file(fileName);
file.remove();
m_multiIndex++;
}
else
{

2
app/HGProductionTool/form_maininterface.h
View File

@ -47,6 +47,8 @@ private slots:
void on_testDistortion(float value);
void on_testCorrectInfo(QString info);
void on_viewerDblClick();
private slots:
void on_pbtn_preStep_clicked();