增加设备型号读取和设置
This commit is contained in:
parent
c89a4c8700
commit
4e19cd2567
Binary file not shown.
|
@ -113,42 +113,42 @@
|
|||
<translation>取消</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="132"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="139"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="148"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="155"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="172"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="177"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="140"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="147"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="156"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="163"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="180"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="185"/>
|
||||
<source>tips</source>
|
||||
<translation>提示</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="132"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="140"/>
|
||||
<source>device is lost</source>
|
||||
<translation>设备已丢失</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="139"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="147"/>
|
||||
<source>Serial num is empty</source>
|
||||
<translation>序列号为空</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="148"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="156"/>
|
||||
<source>sn is illegal</source>
|
||||
<translation>序列号不合法</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="155"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="163"/>
|
||||
<source>The device is testing</source>
|
||||
<translation>该设备正在进行测试</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="172"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="180"/>
|
||||
<source>set sn failed</source>
|
||||
<translation>设置序列号失败</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="dialog_inputserialnum.cpp" line="177"/>
|
||||
<location filename="dialog_inputserialnum.cpp" line="185"/>
|
||||
<source>set sn succeed</source>
|
||||
<translation>设置序列号成功</translation>
|
||||
</message>
|
||||
|
@ -866,8 +866,13 @@
|
|||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="696"/>
|
||||
<location filename="form_maininterface.cpp" line="757"/>
|
||||
<location filename="form_maininterface.cpp" line="271"/>
|
||||
<source>device model:%1</source>
|
||||
<translation>设备型号:%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="705"/>
|
||||
<location filename="form_maininterface.cpp" line="766"/>
|
||||
<source>device history scan count:</source>
|
||||
<translation>设备历史扫描张数:</translation>
|
||||
</message>
|
||||
|
@ -876,37 +881,37 @@
|
|||
<translation type="vanished">设备序列号:%1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="402"/>
|
||||
<location filename="form_maininterface.cpp" line="406"/>
|
||||
<source>ID</source>
|
||||
<translation>序号</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="402"/>
|
||||
<location filename="form_maininterface.cpp" line="406"/>
|
||||
<source>Test items</source>
|
||||
<translation>测试项</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="402"/>
|
||||
<location filename="form_maininterface.cpp" line="406"/>
|
||||
<source>status</source>
|
||||
<translation>测试状态</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="484"/>
|
||||
<location filename="form_maininterface.cpp" line="488"/>
|
||||
<source>not test</source>
|
||||
<translation>未测试</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="484"/>
|
||||
<location filename="form_maininterface.cpp" line="488"/>
|
||||
<source>not pass</source>
|
||||
<translation>不通过</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="484"/>
|
||||
<location filename="form_maininterface.cpp" line="488"/>
|
||||
<source>not support</source>
|
||||
<translation>不支持</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="484"/>
|
||||
<location filename="form_maininterface.cpp" line="488"/>
|
||||
<source>pass</source>
|
||||
<translation>通过</translation>
|
||||
</message>
|
||||
|
@ -932,14 +937,14 @@
|
|||
<translation type="vanished">Pid:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="690"/>
|
||||
<location filename="form_maininterface.cpp" line="751"/>
|
||||
<location filename="form_maininterface.cpp" line="699"/>
|
||||
<location filename="form_maininterface.cpp" line="760"/>
|
||||
<source>device roller count:</source>
|
||||
<translation>设备滚轴张数:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="200"/>
|
||||
<location filename="form_maininterface.cpp" line="550"/>
|
||||
<location filename="form_maininterface.cpp" line="554"/>
|
||||
<source>image pixel: </source>
|
||||
<translation>标准圆:宽 * 高: </translation>
|
||||
</message>
|
||||
|
@ -957,11 +962,14 @@
|
|||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="270"/>
|
||||
<source>device firmware number:%1</source>
|
||||
<translation>设备固件版本号:%1</translation>
|
||||
<source>device firmware number:%1
|
||||
</source>
|
||||
<oldsource>device firmware number:%1</oldsource>
|
||||
<translation>设备固件版本号:%1
|
||||
</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="form_maininterface.cpp" line="587"/>
|
||||
<location filename="form_maininterface.cpp" line="596"/>
|
||||
<source> minute</source>
|
||||
<translation> 分钟</translation>
|
||||
</message>
|
||||
|
@ -1187,19 +1195,19 @@
|
|||
<context>
|
||||
<name>QObject</name>
|
||||
<message>
|
||||
<location filename="hgscanner.cpp" line="125"/>
|
||||
<location filename="hgscanner.cpp" line="130"/>
|
||||
<source>success: </source>
|
||||
<oldsource>success</oldsource>
|
||||
<translation>成功: </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hgscanner.cpp" line="91"/>
|
||||
<location filename="hgscanner.cpp" line="127"/>
|
||||
<location filename="hgscanner.cpp" line="96"/>
|
||||
<location filename="hgscanner.cpp" line="132"/>
|
||||
<source>failed: </source>
|
||||
<translation>失败: </translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="hgscanner.cpp" line="75"/>
|
||||
<location filename="hgscanner.cpp" line="80"/>
|
||||
<source>Not find test item</source>
|
||||
<translation>没有找到该测试项</translation>
|
||||
</message>
|
||||
|
|
|
@ -55,7 +55,8 @@ AnalysisJson::json_global AnalysisJson::GetGlobal()
|
|||
obj["vid-to"].toInt(),
|
||||
obj["pid-to"].toInt(),
|
||||
obj["speed-mode"].toInt(),
|
||||
obj["sleep-time"].toInt()};
|
||||
obj["sleep-time"].toInt(),
|
||||
obj["device-model"].toString()};
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ public:
|
|||
std::int32_t pid_to;
|
||||
std::int32_t speed_mode;
|
||||
std::int32_t sleep_time;
|
||||
QString device_model;
|
||||
};
|
||||
|
||||
AnalysisJson() = delete ;
|
||||
|
|
|
@ -114,10 +114,18 @@ void Dialog_InputSerialNum::setSpeedAndSleep()
|
|||
m_mainWnd->addTestingRef();
|
||||
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
|
||||
|
||||
QString device_model = jsonGlobal.device_model;
|
||||
if (!device_model.isEmpty())
|
||||
{
|
||||
std::wstring devModel = device_model.toStdWString();
|
||||
lp->cat = WRITE_CAT_DEVS_MODEL;
|
||||
lp->val = (void*)devModel.c_str();
|
||||
m_mainWnd->addTestingRef();
|
||||
func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
|
||||
}
|
||||
|
||||
delete lp;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void Dialog_InputSerialNum::on_testResult()
|
||||
|
|
|
@ -55,7 +55,7 @@ Form_mainInterface::Form_mainInterface(class MainWindow *mainwnd, Dialog_logIn::
|
|||
connect(this, SIGNAL(testResultImg(void*)), this, SLOT(on_testResultImg(void*)), Qt::QueuedConnection);
|
||||
connect(this, &Form_mainInterface::testDistortion, this, &Form_mainInterface::on_testDistortion);
|
||||
connect(this, SIGNAL(testCorrectInfo(QString)), this, SLOT(on_testCorrectInfo(QString)), Qt::QueuedConnection);
|
||||
connect(this, SIGNAL(testGetDevCfgInfo(int,int,int,int,QString,QString)), this, SLOT(on_testGetDevCfgInfo(int,int,int,int,QString,QString)), Qt::QueuedConnection);
|
||||
connect(this, SIGNAL(testGetDevCfgInfo(int,int,int,int,QString,QString,QString)), this, SLOT(on_testGetDevCfgInfo(int,int,int,int,QString,QString,QString)), Qt::QueuedConnection);
|
||||
connect(this, SIGNAL(testOpenCacheFile(QString)), this, SLOT(on_testOpenCacheFile(QString)), Qt::QueuedConnection);
|
||||
|
||||
if (m_handle)
|
||||
|
@ -255,7 +255,7 @@ void Form_mainInterface::on_testCorrectInfo(QString info)
|
|||
}
|
||||
}
|
||||
|
||||
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, QString devModel)
|
||||
{
|
||||
char buf[10];
|
||||
sprintf(buf, "%x", vid);
|
||||
|
@ -267,7 +267,9 @@ void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, i
|
|||
str.append(tr("sleep time:%1minute\n\t").arg(QString::number(sleepTime)));
|
||||
str.append(tr("speed mode:%1PPM\n\t").arg(QString::number(speedMode)));
|
||||
str.append(tr("device serial number:%1\n\t").arg(devSn));
|
||||
str.append(tr("device firmware number:%1").arg(devFw));
|
||||
str.append(tr("device firmware number:%1\n\t").arg(devFw));
|
||||
if (!devModel.isEmpty())
|
||||
str.append(tr("device model:%1").arg(devModel));
|
||||
|
||||
m_textTips->setViewContent(str);
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ signals:
|
|||
void testResultImg(void* img);
|
||||
void testDistortion(SANE_DISTORTION_VAL data);
|
||||
void testCorrectInfo(QString info);
|
||||
void testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw);
|
||||
void testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw, QString devModel);
|
||||
void testOpenCacheFile(QString name);
|
||||
|
||||
private slots:
|
||||
|
@ -48,7 +48,7 @@ private slots:
|
|||
void on_testResultImg(void* img);
|
||||
void on_testDistortion(SANE_DISTORTION_VAL data);
|
||||
void on_testCorrectInfo(QString info);
|
||||
void on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw);
|
||||
void on_testGetDevCfgInfo(int vid, int pid, int sleepTime, int speedMode, QString devSn, QString devFw, QString devModel);
|
||||
void on_testOpenCacheFile(QString name);
|
||||
|
||||
void on_viewerDblClick();
|
||||
|
|
|
@ -16,6 +16,7 @@ hgscanner::hgscanner(Form_mainInterface *form, Form_BurnMode *burnMode, Dialog_I
|
|||
, m_speedMode(0)
|
||||
, m_devSn("")
|
||||
, m_devFw("")
|
||||
, m_devModel("")
|
||||
{
|
||||
cb_ = nullptr;
|
||||
}
|
||||
|
@ -65,6 +66,10 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
{
|
||||
m_devFw = QString::fromStdWString((const wchar_t*)data);
|
||||
}
|
||||
else if (ev == TEST_EVEB_GET_DEVICE_CONFIG_DEVS_MODEL)
|
||||
{
|
||||
m_devModel = QString::fromStdWString((const wchar_t*)data);
|
||||
}
|
||||
|
||||
if (ev == TEST_EVENT_TIPS)
|
||||
{
|
||||
|
@ -115,7 +120,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
|
|||
{
|
||||
if (m_interface != nullptr)
|
||||
{
|
||||
emit m_interface->testGetDevCfgInfo((int)m_vidPid.VID, (int)m_vidPid.PID, m_sleepTime, m_speedMode, m_devSn, m_devFw);
|
||||
emit m_interface->testGetDevCfgInfo((int)m_vidPid.VID, (int)m_vidPid.PID, m_sleepTime, m_speedMode, m_devSn, m_devFw, m_devModel);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -46,5 +46,6 @@ private:
|
|||
int m_speedMode;
|
||||
QString m_devSn;
|
||||
QString m_devFw;
|
||||
QString m_devModel;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue