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-05 20:37:01 +08:00
parent aa17d7556b
commit 9fb38d18d0
6 changed files with 109 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

60
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -730,73 +730,81 @@
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="55"/> <location filename="form_maininterface.cpp" line="55"/>
<location filename="form_maininterface.cpp" line="123"/> <location filename="form_maininterface.cpp" line="126"/>
<source> connect status:</source> <source> connect status:</source>
<translation> 设备连接状态：</translation> <translation> 设备连接状态：</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="64"/> <location filename="form_maininterface.cpp" line="67"/>
<source>load last image which uploaded last time</source> <source>load last image which uploaded last time</source>
<translation>加载上一次上传的图片</translation> <translation>加载上一次上传的图片</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="122"/> <location filename="form_maininterface.cpp" line="125"/>
<source>Device has disconnected</source> <source>Device has disconnected</source>
<translation>设备已断开</translation> <translation>设备已断开</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="139"/> <location filename="form_maininterface.cpp" line="142"/>
<location filename="form_maininterface.cpp" line="497"/> <location filename="form_maininterface.cpp" line="511"/>
<source>tips</source> <source>tips</source>
<translation>提示</translation> <translation>提示</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="173"/> <location filename="form_maininterface.cpp" line="175"/>
<source>destortion value: </source>
<translation>畸变修正值： </translation>
</message>
<message>
<source>yes</source> <source>yes</source>
<translation>确定</translation> <translation type="vanished">确定</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="174"/>
<source>no</source> <source>no</source>
<translation>取消</translation> <translation type="vanished">取消</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="293"/> <location filename="form_maininterface.cpp" line="288"/>
<source>ID</source> <source>ID</source>
<translation>序号</translation> <translation>序号</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="293"/> <location filename="form_maininterface.cpp" line="288"/>
<source>Test items</source> <source>Test items</source>
<translation>测试项</translation> <translation>测试项</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="293"/> <location filename="form_maininterface.cpp" line="288"/>
<source>status</source> <source>status</source>
<translation>测试状态</translation> <translation>测试状态</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="375"/> <location filename="form_maininterface.cpp" line="370"/>
<source>not test</source> <source>not test</source>
<translation>未测试</translation> <translation>未测试</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="375"/> <location filename="form_maininterface.cpp" line="370"/>
<source>not pass</source> <source>not pass</source>
<translation>不通过</translation> <translation>不通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="375"/> <location filename="form_maininterface.cpp" line="370"/>
<source>not support</source> <source>not support</source>
<translation>不支持</translation> <translation>不支持</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="375"/> <location filename="form_maininterface.cpp" line="370"/>
<source>pass</source> <source>pass</source>
<translation>通过</translation> <translation>通过</translation>
</message> </message>
<message> <message>
<location filename="form_maininterface.cpp" line="497"/> <location filename="form_maininterface.cpp" line="422"/>
<source>image pixel: </source>
<translation>图像像素： </translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="511"/>
<source>no image</source> <source>no image</source>
<translation>无图</translation> <translation>无图</translation>
</message> </message>
@ -822,47 +830,47 @@
<translation>设备</translation> <translation>设备</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="36"/> <location filename="mainwindow.ui" line="38"/>
<source>menu_user</source> <source>menu_user</source>
<translation>用户</translation> <translation>用户</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="52"/> <location filename="mainwindow.ui" line="54"/>
<source>act_newDevice</source> <source>act_newDevice</source>
<translation>新建项目</translation> <translation>新建项目</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="57"/> <location filename="mainwindow.ui" line="59"/>
<source>act_manage</source> <source>act_manage</source>
<translation>账户管理</translation> <translation>账户管理</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="62"/> <location filename="mainwindow.ui" line="64"/>
<source>act_changePwd</source> <source>act_changePwd</source>
<translation>修改密码</translation> <translation>修改密码</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="67"/> <location filename="mainwindow.ui" line="69"/>
<source>act_export</source> <source>act_export</source>
<translation>导出</translation> <translation>导出</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="72"/> <location filename="mainwindow.ui" line="74"/>
<source>act_logOut</source> <source>act_logOut</source>
<translation>登出</translation> <translation>登出</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="77"/> <location filename="mainwindow.ui" line="79"/>
<source>act_close</source> <source>act_close</source>
<translation>关闭</translation> <translation>关闭</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="82"/> <location filename="mainwindow.ui" line="84"/>
<source>act_upload</source> <source>act_upload</source>
<translation>上传配置文件</translation> <translation>上传配置文件</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="87"/> <location filename="mainwindow.ui" line="89"/>
<source>act_refreshDevice</source> <source>act_refreshDevice</source>
<translation>刷新设备列表</translation> <translation>刷新设备列表</translation>
</message> </message>

