Merge branch 'master' of http://192.168.10.5:8099/sane/code_production
This commit is contained in:
commit
3f9bb9a9bb
Binary file not shown.
|
@ -767,12 +767,12 @@
|
||||||
<translation type="vanished">设备未连接</translation>
|
<translation type="vanished">设备未连接</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="64"/>
|
<location filename="form_maininterface.cpp" line="65"/>
|
||||||
<source>Device type:</source>
|
<source>Device type:</source>
|
||||||
<translation>设备型号:</translation>
|
<translation>设备型号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="64"/>
|
<location filename="form_maininterface.cpp" line="65"/>
|
||||||
<source> SerialNum:</source>
|
<source> SerialNum:</source>
|
||||||
<translation> 序列号:</translation>
|
<translation> 序列号:</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -789,7 +789,7 @@
|
||||||
<translation type="vanished"> 休眠时间: </translation>
|
<translation type="vanished"> 休眠时间: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="82"/>
|
<location filename="form_maininterface.cpp" line="83"/>
|
||||||
<source>load last image which uploaded last time</source>
|
<source>load last image which uploaded last time</source>
|
||||||
<translation>加载上一次上传的图片</translation>
|
<translation>加载上一次上传的图片</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -798,14 +798,14 @@
|
||||||
<translation type="vanished">设备已断开</translation>
|
<translation type="vanished">设备已断开</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="158"/>
|
<location filename="form_maininterface.cpp" line="162"/>
|
||||||
<source>tips</source>
|
<source>tips</source>
|
||||||
<translation>提示</translation>
|
<translation>提示</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="201"/>
|
<location filename="form_maininterface.cpp" line="205"/>
|
||||||
<location filename="form_maininterface.cpp" line="211"/>
|
<location filename="form_maininterface.cpp" line="215"/>
|
||||||
<location filename="form_maininterface.cpp" line="221"/>
|
<location filename="form_maininterface.cpp" line="225"/>
|
||||||
<source>destortion value: </source>
|
<source>destortion value: </source>
|
||||||
<translation>畸变修正值: </translation>
|
<translation>畸变修正值: </translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -818,51 +818,56 @@
|
||||||
<translation type="vanished">取消</translation>
|
<translation type="vanished">取消</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="66"/>
|
<location filename="form_maininterface.cpp" line="67"/>
|
||||||
<source> speed mode:</source>
|
<source> speed mode:</source>
|
||||||
<translation> 目标配置: 速度模式:</translation>
|
<translation> 目标配置: 速度模式:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="67"/>
|
<location filename="form_maininterface.cpp" line="68"/>
|
||||||
<source> sleep time:</source>
|
<source> sleep time:</source>
|
||||||
<translation> 休眠时间:</translation>
|
<translation> 休眠时间:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="252"/>
|
<location filename="form_maininterface.cpp" line="159"/>
|
||||||
|
<source>,but correct information is abnormal</source>
|
||||||
|
<translation>,但是校正有异常</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="form_maininterface.cpp" line="264"/>
|
||||||
<source>please verify the configuration of the device:</source>
|
<source>please verify the configuration of the device:</source>
|
||||||
<translation>请验证设备配置:</translation>
|
<translation>请验证设备配置:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="253"/>
|
<location filename="form_maininterface.cpp" line="265"/>
|
||||||
<source>vid:%1
|
<source>vid:%1
|
||||||
</source>
|
</source>
|
||||||
<translation>vid:%1
|
<translation>vid:%1
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="254"/>
|
<location filename="form_maininterface.cpp" line="266"/>
|
||||||
<source>pid:%1
|
<source>pid:%1
|
||||||
</source>
|
</source>
|
||||||
<translation>pid:%1
|
<translation>pid:%1
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="255"/>
|
<location filename="form_maininterface.cpp" line="267"/>
|
||||||
<source>sleep time:%1minute
|
<source>sleep time:%1minute
|
||||||
</source>
|
</source>
|
||||||
<translation>休眠时间:%1分钟
|
<translation>休眠时间:%1分钟
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="256"/>
|
<location filename="form_maininterface.cpp" line="268"/>
|
||||||
<source>speed mode:%1PPM
|
<source>speed mode:%1PPM
|
||||||
</source>
|
</source>
|
||||||
<translation>速度模式:%1PPM
|
<translation>速度模式:%1PPM
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="684"/>
|
<location filename="form_maininterface.cpp" line="696"/>
|
||||||
<location filename="form_maininterface.cpp" line="744"/>
|
<location filename="form_maininterface.cpp" line="757"/>
|
||||||
<source>device history scan count:</source>
|
<source>device history scan count:</source>
|
||||||
<translation>设备历史扫描张数:</translation>
|
<translation>设备历史扫描张数:</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -871,37 +876,37 @@
|
||||||
<translation type="vanished">设备序列号:%1</translation>
|
<translation type="vanished">设备序列号:%1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="390"/>
|
<location filename="form_maininterface.cpp" line="402"/>
|
||||||
<source>ID</source>
|
<source>ID</source>
|
||||||
<translation>序号</translation>
|
<translation>序号</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="390"/>
|
<location filename="form_maininterface.cpp" line="402"/>
|
||||||
<source>Test items</source>
|
<source>Test items</source>
|
||||||
<translation>测试项</translation>
|
<translation>测试项</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="390"/>
|
<location filename="form_maininterface.cpp" line="402"/>
|
||||||
<source>status</source>
|
<source>status</source>
|
||||||
<translation>测试状态</translation>
|
<translation>测试状态</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="472"/>
|
<location filename="form_maininterface.cpp" line="484"/>
|
||||||
<source>not test</source>
|
<source>not test</source>
|
||||||
<translation>未测试</translation>
|
<translation>未测试</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="472"/>
|
<location filename="form_maininterface.cpp" line="484"/>
|
||||||
<source>not pass</source>
|
<source>not pass</source>
|
||||||
<translation>不通过</translation>
|
<translation>不通过</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="472"/>
|
<location filename="form_maininterface.cpp" line="484"/>
|
||||||
<source>not support</source>
|
<source>not support</source>
|
||||||
<translation>不支持</translation>
|
<translation>不支持</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="472"/>
|
<location filename="form_maininterface.cpp" line="484"/>
|
||||||
<source>pass</source>
|
<source>pass</source>
|
||||||
<translation>通过</translation>
|
<translation>通过</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -927,46 +932,46 @@
|
||||||
<translation type="vanished">Pid:</translation>
|
<translation type="vanished">Pid:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="678"/>
|
<location filename="form_maininterface.cpp" line="690"/>
|
||||||
<location filename="form_maininterface.cpp" line="738"/>
|
<location filename="form_maininterface.cpp" line="751"/>
|
||||||
<source>device roller count:</source>
|
<source>device roller count:</source>
|
||||||
<translation>设备滚轴张数:</translation>
|
<translation>设备滚轴张数:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="196"/>
|
<location filename="form_maininterface.cpp" line="200"/>
|
||||||
<location filename="form_maininterface.cpp" line="538"/>
|
<location filename="form_maininterface.cpp" line="550"/>
|
||||||
<source>image pixel: </source>
|
<source>image pixel: </source>
|
||||||
<translation>标准圆:宽 * 高: </translation>
|
<translation>标准圆:宽 * 高: </translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="64"/>
|
<location filename="form_maininterface.cpp" line="65"/>
|
||||||
<source>FirmwareNum:</source>
|
<source>FirmwareNum:</source>
|
||||||
<translation>固件号:</translation>
|
<translation>固件号:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="257"/>
|
<location filename="form_maininterface.cpp" line="269"/>
|
||||||
<source>device serial number:%1
|
<source>device serial number:%1
|
||||||
</source>
|
</source>
|
||||||
<translation>设备序列号:%1
|
<translation>设备序列号:%1
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="258"/>
|
<location filename="form_maininterface.cpp" line="270"/>
|
||||||
<source>device firmware number:%1</source>
|
<source>device firmware number:%1</source>
|
||||||
<translation>设备固件版本号:%1</translation>
|
<translation>设备固件版本号:%1</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="575"/>
|
<location filename="form_maininterface.cpp" line="587"/>
|
||||||
<source> minute</source>
|
<source> minute</source>
|
||||||
<translation> 分钟</translation>
|
<translation> 分钟</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="69"/>
|
<location filename="form_maininterface.cpp" line="70"/>
|
||||||
<source> VID:</source>
|
<source> VID:</source>
|
||||||
<translation> VID:</translation>
|
<translation> VID:</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="form_maininterface.cpp" line="69"/>
|
<location filename="form_maininterface.cpp" line="70"/>
|
||||||
<source> PID:</source>
|
<source> PID:</source>
|
||||||
<translation> PID:</translation>
|
<translation> PID:</translation>
|
||||||
</message>
|
</message>
|
||||||
|
|
|
@ -31,6 +31,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
|
||||||
, m_devFwNum(devFwNum)
|
, m_devFwNum(devFwNum)
|
||||||
, m_curItemName("")
|
, m_curItemName("")
|
||||||
, m_isTesting(false)
|
, m_isTesting(false)
|
||||||
|
, m_isCorrectNormal(true)
|
||||||
, m_multiIndex(-1)
|
, m_multiIndex(-1)
|
||||||
, m_curNameIndex(1)
|
, m_curNameIndex(1)
|
||||||
, m_curDpi(0)
|
, m_curDpi(0)
|
||||||
|
@ -154,6 +155,9 @@ void Form_mainInterface::paintEvent(QPaintEvent *event)
|
||||||
|
|
||||||
void Form_mainInterface::on_testResult(QString text)
|
void Form_mainInterface::on_testResult(QString text)
|
||||||
{
|
{
|
||||||
|
if (!m_isCorrectNormal)
|
||||||
|
text += (tr(",but correct information is abnormal"));
|
||||||
|
|
||||||
if (!text.isEmpty())
|
if (!text.isEmpty())
|
||||||
QMessageBox::information(this, tr("tips"), text);
|
QMessageBox::information(this, tr("tips"), text);
|
||||||
|
|
||||||
|
@ -240,7 +244,15 @@ void Form_mainInterface::on_testDistortion(SANE_DISTORTION_VAL data)
|
||||||
|
|
||||||
void Form_mainInterface::on_testCorrectInfo(QString info)
|
void Form_mainInterface::on_testCorrectInfo(QString info)
|
||||||
{
|
{
|
||||||
m_textTips->addContent(info);
|
if (info.contains("异常"))
|
||||||
|
{
|
||||||
|
m_isCorrectNormal = false;
|
||||||
|
m_textTips->addContent(info, false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_textTips->addContent(info, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw)
|
void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw)
|
||||||
|
@ -264,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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -275,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));
|
||||||
|
@ -689,6 +704,7 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
|
||||||
|
|
||||||
void Form_mainInterface::on_pbtn_start_clicked()
|
void Form_mainInterface::on_pbtn_start_clicked()
|
||||||
{
|
{
|
||||||
|
m_isCorrectNormal = true;
|
||||||
m_multiIndex = -1;
|
m_multiIndex = -1;
|
||||||
m_curNameIndex = 1;
|
m_curNameIndex = 1;
|
||||||
m_list_images.clear();
|
m_list_images.clear();
|
||||||
|
|
|
@ -124,6 +124,7 @@ private:
|
||||||
QString m_devFwNum;
|
QString m_devFwNum;
|
||||||
QString m_curItemName;
|
QString m_curItemName;
|
||||||
bool m_isTesting;
|
bool m_isTesting;
|
||||||
|
bool m_isCorrectNormal;
|
||||||
int m_multiIndex;
|
int m_multiIndex;
|
||||||
int m_curNameIndex;
|
int m_curNameIndex;
|
||||||
int m_curDpi;
|
int m_curDpi;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "form_texttips.h"
|
#include "form_texttips.h"
|
||||||
#include "ui_form_texttips.h"
|
#include "ui_form_texttips.h"
|
||||||
|
|
||||||
|
#define TEXT_COLOR_RED(STRING) " <font color=red> " STRING " </font> " " <font color=black> </font> "
|
||||||
Form_textTips::Form_textTips(QWidget *parent)
|
Form_textTips::Form_textTips(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
, ui(new Ui::Form_textTips)
|
, ui(new Ui::Form_textTips)
|
||||||
|
@ -22,10 +23,18 @@ void Form_textTips::setViewContent(QString content)
|
||||||
ui->textBrowser->setText(content);
|
ui->textBrowser->setText(content);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Form_textTips::addContent(QString content)
|
void Form_textTips::addContent(QString content, bool isNormal)
|
||||||
{
|
{
|
||||||
ui->textBrowser->insertPlainText(content);
|
if (isNormal)
|
||||||
|
ui->textBrowser->insertPlainText(content);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ui->textBrowser->setTextColor(Qt::red);
|
||||||
|
ui->textBrowser->insertPlainText(content);
|
||||||
|
}
|
||||||
|
|
||||||
ui->textBrowser->moveCursor(QTextCursor::End);
|
ui->textBrowser->moveCursor(QTextCursor::End);
|
||||||
|
ui->textBrowser->setTextColor(Qt::black);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ public:
|
||||||
~Form_textTips();
|
~Form_textTips();
|
||||||
|
|
||||||
void setViewContent(QString content);
|
void setViewContent(QString content);
|
||||||
void addContent(QString content);
|
void addContent(QString content, bool isNormal);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::Form_textTips *ui;
|
Ui::Form_textTips *ui;
|
||||||
|
|
|
@ -1173,11 +1173,12 @@ public:
|
||||||
bool type = false;
|
bool type = false;
|
||||||
unsigned int len = sizeof(SANE_Int);
|
unsigned int len = sizeof(SANE_Int);
|
||||||
int ret = helper_->io_control(IO_CTRL_CODE_SET_CLEAR_HISTORY_COUNT, NULL, NULL);
|
int ret = helper_->io_control(IO_CTRL_CODE_SET_CLEAR_HISTORY_COUNT, NULL, NULL);
|
||||||
|
if (ret != SCANNER_ERR_OK)
|
||||||
|
{
|
||||||
|
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||||
|
}
|
||||||
ret = helper_->io_control(IO_CTRL_CODE_GET_HISTORY_SCAN_NUM, &num, &len);
|
ret = helper_->io_control(IO_CTRL_CODE_GET_HISTORY_SCAN_NUM, &num, &len);
|
||||||
if (ret != SCANNER_ERR_OK)
|
|
||||||
{
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
if ((num == 0 && num != -1))
|
if ((num == 0 && num != -1))
|
||||||
{
|
{
|
||||||
type = true;
|
type = true;
|
||||||
|
|
Loading…
Reference in New Issue