merge 1.14

2022-01-14 10:12:43 +08:00
parent 80528751e4 78c7005f1c
commit a1add44ab5
12 changed files with 101 additions and 49 deletions
--- a/src/device/DeviceManager.h
+++ b/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;