From 4e5168d513c39e2b0b3dcd07bef230e4cf041a71 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 23 Feb 2022 11:31:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=9C=AA=E7=BB=93=E6=9D=9F=E6=97=B6=EF=BC=8C=E8=AF=95=E5=9B=BE?= =?UTF-8?q?=E5=86=8D=E5=85=A5=E7=9A=84=E8=AD=A6=E5=91=8A=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=822.=E5=B0=86=E9=A2=84=E7=83=AD?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E4=BA=86=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E7=9A=8415min=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=203.=E7=8E=B0=E5=9C=A8=E9=87=87=E9=9B=86=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E5=B0=86=E6=8C=89=E7=85=A7=E7=BD=91=E9=A1=B5=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E6=89=A7=E8=A1=8C=EF=BC=8C=E8=80=8C=E9=9D=9E=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E6=97=B6=E5=9B=BA=E5=AE=9A=E7=9A=845s=E3=80=82?= =?UTF-8?q?=E7=BD=91=E9=A1=B5=E4=B8=8A=E5=8D=95=E4=BD=8D=E4=B8=BA=E5=88=86?= =?UTF-8?q?=E9=92=9F=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E5=87=BA=E7=8E=B0?= =?UTF-8?q?1=E4=BD=8D=E6=95=B0=E5=AD=97=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=A1=A5=E9=9B=B6=E3=80=82=E4=BE=8B=E5=A6=825=E5=88=86?= =?UTF-8?q?=E9=92=9F=E9=97=B4=E9=9A=94=E5=BA=94=E8=AF=A5=E5=86=99=E4=B8=BA?= =?UTF-8?q?05=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CaptureThread/MainDataGrabber.cpp | 2 +- source/CaptureThread/Scheduler.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/CaptureThread/MainDataGrabber.cpp b/source/CaptureThread/MainDataGrabber.cpp index d67d953..137ea6b 100644 --- a/source/CaptureThread/MainDataGrabber.cpp +++ b/source/CaptureThread/MainDataGrabber.cpp @@ -428,7 +428,7 @@ int CMainDataGrabber::GrabOnceFinished() { if (m_iFlagIsCapturing) { - qDebug() << "Fatal Thread Err."; + qDebug() << "Fatal Warning.Last capture not finished.New acquisition will not start"; return 1000; } m_iFlagIsCapturing = 1; diff --git a/source/CaptureThread/Scheduler.cpp b/source/CaptureThread/Scheduler.cpp index 1e83b7b..b14a7bf 100644 --- a/source/CaptureThread/Scheduler.cpp +++ b/source/CaptureThread/Scheduler.cpp @@ -28,7 +28,7 @@ void Scheduler::Preheating() #ifdef _DEBUG QThread::msleep(5000); #else - QThread::msleep(10000);//NEED TO CHANGE BEFOR HAND TO CUSTOM + QThread::msleep(900000);//NEED TO CHANGE BEFOR HAND TO CUSTOM #endif qDebug() << "Preheating Finished"; } @@ -53,7 +53,7 @@ void Scheduler::StartAsPlanned() int iIntervalInMS = m_struAcqTime.qtInterval.hour() * 3600 * 1000 + m_struAcqTime.qtInterval.minute() * 60 * 1000 + m_struAcqTime.qtInterval.second() * 1000; - m_GrabTimer->start(5000); + m_GrabTimer->start(iIntervalInMS); //this->OnTimeCounter(); //emit &QTimer::timeout; }