62
app/HGProductionTool/form_maininterface.cpp
View File

@ -40,7 +40,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
connect(this, SIGNAL(testResult(QString)), this, SLOT(on_testResult(QString)), Qt::QueuedConnection); connect(this, SIGNAL(testResult(QString)), this, SLOT(on_testResult(QString)), Qt::QueuedConnection);
connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection); connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection);
connect(this, SIGNAL(testDistortion(QString,void*)), this, SLOT(on_testDistortion(QString,void*)), Qt::QueuedConnection); connect(this, SIGNAL(testDistortion(float)), this, SLOT(on_testDistortion(float)), Qt::QueuedConnection);
connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection); connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection);
QString str; QString str;
@ -54,6 +54,9 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
ui->label_sn->setText(tr("Device type:") + m_devType + tr(" SerialNum:") + m_serialNum); ui->label_sn->setText(tr("Device type:") + m_devType + tr(" SerialNum:") + m_serialNum);
ui->label_devStatus->setText(tr(" connect status:") + str); ui->label_devStatus->setText(tr(" connect status:") + str);
ui->label_imgInfo->setVisible(false);
ui->label_destortionInfo->setVisible(false);
setMinimumWidth(500); setMinimumWidth(500);
ui->tableWidget->setMinimumWidth(400); ui->tableWidget->setMinimumWidth(400);
ui->tableWidget->setMaximumWidth(400); ui->tableWidget->setMaximumWidth(400);
@ -153,7 +156,7 @@ void Form_mainInterface::on_testResultImg(void *img)
HGImage image = (HGImage)img; HGImage image = (HGImage)img;
std::string filename = getStdString(getCacheFileName()); std::string filename = getStdString(getCacheFileName());
HGResult ret = HGImgFmt_SaveImage(image, 0, 0, filename.c_str()); HGImgFmt_SaveImage(image, 0, 0, filename.c_str());
m_list_images.push_back(QString::fromStdString(filename)); m_list_images.push_back(QString::fromStdString(filename));
m_multiIndex = m_list_images.size() - 1; m_multiIndex = m_list_images.size() - 1;
@ -166,27 +169,18 @@ void Form_mainInterface::on_testResultImg(void *img)
HGBase_DestroyImage(image); HGBase_DestroyImage(image);
} }
void Form_mainInterface::on_testDistortion(QString name, void *data) void Form_mainInterface::on_testDistortion(float value)
{ {
QString info = QString::fromStdWString((const wchar_t*)data); ui->label_destortionInfo->setText(tr("destortion value: ") + QString::number(value, 'f', 4));
QMessageBox msg(QMessageBox::Question, name, info, QMessageBox::Yes | QMessageBox::No, this); updateImgPixelInfo();
msg.setButtonText(QMessageBox::Yes, tr("yes"));
msg.setButtonText(QMessageBox::No, tr("no"));
msg.exec();
if (msg.clickedButton() == msg.button(QMessageBox::Yes))
{
// func_test_go(HGPDTTOOLDB_NAME_SINGLE_PAGE_TEST_1, L"null", m_hg);
}
else
{
updateUiEnabled(true);
m_isTesting = false;
m_mainwnd->releaseTesting();
if (m_disconnect) updateUiEnabled(true);
{ m_isTesting = false;
m_mainwnd->RemoveInterface(this); m_mainwnd->releaseTesting();
}
if (m_disconnect)
{
m_mainwnd->RemoveInterface(this);
} }
} }
@ -409,6 +403,25 @@ void Form_mainInterface::updateUiEnabled(bool enable)
ui->pbtn_leftRotate->setEnabled(enable); ui->pbtn_leftRotate->setEnabled(enable);
ui->pbtn_rightRotate->setEnabled(enable); ui->pbtn_rightRotate->setEnabled(enable);
ui->pbtn_stop->setEnabled(enable); ui->pbtn_stop->setEnabled(enable);
ui->pbtn_prePage->setEnabled(enable);
ui->pbtn_nextPage->setEnabled(enable);
}
void Form_mainInterface::updateImgPixelInfo()
{
ui->label_imgInfo->setVisible(true);
ui->label_destortionInfo->setVisible(true);
HGImage image = NULL;
m_view->getImage(&image);
HGImageInfo imgInfo;
memset(&imgInfo, 0, sizeof(imgInfo));
HGBase_GetImageInfo(image, &imgInfo);
int imgWidth = imgInfo.width;
int imgHeight = imgInfo.height;
if (imgWidth > 0 && imgHeight > 0)
ui->label_imgInfo->setText(tr("image pixel: ") + QString::number(imgWidth) + " * " + QString::number(imgHeight) + " ");
} }
void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous) void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *current, QTableWidgetItem *previous)
@ -419,6 +432,8 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
ui->pbtn_showImg->setVisible(false); ui->pbtn_showImg->setVisible(false);
ui->pbtn_leftRotate->setVisible(false); ui->pbtn_leftRotate->setVisible(false);
ui->pbtn_rightRotate->setVisible(false); ui->pbtn_rightRotate->setVisible(false);
ui->pbtn_prePage->setVisible(false);
ui->pbtn_nextPage->setVisible(false);
int row = current->row(); int row = current->row();
int count = ui->tableWidget->rowCount(); int count = ui->tableWidget->rowCount();
ui->pbtn_preStep->setEnabled(row != 0); ui->pbtn_preStep->setEnabled(row != 0);
@ -459,6 +474,9 @@ void Form_mainInterface::on_pbtn_start_clicked()
if (dir.exists()) if (dir.exists())
dir.removeRecursively(); dir.removeRecursively();
ui->label_imgInfo->setVisible(false);
ui->label_destortionInfo->setVisible(false);
int row = ui->tableWidget->currentRow(); int row = ui->tableWidget->currentRow();
QTableWidgetItem *item = ui->tableWidget->item(row, 1); QTableWidgetItem *item = ui->tableWidget->item(row, 1);
QString title = item->text(); QString title = item->text();
@ -485,6 +503,8 @@ void Form_mainInterface::on_pbtn_showImg_clicked()
{ {
ui->pbtn_leftRotate->setVisible(true); ui->pbtn_leftRotate->setVisible(true);
ui->pbtn_rightRotate->setVisible(true); ui->pbtn_rightRotate->setVisible(true);
ui->pbtn_prePage->setVisible(true);
ui->pbtn_nextPage->setVisible(true);
ui->stackedWidget->setCurrentWidget(m_view); ui->stackedWidget->setCurrentWidget(m_view);
HGImage img = nullptr; HGImage img = nullptr;
HGImgFmt_LoadImage(fileName.toStdString().c_str(), 0, 0, 0, 0, &img); HGImgFmt_LoadImage(fileName.toStdString().c_str(), 0, 0, 0, 0, &img);

5
app/HGProductionTool/form_maininterface.h
View File

@ -38,13 +38,13 @@ protected:
signals: signals:
void testResult(QString text); void testResult(QString text);
void testResultImg(void* img); void testResultImg(void* img);
void testDistortion(QString title, void *data); void testDistortion(float value);
void testCorrectInfo(QString info); void testCorrectInfo(QString info);
private slots: private slots:
void on_testResult(QString text); void on_testResult(QString text);
void on_testResultImg(void* img); void on_testResultImg(void* img);
void on_testDistortion(QString title, void *data); void on_testDistortion(float value);
void on_testCorrectInfo(QString info); void on_testCorrectInfo(QString info);
private slots: private slots:
@ -78,6 +78,7 @@ private:
QString getCachePath(); QString getCachePath();
QString getCacheFileName(); QString getCacheFileName();
void updateUiEnabled(bool enable); void updateUiEnabled(bool enable);
void updateImgPixelInfo();
private: private:
Ui::Form_mainInterface *ui; Ui::Form_mainInterface *ui;

34
app/HGProductionTool/form_maininterface.ui
View File

@ -167,11 +167,35 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_destortionInfo"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="text"> <item>
<string/> <widget class="QLabel" name="label_imgInfo">
</property> <property name="text">
</widget> <string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_destortionInfo">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>

5
app/HGProductionTool/hgscanner.cpp
View File

@ -98,9 +98,8 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
} }
else if (ev == TEST_EVENT_DISTORTION_VAL) else if (ev == TEST_EVENT_DISTORTION_VAL)
{ {
float f = *(float*)data; float fValue = *(float*)data;
QString title = QString::fromStdWString(name); emit m_interface->testDistortion(fValue);
emit m_interface->testDistortion(title, data);
} }
else if (ev == TEST_EVENT_FALT_INFO) else if (ev == TEST_EVENT_FALT_INFO)
{ {