Disable empty password login of usct.

src/ShimLib/ShimLib.c

@@ -27,20 +27,26 @@ volatile int running = 1;
 volatile int progress = 0;
 volatile int status = READY;
 volatile int stop_flag = 0;
+volatile int empty = 0;
 char output_path[256] = {0};
 
 void ThreadFunc(void* args){
 	while (running){
-		WaitForSingleObject(e1, INFINITE);
-		status = SCANNING;
         stop_flag = 0;
-		progress = 0;
+        progress = 0;
-		for (int i = 0; i < 50; ++i) {
+		WaitForSingleObject(e1, INFINITE);
-			if (stop_flag > 0){
-				stop_flag = 0;
-				break;
-			}
 
+        status = SCANNING;
+        Sleep(300);
+        if (empty)
+        {
+            GetPreviewData();
+        }
+		for (int i = 0; i <= 50; ++i) {
+            if (stop_flag > 0 || status != SCANNING){
+                stop_flag = 0;
+                break;
+            }
             if (i == 20){
                 progress = 139;
                 WaitForSingleObject(e2, INFINITE);
@@ -53,6 +59,10 @@ void ThreadFunc(void* args){
             }
             else{
                 progress = i *2;
+            }
+            if (stop_flag > 0 || status != SCANNING){
+                stop_flag = 0;
+                break;
             }
 			Sleep(300);
 		}
@@ -87,6 +97,7 @@ int ScanControl(ScanAction actionType) {
             stop_flag = 1;
             progress = 0;
             status = READY;
+            SetEvent(e2);
             printf("Stop everything!\r\n");
             break;
         case SCAN_CONTINUE:
@@ -106,7 +117,8 @@ StatusInfo GetStatus() {
 }
 
 //result, 0 success, other false
-int SetScanInfo(const char* jsonString, int empty) {
+int SetScanInfo(const char* jsonString, int e) {
+    empty = e;
 	return 0;
 }
 
@@ -119,7 +131,15 @@ const size_t Col = 140;
 
 const char* FRAME_FILE_PATH_1 = "./img1_v2.bin";
 const char* FRAME_FILE_PATH_2 = "./pre_image.bin";
+
+int previewCount = 0;
 const char* GetPreviewData() {
+    previewCount++;
+    if (previewCount>3){
+        status = READY;
+        innerCallback("22222");
+        return NULL;
+    }
 	FILE* file;
 	preivew_change_flag++;
 	preivew_change_flag = preivew_change_flag % 2;

src/components/DateSlidePickerBox.cpp

@@ -6,7 +6,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QDate>
-DateSlidePickerBox::DateSlidePickerBox(QWidget *parent) {
+DateSlidePickerBox::DateSlidePickerBox(QWidget *parent):QWidget(parent) {
     layout = new QHBoxLayout(this);
     myear = new SlidePickerBox(this);
     QStringList centry;

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"
@@ -44,7 +43,7 @@ void ErrorCallback(const char* msg)
 }
 
 void DeviceManager::emitErrorCallback(const char *msg) {
-    this->setErrorOccurred(true);
+    errorOccurred=true;
     printf("Error Callback , message:%s\r\n", msg);
     QString m(msg);
     emit raiseGlobalError( m);
@@ -54,7 +53,7 @@ void DeviceManager::emitErrorCallback(const char *msg) {
 void DeviceManager::initDevice() {
 	InitLib(ErrorCallback);
 
-	deviceInfTimerID = startTimer(1000);
+	deviceInfTimerID = startTimer(10000);
 
 	// empty scan
 	connect(EventCenter::Default(), &EventCenter::RequestEmptyScan, [=](QObject* sender, QObject* detail) {
@@ -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);
@@ -132,10 +132,11 @@ void DeviceManager::initDevice() {
 			if (!ScanControl(PREVIEW_SCAN))
 			{
 				qDebug() << "Preview success!";
-				lastStatus = SCANNING;
+//				lastStatus = SCANNING;
 				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);
@@ -163,7 +164,9 @@ void DeviceManager::initDevice() {
 			if (inf.status == SCANNING) {
 				qDebug() << "Preview data reader read start!";
 				const char* data = GetPreviewData();
-				if (!data)continue;
+				if (!data){
+				    continue;
+				}
 				qDebug() << "Preview data reader read end!";
 				QByteArray bytes = QByteArray::fromRawData(data, 140 * 140);
 				//double check
@@ -176,6 +179,12 @@ void DeviceManager::initDevice() {
 				TRIGGER_EVENT(GUIEvents::ResponsePreviewData, nullptr, (QObject*)(&bytes));
 				qDebug() << "Preview data response event end!";
 			}
+			else{
+//			    lastStatus = READY;
+                previewing = false;
+                AppGlobalValues::setInProcessing(false);
+			    QThread::sleep(3);
+			}
 			QThread::msleep(100);
 		}
 		});
@@ -198,6 +207,7 @@ void DeviceManager::timerEvent(QTimerEvent* event) {
     //scanning progress timer
     //error exit,  callback error
     if (errorOccurred) {
+        timerID = event->timerId();
         exitScanTimer();
         return;
     }
@@ -216,14 +226,14 @@ void DeviceManager::timerEvent(QTimerEvent* event) {
             return;
         } else {
             //未发生错误并且，之前状态是扫描，代表正常扫描完成
-            if (lastStatus == SCANNING) {
+            if (lastStatus == SCANNING && ! errorOccurred) {
                 prepareFinishScan();
             }
             //一般不会出现其他情况
-            else {
+//            else {
-                QString msg("Unknown error in scanning progress timer");
+//                QString msg("Unknown error in scanning progress timer");
-                THROW_ERROR(msg);
+//                THROW_ERROR(msg);
-            }
+//            }
         }
     }
     exitScanTimer();
@@ -241,13 +251,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 +267,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();
         }
@@ -269,7 +281,7 @@ void DeviceManager::scanProcess(int sProgress) {
 
 void DeviceManager::exitScanTimer() {
     qDebug() << "Scanning progress Timer exit";
-    killTimer(timerID);
+    if (timerID>0)killTimer(timerID);
     timerID = -1;
     lastStatus = -1;
     previewing = false;
@@ -277,9 +289,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
@@ -88,13 +92,13 @@ private:
     void scanProcess(int progress);
 
 	int scanPhase = 1;
-	int timerID = -1;
+    volatile int timerID = -1;
 	int deviceInfTimerID = -1;
 	int lastStatus = -1;
 	bool previewing = false;
 	volatile bool endLoop = false;
-	bool errorOccurred = false;
+    volatile 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));
 		});
@@ -258,9 +258,11 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
 		lbl_e2->setText(tr("some settings\n\nparameters\n"));
 		});
 
+    connect(EventCenter::Default(), &EventCenter::DeviceErrorRaise, [=](QObject* parent, QObject* msg){
+        setPreviewing(false);
+    });
 
-
+    previewfunc = [=](bool val)->void {
-	previewfunc = [=](bool val)->void {
 		viewer->setVisible(val);
 		btnPreview->setCheckable(val);
 		btnPreview->setChecked(val);

src/forms/settings/aboutwidget.cpp

@@ -167,13 +167,14 @@ void AboutWidget::initUi()
 
 void AboutWidget::openHelpFile()
 {
-	QString userManulFile = QCoreApplication::applicationDirPath() + "/userManual.pdf";
+    qApp->exit();
-
+//	QString userManulFile = QCoreApplication::applicationDirPath() + "/userManual.pdf";
-	QFileInfo file(userManulFile);
+//
-	if (file.exists())
+//	QFileInfo file(userManulFile);
-	{
+//	if (file.exists())
-		QDesktopServices::openUrl(QUrl::fromLocalFile(userManulFile));
+//	{
-	}
+//		QDesktopServices::openUrl(QUrl::fromLocalFile(userManulFile));
+//	}
 	//else
 	//{
 	//	EQ9MessageBox box;

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 btn_scanConfirm = new ImageSwitch(this);
-    auto lbl_needConfirm = new QLabel(this);
+    auto lbl_scanConfirm = new QLabel(this);
-    lbl_needConfirm->setText("Scan Confirm");
+    lbl_scanConfirm->setText("Scan Confirm");
-    gridLayout->addWidget(btn_needConfirm, 4, 2, 1, 1);
+    gridLayout->addWidget(btn_scanConfirm, 4, 2, 1, 1);
-    gridLayout->addWidget(lbl_needConfirm, 4, 0, 1, 1);
+    gridLayout->addWidget(lbl_scanConfirm, 4, 0, 1, 1);
-    btn_needConfirm->setChecked(JsonObject::Instance()->getScanConfirm());
+    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, [=]() {
+    connect(btn_scanConfirm, &ImageSwitch::clicked, [=]() {
-        JsonObject::Instance()->setScanConfirm(btn_needConfirm->getChecked());
+        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

@@ -7,6 +7,7 @@
 #include <QTranslator>
 #include <QDebug>
 #include <QApplication>
+#include <iostream>
 #include "json/cJSON.h"
 const char* strProductFileName = "./cfgs/usct-product.json";
 const char* strProductFileNameDefault = "./cfgs/usct-product";
@@ -81,7 +82,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;
@@ -338,11 +339,19 @@ bool JsonObject::savecfg()
 	}
 
 	char* strJsonData = cJSON_Print((cJSON*)json_root);
-	std::stringstream ss;
+	if (strlen(strJsonData)>1){
-	ss << strJsonData;
+        std::stringstream ss;
-	outFile << ss.rdbuf();
+        ss << strJsonData;
-	outFile.close();
+        outFile << ss.rdbuf();
-	m_bLoaded = false;
+        outFile.flush();
+        outFile.close();
+        m_bLoaded = false;
+	}
+	else{
+	    std::cout<<"===========================================app want write empty content to cfg json============================================="<<std::endl;
+
+	}
+	delete strJsonData;
 	return true;
 }
 
@@ -437,13 +446,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 +532,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/loginwindow.cpp

@@ -128,8 +128,8 @@ void LoginWindow::doLogin()
 	QString strUserCode = m_pUserCodeEdit->text();
 	QString strPassWord = m_pPassWordEdit->text();
 
-	QString encryptedPassword = strPassWord;
+//	QString encryptedPassword = strPassWord;
-	strPassWord = "123456";
+//	strPassWord = "123456";
 
 	QString encryptPwd = User::getEncryptedPassword(strPassWord);
 	QString sql = QString("select UserCode from Account where UserCode='%1' and Password='%2'")

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();
+		if (!msgDialog->isHidden()){
-		delete msgDialog;
+            if (v && ((QVariant*)v)->toBool()) {
-		msgDialog = nullptr;
+                msgDialog->stopLoading();
-		AppGlobalValues::setInProcessing(false);
+                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();
 		});