删除 判断SANE_EVENT_FINISHED是否发送信号
This commit is contained in:
parent
fcd765f423
commit
5007275bdd
|
@ -69,7 +69,6 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
, auto_save_changes_(false)
|
, auto_save_changes_(false)
|
||||||
, save_from_changed_(false)
|
, save_from_changed_(false)
|
||||||
, m_closeTip(true)
|
, m_closeTip(true)
|
||||||
, m_isEmit_scan_finish(false)
|
|
||||||
, m_devSerialNum("")
|
, m_devSerialNum("")
|
||||||
, m_devVersionNum("")
|
, m_devVersionNum("")
|
||||||
, m_currDeviceName("")
|
, m_currDeviceName("")
|
||||||
|
@ -1051,7 +1050,6 @@ void MainWindow::on_scan_finish(QString finishInfo, int err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_isEmit_scan_finish = true;
|
|
||||||
m_isScanning = false;
|
m_isScanning = false;
|
||||||
m_thumb->setAcceptDrops(true);
|
m_thumb->setAcceptDrops(true);
|
||||||
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
|
m_dialogLog->updateStatus(cur_dev_.is_online() && 0 != m_scanType, m_isScanning);
|
||||||
|
@ -1108,7 +1106,7 @@ void MainWindow::on_continueScan()
|
||||||
|
|
||||||
void MainWindow::on_stopScan()
|
void MainWindow::on_stopScan()
|
||||||
{
|
{
|
||||||
m_dialogLog->updateStatus(cur_dev_.is_online() && m_isEmit_scan_finish, m_isScanning);
|
m_dialogLog->updateStatus(cur_dev_.is_online(), m_isScanning);
|
||||||
|
|
||||||
if (!m_isScanning)
|
if (!m_isScanning)
|
||||||
{
|
{
|
||||||
|
|
|
@ -286,7 +286,6 @@ private:
|
||||||
int m_aquireIntoMultiPageCount;
|
int m_aquireIntoMultiPageCount;
|
||||||
bool m_isScanning;
|
bool m_isScanning;
|
||||||
bool m_closeTip;
|
bool m_closeTip;
|
||||||
bool m_isEmit_scan_finish;
|
|
||||||
QString m_devSerialNum;
|
QString m_devSerialNum;
|
||||||
QString m_devVersionNum;
|
QString m_devVersionNum;
|
||||||
QString m_currDeviceName;
|
QString m_currDeviceName;
|
||||||
|
|
Loading…
Reference in New Issue