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-02-08 18:49:41 +08:00
parent 6f692b5e37
commit 40c66d7a21
1 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
app/HGProductionTool/mainwindow.cpp
View File

@ -46,7 +46,6 @@ MainWindow::MainWindow(HGPdtToolDbUserMgr pdtToolDbuserMgr, Dialog_logIn::LogInT
setWindowTitle(tr("production tool-burn station")); setWindowTitle(tr("production tool-burn station"));
// ui->act_newDevice->setVisible(false); // ui->act_newDevice->setVisible(false);
ui->act_refreshDevice->setVisible(false);
m_formBurnMode = new Form_BurnMode(this, this); m_formBurnMode = new Form_BurnMode(this, this);
@ -408,66 +407,64 @@ QString MainWindow::getDevFwNum(SANE_Handle handle)
void MainWindow::on_sane_dev_arrive(QString devName) void MainWindow::on_sane_dev_arrive(QString devName)
{ {
ui->act_refreshDevice->setEnabled(false); //// QTime curTimer = QTime::currentTime().addMSecs(5000);
// QTime curTimer = QTime::currentTime().addMSecs(5000); //// while (QTime::currentTime() < curTimer)
// while (QTime::currentTime() < curTimer) //// {
//// QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
//// }
// if (m_loginType == Dialog_logIn::LogInType_Burn)
// { // {
// QCoreApplication::processEvents(QEventLoop::AllEvents, 100); // SANE_Handle devHandle = nullptr;
// sane_open(devName.toStdString().c_str(), &devHandle);
// if (nullptr != devHandle)
// {
// DeviceManager *devManager = new DeviceManager(this, m_formBurnMode, devHandle, devName);
// m_formBurnMode->addDevice(devManager);
// } // }
ui->act_refreshDevice->setEnabled(true);
if (m_loginType == Dialog_logIn::LogInType_Burn)
{
SANE_Handle devHandle = nullptr;
sane_open(devName.toStdString().c_str(), &devHandle);
if (nullptr != devHandle)
{
DeviceManager *devManager = new DeviceManager(this, m_formBurnMode, devHandle, devName);
m_formBurnMode->addDevice(devManager);
}
return;
}
// QString str = tr("Confirm whether the device is reset");
// Dialog_HGMessageBox dlg(str, this);
// if (!dlg.exec())
// {
// return; // return;
// } // }
SANE_Handle devHandle = nullptr; // // QString str = tr("Confirm whether the device is reset");
sane_open(devName.toStdString().c_str(), &devHandle); // // Dialog_HGMessageBox dlg(str, this);
// // if (!dlg.exec())
// // {
// // return;
// // }
if (nullptr == devHandle) // SANE_Handle devHandle = nullptr;
{ // sane_open(devName.toStdString().c_str(), &devHandle);
QMessageBox::information(this, tr("tips"), tr("Open device failed"));
return;
}
m_inputSnDlg = new Dialog_InputSerialNum(this, devName, m_pdtToolDbuserMgr, devHandle, getDevSn(devHandle), getDevType(devHandle)); // if (nullptr == devHandle)
if (!m_inputSnDlg->exec()) // {
{ // QMessageBox::information(this, tr("tips"), tr("Open device failed"));
sane_close(devHandle); // return;
return ; // }
}
HGPdtToolDbDevice pdtToolDbDevice = nullptr; // m_inputSnDlg = new Dialog_InputSerialNum(this, devName, m_pdtToolDbuserMgr, devHandle, getDevSn(devHandle), getDevType(devHandle));
HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, m_inputSnDlg->GetSn().toStdString().c_str(), &pdtToolDbDevice); // if (!m_inputSnDlg->exec())
// {
// sane_close(devHandle);
// return ;
// }
Form_mainInterface *mainInterface = new Form_mainInterface(this, m_loginType, devHandle, m_pdtToolDbuserMgr, pdtToolDbDevice, // HGPdtToolDbDevice pdtToolDbDevice = nullptr;
m_inputSnDlg->GetSn(), m_inputSnDlg->GetDevType(), devName, getDevFwNum(devHandle)); // HGPdtToolDb_OpenDevice(m_pdtToolDbuserMgr, m_inputSnDlg->GetSn().toStdString().c_str(), &pdtToolDbDevice);
if (!AddInterface(mainInterface))
{
QMessageBox::information(this, tr("tips"), tr("cannot create more table"));
delete mainInterface;
}
if (m_inputSnDlg != nullptr) // Form_mainInterface *mainInterface = new Form_mainInterface(this, m_loginType, devHandle, m_pdtToolDbuserMgr, pdtToolDbDevice,
{ // m_inputSnDlg->GetSn(), m_inputSnDlg->GetDevType(), devName, getDevFwNum(devHandle));
delete m_inputSnDlg; // if (!AddInterface(mainInterface))
m_inputSnDlg = nullptr; // {
} // QMessageBox::information(this, tr("tips"), tr("cannot create more table"));
// delete mainInterface;
// }
// if (m_inputSnDlg != nullptr)
// {
// delete m_inputSnDlg;
// m_inputSnDlg = nullptr;
// }
} }
void MainWindow::on_sane_dev_remove(QString devName) void MainWindow::on_sane_dev_remove(QString devName)
@ -635,6 +632,22 @@ void MainWindow::on_act_refreshDevice_triggered()
{ {
std::vector<std::string> name; std::vector<std::string> name;
name = getDevices(); name = getDevices();
if (m_loginType == Dialog_logIn::LogInType_Burn)
{
for (int i = 0; i < name.size(); ++i)
{
SANE_Handle devHandle = nullptr;
sane_open(name[i].c_str(), &devHandle);
if (nullptr != devHandle)
{
DeviceManager *devManager = new DeviceManager(this, m_formBurnMode, devHandle, name[i].c_str());
m_formBurnMode->addDevice(devManager);
}
}
return;
}
for (int i = 0; i < name.size(); ++i) for (int i = 0; i < name.size(); ++i)
{ {
SANE_Handle devHandle = nullptr; SANE_Handle devHandle = nullptr;