xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 03:49:42 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zhangzhuo'

Browse Source
This commit is contained in:
xin
2022-02-24 09:54:41 +08:00
parent b85484e401 de6c6b8efd
commit cc494f3894
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/CaptureThread/MainDataGrabber.cpp
View File

@ -428,7 +428,7 @@ int CMainDataGrabber::GrabOnceFinished()
{ {
if (m_iFlagIsCapturing) if (m_iFlagIsCapturing)
{ {
qDebug() << "Fatal Thread Err."; qDebug() << "Fatal Warning.Last capture not finished.New acquisition will not start";
return 1000; return 1000;
} }
m_iFlagIsCapturing = 1; m_iFlagIsCapturing = 1;

4
source/CaptureThread/Scheduler.cpp
View File

@ -28,7 +28,7 @@ void Scheduler::Preheating()
#ifdef _DEBUG #ifdef _DEBUG
QThread::msleep(5000); QThread::msleep(5000);
#else #else
QThread::msleep(10000);//NEED TO CHANGE BEFOR HAND TO CUSTOM QThread::msleep(900000);//NEED TO CHANGE BEFOR HAND TO CUSTOM
#endif #endif
qDebug() << "Preheating Finished"; 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; 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(); //this->OnTimeCounter();
//emit &QTimer::timeout; //emit &QTimer::timeout;
} }

16
source/Settings/SystemConfigger.cpp
View File

@ -193,7 +193,21 @@
return 1; return 1;
} }
#else #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()) if (!m_struAcqTime.qtInterval.isValid())
{ {
qDebug() << "Invalid IntervalTime"; qDebug() << "Invalid IntervalTime";