Fix simulator stop bug.

src/ShimLib/ShimLib.c

@@ -35,7 +35,7 @@ void ThreadFunc(void* args){
 		status = SCANNING;
         stop_flag = 0;
 		progress = 0;
-		for (int i = 0; i < 50; ++i) {
+		for (int i = 0; i <= 50; ++i) {
 			if (stop_flag > 0){
 				stop_flag = 0;
 				break;
@@ -87,6 +87,7 @@ int ScanControl(ScanAction actionType) {
             stop_flag = 1;
             progress = 0;
             status = READY;
+            SetEvent(e2);
             printf("Stop everything!\r\n");
             break;
         case SCAN_CONTINUE:

src/components/imageswitch.h

@@ -26,7 +26,8 @@ public:
     enum ButtonStyle {
         ButtonStyle_1 = 0,  //开关样式1
         ButtonStyle_2 = 1,  //开关样式2
-        ButtonStyle_3 = 2   //开关样式3
+        ButtonStyle_3 = 2,   //开关样式3
+        None = 3   //开关样式3
     };
 
     explicit ImageSwitch(QWidget *parent = 0);
@@ -37,7 +38,7 @@ protected:
 
 private:
     bool isChecked;
-    ButtonStyle buttonStyle;
+    ButtonStyle buttonStyle = None;
 
     QString imgOffFile;
     QString imgOnFile;

src/device/DeviceManager.cpp

@@ -7,7 +7,6 @@
 #include <QVariant>
 #include <QTimerEvent>
 #include <QDate>
-#include <QDateTime>
 #include <qdebug.h>
 #include "appvals/AppGlobalValues.h"
 #include "json/ScanJson.h"
@@ -113,6 +112,7 @@ void DeviceManager::initDevice() {
 		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);
+		// preview end
 		TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, nullptr);
 		TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
 		AppGlobalValues::setInProcessing(false);
@@ -136,6 +136,7 @@ void DeviceManager::initDevice() {
 				previewing = true;
 				//                timerID = startTimer(500);
 				TRIGGER_EVENT(GUIEvents::ResponsePreview, nullptr, nullptr);
+				// end scan without prompt
 				TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, nullptr);
 				QString s("Device Previewing!");
 				TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr, (QObject*)&s);
@@ -241,13 +242,15 @@ void DeviceManager::scanProcess(int sProgress) {
             (scanPhase != 3)) ? "": ", patient can leave";
     QVariant var(QString("%1%3\r\n progress:%2%").arg(getPhaseName(scanPhase)).arg(progress).arg(extraMsg));
     TRIGGER_EVENT(InvokeOperationProgress, nullptr, (QObject *) &var);
+    // 300 means finished
+    if (sProgress == 300) return;
     //phase control
     //no change return
     if (scanPhase == phase) return;
     // error phase
     if (phase > 3 || scanPhase > phase) {
         QString errorMsg = QString("Error Scan Phase code, current Phase code:%1, new Phase code:%2!").arg(
-                scanPhase, phase);
+                scanPhase).arg(phase);
         THROW_ERROR(errorMsg)
         exitScanTimer();
         return;
@@ -255,7 +258,7 @@ void DeviceManager::scanProcess(int sProgress) {
     // enter phase 2
     if ((scanPhase = phase) == 2) {
         if (!AppGlobalValues::EmptyScanFlag().toBool() && JsonObject::Instance()->getScanConfirm()) {
-            var.setValue(QString("Waiting for patient to start scan!\r\n Click \"Next\" to continue!"));
+            var.setValue(QString("Waiting for operator to start scan!\r\n Click \"Next\" to continue!"));
             TRIGGER_EVENT(InvokeOperationPending, nullptr, (QObject *) &var);
             exitScanTimer();
         }
@@ -277,9 +280,9 @@ void DeviceManager::exitScanTimer() {
 
 void DeviceManager::prepareFinishScan() {
     qDebug() << "Scan finished";
-    QVariant var(true);
+    QVariant var(JsonObject::Instance()->getCompleteNotify());
     qDebug() << "InvokeOperationEnd";
-
+    // stop normal scan with prompt
     TRIGGER_EVENT(InvokeOperationEnd, nullptr, (QObject *) &var);
     AppGlobalValues::setInProcessing(false);
 //    log, no need

src/device/DeviceManager.h

@@ -15,6 +15,10 @@ public:
         static DeviceManager manager;
         return &manager;
     }
+    DeviceManager() = default;
+	~DeviceManager() override = default ;
+    DeviceManager(const DeviceManager&) = delete;
+    DeviceManager operator=(const DeviceManager&) = delete;
     /**
      * init device, include Shimlib and it's error call back,
      * deviceInfTimer to get temperature of water, and the
@@ -94,7 +98,7 @@ private:
 	bool previewing = false;
 	volatile bool endLoop = false;
 	bool errorOccurred = false;
-	QThread* previewDataCaller;
+	QThread* previewDataCaller = nullptr;
 };
 
 

src/forms/scan/ScanFormWidget.cpp

@@ -219,7 +219,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
 		patient_information->setPatientInformation((PatientInformation*)data);
 		});
 	connect(btnRefresh, &QToolButton::clicked, [=]() {
-		QString patientInf(patient_information->getCurrentPatientJsonString(false));
+		QString patientInf(patient_information->getCurrentPatientJsonString(true));
 		LOG_USER_OPERATION(StartRefresh);
 		EventCenter::Default()->triggerEvent(GUIEvents::RequestEmptyScan, nullptr, (QObject*)(&patientInf));
 		});

src/forms/settings/systemsettingform.cpp

@@ -51,17 +51,28 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 	ui->btnFlt->setObjectName("BigBtn");
 
     QGridLayout* gridLayout = (QGridLayout*)ui->block10->layout();
-    auto btn_needConfirm = new ImageSwitch(this);
-    auto lbl_needConfirm = new QLabel(this);
-    lbl_needConfirm->setText("Scan Confirm");
-    gridLayout->addWidget(btn_needConfirm, 4, 2, 1, 1);
-    gridLayout->addWidget(lbl_needConfirm, 4, 0, 1, 1);
-    btn_needConfirm->setChecked(JsonObject::Instance()->getScanConfirm());
+    auto btn_scanConfirm = new ImageSwitch(this);
+    auto lbl_scanConfirm = new QLabel(this);
+    lbl_scanConfirm->setText("Scan Confirm");
+    gridLayout->addWidget(btn_scanConfirm, 4, 2, 1, 1);
+    gridLayout->addWidget(lbl_scanConfirm, 4, 0, 1, 1);
+    btn_scanConfirm->setChecked(JsonObject::Instance()->getScanConfirm());
     QFrame* line5 =  new QFrame(this);
     line5->setFrameShape(QFrame::HLine);
     line5->setFrameShadow(QFrame::Sunken);
     gridLayout->addWidget(line5,5,0);
 
+    auto btn_scanComplete = new ImageSwitch(this);
+    auto lbl_scanComplete = new QLabel(this);
+    lbl_scanComplete->setText("Complete Notify");
+    gridLayout->addWidget(btn_scanComplete, 6, 2, 1, 1);
+    gridLayout->addWidget(lbl_scanComplete, 6, 0, 1, 1);
+    btn_scanComplete->setChecked(JsonObject::Instance()->getCompleteNotify());
+    QFrame* line6 =  new QFrame(this);
+    line6->setFrameShape(QFrame::HLine);
+    line6->setFrameShadow(QFrame::Sunken);
+    gridLayout->addWidget(line6,7,0);
+
     ////test begin
 	//flag_disksize = true;
 	//m_disksize = 75.0;
@@ -100,8 +111,11 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 			////
 		}
 		});
-    connect(btn_needConfirm, &ImageSwitch::clicked, [=]() {
-        JsonObject::Instance()->setScanConfirm(btn_needConfirm->getChecked());
+    connect(btn_scanConfirm, &ImageSwitch::clicked, [=]() {
+        JsonObject::Instance()->setScanConfirm(btn_scanConfirm->getChecked());
+    });
+    connect(btn_scanComplete, &ImageSwitch::clicked, [=]() {
+        JsonObject::Instance()->setCompleteNotify(btn_scanComplete->getChecked());
     });
 	connect(ui->btn_network, &QToolButton::clicked, [=]() {
 		GetAdminPsw dialog(this);

src/json/ScanJson.cpp

@@ -14,7 +14,8 @@ void ScanJson::save() {
     }
     QFile f(QString("%1/jsons/%2.json").arg(QCoreApplication::applicationDirPath(),scanID.c_str()));
     f.open(QFileDevice::ReadWrite);
-    cJSON_AddItemToObject(root, "EmptyScanID", cJSON_CreateString(emptyScanID.c_str()));
+    cJSON_AddItemToObject(root, "EmptyScanID",
+            cJSON_CreateString(emptyScanID.empty()?JsonObject::Instance()->getEmptyScanID():emptyScanID.c_str()));
     cJSON_AddItemToObject(root, "ScanID", cJSON_CreateString(scanID.c_str()));
     char* content = cJSON_Print(root);
     f.write(content);

src/json/jsonobject.cpp

@@ -81,7 +81,7 @@ void JsonObject::setBool(const char *catergory, const char *stringName, bool val
 bool JsonObject::getBool(const char* catergory, const char* stringName)
 {
     if (!loadcfg())
-        return nullptr;
+        return false;
 
     cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
     if (!first) return false;
@@ -437,13 +437,6 @@ void JsonObject::autoDHCP(bool ena)
 	setJsonString("address", "dhcp", str.toStdString().c_str());
 }
 
-bool JsonObject::getScanConfirm() {
-    return getBool("general","ScanConfirm");
-}
-void JsonObject::setScanConfirm(bool val) {
-    setBool("general","ScanConfirm", val, true);
-}
-
 IpAddr JsonObject::getDefaultIpAddr()
 {
 	IpAddr obj;
@@ -530,4 +523,20 @@ const char *JsonObject::getEmptyScanID() {
     return getJsonString("deviceparam","EmptyScanID");
 }
 
+bool JsonObject::getScanConfirm() {
+    return getBool("general","ScanConfirm");
+}
+
+void JsonObject::setScanConfirm(bool val) {
+    setBool("general","ScanConfirm", val, true);
+}
+
+bool JsonObject::getCompleteNotify() {
+    return getBool("general","CompleteNotify");
+}
+
+void JsonObject::setCompleteNotify(bool val) {
+    setBool("general","CompleteNotify", val, true);
+}
+
 

src/json/jsonobject.h

@@ -90,6 +90,9 @@ public:
     bool getScanConfirm();
     void setScanConfirm(bool val);
 
+    bool getCompleteNotify();
+    void setCompleteNotify(bool val);
+
     const char* getEmptyScanID();
     void setEmptyScanID(const char* id);
 
@@ -111,7 +114,7 @@ private:
 	char* getJsonString(const char* catergory, const char* stringName);
 
 	void setBool(const char* catergory, const char* stringName,bool val, bool save = true);
-    bool JsonObject::getBool(const char* catergory, const char* stringName);
+    bool getBool(const char* catergory, const char* stringName);
 
 	char* getArrayNode(const char* catergory, const char* stringName, int index, const char* id);
 	void setArrayNode(const char* catergory, const char* stringName, int index, const char* id, const char* stringValue);

src/windows/mainwindow.cpp

@@ -143,13 +143,24 @@ MainWindow::MainWindow(QWidget* parent) :
             msgDialog->showMessage(var->toString());
         }
 	});
-	connect(EventCenter::Default(), &EventCenter::InvokeOperationEnd, [=]() {
+	connect(EventCenter::Default(), &EventCenter::InvokeOperationEnd, [=](QObject*, QObject* v) {
 		if (!msgDialog) return;
-		if (!msgDialog->isHidden())msgDialog->accept();
-		delete msgDialog;
-		msgDialog = nullptr;
-		AppGlobalValues::setInProcessing(false);
-		});
+		if (!msgDialog->isHidden()){
+            if (v && ((QVariant*)v)->toBool()) {
+                msgDialog->stopLoading();
+                msgDialog->showMessage("Scan completed!");
+                msgDialog->showExitButton();
+                msgDialog->setWindowModality(Qt::WindowModal);
+                msgDialog->exec();
+            }
+            else{
+                msgDialog->accept();
+            }
+            delete msgDialog;
+            msgDialog = nullptr;
+            AppGlobalValues::setInProcessing(false);
+		}
+	});
 	connect(EventCenter::Default(), &EventCenter::RequestLogin, [=](QObject*, QObject* msg) {
 		this->requestLogin();
 		});