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

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev

This commit is contained in:
luoliangyi 2024-05-27 15:51:18 +08:00
parent d2a6a648f7 fcffc96de2
commit 9f2dfff3a7
3 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/scantool/Scantool_zh_CN.qm
View File

Binary file not shown.

138
app/scantool/Scantool_zh_CN.ts
View File

@ -40,28 +40,28 @@
</message>
<message>
<location filename="dialog_add.cpp" line="16"/>
<location filename="dialog_add.cpp" line="48"/>
<location filename="dialog_add.cpp" line="49"/>
<source>Manual</source>
<translation>手动</translation>
</message>
<message>
<location filename="dialog_add.cpp" line="20"/>
<location filename="dialog_add.cpp" line="52"/>
<location filename="dialog_add.cpp" line="53"/>
<source>Button </source>
<translation>按键 </translation>
</message>
<message>
<location filename="dialog_add.cpp" line="46"/>
<location filename="dialog_add.cpp" line="47"/>
<source>Modify</source>
<translation>修改</translation>
</message>
<message>
<location filename="dialog_add.cpp" line="106"/>
<location filename="dialog_add.cpp" line="110"/>
<source>Tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_add.cpp" line="106"/>
<location filename="dialog_add.cpp" line="110"/>
<source>Item find in list</source>
<translation>配置已存在</translation>
</message>
@ -162,38 +162,30 @@
<context>
<name>Form_DeviceConfig</name>
<message>
<location filename="form_deviceconfig.cpp" line="258"/>
<location filename="form_deviceconfig.cpp" line="259"/>
<source>Default</source>
<translation>恢复默认</translation>
</message>
<message>
<location filename="form_deviceconfig.cpp" line="431"/>
<location filename="form_deviceconfig.cpp" line="432"/>
<source>Custom gamma</source>
<translation>自定义色调曲线</translation>
</message>
<message>
<location filename="form_deviceconfig.cpp" line="865"/>
<location filename="form_deviceconfig.cpp" line="892"/>
<location filename="form_deviceconfig.cpp" line="919"/>
<location filename="form_deviceconfig.cpp" line="954"/>
<location filename="form_deviceconfig.cpp" line="989"/>
<location filename="form_deviceconfig.cpp" line="1030"/>
<location filename="form_deviceconfig.cpp" line="1057"/>
<location filename="form_deviceconfig.cpp" line="1092"/>
<location filename="form_deviceconfig.cpp" line="1333"/>
<location filename="form_deviceconfig.cpp" line="817"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_deviceconfig.cpp" line="865"/>
<location filename="form_deviceconfig.cpp" line="892"/>
<location filename="form_deviceconfig.cpp" line="919"/>
<location filename="form_deviceconfig.cpp" line="954"/>
<location filename="form_deviceconfig.cpp" line="989"/>
<location filename="form_deviceconfig.cpp" line="1030"/>
<location filename="form_deviceconfig.cpp" line="1057"/>
<location filename="form_deviceconfig.cpp" line="1092"/>
<location filename="form_deviceconfig.cpp" line="1333"/>
<location filename="form_deviceconfig.cpp" line="873"/>
<location filename="form_deviceconfig.cpp" line="903"/>
<location filename="form_deviceconfig.cpp" line="933"/>
<location filename="form_deviceconfig.cpp" line="971"/>
<location filename="form_deviceconfig.cpp" line="1009"/>
<location filename="form_deviceconfig.cpp" line="1053"/>
<location filename="form_deviceconfig.cpp" line="1083"/>
<location filename="form_deviceconfig.cpp" line="1121"/>
<location filename="form_deviceconfig.cpp" line="1365"/>
<source>The funtion is unsupported</source>
<translation>此版本不支持该功能</translation>
</message>
@ -389,24 +381,23 @@
<translation type="vanished">用户自定义页数</translation>
</message>
<message>
<location filename="form_saveparam.cpp" line="34"/>
<location filename="form_saveparam.cpp" line="243"/>
<location filename="form_saveparam.cpp" line="35"/>
<location filename="form_saveparam.cpp" line="270"/>
<location filename="form_saveparam.cpp" line="277"/>
<location filename="form_saveparam.cpp" line="297"/>
<location filename="form_saveparam.cpp" line="304"/>
<source>e.g. &apos;%1%2&apos;</source>
<translation>例如.“%1%2”</translation>
</message>
<message>
<location filename="form_saveparam.cpp" line="205"/>
<source>Browse directory</source>
<translation>文件夹路径</translation>
<translation type="vanished">文件夹路径</translation>
</message>
</context>
<context>
<name>MainWindow</name>
<message>
<location filename="mainwindow.ui" line="14"/>
<location filename="mainwindow.cpp" line="38"/>
<location filename="mainwindow.cpp" line="46"/>
<source>Scan Tool</source>
<translation>扫描工具</translation>
</message>
@ -436,131 +427,130 @@
<translation>选择设备</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="43"/>
<location filename="mainwindow.cpp" line="51"/>
<source>Show</source>
<translation>打开</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="45"/>
<location filename="mainwindow.cpp" line="53"/>
<source>Exit</source>
<translation>退出</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="62"/>
<location filename="mainwindow.cpp" line="70"/>
<source>Device Type</source>
<translation>设备类型</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="63"/>
<location filename="mainwindow.cpp" line="71"/>
<source>Button Id</source>
<translation>按键ID</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="64"/>
<location filename="mainwindow.cpp" line="72"/>
<source>Device Config</source>
<translation>设备配置</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="65"/>
<location filename="mainwindow.cpp" line="73"/>
<source>Save Param</source>
<translation>保存参数</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="82"/>
<location filename="mainwindow.cpp" line="812"/>
<location filename="mainwindow.cpp" line="1384"/>
<location filename="mainwindow.cpp" line="1445"/>
<location filename="mainwindow.cpp" line="90"/>
<location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="1497"/>
<source>Manual</source>
<translation>手动</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="82"/>
<location filename="mainwindow.cpp" line="812"/>
<location filename="mainwindow.cpp" line="1384"/>
<location filename="mainwindow.cpp" line="1445"/>
<location filename="mainwindow.cpp" line="90"/>
<location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="1497"/>
<source>Button 1</source>
<translation>按键 1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="82"/>
<location filename="mainwindow.cpp" line="812"/>
<location filename="mainwindow.cpp" line="1384"/>
<location filename="mainwindow.cpp" line="1445"/>
<location filename="mainwindow.cpp" line="90"/>
<location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="1497"/>
<source>Button 2</source>
<translation>按键 2</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="82"/>
<location filename="mainwindow.cpp" line="812"/>
<location filename="mainwindow.cpp" line="1384"/>
<location filename="mainwindow.cpp" line="1445"/>
<location filename="mainwindow.cpp" line="90"/>
<location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="1497"/>
<source>Button 3</source>
<translation>按键 3</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="82"/>
<location filename="mainwindow.cpp" line="812"/>
<location filename="mainwindow.cpp" line="1384"/>
<location filename="mainwindow.cpp" line="1445"/>
<location filename="mainwindow.cpp" line="90"/>
<location filename="mainwindow.cpp" line="1053"/>
<location filename="mainwindow.cpp" line="1497"/>
<source>Button 4</source>
<translation>按键 4</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="603"/>
<location filename="mainwindow.cpp" line="1354"/>
<location filename="mainwindow.cpp" line="1410"/>
<location filename="mainwindow.cpp" line="1416"/>
<location filename="mainwindow.cpp" line="1430"/>
<location filename="mainwindow.cpp" line="612"/>
<location filename="mainwindow.cpp" line="1023"/>
<location filename="mainwindow.cpp" line="1392"/>
<location filename="mainwindow.cpp" line="1462"/>
<location filename="mainwindow.cpp" line="1468"/>
<location filename="mainwindow.cpp" line="1482"/>
<location filename="mainwindow.cpp" line="1514"/>
<source>Tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="603"/>
<location filename="mainwindow.cpp" line="1354"/>
<location filename="mainwindow.cpp" line="1416"/>
<location filename="mainwindow.cpp" line="612"/>
<location filename="mainwindow.cpp" line="1023"/>
<location filename="mainwindow.cpp" line="1468"/>
<source>Device is offline</source>
<translation>设备已断开</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="963"/>
<location filename="mainwindow.cpp" line="927"/>
<source>binary</source>
<translation>黑白</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="965"/>
<location filename="mainwindow.cpp" line="929"/>
<source>gray</source>
<translation>256级灰度</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="967"/>
<location filename="mainwindow.cpp" line="931"/>
<source>rgb</source>
<translation>24位彩色</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1410"/>
<location filename="mainwindow.cpp" line="1392"/>
<source>Do not supported to open %1</source>
<translation>不支持打开设备 %1</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1462"/>
<location filename="mainwindow.cpp" line="1514"/>
<source>No item selected</source>
<translation>请选择配置项</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1430"/>
<location filename="mainwindow.cpp" line="1482"/>
<source>Device type mismatch</source>
<translation>设备类型不匹配</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1468"/>
<source>Manual configuration items cannot be deleted</source>
<translation>手动扫描配置不可被删除</translation>
<translation type="vanished">手动扫描配置不可被删除</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1472"/>
<location filename="mainwindow.cpp" line="1518"/>
<source>Question</source>
<translation>询问</translation>
</message>
<message>
<location filename="mainwindow.cpp" line="1473"/>
<location filename="mainwindow.cpp" line="1519"/>
<source>Are you sure you want to remove the item?</source>
<translation>确认删除配置项？</translation>
</message>

