diff --git a/app/HGProductionTool/dialog_setburnsn.ui b/app/HGProductionTool/dialog_setburnsn.ui
index 5891b7d..101e8c4 100644
--- a/app/HGProductionTool/dialog_setburnsn.ui
+++ b/app/HGProductionTool/dialog_setburnsn.ui
@@ -17,9 +17,9 @@
50
- 50
- 54
- 12
+ 40
+ 71
+ 31
diff --git a/app/HGProductionTool/form_burnmode.cpp b/app/HGProductionTool/form_burnmode.cpp
index 18eb070..d823a1a 100644
--- a/app/HGProductionTool/form_burnmode.cpp
+++ b/app/HGProductionTool/form_burnmode.cpp
@@ -227,10 +227,25 @@ void DeviceManager::setSn(QString sn)
{
LPWRITECFG p = new WRITECFG;
+ std::wstring sn2 = sn.toStdWString();
p->cat = WRITE_CAT_SERIALNUM;
- p->val = (void*)&sn;
+ p->val = (void*)sn2.c_str();
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef();
delete p;
}
+
+void Form_BurnMode::on_tableWidget_itemDoubleClicked(QTableWidgetItem *item)
+{
+ int row = item->row();
+ QTableWidgetItem *item2 = ui->tableWidget->item(row, 1);
+ if (item2->checkState() == Qt::Checked)
+ {
+ item2->setCheckState(Qt::Unchecked);
+ }
+ else
+ {
+ item2->setCheckState(Qt::Checked);
+ }
+}
diff --git a/app/HGProductionTool/form_burnmode.h b/app/HGProductionTool/form_burnmode.h
index 768c102..b2fd1d8 100644
--- a/app/HGProductionTool/form_burnmode.h
+++ b/app/HGProductionTool/form_burnmode.h
@@ -2,6 +2,7 @@
#define FORM_BURNMODE_H
#include
+#include
#include "sane/sane_ex.h"
#include "hgscanner.h"
@@ -55,6 +56,8 @@ private slots:
void on_pbtn_setSn_clicked();
+ void on_tableWidget_itemDoubleClicked(QTableWidgetItem *item);
+
private:
void initTableWidget();
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index d4e51c3..d185323 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -318,7 +318,6 @@ void Form_mainInterface::initTableWidgetUi()
ui->tableWidget->setItem(i, 0, new QTableWidgetItem(QString::number(i+1)));
ui->tableWidget->item(i, 0)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
-
ui->tableWidget->setItem(i, 1, new QTableWidgetItem(node.title));
ui->tableWidget->item(i, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
@@ -400,23 +399,27 @@ void Form_mainInterface::setGlobalCfg(AnalysisJson analysisJson)
VIDPID vidpid;
vidpid.VID = jsonGlobal.vid_to;
vidpid.PID = jsonGlobal.pid_to;
+ int vidpidValue = vidpid.Value;
p->cat = WRITE_CAT_VID_PID;
- p->val = (void *) & vidpid.Value;
+ p->val = (void*)&vidpidValue;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef();
+ int speedMode = jsonGlobal.speed_mode ;
p->cat = WRITE_CAT_SPEED;
- p->val = (void*)&jsonGlobal.speed_mode;
+ p->val = (void*)&speedMode;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef();
+ int sleepTime = jsonGlobal.sleep_time;
p->cat = WRITE_CAT_SLEEP;
- p->val = (void*)&jsonGlobal.sleep_time;
+ p->val = (void*)&sleepTime;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef();
+ const wchar_t* sn = m_serialNum.toStdWString().c_str();
p->cat = WRITE_CAT_SERIALNUM;
- p->val = (void*)&m_serialNum;
+ p->val = (void*)sn;
func_test_go(WRITE_CFG_NAME, (const wchar_t*)p, m_hg);
m_mainwnd->addTestingRef();