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

1.修改了线程未结束时，试图再入的警告提示信息。2.将预热时间改为了固定的15min 3.现在采集间隔将按照网页设置的执行，而非调试时固定的5s。网页上单位为分钟，不允许出现1位数字，需要补零。例如5分钟间隔应该写为05。

Browse Source
This commit is contained in:
zhangzhuo
2022-02-23 11:31:36 +08:00
parent 200fda19dc
commit 4e5168d513
2 changed files with 3 additions and 3 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;
} }