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

进一步完善采集流程，数据帧的生成以及传输完成度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

205
source/Thread/AbstractFSController.cpp
View File

@ -1,8 +1,11 @@
#include "AbstractFSController.h"
#include "ZZ_Math_HDRONLY.h"
CAbstractFSController::CAbstractFSController(QObject* parent /*= nullptr*/)
{
m_pFSCtrl = NULL;
m_iThreadID = -1;
m_vecDataFrameDark.clear();
m_vecDataFrameSignal.clear();
}
CAbstractFSController::~CAbstractFSController()
@ -42,11 +45,11 @@ int CAbstractFSController::InitializeFSControl()
break;
case DeviceModel::OSIFBeta:
m_pFSCtrl = new OceanOptics_lib;
// if (m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, m_fsInfo.strSN) !=0)
// {
// qDebug() << "OSIFBeta Not Opened";
// return 2;
// }
if (m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, m_fsInfo.strSN) !=0)
{
qDebug() << "OSIFBeta Not Opened";
return 2;
}
break;
case DeviceModel::ISIF:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
@ -78,36 +81,202 @@ int CAbstractFSController::InitializeFSControl()
default:
break;
}
int iRes = m_pFSCtrl->GetDeviceAttribute(m_daDeviceAttr);
if (iRes !=0 )
{
qDebug() << "GetDeviceAttribute Failed"<< iRes;
return 4;
}
return 0;
}
int CAbstractFSController::PerformAutoExposure()
{
qDebug() << "Starting PerformAutoExposure" << " Thread ID:" << m_iThreadID;
QThread::msleep(5000);
qDebug() << "Stop PerformAutoExposure" << " Thread ID:" << m_iThreadID;
qDebug() << "--------------------------Starting PerformAutoExposure" << " Thread ID:" << m_iThreadID;
using namespace ZZ_MATH;
float fPredictedExposureTime;
int iDeviceDepth = (int)m_fsInfo.lDepth;
bool bFlagIsOverTrying = false;
bool bFlagIsLowerMinExposureTime = false;
bool bFlagIsOverMaxExposureTime = false;
bool bFlagIsAutoExposureOK = false;
bool bFlagIsAutoExposureFailed = false;
bool bIsValueOverflow = false;
bool bIsLastValueOverflow = false;
int iExposureTime = 0;
float fTempExposureTime = 0;
double fLastExposureTime = 0.1;
int iRepeatCount = 0;
//int iRes = m_pFSCtrl->SetExposureTime(1000);//need change to load from files
int iRes = 0;
if (iRes != 0)
{
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:1";
return 1;
}
while (!bFlagIsAutoExposureOK && !bFlagIsAutoExposureFailed)
{
DataFrame dfTemp;
if (iRepeatCount++ > 30)
{
bFlagIsAutoExposureFailed = true;
bFlagIsOverTrying = true;
break;
}
//m_pFSCtrl->SetExposureTime(5000);
m_pFSCtrl->GetExposureTime(iExposureTime);
//m_pFSCtrl->SetExposureTime(2500);
//fExposureTime = (float)m_daDeviceAttr.iMinIntegrationTimeInMS;
fTempExposureTime = iExposureTime;
iRes = m_pFSCtrl->SingleShot(dfTemp);
//iRes = m_pFSCtrl->SingleShot(dfTemp);
if (iRes != 0)
{
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:2";
return 2;
}
HeapSort(dfTemp.usData, m_daDeviceAttr.iPixels);
double dSum = 0;
int iCount = m_daDeviceAttr.iPixels / 100;
for (int i = 0; i < iCount; i++)
{
dSum += dfTemp.usData[i];
}
double dTemp = dSum / iCount;
if (dTemp >= iDeviceDepth * 0.99)
{
bIsValueOverflow = true;
if (!bIsLastValueOverflow)
{
iExposureTime = (float)(fLastExposureTime + iExposureTime) / 2;
}
else
{
iExposureTime = iExposureTime / 2;
}
}
else if (iDeviceDepth * m_fsInfo.fMaxFactor >= dTemp && dTemp >= iDeviceDepth * m_fsInfo.fMinFactor)
{
bFlagIsAutoExposureOK = 1;
}
else if (dTemp > iDeviceDepth * m_fsInfo.fMaxFactor)
{
bIsValueOverflow = true;
if (!bIsLastValueOverflow)
{
iExposureTime = (float)(fLastExposureTime + iExposureTime) / 2;
}
else
{
iExposureTime = iExposureTime * 3 / 4;
}
}
else if (dTemp < iDeviceDepth * m_fsInfo.fMinFactor)
{
bIsValueOverflow = false;
if (bIsLastValueOverflow)
{
iExposureTime = (float)(fLastExposureTime + iExposureTime) / 2;
}
else
{
double dFactor;
dFactor = dTemp / (iDeviceDepth * m_fsInfo.fMaxFactor);
iExposureTime = (float)(iExposureTime / dFactor);
}
if (/*fExposureTime > 100 || */iExposureTime < 10)
{
bFlagIsAutoExposureOK = false;
bFlagIsAutoExposureFailed = true;
bFlagIsLowerMinExposureTime = true;
}
}
bIsLastValueOverflow = bIsValueOverflow;
fLastExposureTime = fTempExposureTime;
if (iExposureTime > 30000)
{
bFlagIsAutoExposureOK = false;
bFlagIsAutoExposureFailed = true;
float fPredictedExposureTime = 30000;
iRes = m_pFSCtrl->SetExposureTime(30000);
if (iRes != 0)
{
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3";
return 3;
}
bFlagIsOverMaxExposureTime = true;
break;
}
iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
if (iRes != 0)
{
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4";
return 3;
}
else
{
qDebug() << "Success:PerformAutoExposure. Value"<< iExposureTime;
}
}
fPredictedExposureTime = iExposureTime;
qDebug() << "--------------------------Stop PerformAutoExposure" << " Thread ID:" << m_iThreadID;
//emit SignalAcqFinished(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::TakeDarkFrame()
{
qDebug() << "Starting TakeDarkFrame" << " Thread ID:" << m_iThreadID;
QThread::msleep(1000);
m_vecDataFrameDark.push_back(TakeOneFrame());
qDebug() << "Stop TakeDarkFrame" << " Thread ID:" << m_iThreadID;
//emit SignalAcqFinished(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::TakeSignal()
int CAbstractFSController::TakeSignalFrame()
{
qDebug() << "Starting TakeSignal" << " Thread ID:" << m_iThreadID;
QThread::msleep(5000);
m_vecDataFrameSignal.push_back(TakeOneFrame());
qDebug() << "Stop TakeSignal" << " Thread ID:" << m_iThreadID;
//emit SignalAcqFinished(m_iThreadID, 1);
return 0;
}
DataFrame CAbstractFSController::TakeOneFrame()
{
DataFrame dfTemp;
int iRes = m_pFSCtrl->SingleShot(dfTemp);
if (iRes != 0)
{
qDebug() << "Err. SingleShot" << " Thread ID:" << m_iThreadID;
}
return dfTemp;
}
int CAbstractFSController::SaveDataFile()
{
return 0;
@ -123,7 +292,7 @@ int CAbstractFSController::StartAcquisitionSignal()
// m_pFSCtrl->GetExposureTime(iii);
// m_pFSCtrl->SingleShot(struDF);
PerformAutoExposure();
TakeSignal();
TakeSignalFrame();
qDebug() << "Stop acq Signal" << " Thread ID:" << m_iThreadID;
emit SignalAcqFinished_Signal(m_iThreadID, 1);
@ -145,5 +314,17 @@ int CAbstractFSController::StopAcquisition()
return 0;
}
int CAbstractFSController::ClearBuffer()
{
m_vecDataFrameDark.clear();
m_vecDataFrameSignal.clear();
return 0;
}
int CAbstractFSController::GetBuffer(std::vector<DataFrame> *pvecDataFrameDark, std::vector<DataFrame> *pvecDataFrameSignal)
{
pvecDataFrameDark = &m_vecDataFrameDark;
pvecDataFrameSignal = &m_vecDataFrameSignal;
return 0;
}

16
source/Thread/AbstractFSController.h
View File

@ -3,12 +3,16 @@
#include "ATPControl_Serial_QT.h"
#include "OControl_USB.h"
#include <atomic>
#include <vector>
typedef struct tagFSInfo
{
ZZ_U8 ucDeviceModel;
int iInterface;
std::string strSN;
long lDepth;
float fMinFactor;
float fMaxFactor;
}FSInfo;
class CAbstractFSController :public QObject
@ -30,18 +34,24 @@ private:
CIrisFSBase *m_pFSCtrl;
int m_iThreadID;
FSInfo m_fsInfo;
DataFrame m_dfDark,m_dfSignal;
//DataFrame m_dfDark,m_dfSignal;
std::vector<DataFrame> m_vecDataFrameDark, m_vecDataFrameSignal;
DeviceAttribute m_daDeviceAttr;
private:
int PerformAutoExposure();
int TakeDarkFrame();
int TakeSignal();
int TakeSignalFrame();
DataFrame TakeOneFrame();
int SaveDataFile();
public slots:
virtual int StartAcquisitionSignal();
virtual int StartAcquisitionDark();
virtual int StopAcquisition();
virtual int ClearBuffer();
virtual int GetBuffer(std::vector<DataFrame> *pvecDataFrameDark, std::vector<DataFrame> *pvecDataFrameSignal);
signals:
void SignalAcqStarted();

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

5
source/Thread/MainDataGrabber.h
View File

@ -2,6 +2,7 @@
#include"pch.h"
#include <vector>
#include "AbstractFSController.h"
#include "DataFileProcessor.h"
using namespace std;
using namespace ZZ_MISCDEF::ZZ_RUNPARAMS;
@ -26,7 +27,8 @@ private:
int m_iFlagIsCapturing_Signal;
int m_iFlagIsCapturing_Dark;
DataFileProcessor* m_pdfpSaver;
FSContext m_struDeviceContext;
LSContext m_struLinearShutterContext;
AcqPosSettings m_struAcqPosSetting;
@ -39,6 +41,7 @@ private:
public:
//Call this first
int SetGrabberParams(RunTimeGrabberParams struGrabberRTParams);
int SetGrabberFileProcessor(DataFileProcessor &dfpSaver);
int InitThreadStatus();
int InitializeWorkers();