Empty Scan ID Initial check.

src/ShimLib/ShimLib.c

@@ -79,6 +79,7 @@ int ScanControl(ScanAction actionType) {
             break;
         case PREVIEW_SCAN:
             statusCountFlag = 1;
+            status = SCANNING;
             printf("Do preview!\r\n");
             break;
         case STOP:

src/device/DeviceManager.cpp

@@ -11,6 +11,7 @@
 #include <qdebug.h>
 #include "appvals/AppGlobalValues.h"
 #include "json/ScanJson.h"
+#include "json/jsonobject.h"
 #define TRIGGER_EVENT EventCenter::Default()->triggerEvent
 
 #define THROW_ERROR(errormsg)\
@@ -58,7 +59,7 @@ void DeviceManager::initDevice() {
 	// empty scan
 	connect(EventCenter::Default(), &EventCenter::RequestEmptyScan, [=](QObject* sender, QObject* detail) {
 		std::string json = getJsonFromPatInf(detail);
-		processScan(json.c_str(), true);
+        startScan(json.c_str(), true);
 		});
 	// Patient scan
 	connect(EventCenter::Default(), &EventCenter::RequestPatientScan, [=](QObject* sender, QObject* detail) {
@@ -66,7 +67,7 @@ void DeviceManager::initDevice() {
 		qDebug() << json.c_str();
 		if (!json.empty())
 		{
-			processScan(json.c_str());
+            startScan(json.c_str());
 		}
 		});
 	// Continue Scan
@@ -116,7 +117,6 @@ void DeviceManager::initDevice() {
 		TRIGGER_EVENT(GUIEvents::ResponseStop, nullptr, nullptr);
 		AppGlobalValues::setInProcessing(false);
 		});
-
 	// preview
 	connect(EventCenter::Default(), &EventCenter::RequestPreviewScan, [=]() {
 		// check device status=========================================
@@ -147,7 +147,7 @@ void DeviceManager::initDevice() {
 		THROW_ERROR(msg);
 		qDebug() << "Error thrown!";
 		});
-
+    // init the preview data caller thread
 	previewDataCaller = QThread::create([=]() {
 		while (!endLoop)
 		{
@@ -184,6 +184,11 @@ void DeviceManager::initDevice() {
 
 }
 
+const char * getPhaseName(int phase){
+    const char* names[3] = {"Initializing","Scanning", "CE Measuring"};
+    return names[phase-1];
+}
+
 void DeviceManager::timerEvent(QTimerEvent* event) {
     if (event->timerId() == deviceInfTimerID) {
         QString temp = QString(GetDeviceInfo(MEAN_TEMPERATURE));
@@ -191,86 +196,28 @@ void DeviceManager::timerEvent(QTimerEvent* event) {
         return;
     }
     //scanning progress timer
-	{
     //error exit,  callback error
-		if (errorOccurred)
+    if (errorOccurred) {
-		{
+        exitScanTimer();
-			goto exitTimer;
+        return;
     }
     // previewing exit
-		if (previewing)
+    if (previewing) {
-		{
         QString msg("Device is previewing, exit current operation!");
         THROW_ERROR(msg);
-			goto exitTimer;
+    } else {
-		}
-		else {
         // check device status=========================================
         qDebug() << "GetStatus";
         StatusInfo inf = GetStatus();
         qDebug() << "Scanning request status, status:" << getStatusString(inf.status);
         //设备正常扫描中
         if (inf.status == SCANNING) {
-                qDebug() << "current output path:" << getScanOutputPath();
+            scanProcess(inf.progress);
-                lastStatus = SCANNING;
-
-                //normal scan pending
-                int phase = inf.progress/100 + 1;
-                int progress = inf.progress % 100;
-                QString extraMsg = (AppGlobalValues::EmptyScanFlag().toBool()||(scanPhase != 3))?"":", patient can leave";
-                QVariant var(QString("Phase %1%3\r\n progress:%2%").arg(scanPhase).arg(progress).arg(extraMsg));
-                TRIGGER_EVENT(GUIEvents::InvokeOperationProgress, nullptr, (QObject *) &var);
-                if (scanPhase != phase) {
-                    if (phase > 3 || scanPhase > phase ){
-                        QString errorMsg = QString("Error Scan Phase code, current Phase code:%1, new Phase code:%2!").arg(scanPhase,phase);
-                        THROW_ERROR(errorMsg)
-                        goto exitTimer;
-                    }
-                    scanPhase = phase;
-                    if (scanPhase == 2){
-                        if (!AppGlobalValues::EmptyScanFlag().toBool()) {
-                            var.setValue(QString("Scan phase 2 waiting for patient!\r\n Click \"Next\" to continue!"));
-                            TRIGGER_EVENT(GUIEvents::InvokeOperationPending, nullptr, (QObject *) &var);
-                            goto exitTimer;
-                        }
-                        //empty scan no pending, auto continue
-                        else {
-                            postContinueCommand();
-                        }
-                    }
-                }
             return;
-            }
+        } else {
-			else {
             //未发生错误并且，之前状态是扫描，代表正常扫描完成
             if (lastStatus == SCANNING) {
-					qDebug() << "Scan finished";
+                prepareFinishScan();
-					QVariant var(true);
-					qDebug() << "InvokeOperationEnd";
-
-					TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, (QObject*)&var);
-					AppGlobalValues::setInProcessing(false);
-					lastStatus = -1;
-					previewing = false;
-					QString s("%1  %2");
-					s = s.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd HH:mm:ss")).arg("Scan finished");
-					TRIGGER_EVENT(GUIEvents::GlobalBannerMessage, nullptr, (QObject*)&s);
-                    QString outputPath = GetDeviceInfo(DeviceInfo::DEV_OUTPATH);
-                    outputPath = outputPath.replace("\\","/");
-                    if (outputPath.endsWith('/')) outputPath = outputPath.remove(outputPath.length()-1,1);
-                    QStringList list  = outputPath.split('/');
-                    if (list.length()){
-                        if (AppGlobalValues::EmptyScanFlag().toBool()){
-                            ScanJson::Current()->setEmptyScanID(list.last().toStdString().c_str());
-                        }else{
-                            ScanJson::Current()->setScanID(list.last().toStdString().c_str());
-                        }
-                        ScanJson::Current()->save();
-                    }
-                    else{
-                        QString msg("Scan Output Path error!");
-                        THROW_ERROR(msg);
-                    }
             }
             //一般不会出现其他情况
             else {
@@ -279,20 +226,88 @@ void DeviceManager::timerEvent(QTimerEvent* event) {
             }
         }
     }
-	exitTimer:
+    exitScanTimer();
+}
+
+void DeviceManager::scanProcess(int sProgress) {
+    qDebug() << "current output path:" << getScanOutputPath();
+    lastStatus = SCANNING;
+
+    //normal scan pending
+    int phase = sProgress / 100 + 1;
+    int progress = sProgress % 100;
+    // scan with phase 3 has a different message
+    QString extraMsg = (AppGlobalValues::EmptyScanFlag().toBool() ||
+            (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);
+    //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);
+        THROW_ERROR(errorMsg)
+        exitScanTimer();
+        return;
+    }
+    // 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!"));
+            TRIGGER_EVENT(InvokeOperationPending, nullptr, (QObject *) &var);
+            exitScanTimer();
+        }
+        //empty scan no pending, auto continue
+        else {
+            postContinueCommand();
+        }
+    }
+
+}
+
+void DeviceManager::exitScanTimer() {
     qDebug() << "Scanning progress Timer exit";
     killTimer(timerID);
     timerID = -1;
     lastStatus = -1;
     previewing = false;
-		return;
 }
 
+void DeviceManager::prepareFinishScan() {
+    qDebug() << "Scan finished";
+    QVariant var(true);
+    qDebug() << "InvokeOperationEnd";
 
+    TRIGGER_EVENT(InvokeOperationEnd, nullptr, (QObject *) &var);
+    AppGlobalValues::setInProcessing(false);
+//    log, no need
+//    QString s("%1  %2");
+//    s = s.arg(QDateTime::currentDateTime().toString("yyyy/MM/dd HH:mm:ss")).arg("Scan finished");
+//    TRIGGER_EVENT(GlobalBannerMessage, nullptr, (QObject *) &s);
 
+    // get output data path
+    QString outputPath = GetDeviceInfo(DEV_OUTPATH);
+    outputPath = outputPath.replace("\\", "/");
+    // get scan ID from path
+    if (outputPath.endsWith('/')) outputPath = outputPath.remove(outputPath.length() - 1, 1);
+    QStringList list = outputPath.split('/');
+    if (list.length()) {
+        if (AppGlobalValues::EmptyScanFlag().toBool()) {
+            ScanJson::Current()->setEmptyScanID(list.last().toStdString().c_str());
+        } else {
+            ScanJson::Current()->setScanID(list.last().toStdString().c_str());
+        }
+        // save json
+        ScanJson::Current()->save();
+    } else {
+        QString msg("Scan Output Path error!");
+        THROW_ERROR(msg);
+    }
 }
 
-void DeviceManager::processScan(const char* json, bool empty) {
+void DeviceManager::startScan(const char* json, bool empty) {
 	//clear last error state first
 	errorOccurred = false;
 	// check device status=========================================

src/device/DeviceManager.h

@@ -15,13 +15,33 @@ public:
         static DeviceManager manager;
         return &manager;
     }
+    /**
+     * init device, include Shimlib and it's error call back,
+     * deviceInfTimer to get temperature of water, and the
+     * preview data caller thread.
+     */
     void initDevice();
+
+    /**
+     * close and release the device reference resource.
+     */
 	void close();
+
+    /**
+     * Get Firm ware version
+     * @return Firm ware version
+     */
+    QString getSoftwareVersion();
+
+    /**
+     * Get Scan data output path
+     * @return Scan data output path
+     */
+    QString getScanOutputPath();
+
     void setErrorOccurred(bool v){
         errorOccurred = v;
     }
-    QString getSoftwareVersion();
-    QString getScanOutputPath();
     bool getErrorOccurred(){
         return errorOccurred;
     }
@@ -33,9 +53,40 @@ protected:
 	void timerEvent(QTimerEvent* event) override;
 
 private:
-	void processScan(const char* json, bool empty = false);
+    /**
+     * To start a new scan operation
+     * @param json The patient information json string
+     * @param empty Empty scan flag
+     */
+	void startScan(const char* json, bool empty = false);
+
+	/**
+	 * Post Scan start command to Shimlib
+	 */
     void postScanCommand();
+
+    /**
+     * Post Continue Scan command to Shimlib
+     * @param useTimer start a new timer flag
+     */
     void postContinueCommand(bool useTimer = false);
+
+    /**
+     * Prepare for finishing the Scan
+     */
+    void prepareFinishScan();
+
+    /**
+     * exit the current Scan process timer
+     */
+    void exitScanTimer();
+
+    /**
+     * Process scan progress change
+     * @param Scan progress
+     */
+    void scanProcess(int progress);
+
 	int scanPhase = 1;
 	int timerID = -1;
 	int deviceInfTimerID = -1;

src/forms/scan/ScanFormWidget.cpp

@@ -16,6 +16,7 @@
 #include <qdebug.h>
 #include "log/UserOperationLog.h"
 #include <QLabel>
+#include "json/jsonobject.h"
 
 #ifdef WIN32
 #else
@@ -229,6 +230,11 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) {
 	connect(btnScan, &QToolButton::clicked, [=]() {
 		QString patientInf(patient_information->getCurrentPatientJsonString(false));
 		LOG_USER_OPERATION(StartScan);
+		if (!JsonObject::Instance()->getEmptyScanID()){
+		    QString msg(tr("No refresh data exists, please do Refresh operation first."));
+            EventCenter::Default()->triggerEvent(GUIEvents::DeviceErrorRaise, nullptr, (QObject*)(&msg));
+		    return;
+		}
 		EventCenter::Default()->triggerEvent(GUIEvents::RequestPatientScan, nullptr, (QObject*)(&patientInf));
 		});
 	connect(btnStop, &QToolButton::clicked, [=]() {

src/forms/settings/systemsettingform.cpp

@@ -5,6 +5,8 @@
 #include <QDebug>
 #include <QLineEdit>
 #include <QToolButton>
+#include <QGridLayout>
+
 
 #include "src/dialogs/SelectDialog.h"
 #include "network/networkcfgdialog.h"
@@ -48,6 +50,18 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 	ui->btnFlt->setText(JsonObject::Instance()->defaultFilter());
 	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());
+    QFrame* line5 =  new QFrame(this);
+    line5->setFrameShape(QFrame::HLine);
+    line5->setFrameShadow(QFrame::Sunken);
+    gridLayout->addWidget(line5,5,0);
+
     ////test begin
 	//flag_disksize = true;
 	//m_disksize = 75.0;
@@ -86,6 +100,9 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
 			////
 		}
 		});
+    connect(btn_needConfirm, &ImageSwitch::clicked, [=]() {
+        JsonObject::Instance()->setScanConfirm(btn_needConfirm->getChecked());
+    });
 	connect(ui->btn_network, &QToolButton::clicked, [=]() {
 		GetAdminPsw dialog(this);
 		if (dialog.exec() == QDialog::Accepted)

src/json/ScanJson.cpp

@@ -8,7 +8,11 @@
 #include <QCoreApplication>
 void ScanJson::save() {
     if (!root) return;
-    QFile f(QString("%1/%2.json").arg(QCoreApplication::applicationDirPath(),scanID.c_str()));
+    QDir d(QCoreApplication::applicationDirPath());
+    if (!d.exists("jsons")){
+        d.mkdir("jsons");
+    }
+    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, "ScanID", cJSON_CreateString(scanID.c_str()));

src/json/ScanJson.h

@@ -7,6 +7,7 @@
 
 #include <string>
 #include "cJSON.h"
+#include "jsonobject.h"
 
 class ScanJson {
 public:
@@ -27,8 +28,10 @@ public:
     void setEmptyScanID(const char * id){
         emptyScanID.clear();
         emptyScanID.append(id);
+        JsonObject::Instance()->setEmptyScanID(id);
         setScanID(id);
     }
+
     void save();
     static ScanJson* Current(){
         static ScanJson instance;

src/json/jsonobject.cpp

@@ -30,7 +30,13 @@ void JsonObject::setJsonString(const char* catergory, const char* stringName, co
 	if (!first) return;
 
 	cJSON* Item = cJSON_CreateString(stringValue);
+    cJSON* valItem = cJSON_GetObjectItem(first, stringName);
+	if (valItem){
         cJSON_ReplaceItemInObject(first, stringName, Item);
+    }
+	else{
+        cJSON_AddItemToObject(first, stringName , Item);
+    }
 	if (save)
 	{
 		savecfg();
@@ -50,6 +56,41 @@ char* JsonObject::getJsonString(const char* catergory, const char* stringName)
 	return second->valuestring;
 
 }
+
+void JsonObject::setBool(const char *catergory, const char *stringName, bool val, bool save) {
+    if (!loadcfg())
+        return;
+
+    cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
+    if (!first) return;
+
+    cJSON* Item = cJSON_CreateBool(val?1:0);
+    cJSON* valItem = cJSON_GetObjectItem(first, stringName);
+    if (valItem){
+        cJSON_ReplaceItemInObject(first, stringName, Item);
+    }
+    else{
+        cJSON_AddItemToObject(first, stringName , Item);
+    }
+    if (save)
+    {
+        savecfg();
+    }
+}
+
+bool JsonObject::getBool(const char* catergory, const char* stringName)
+{
+    if (!loadcfg())
+        return nullptr;
+
+    cJSON* first = cJSON_GetObjectItem((cJSON*)json_root, catergory);
+    if (!first) return false;
+
+    cJSON* second = cJSON_GetObjectItem(first, stringName);
+    if (!second) return false;
+    return second->valueint;
+}
+
 char* JsonObject::getArrayNode(const char* catergory, const char* stringName, int index, const char* id)
 {
 	if (!loadcfg())
@@ -396,6 +437,12 @@ 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()
 {
@@ -474,3 +521,13 @@ void JsonObject::setIpRouteList(const QList<QStringList>& list)
 	}
 	savecfg();
 }
+
+void JsonObject::setEmptyScanID(const char *id) {
+    setJsonString("deviceparam","EmptyScanID",id, true);
+}
+
+const char *JsonObject::getEmptyScanID() {
+    return getJsonString("deviceparam","EmptyScanID");
+}
+
+

src/json/jsonobject.h

@@ -87,6 +87,12 @@ public:
 	bool isDHCP();
 	void autoDHCP(bool);
 
+    bool getScanConfirm();
+    void setScanConfirm(bool val);
+
+    const char* getEmptyScanID();
+    void setEmptyScanID(const char* id);
+
 	IpAddr getDefaultIpAddr();
 	void setDefaultIpAddr(const IpAddr& addr);
 
@@ -104,6 +110,9 @@ private:
 	void  setJsonString(const char* catergory, const char* stringName, const char* stringValue, bool save = true);
 	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);
+
 	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);
 	int getArraySize(const char* catergory, const char* stringName);