xin/TowerOptoSifAndSpectral
1
0
Fork 1
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-12-16 03:23:32 +08:00
Code Issues Projects Releases Wiki Activity

主采集逻辑修改中，添加了部分写文件实现

Browse Source
This commit is contained in:
zhangzhuo
2021-12-02 18:07:29 +08:00
parent 95da780693
commit efbcde38d7
403 changed files with 26857 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
source/Thread/AbstractFSController.cpp
View File

@ -33,21 +33,47 @@ int CAbstractFSController::InitializeFSControl()
switch (m_fsInfo.ucDeviceModel)
{
case DeviceModel::OSIFAlpha:
m_pFSCtrl = new OceanOptics_lib;
if (m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, m_fsInfo.strSN) != 0)
{
qDebug() << "OSIFAlpha Not Opened";
return 2;
}
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;
// }
break;
case DeviceModel::ISIF:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, NULL);
if (m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, m_fsInfo.strSN) != 0)
{
qDebug() << "ISIF Not Opened";
return 3;
}
break;
case DeviceModel::IS1:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, NULL);
if (m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, m_fsInfo.strSN) != 0)
{
qDebug() << "IS1 Not Opened";
return 3;
}
break;
case DeviceModel::IS2:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, NULL);
if (m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, m_fsInfo.strSN) != 0)
{
qDebug() << "IS2 Not Opened";
return 3;
}
break;
default:
break;
@ -55,20 +81,69 @@ int CAbstractFSController::InitializeFSControl()
return 0;
}
int CAbstractFSController::StartAcquisition()
int CAbstractFSController::PerformAutoExposure()
{
qDebug() << "Starting PerformAutoExposure" << " Thread ID:" << m_iThreadID;
QThread::msleep(5000);
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);
qDebug() << "Stop TakeDarkFrame" << " Thread ID:" << m_iThreadID;
//emit SignalAcqFinished(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::TakeSignal()
{
qDebug() << "Starting TakeSignal" << " Thread ID:" << m_iThreadID;
QThread::msleep(5000);
qDebug() << "Stop TakeSignal" << " Thread ID:" << m_iThreadID;
//emit SignalAcqFinished(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::SaveDataFile()
{
return 0;
}
int CAbstractFSController::StartAcquisitionSignal()
{
//
qDebug() << "Starting acq" << " Thread ID:" << m_iThreadID;
QThread::msleep(5000);
qDebug() << "Stop acq" << " Thread ID:" << m_iThreadID;
emit SignalAcqFinished(m_iThreadID, 1);
qDebug() << "Starting acq Signal" << " Thread ID:" << m_iThreadID;
// DataFrame struDF;
// int iii;
// m_pFSCtrl->SetExposureTime(10000000);
// m_pFSCtrl->GetExposureTime(iii);
// m_pFSCtrl->SingleShot(struDF);
PerformAutoExposure();
TakeSignal();
qDebug() << "Stop acq Signal" << " Thread ID:" << m_iThreadID;
emit SignalAcqFinished_Signal(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::StartAcquisitionDark()
{
qDebug() << "Starting acq Dark" << " Thread ID:" << m_iThreadID;
TakeDarkFrame();
qDebug() << "Stop acq Dark"<< " Thread ID:" << m_iThreadID;
emit SignalAcqFinished_Dark(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::StopAcquisition()
{
return 0;
}

16
source/Thread/AbstractFSController.h
View File

@ -1,6 +1,7 @@
#pragma once
#include "pch.h"
#include "ATPControl_Serial_QT.h"
#include "OControl_USB.h"
#include <atomic>
typedef struct tagFSInfo
@ -23,16 +24,27 @@ public:
//create derived class from base class
virtual int InitializeFSControl();
DataFrame GetLastDataFrame();
private:
CIrisFSBase *m_pFSCtrl;
int m_iThreadID;
FSInfo m_fsInfo;
DataFrame m_dfDark,m_dfSignal;
private:
int PerformAutoExposure();
int TakeDarkFrame();
int TakeSignal();
int SaveDataFile();
public slots:
virtual int StartAcquisition();
virtual int StartAcquisitionSignal();
virtual int StartAcquisitionDark();
virtual int StopAcquisition();
signals:
void SignalAcqStarted();
void SignalAcqFinished(int iThreadID, int iFlagStatus);
void SignalAcqFinished_Signal(int iThreadID, int iFlagStatus);
void SignalAcqFinished_Dark (int iThreadID, int iFlagStatus);
};

170
source/Thread/MainDataGrabber.cpp
View File

@ -2,7 +2,10 @@
CMainDataGrabber::CMainDataGrabber(QObject* parent /*= nullptr*/)
{
m_piFlagCaptureThreadStatus = NULL;
m_piFlagCaptureThreadStatus_Signal = NULL;
m_piFlagCaptureThreadStatus_Dark = NULL;
m_GrabTimer = new QTimer(this);
m_iFlagIsCapturing = false;
}
CMainDataGrabber::~CMainDataGrabber()
@ -16,9 +19,21 @@ CMainDataGrabber::~CMainDataGrabber()
}
m_pControlThread.clear();
if (m_piFlagCaptureThreadStatus!=NULL)
if (m_piFlagCaptureThreadStatus_Signal!=NULL)
{
delete m_piFlagCaptureThreadStatus;
delete m_piFlagCaptureThreadStatus_Signal;
}
if (m_piFlagCaptureThreadStatus_Dark != NULL)
{
delete m_piFlagCaptureThreadStatus_Dark;
}
if (m_GrabTimer!=NULL)
{
m_GrabTimer->stop();
delete m_GrabTimer;
}
}
@ -26,20 +41,34 @@ int CMainDataGrabber::SetGrabberParams(RunTimeGrabberParams struGrabberRTParams)
{
m_struAcqTime = struGrabberRTParams.atsParams;
m_struDeviceContext = struGrabberRTParams.fscParams;
m_struAcqPosSetting = struGrabberRTParams.apsParams;
m_struLinearShutterContext = struGrabberRTParams.lscParam;
m_iTotalThreads = m_struDeviceContext.ucDeviceNumber;
return 0;
}
int CMainDataGrabber::InitThreadStatus()
{
if (m_piFlagCaptureThreadStatus!=NULL)
if (m_piFlagCaptureThreadStatus_Signal!=NULL)
{
delete m_piFlagCaptureThreadStatus;
delete m_piFlagCaptureThreadStatus_Signal;
}
m_piFlagCaptureThreadStatus = new int[m_iTotalThreads];
m_piFlagCaptureThreadStatus_Signal = new int[m_iTotalThreads];
for (int i = 0; i < m_iTotalThreads; i++)
{
m_piFlagCaptureThreadStatus[i] = 0;
m_piFlagCaptureThreadStatus_Signal[i] = 0;
}
if (m_piFlagCaptureThreadStatus_Dark != NULL)
{
delete m_piFlagCaptureThreadStatus_Dark;
}
m_piFlagCaptureThreadStatus_Dark = new int[m_iTotalThreads];
for (int i = 0; i < m_iTotalThreads; i++)
{
m_piFlagCaptureThreadStatus_Dark[i] = 0;
}
return 0;
}
@ -48,7 +77,8 @@ int CMainDataGrabber::InitializeWorkers()
{
for (ZZ_U8 i = 0; i < m_struDeviceContext.ucDeviceNumber; i++)
{
m_piFlagCaptureThreadStatus[i] = 0;
m_piFlagCaptureThreadStatus_Signal[i] = 0;
m_piFlagCaptureThreadStatus_Dark[i] = 0;
FSInfo fsInfo;
fsInfo.iInterface = m_struDeviceContext.iInterface[i];
@ -57,7 +87,7 @@ int CMainDataGrabber::InitializeWorkers()
CAbstractFSController* m_pWorkThread = new CAbstractFSController;
m_pWorkThread->SetRunParas(i, fsInfo);
//m_pWorkThread->InitializeFSControl();
m_pWorkThread->InitializeFSControl();
m_pControlThread.push_back(m_pWorkThread);
}
return 0;
@ -82,23 +112,56 @@ int CMainDataGrabber::SetupMsgPipelines()
for (ZZ_U8 i = 0; i < m_struDeviceContext.ucDeviceNumber; i++)
{
connect(this, &CMainDataGrabber::SignalStartGrabOnce, m_pControlThread[i], &CAbstractFSController::StartAcquisition);
connect(m_pControlThread[i], &CAbstractFSController::SignalAcqFinished, this, &CMainDataGrabber::HandleThreadEvent);
connect(this, &CMainDataGrabber::SignalStartGrabOnce_Signal, m_pControlThread[i], &CAbstractFSController::StartAcquisitionSignal);
connect(this, &CMainDataGrabber::SignalStartGrabOnce_Dark, m_pControlThread[i], &CAbstractFSController::StartAcquisitionDark);
connect(m_pControlThread[i], &CAbstractFSController::SignalAcqFinished_Signal, this, &CMainDataGrabber::HandleThreadEvent_Signal);
connect(m_pControlThread[i], &CAbstractFSController::SignalAcqFinished_Dark, this, &CMainDataGrabber::HandleThreadEvent_Dark);
}
connect(this, &CMainDataGrabber::SignalGrabOnceFinished, this, &CMainDataGrabber::GrabFinished);
connect(this, &CMainDataGrabber::SignalGrabOnceFinished, this, &CMainDataGrabber::GrabOnceFinished);
connect(m_GrabTimer, &QTimer::timeout, this, &CMainDataGrabber::OnTimeCounter);
connect(this, &CMainDataGrabber::SignalStartGrab, this, &CMainDataGrabber::StartGrabTimer);
return 0;
}
int CMainDataGrabber::HandleThreadEvent(int iThreadID, int iFlagStatus)
int CMainDataGrabber::StartGrab()
{
m_piFlagCaptureThreadStatus[iThreadID] = iFlagStatus;
emit SignalStartGrab();
return 0;
}
int CMainDataGrabber::HandleThreadEvent_Signal(int iThreadID, int iFlagStatus)
{
m_piFlagCaptureThreadStatus_Signal[iThreadID] = iFlagStatus;
bool bFinished = true;
for (int i = 0; i < m_iTotalThreads; i++)
{
if (m_piFlagCaptureThreadStatus[i] != 1)
if (m_piFlagCaptureThreadStatus_Signal[i] != 1)
{
bFinished = false;
break;
}
}
if (bFinished)
{
emit SignalStartGrabOnce_Dark();
}
return 0;
}
int CMainDataGrabber::HandleThreadEvent_Dark(int iThreadID, int iFlagStatus)
{
m_piFlagCaptureThreadStatus_Dark[iThreadID] = iFlagStatus;
bool bFinished = true;
for (int i = 0; i < m_iTotalThreads; i++)
{
if (m_piFlagCaptureThreadStatus_Dark[i] != 1)
{
bFinished = false;
break;
@ -112,29 +175,74 @@ int CMainDataGrabber::HandleThreadEvent(int iThreadID, int iFlagStatus)
return 0;
}
int CMainDataGrabber::StartGrab()
int CMainDataGrabber::StartGrabTimer()
{
m_iFlagIsCapturing = true;
emit SignalStartGrabOnce();
while (m_iFlagIsCapturing)
{
QThread::msleep(1000);
}
//////////////////////////////////////////////////////////////////////////start
////check start time
// bool bStopWait = false;
// while (!bStopWait)
// {
// QTime qtTime = QTime::currentTime();
// if (m_struAcqTime.qtStartTime >= qtTime && qtTime<m_struAcqTime.qtStopTime)
// {
// bStopWait = true;
// }
// }
m_iFlagIsCapturing = true;
InitThreadStatus();
emit SignalStartGrabOnce();
while (m_iFlagIsCapturing)
{
QThread::msleep(1000);
}
qDebug() << "Allgrab stopped" << " Thread ID:" <<2;
////start
int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000;
m_GrabTimer->start(iIntervalInMS);
//////////////////////////////////////////////////////////////////////////test
// m_iFlagIsCapturing = true;
// emit SignalStartGrabOnce();
// while (m_iFlagIsCapturing)
// {
// QThread::msleep(1000);
// }
//
// m_iFlagIsCapturing = true;
// InitThreadStatus();
// emit SignalStartGrabOnce();
// while (m_iFlagIsCapturing)
// {
// QThread::msleep(1000);
// }
// qDebug() << "Allgrab stopped" << " Thread ID:" <<2;
return 0;
}
int CMainDataGrabber::GrabFinished()
int CMainDataGrabber::GrabOnceFinished()
{
m_iFlagIsCapturing = false;
return 0;
}
int CMainDataGrabber::OnTimeCounter()
{
if (m_iFlagIsCapturing)
{
qDebug() << "busy";
return 0;
}
m_iFlagIsCapturing = true;
m_struAcqPosSetting.iTotalPosition = 5;
emit SignalStartGrabOnce_Signal();
for (int i=0;i< m_struAcqPosSetting.iTotalPosition;i++)
{
m_iFlagIsCapturing = true;
while (m_iFlagIsCapturing)
{
QThread::msleep(1000);
}
}
return 0;
}

33
source/Thread/MainDataGrabber.h
View File

@ -17,13 +17,19 @@ private:
vector<CAbstractFSController *> m_pControlThread;
vector<QThread* > m_pqThreadHolder;
int *m_piFlagCaptureThreadStatus;
int *m_piFlagCaptureThreadStatus_Signal;
int *m_piFlagCaptureThreadStatus_Dark;
int m_iTotalThreads;
int m_iFlagIsCapturing;
AcqTimeSettings m_struAcqTime;
FSContext m_struDeviceContext;
FSContext m_struDeviceContext;
LSContext m_struLinearShutterContext;
AcqPosSettings m_struAcqPosSetting;
AcqTimeSettings m_struAcqTime;
QTimer *m_GrabTimer;
public:
//Call this first
@ -32,17 +38,24 @@ public:
int InitThreadStatus();
int InitializeWorkers();
int StartWorkers();
int SetupMsgPipelines();
public slots:
int HandleThreadEvent(int iThreadID, int iFlagStatus);
int StartGrab();
int GrabFinished();
public slots:
int HandleThreadEvent_Signal(int iThreadID, int iFlagStatus);
int HandleThreadEvent_Dark(int iThreadID, int iFlagStatus);
int StartGrabTimer();
int GrabOnceFinished();
int OnTimeCounter();
signals:
void SignalStartGrabOnce();
void SignalStopGrab();
void SignalStartGrabOnce_Signal();
void SignalStartGrabOnce_Dark();
void SignalGrabOnceFinished();
void SignalStopGrab();
void SignalStartGrab();
};