merge 1.14

src/device/DeviceManager.cpp

@@ -39,12 +39,15 @@ std::string getJsonFromPatInf(QObject* obj)
 
 void ErrorCallback(const char* msg)
 {
-	DeviceManager::Default()->setErrorOccurred(true);
-	printf("Error Callback , message:%s\r\n", msg);
-	QString m(msg);
-	THROW_ERROR(m);
+    DeviceManager::Default()->emitErrorCallback(msg);
 }
 
+void DeviceManager::emitErrorCallback(const char *msg) {
+    this->setErrorOccurred(true);
+    printf("Error Callback , message:%s\r\n", msg);
+    QString m(msg);
+    emit raiseGlobalError( m);
+}
 
 
 void DeviceManager::initDevice() {

src/device/DeviceManager.h

@@ -11,17 +11,20 @@ class DeviceManager :public QObject {
 	Q_OBJECT
 
 public:
-	static DeviceManager* Default() {
-		static DeviceManager manager;
-		return &manager;
-	}
-	void initDevice();
-	void setErrorOccurred(bool v) {
-		errorOccurred = v;
-	}
-	bool getErrorOccurred() {
-		return errorOccurred;
-	}
+    static DeviceManager* Default(){
+        static DeviceManager manager;
+        return &manager;
+    }
+    void initDevice();
+    void setErrorOccurred(bool v){
+        errorOccurred = v;
+    }
+    bool getErrorOccurred(){
+        return errorOccurred;
+    }
+    void emitErrorCallback(const char * msg);
+    signals:
+    void raiseGlobalError(QString msg);
 
 protected:
 	void timerEvent(QTimerEvent* event) override;