Add device global error callback

This commit is contained in:
Krad
2021-10-19 14:09:14 +08:00
parent 1ade32aeb9
commit c432bc5b0c
2 changed files with 11 additions and 2 deletions

View File

@@ -17,7 +17,17 @@ std::string getJsonFromPatInf(QObject* obj)
return ((QString*)obj)->toStdString(); return ((QString*)obj)->toStdString();
} }
void ErrorCallback(const char * msg)
{
QString m(msg);
THROW_ERROR(m);
}
void DeviceManager::initDevice() { void DeviceManager::initDevice() {
InitLib(ErrorCallback);
deviceInfTimerID = startTimer(1000); deviceInfTimerID = startTimer(1000);
// empty scan // empty scan
connect(EventCenter::Default(),&EventCenter::RequestEmptyScan,[=](QObject* sender, QObject* detail){ connect(EventCenter::Default(),&EventCenter::RequestEmptyScan,[=](QObject* sender, QObject* detail){
@@ -91,7 +101,7 @@ void DeviceManager::timerEvent(QTimerEvent *event) {
//preview scan //preview scan
else{ else{
const char * data = GetPreviewData(); const char * data = GetPreviewData();
QByteArray bytes =QByteArray::fromRawData(data,40000); QByteArray bytes =QByteArray::fromRawData(data,140*140);
TRIGGER_EVENT(GUIEvents::ResponsePreviewData, nullptr, (QObject*)(&bytes)); TRIGGER_EVENT(GUIEvents::ResponsePreviewData, nullptr, (QObject*)(&bytes));
delete [] data; delete [] data;
} }

View File

@@ -14,7 +14,6 @@ public:
static DeviceManager manager; static DeviceManager manager;
return &manager; return &manager;
} }
void setDeviceErrorCallBack();
void initDevice(); void initDevice();
protected: protected: