Compare commits

...

3 Commits

Author SHA1 Message Date
13038267101 3f9bb9a9bb Merge branch 'master' of http://192.168.10.5:8099/sane/code_production 2023-03-07 16:44:44 +08:00
13038267101 581e889993 调整畸变 2023-03-07 16:44:38 +08:00
yangjiaxuan efeb97b14c 微调 2023-03-07 13:59:10 +08:00
2 changed files with 14 additions and 10 deletions

View File

@ -276,9 +276,13 @@ void Form_mainInterface::on_testOpenCacheFile(QString name)
{ {
if (name == HGPDTTOOLDB_NAME_IMAGE_GRAY_QUALITY && m_curDpi == 600) if (name == HGPDTTOOLDB_NAME_IMAGE_GRAY_QUALITY && m_curDpi == 600)
{ {
if (m_view != nullptr) if (m_multiIndex != -1)
{ {
m_view->doubleClicked(); QString cacheFilePath = getCachePath();
QFileInfo fileInfo(cacheFilePath);
auto pathDir = fileInfo.path();
QString strFilePath = "file:///" + pathDir;
QDesktopServices::openUrl(QUrl(strFilePath));
} }
} }
} }
@ -287,9 +291,8 @@ void Form_mainInterface::on_viewerDblClick()
{ {
if (m_multiIndex != -1) if (m_multiIndex != -1)
{ {
// QString strFileName = m_list_images[m_multiIndex]; QString strFileName = m_list_images[m_multiIndex];
QString cacheFilePath = getCachePath(); QFileInfo fileInfo(strFileName);
QFileInfo fileInfo(cacheFilePath);
auto pathDir = fileInfo.path(); auto pathDir = fileInfo.path();
QString strFilePath = "file:///" + pathDir; QString strFilePath = "file:///" + pathDir;
QDesktopServices::openUrl(QUrl(strFilePath)); QDesktopServices::openUrl(QUrl(strFilePath));

View File

@ -1022,7 +1022,12 @@ public:
{ {
ret = helper_->io_control(IO_CTRL_CODE_SET_DPI, &dpi, &llen); ret = helper_->io_control(IO_CTRL_CODE_SET_DPI, &dpi, &llen);
} }
//先默认设置1
float distortion = 1.0;
int setdistortion = *(int*)&distortion;
ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_CHECK_VAL, &setdistortion, &len);
ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_IMAGE, &type, &len); ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_IMAGE, &type, &len);
if (ret != SCANNER_ERR_OK) if (ret != SCANNER_ERR_OK)
{ {
@ -1107,10 +1112,6 @@ public:
int setdistortion = *(int*)&distortion; int setdistortion = *(int*)&distortion;
int getdistortion = 0; int getdistortion = 0;
//先默认设置1
int in = 1;
ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_CHECK_VAL, &in, &len);
ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_CHECK_VAL, &setdistortion, &len); ret = helper_->io_control(IO_CTRL_CODE_SET_DISTORTION_CHECK_VAL, &setdistortion, &len);
if (ret != SCANNER_ERR_OK) if (ret != SCANNER_ERR_OK)
{ {