From c577a239b93a65a572dd15ec242241d57981eea3 Mon Sep 17 00:00:00 2001
From: krad <kradchen123@163.com>
Date: Tue, 2 Nov 2021 10:32:30 +0800
Subject: [PATCH] New Stop operation logic

---
 src/device/DeviceManager.cpp | 59 ++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp
index ea0efc3..abe1482 100644
--- a/src/device/DeviceManager.cpp
+++ b/src/device/DeviceManager.cpp
@@ -75,45 +75,44 @@ void DeviceManager::initDevice() {
     });
     // stop
     connect(EventCenter::Default(),&EventCenter::RequestStop,[=]() {
-        qDebug()<<"GetStatus";
+        qDebug() << "GetStatus";
         StatusInfo inf = GetStatus();
-        qDebug()<<"Stop request status, status:%s"<<getStatusString(inf.status);
+        qDebug() << "Stop request status, status:%s" << getStatusString(inf.status);
 
         // check device status=========================================
         //device is ready return
-        if (inf.status == READY) return;
-        if (inf.status == BUSY) {
-            QString msg("Device is busy, Stop operation fail!");
-            THROW_ERROR(msg);
+        if (inf.status != SCANNING) {
+            TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
             return;
-        };
-        if (inf.status == SCANNING) {
-            TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
-            //ScanControl fail
-            qDebug()<<"Request stop!";
-            if (timerID!=-1)killTimer(timerID);
-            if (ScanControl(STOP)) {
-                qDebug()<<"Stop fail!";
-                QString msg("Stop operation fail!");
-                THROW_ERROR(msg);
-                qDebug()<<"Error thrown!";
-                lastStatus = -1;
-                previewing = false;
-                QString s("%1  %2");
-                s = s.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd HH:mm:ss"), msg);
-                TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr,(QObject*)&msg);
-                return;
-            }
+        }
+//        if (inf.status == BUSY) {
+//            QString msg("Device is busy, Stop operation fail!");
+//            THROW_ERROR(msg);
+//            return;
+//        };
+        TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
+        //ScanControl fail
+        qDebug() << "Request stop!";
+        if (timerID != -1)killTimer(timerID);
+        if (ScanControl(STOP)) {
+            qDebug() << "Stop fail!";
+            QString msg("Stop operation fail!");
+            THROW_ERROR(msg);
+            qDebug() << "Error thrown!";
             lastStatus = -1;
             previewing = false;
             QString s("%1  %2");
-            s = s.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd HH:mm:ss"),("Scan Stopped!"));
-            TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr,(QObject*)&s);
-            TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, nullptr);
-            TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
+            s = s.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd HH:mm:ss"), msg);
+            TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr, (QObject *) &msg);
+            return;
         }
-
-
+        lastStatus = -1;
+        previewing = false;
+        QString s("%1  %2");
+        s = s.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd HH:mm:ss"), ("Scan Stopped!"));
+        TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr, (QObject *) &s);
+        TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, nullptr);
+        TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
     });
 
     // preview