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.cpp
+++ b/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() {