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

进一步完善采集流程，数据帧的生成以及传输完成度0.7

Browse Source
This commit is contained in:
zhangzhuo
2021-12-06 17:50:39 +08:00
parent 34451f2910
commit 3de7eb3da7
48 changed files with 486 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
source/Thread/MainDataGrabber.cpp
View File

@ -59,6 +59,12 @@ int CMainDataGrabber::SetGrabberParams(RunTimeGrabberParams struGrabberRTParams)
return 0;
}
int CMainDataGrabber::SetGrabberFileProcessor(DataFileProcessor &dfpSaver)
{
m_pdfpSaver = &dfpSaver;
return 0;
}
int CMainDataGrabber::InitThreadStatus()
{
if (m_piFlagCaptureThreadStatus_Signal!=NULL)
@ -95,6 +101,9 @@ int CMainDataGrabber::InitializeWorkers()
fsInfo.iInterface = m_struDeviceContext.iInterface[i];
fsInfo.ucDeviceModel = m_struDeviceContext.ucDeviceModel[i];
fsInfo.strSN = m_struDeviceContext.strSN[i];
fsInfo.fMaxFactor = m_struDeviceContext.fMaxFactor[i];
fsInfo.fMinFactor = m_struDeviceContext.fMinFactor[i];
fsInfo.lDepth = m_struDeviceContext.lDepth[i];
CAbstractFSController* m_pWorkThread = new CAbstractFSController;
m_pWorkThread->SetRunParas(i, fsInfo);
@ -282,40 +291,86 @@ int CMainDataGrabber::GrabOnceFinished()
int CMainDataGrabber::OnTimeCounter()
{
if (m_iFlagIsCapturing)
{
qDebug() << "-------------------------------------------busy";
return 0;
}
m_iFlagIsCapturing = 1;
if (m_iFlagIsCapturing)
{
qDebug() << "Fatal Thread Err.";
return 1000;
}
m_iFlagIsCapturing = 1;
m_struAcqPosSetting.iTotalPosition = 2;
//m_pdfpSaver->WriteDataFile();
for (ZZ_U8 i = 0; i < m_struDeviceContext.ucDeviceNumber; i++)
{
m_pControlThread[i]->ClearBuffer();
}
for (int i=0;i< m_struAcqPosSetting.iTotalPosition-1;i++)
{
////move to
m_struAcqPosSetting.iPosition[i + 1];
m_iFlagIsCapturing_Signal = 1;
emit SignalStartGrabOnce_Signal();
while (m_iFlagIsCapturing_Signal)
{
Delay_MSec(1000);
}
////move to
m_struAcqPosSetting.iPosition[0];
m_iFlagIsCapturing_Dark = 1;
emit SignalStartGrabOnce_Dark();
while (m_iFlagIsCapturing_Dark)
{
Delay_MSec(1000);
}
}
std::vector<DataFrame> test,test1;
for (ZZ_U8 i = 0; i < m_struDeviceContext.ucDeviceNumber; i++)
{
m_pControlThread[i]->GetBuffer(&test, &test1);
}
// qDebug() << "-------------------------------------------busy" << QTime::currentTime().toString();
// QThread::msleep(5000);
// return 0;
// if (m_iFlagIsCapturing)
// {
//
// }
// m_iFlagIsCapturing = 1;
//qDebug() << "-------------------------------------------return";
//return 1;
for (int i = 0; i < 5; i++)
{
m_iFlagIsCapturing_Signal = 1;
emit SignalStartGrabOnce_Signal();
while (m_iFlagIsCapturing_Signal)
{
Delay_MSec(1000);
//QThread::msleep(1000);
qDebug() << "msleep" << 1000;
}
m_iFlagIsCapturing_Dark = 1;
emit SignalStartGrabOnce_Dark();
while (m_iFlagIsCapturing_Dark)
{
Delay_MSec(1000);
//QThread::msleep(1000);
qDebug() << "msleep" << 1000;
}
}
qDebug() << "for quit";
emit SignalGrabOnceFinished();
// for (int i = 0; i < 5; i++)
// {
// m_iFlagIsCapturing_Signal = 1;
// emit SignalStartGrabOnce_Signal();
// while (m_iFlagIsCapturing_Signal)
// {
// //Delay_MSec(1000);
// QThread::msleep(100);
// QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
// //qDebug() << "msleep" << 1000;
// }
//
// m_iFlagIsCapturing_Dark = 1;
// emit SignalStartGrabOnce_Dark();
// while (m_iFlagIsCapturing_Dark)
// {
// Delay_MSec(1000);
// QThread::msleep(100);
// QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
// //qDebug() << "msleep" << 1000;
// }
//
// }
// qDebug() << "for quit";
//
//
// emit SignalGrabOnceFinished();
return 0;
}