diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index d8b27cb..2dc1f13 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -17,7 +17,17 @@ std::string getJsonFromPatInf(QObject* obj) return ((QString*)obj)->toStdString(); } +void ErrorCallback(const char * msg) +{ + QString m(msg); + THROW_ERROR(m); +} + + + void DeviceManager::initDevice() { + InitLib(ErrorCallback); + deviceInfTimerID = startTimer(1000); // empty scan connect(EventCenter::Default(),&EventCenter::RequestEmptyScan,[=](QObject* sender, QObject* detail){ @@ -91,7 +101,7 @@ void DeviceManager::timerEvent(QTimerEvent *event) { //preview scan else{ const char * data = GetPreviewData(); - QByteArray bytes =QByteArray::fromRawData(data,40000); + QByteArray bytes =QByteArray::fromRawData(data,140*140); TRIGGER_EVENT(GUIEvents::ResponsePreviewData, nullptr, (QObject*)(&bytes)); delete [] data; } diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h index 9e59df6..686b58b 100644 --- a/src/device/DeviceManager.h +++ b/src/device/DeviceManager.h @@ -14,7 +14,6 @@ public: static DeviceManager manager; return &manager; } - void setDeviceErrorCallBack(); void initDevice(); protected: