From 4e5168d513c39e2b0b3dcd07bef230e4cf041a71 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 23 Feb 2022 11:31:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=9C=AA=E7=BB=93=E6=9D=9F=E6=97=B6=EF=BC=8C=E8=AF=95?= =?UTF-8?q?=E5=9B=BE=E5=86=8D=E5=85=A5=E7=9A=84=E8=AD=A6=E5=91=8A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E3=80=822.=E5=B0=86=E9=A2=84?= =?UTF-8?q?=E7=83=AD=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E4=BA=86=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E7=9A=8415min=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?=20=20=20=203.=E7=8E=B0=E5=9C=A8=E9=87=87=E9=9B=86=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E5=B0=86=E6=8C=89=E7=85=A7=E7=BD=91=E9=A1=B5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=89=A7=E8=A1=8C=EF=BC=8C=E8=80=8C=E9=9D=9E?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=B6=E5=9B=BA=E5=AE=9A=E7=9A=845s?= =?UTF-8?q?=E3=80=82=E7=BD=91=E9=A1=B5=E4=B8=8A=E5=8D=95=E4=BD=8D=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E9=92=9F=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E5=87=BA?= =?UTF-8?q?=E7=8E=B01=E4=BD=8D=E6=95=B0=E5=AD=97=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=A1=A5=E9=9B=B6=E3=80=82=E4=BE=8B=E5=A6=825?= =?UTF-8?q?=E5=88=86=E9=92=9F=E9=97=B4=E9=9A=94=E5=BA=94=E8=AF=A5=E5=86=99?= =?UTF-8?q?=E4=B8=BA05=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; } From de6c6b8efdcd702097cced62e587939db09f8877 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 23 Feb 2022 14:05:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E4=BA=86=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E6=97=B6=E9=97=B4=E4=B8=BA=E4=B8=AA=E4=BD=8D=E6=95=B0?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=A1=AB=E9=9B=B6=E4=BC=9A=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Settings/SystemConfigger.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/source/Settings/SystemConfigger.cpp b/source/Settings/SystemConfigger.cpp index fcd53e1..f99c994 100644 --- a/source/Settings/SystemConfigger.cpp +++ b/source/Settings/SystemConfigger.cpp @@ -193,7 +193,21 @@ return 1; } #else - m_struAcqTime.qtInterval = QTime::fromString(m_qjoJObj.value("IntervalTime").toString(), "mm"); + QString qstrTemp; + int iTemp = m_qjoJObj.value("IntervalTime").toInt(); + if (iTemp < 10) + { + qstrTemp = m_qjoJObj.value("IntervalTime").toString(); + if (qstrTemp.size() == 1) + { + qstrTemp = "0" + qstrTemp; + } + m_struAcqTime.qtInterval = QTime::fromString(qstrTemp, "mm"); + } + else + { + m_struAcqTime.qtInterval = QTime::fromString(m_qjoJObj.value("IntervalTime").toString(), "mm"); + } if (!m_struAcqTime.qtInterval.isValid()) { qDebug() << "Invalid IntervalTime";