38
app/scantool/mainwindow.cpp
View File

@ -10,6 +10,7 @@
#include "base/HGCrash.h"
#include "imgproc/HGImgProc.h"
#include "imgproc/HGOCR.h"
#include "huagao/hgscanner_error.h"
#include "dialog_scaninfo.h"
#include "form_saveparam.h"
#include "sqlite3.h"
@ -1259,6 +1260,11 @@ void MainWindow::timerEvent(QTimerEvent *e)
this->killTimer(m_timerId);
m_timerId = -1;
}
else if (SCANNER_ERR_DEVICE_NOT_SUPPORT == status)
{
this->killTimer(m_timerId);
m_timerId = -1;
}
}
}
@ -1381,9 +1387,13 @@ void MainWindow::on_comboBox_currentIndexChanged(const QString &arg1)
ui->pushButtonAdd->setEnabled(true);
ui->pushButtonModify->setEnabled(true);
}
else if (SCANNER_ERR_DEVICE_NOT_SUPPORT == status)
{
QMessageBox::information(this, tr("Tips"), tr("Do not supported to open %1").arg(arg1));
}
else
{
m_timerId = this->startTimer(2000);
m_timerId = this->startTimer(5000);
}
}
@ -1416,19 +1426,19 @@ void MainWindow::on_showMainWindowDlg()
void MainWindow::on_saneEventCloseDevice(void* devHandle)
{
if (devHandle == m_devHandle)
{
assert(nullptr != m_devHandle || nullptr != devHandle);
StopScan();
emit closeDevice();
sane_close(m_devHandle);
m_devHandle = NULL;
m_devName.clear();
assert(nullptr != m_devHandle || nullptr != devHandle);
if (devHandle != m_devHandle)
return;
ui->pushButtonScan->setEnabled(false);
ui->pushButtonAdd->setEnabled(false);
ui->pushButtonModify->setEnabled(false);
}
StopScan();
emit closeDevice();
sane_close(m_devHandle);
m_devHandle = NULL;
m_devName.clear();
ui->pushButtonScan->setEnabled(false);
ui->pushButtonAdd->setEnabled(false);
ui->pushButtonModify->setEnabled(false);
if (-1 != m_timerId)
{
@ -1436,7 +1446,7 @@ void MainWindow::on_saneEventCloseDevice(void* devHandle)
m_timerId = -1;
}
m_timerId = this->startTimer(2000);
m_timerId = this->startTimer(5000);
}
void MainWindow:: on_pushButtonAdd_clicked()