diff --git a/app/HGProductionTool/ProductionTool_zh_CN.qm b/app/HGProductionTool/ProductionTool_zh_CN.qm
index ef4ce58..d6b86b2 100644
Binary files a/app/HGProductionTool/ProductionTool_zh_CN.qm and b/app/HGProductionTool/ProductionTool_zh_CN.qm differ
diff --git a/app/HGProductionTool/ProductionTool_zh_CN.ts b/app/HGProductionTool/ProductionTool_zh_CN.ts
index 2b4bcc3..0e78060 100644
--- a/app/HGProductionTool/ProductionTool_zh_CN.ts
+++ b/app/HGProductionTool/ProductionTool_zh_CN.ts
@@ -767,12 +767,12 @@
设备未连接
-
+
Device type:
设备型号：
-
+
SerialNum:
序列号：
@@ -789,7 +789,7 @@
休眠时间：
-
+
load last image which uploaded last time
加载上一次上传的图片
@@ -798,14 +798,14 @@
设备已断开
-
+
tips
提示
-
-
-
+
+
+
destortion value:
畸变修正值：
@@ -818,51 +818,56 @@
取消
-
+
speed mode:
目标配置： 速度模式：
-
+
sleep time:
休眠时间：
-
+
+ ,but correct information is abnormal
+ ，但是校正有异常
+
+
+
please verify the configuration of the device:
请验证设备配置：
-
+
vid:%1
vid:%1
-
+
pid:%1
pid:%1
-
+
sleep time:%1minute
休眠时间：%1分钟
-
+
speed mode:%1PPM
速度模式：%1PPM
-
-
+
+
device history scan count:
设备历史扫描张数：
@@ -871,37 +876,37 @@
设备序列号：%1
-
+
ID
序号
-
+
Test items
测试项
-
+
status
测试状态
-
+
not test
未测试
-
+
not pass
不通过
-
+
not support
不支持
-
+
pass
通过
@@ -927,46 +932,46 @@
Pid：
-
-
+
+
device roller count:
设备滚轴张数：
-
-
+
+
image pixel:
标准圆:宽 * 高:
-
+
FirmwareNum:
固件号：
-
+
device serial number:%1
设备序列号：%1
-
+
device firmware number:%1
设备固件版本号：%1
-
+
minute
分钟
-
+
VID:
VID：
-
+
PID:
PID：
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index 51f5ae2..082cf08 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -31,6 +31,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
, m_devFwNum(devFwNum)
, m_curItemName("")
, m_isTesting(false)
+ , m_isCorrectNormal(true)
, m_multiIndex(-1)
, m_curNameIndex(1)
, m_curDpi(0)
@@ -154,6 +155,9 @@ void Form_mainInterface::paintEvent(QPaintEvent *event)
void Form_mainInterface::on_testResult(QString text)
{
+ if (!m_isCorrectNormal)
+ text += (tr(",but correct information is abnormal"));
+
if (!text.isEmpty())
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)
{
- 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)
@@ -689,6 +701,7 @@ void Form_mainInterface::on_tableWidget_currentItemChanged(QTableWidgetItem *cur
void Form_mainInterface::on_pbtn_start_clicked()
{
+ m_isCorrectNormal = true;
m_multiIndex = -1;
m_curNameIndex = 1;
m_list_images.clear();
diff --git a/app/HGProductionTool/form_maininterface.h b/app/HGProductionTool/form_maininterface.h
index b1af35f..101fc6e 100644
--- a/app/HGProductionTool/form_maininterface.h
+++ b/app/HGProductionTool/form_maininterface.h
@@ -124,6 +124,7 @@ private:
QString m_devFwNum;
QString m_curItemName;
bool m_isTesting;
+ bool m_isCorrectNormal;
int m_multiIndex;
int m_curNameIndex;
int m_curDpi;
diff --git a/app/HGProductionTool/form_texttips.cpp b/app/HGProductionTool/form_texttips.cpp
index 9f49a48..1b2fdb4 100644
--- a/app/HGProductionTool/form_texttips.cpp
+++ b/app/HGProductionTool/form_texttips.cpp
@@ -1,6 +1,7 @@
#include "form_texttips.h"
#include "ui_form_texttips.h"
+#define TEXT_COLOR_RED(STRING) " " STRING " " " "
Form_textTips::Form_textTips(QWidget *parent)
: QWidget(parent)
, ui(new Ui::Form_textTips)
@@ -22,10 +23,18 @@ void Form_textTips::setViewContent(QString 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->setTextColor(Qt::black);
}
diff --git a/app/HGProductionTool/form_texttips.h b/app/HGProductionTool/form_texttips.h
index f00003a..5b77cb0 100644
--- a/app/HGProductionTool/form_texttips.h
+++ b/app/HGProductionTool/form_texttips.h
@@ -16,7 +16,7 @@ public:
~Form_textTips();
void setViewContent(QString content);
- void addContent(QString content);
+ void addContent(QString content, bool isNormal);
private:
Ui::Form_textTips *ui;
diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp
index 99fc885..969edf4 100644
--- a/code/base/test_base.cpp
+++ b/code/base/test_base.cpp
@@ -1172,11 +1172,12 @@ public:
bool type = false;
unsigned int len = sizeof(SANE_Int);
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);
- if (ret != SCANNER_ERR_OK)
- {
- return ret;
- }
+
if ((num == 0 && num != -1))
{
type = true;