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; } 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";