Add device global error callback
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ public:
|
||||
static DeviceManager manager;
|
||||
return &manager;
|
||||
}
|
||||
void setDeviceErrorCallBack();
|
||||
void initDevice();
|
||||
|
||||
protected:
|
||||
|
||||
Reference in New Issue
Block a user