整理了测试的基本采集逻辑;掉入了快门控制;下周需要写完数据格式保存功能以及在MainDataGrabber层的自动曝光功能

This commit is contained in:
2021-11-26 17:32:50 +08:00
parent 8bbd435518
commit 95da780693
17 changed files with 1961 additions and 44 deletions

View File

@ -1,19 +1,22 @@
#include "AbstractFSController.h"
CAbstractFSController::CAbstractFSController(QObject* parent /*= nullptr*/)
{
m_pFSCtrl = NULL;
m_iThreadID = -1;
m_iDeviceType = -1;
}
CAbstractFSController::~CAbstractFSController()
{
if (m_pFSCtrl!= 0 )
{
delete m_pFSCtrl;
}
}
int CAbstractFSController::SetRunParas(int iThreadID, int iDeviceType)
int CAbstractFSController::SetRunParas(int iThreadID, FSInfo fsInfo)
{
m_iThreadID = iThreadID;
m_iDeviceType = iDeviceType;
m_fsInfo = fsInfo;
return 0;
}
@ -21,12 +24,13 @@ int CAbstractFSController::SetRunParas(int iThreadID, int iDeviceType)
int CAbstractFSController::InitializeFSControl()
{
if (m_iThreadID == -1|| m_iDeviceTyp == -1)
using namespace ZZ_MISCDEF::IRIS;
if (m_iThreadID == -1/*|| m_iDeviceType == -1*/)
{
qDebug() << "Params Err. Call SetRunParas first";
return 1;
}
switch (m_iDeviceType)
switch (m_fsInfo.ucDeviceModel)
{
case DeviceModel::OSIFAlpha:
@ -35,12 +39,15 @@ int CAbstractFSController::InitializeFSControl()
break;
case DeviceModel::ISIF:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, NULL);
break;
case DeviceModel::IS1:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, NULL);
break;
case DeviceModel::IS2:
m_pFSCtrl = new ZZ_ATPControl_Serial_Qt;
m_pFSCtrl->Initialize(false, m_fsInfo.iInterface, NULL);
break;
default:
break;
@ -50,11 +57,18 @@ int CAbstractFSController::InitializeFSControl()
int CAbstractFSController::StartAcquisition()
{
//
qDebug() << "Starting acq" << " Thread ID:" << m_iThreadID;
QThread::msleep(5000);
qDebug() << "Stop acq" << " Thread ID:" << m_iThreadID;
emit SignalAcqFinished(m_iThreadID, 1);
return 0;
}
int CAbstractFSController::StopAcquisition()
{
return 0;
}