Some debug log logic.
This commit is contained in:
@@ -12,6 +12,23 @@
|
|||||||
#define THROW_ERROR(errormsg)\
|
#define THROW_ERROR(errormsg)\
|
||||||
TRIGGER_EVENT(GUIEvents::GUIErrorRaise, nullptr, (QObject*)&errormsg);
|
TRIGGER_EVENT(GUIEvents::GUIErrorRaise, nullptr, (QObject*)&errormsg);
|
||||||
|
|
||||||
|
|
||||||
|
const char * getStatusString(int status)
|
||||||
|
{
|
||||||
|
switch (status) {
|
||||||
|
case SCANNING:
|
||||||
|
return "SCANNING";
|
||||||
|
case READY:
|
||||||
|
return "Ready";
|
||||||
|
case BUSY:
|
||||||
|
return "BUSY";
|
||||||
|
case ERROR:
|
||||||
|
return "ERROR";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
std::string getJsonFromPatInf(QObject* obj)
|
std::string getJsonFromPatInf(QObject* obj)
|
||||||
{
|
{
|
||||||
return ((QString*)obj)->toStdString();
|
return ((QString*)obj)->toStdString();
|
||||||
@@ -19,6 +36,7 @@ std::string getJsonFromPatInf(QObject* obj)
|
|||||||
|
|
||||||
void ErrorCallback(const char * msg)
|
void ErrorCallback(const char * msg)
|
||||||
{
|
{
|
||||||
|
printf("Error Callback , message:%s\r\n", msg);
|
||||||
QString m(msg);
|
QString m(msg);
|
||||||
THROW_ERROR(m);
|
THROW_ERROR(m);
|
||||||
}
|
}
|
||||||
@@ -48,6 +66,7 @@ void DeviceManager::initDevice() {
|
|||||||
connect(EventCenter::Default(),&EventCenter::RequestStop,[=]() {
|
connect(EventCenter::Default(),&EventCenter::RequestStop,[=]() {
|
||||||
TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
|
TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
|
||||||
StatusInfo inf = GetStatus();
|
StatusInfo inf = GetStatus();
|
||||||
|
printf("Stop request status, status:%s\r\n",getStatusString(inf.status));
|
||||||
if (inf.status == SCANNING) {
|
if (inf.status == SCANNING) {
|
||||||
//ScanControl fail
|
//ScanControl fail
|
||||||
if (ScanControl(STOP)) {
|
if (ScanControl(STOP)) {
|
||||||
@@ -67,6 +86,7 @@ void DeviceManager::initDevice() {
|
|||||||
connect(EventCenter::Default(),&EventCenter::RequestPreviewScan,[=](){
|
connect(EventCenter::Default(),&EventCenter::RequestPreviewScan,[=](){
|
||||||
TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
|
TRIGGER_EVENT(GUIEvents::InvokeOperationStart, nullptr, nullptr);
|
||||||
StatusInfo inf = GetStatus();
|
StatusInfo inf = GetStatus();
|
||||||
|
printf("PreviewScan request status, status:%s\r\n",getStatusString(inf.status));
|
||||||
if (inf.status==READY)
|
if (inf.status==READY)
|
||||||
{
|
{
|
||||||
//ScanControl
|
//ScanControl
|
||||||
@@ -89,6 +109,7 @@ void DeviceManager::timerEvent(QTimerEvent *event) {
|
|||||||
if (event->timerId() !=deviceInfTimerID)
|
if (event->timerId() !=deviceInfTimerID)
|
||||||
{
|
{
|
||||||
StatusInfo inf = GetStatus();
|
StatusInfo inf = GetStatus();
|
||||||
|
printf("Timer request status, status:%s\r\n",getStatusString(inf.status));
|
||||||
if (inf.status==SCANNING)
|
if (inf.status==SCANNING)
|
||||||
{
|
{
|
||||||
lastStatus = SCANNING;
|
lastStatus = SCANNING;
|
||||||
@@ -140,6 +161,7 @@ void DeviceManager::processScan(const char *json, bool empty) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
StatusInfo inf = GetStatus();
|
StatusInfo inf = GetStatus();
|
||||||
|
printf("ProcessScan request status, status:%s\r\n",getStatusString(inf.status));
|
||||||
if (inf.status==READY)
|
if (inf.status==READY)
|
||||||
{
|
{
|
||||||
//ScanControl fail
|
//ScanControl fail
|
||||||
|
|||||||
Reference in New Issue
Block a user