From 53c92055a629b8d969430c45c379425cd898f629 Mon Sep 17 00:00:00 2001 From: Krad Date: Thu, 2 Jun 2022 14:01:16 +0800 Subject: [PATCH] Preview error handle --- src/ShimLib/ShimLib.c | 8 ++++++++ src/components/DateSlidePickerBox.cpp | 2 +- src/device/DeviceManager.cpp | 4 +++- src/forms/scan/ScanFormWidget.cpp | 6 ++++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/ShimLib/ShimLib.c b/src/ShimLib/ShimLib.c index 8d9ec31..d178d27 100644 --- a/src/ShimLib/ShimLib.c +++ b/src/ShimLib/ShimLib.c @@ -120,7 +120,15 @@ const size_t Col = 140; const char* FRAME_FILE_PATH_1 = "./img1_v2.bin"; const char* FRAME_FILE_PATH_2 = "./pre_image.bin"; + +int previewCount = 0; const char* GetPreviewData() { + previewCount++; + if (previewCount>3){ + status = READY; + innerCallback("22222"); + return NULL; + } FILE* file; preivew_change_flag++; preivew_change_flag = preivew_change_flag % 2; diff --git a/src/components/DateSlidePickerBox.cpp b/src/components/DateSlidePickerBox.cpp index 89a06db..7e21a73 100644 --- a/src/components/DateSlidePickerBox.cpp +++ b/src/components/DateSlidePickerBox.cpp @@ -6,7 +6,7 @@ #include #include #include -DateSlidePickerBox::DateSlidePickerBox(QWidget *parent) { +DateSlidePickerBox::DateSlidePickerBox(QWidget *parent):QWidget(parent) { layout = new QHBoxLayout(this); myear = new SlidePickerBox(this); QStringList centry; diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index d3a7061..01c98ae 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -164,7 +164,9 @@ void DeviceManager::initDevice() { if (inf.status == SCANNING) { qDebug() << "Preview data reader read start!"; const char* data = GetPreviewData(); - if (!data)continue; + if (!data){ + continue; + } qDebug() << "Preview data reader read end!"; QByteArray bytes = QByteArray::fromRawData(data, 140 * 140); //double check diff --git a/src/forms/scan/ScanFormWidget.cpp b/src/forms/scan/ScanFormWidget.cpp index 7ec8902..9f3d9e3 100644 --- a/src/forms/scan/ScanFormWidget.cpp +++ b/src/forms/scan/ScanFormWidget.cpp @@ -258,9 +258,11 @@ ScanFormWidget::ScanFormWidget(QWidget* parent) : TabFormWidget(parent) { lbl_e2->setText(tr("some settings\n\nparameters\n")); }); + connect(EventCenter::Default(), &EventCenter::DeviceErrorRaise, [=](QObject* parent, QObject* msg){ + setPreviewing(false); + }); - - previewfunc = [=](bool val)->void { + previewfunc = [=](bool val)->void { viewer->setVisible(val); btnPreview->setCheckable(val); btnPreview->setChecked(val);