From 66803c9b2968ad5cfec279f6ebb9883131364b63 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Wed, 4 Jan 2023 22:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dialog_inputserialnum.cpp | 18 +++++++--------
app/HGProductionTool/form_burnmode.cpp | 22 ++++++++++++++-----
app/HGProductionTool/form_burnmode.h | 4 ++--
app/HGProductionTool/form_burnmode.ui | 13 ++++++++++-
app/HGProductionTool/form_maininterface.ui | 9 +++++++-
app/HGProductionTool/hgscanner.cpp | 21 ++++++------------
6 files changed, 55 insertions(+), 32 deletions(-)
diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp
index 166357b..a84d04b 100644
--- a/app/HGProductionTool/dialog_inputserialnum.cpp
+++ b/app/HGProductionTool/dialog_inputserialnum.cpp
@@ -56,15 +56,15 @@ void Dialog_InputSerialNum::on_pbtn_ok_clicked()
return;
}
-// QString str = ui->lineEdit_sn->text();
-// for (int i = 0; i < str.size(); ++i)
-// {
-// if ((str.at(i) < '0' || str.at(i) > '9') || (str.at(i) < 'A' || str.at(i) > 'Z'))
-// {
-// QMessageBox::information(this, tr("tips"), tr("sn is illegal"));
-// return;
-// }
-// }
+ QString str = ui->lineEdit_sn->text();
+ for (int i = 0; i < str.size(); ++i)
+ {
+ if ((str.at(i) < '0' && str.at(i) > '9') || (str.at(i) < 'A' && str.at(i) > 'Z'))
+ {
+ QMessageBox::information(this, tr("tips"), tr("sn is illegal"));
+ return;
+ }
+ }
if (m_mainWnd->FindInterface(ui->lineEdit_sn->text()) != nullptr)
{
diff --git a/app/HGProductionTool/form_burnmode.cpp b/app/HGProductionTool/form_burnmode.cpp
index d814c22..ea4925f 100644
--- a/app/HGProductionTool/form_burnmode.cpp
+++ b/app/HGProductionTool/form_burnmode.cpp
@@ -17,7 +17,7 @@ Form_BurnMode::Form_BurnMode(class MainWindow *mainwnd, QWidget *parent) :
{
ui->setupUi(this);
- connect(this, SIGNAL(testResult(QString)), this, SLOT(on_testResult(QString)), Qt::QueuedConnection);
+ connect(this, SIGNAL(testResult(bool)), this, SLOT(on_testResult(bool)), Qt::QueuedConnection);
initTableWidget();
}
@@ -77,11 +77,8 @@ void Form_BurnMode::deleteDevice(QString devName)
}
}
-void Form_BurnMode::on_testResult(QString text)
+void Form_BurnMode::on_testResult(bool setStatus)
{
- if (!text.isEmpty())
- QMessageBox::information(this, tr("tips"), text);
-
m_mainwnd->releaseTesting();
}
@@ -134,6 +131,21 @@ void Form_BurnMode::on_cbox_selectAll_stateChanged(int arg1)
void Form_BurnMode::on_pbtn_burn_clicked()
{
+ int select = 0;
+ for(int i = 0; i < ui->tableWidget->columnCount(); i++)
+ {
+ QTableWidgetItem *item = ui->tableWidget->item(i, 1);
+ if (item != nullptr && Qt::Checked == item->checkState())
+ {
+ select++;
+ }
+ }
+ if (select == 0)
+ {
+ QMessageBox::information(this, tr("tips"), tr("Please check a devices to set sn at least"));
+ return;
+ }
+
for(int i = 0; i < ui->tableWidget->columnCount(); i++)
{
QTableWidgetItem *item = ui->tableWidget->item(i, 1);
diff --git a/app/HGProductionTool/form_burnmode.h b/app/HGProductionTool/form_burnmode.h
index aef4d53..63a779c 100644
--- a/app/HGProductionTool/form_burnmode.h
+++ b/app/HGProductionTool/form_burnmode.h
@@ -60,10 +60,10 @@ public:
void deleteDevice(QString devName);
signals:
- void testResult(QString text);
+ void testResult(bool setStatus);
private slots:
- void on_testResult(QString text);
+ void on_testResult(bool setStatus);
private slots:
void on_cbox_selectAll_stateChanged(int arg1);
diff --git a/app/HGProductionTool/form_burnmode.ui b/app/HGProductionTool/form_burnmode.ui
index db77729..7613b71 100644
--- a/app/HGProductionTool/form_burnmode.ui
+++ b/app/HGProductionTool/form_burnmode.ui
@@ -7,7 +7,7 @@
0
0
527
- 333
+ 321
@@ -73,6 +73,17 @@
+ -
+
+
-
+
+
+
+
+
+
+
+
diff --git a/app/HGProductionTool/form_maininterface.ui b/app/HGProductionTool/form_maininterface.ui
index ee4b6c6..0a436f0 100644
--- a/app/HGProductionTool/form_maininterface.ui
+++ b/app/HGProductionTool/form_maininterface.ui
@@ -7,7 +7,7 @@
0
0
716
- 407
+ 439
@@ -152,6 +152,13 @@
+ -
+
+
+
+
+
+
diff --git a/app/HGProductionTool/hgscanner.cpp b/app/HGProductionTool/hgscanner.cpp
index 72575c9..d99ea95 100644
--- a/app/HGProductionTool/hgscanner.cpp
+++ b/app/HGProductionTool/hgscanner.cpp
@@ -47,7 +47,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
}
else if (m_burnMode != nullptr)
{
- emit m_burnMode->testResult(info);
+ emit m_burnMode->testResult(flag);
}
}
else if (ev == TEST_EVENT_IO_FAIL)
@@ -64,24 +64,17 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
}
else if (m_burnMode != nullptr)
{
- emit m_burnMode->testResult(info);
+ emit m_burnMode->testResult(flag);
}
}
else if (ev == TEST_EVENT_MANUAL_CONFIRMATION)
{
- QString info;
if (data != nullptr)
{
- info = QString::fromStdWString((const wchar_t*)data);
- }
-
- if (m_interface != nullptr)
- {
- emit m_interface->testResult(info);
- }
- else if (m_burnMode != nullptr)
- {
- emit m_burnMode->testResult(info);
+ if (m_burnMode != nullptr)
+ {
+ emit m_burnMode->testResult(flag);
+ }
}
}
else if (ev == TEST_EVENT_RESULT)
@@ -100,7 +93,7 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
}
else if (m_burnMode != nullptr)
{
- emit m_burnMode->testResult(info);
+ emit m_burnMode->testResult(flag);
}
}
else if (ev == TEST_EVENT_DISTORTION)