mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-12-16 19:43:32 +08:00
v2.1.3
This commit is contained in:
@ -562,6 +562,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
|
||||
// m_struAcqPosSetting.iPosition[i + 1];
|
||||
m_iFlagIsCapturing_Signal = 1;
|
||||
|
||||
emit SignalStartGrabOnce_Signal();
|
||||
while (m_iFlagIsCapturing_Signal)
|
||||
{
|
||||
@ -596,6 +597,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
|
||||
//m_struAcqPosSetting.iPosition[0];
|
||||
m_iFlagIsCapturing_Dark = 1;
|
||||
// todo : 机载时是否有实时采集暗电流
|
||||
emit SignalStartGrabOnce_Dark();
|
||||
while (m_iFlagIsCapturing_Dark)
|
||||
{
|
||||
@ -619,6 +621,9 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
}
|
||||
|
||||
std::vector<std::vector<DataFrame>> vecData;
|
||||
bool savedarkfile=true;
|
||||
|
||||
std::vector<std::vector<DataFrame>> vecDarkData;
|
||||
|
||||
for (ZZ_U8 i = 0; i < m_struDeviceContext.ucDeviceNumber; i++)
|
||||
{
|
||||
@ -629,6 +634,10 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
SubDataFrame(vecSignal[j], vecDark[j], m_struDeviceContext.usPixels[i]);
|
||||
}
|
||||
vecData.push_back(vecSignal);
|
||||
if (savedarkfile) {
|
||||
vecDarkData.push_back(vecDark);
|
||||
}
|
||||
|
||||
qDebug() << "ucDeviceNumber" << i << " Data Size" << vecSignal.size();
|
||||
//vecData[i].push_back();
|
||||
}
|
||||
@ -639,8 +648,15 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
m_pmduUploader->SetData(vecData);
|
||||
emit SignalPushOneDataFrame();
|
||||
m_pdfpSaver->SetData(vecData);
|
||||
if (savedarkfile) {
|
||||
m_pdfpSaver->SetDarkData(vecDarkData);
|
||||
|
||||
}
|
||||
qDebug() << "Thread Data Server: WriteDataFile Called";
|
||||
m_pdfpSaver->WriteDataFile();
|
||||
if (savedarkfile) {
|
||||
m_pdfpSaver->WriteDarkDataFile();
|
||||
}
|
||||
}
|
||||
|
||||
m_iFlagIsCapturing = 0;
|
||||
|
||||
Reference in New Issue
Block a user