lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整流程

This commit is contained in:
yangjiaxuan 2023-01-04 22:24:41 +08:00
parent a1fac9e2a7
commit 66803c9b29
6 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -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)
{

22
app/HGProductionTool/form_burnmode.cpp
View File

@ -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);

4
app/HGProductionTool/form_burnmode.h
View File

@ -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);

13
app/HGProductionTool/form_burnmode.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>527</width>
<height>333</height>
<height>321</height>
</rect>
</property>
<property name="windowTitle">
@ -73,6 +73,17 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>

9
app/HGProductionTool/form_maininterface.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>716</width>
<height>407</height>
<height>439</height>
</rect>
</property>
<property name="windowTitle">
@ -152,6 +152,13 @@
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>

21
app/HGProductionTool/hgscanner.cpp
View File

@ -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)