1.修改了海阳光学光谱仪派生类,以支持暗像素信息的获取。

2.针对FLAME设备添加了新的实时暗背景扣除函数。
3.修改了部分系统执行逻辑,以支持FLAME的正确运行。
This commit is contained in:
2023-07-17 11:26:56 +08:00
parent 16d745ed5f
commit 3ce267dccf
19 changed files with 371 additions and 105 deletions

View File

@ -35,6 +35,7 @@ int CAbsFSController::Initialize()
printf("Flame Not Opened");
return 1;
}
GetDarkPixelIndices();
break;
case DeviceModel::OSIFAlpha:
m_pFSCtrl = new OceanOptics_lib;
@ -400,6 +401,27 @@ int CAbsFSController::CheckAndAdjust_Fast()
return 0;
}
int CAbsFSController::GetDarkPixelIndices()
{
m_vecDarkPixleIndices.clear();
if (m_struFSParam.ucDeviceModel == DeviceModel::FLAME)
{
m_vecDarkPixleIndices = ((OceanOptics_lib*)m_pFSCtrl)->m_vecDarkPixels;
}
//////////////////////////////////////////////////////////////////////////debug only
/*qDebug() << m_vecDarkPixleIndices.size();
qDebug() << ((OceanOptics_lib*)m_pFSCtrl)->m_vecDarkPixels.size();
for (int i=0;i< m_vecDarkPixleIndices.size();i++)
{
qDebug() << m_vecDarkPixleIndices[i];
}*/
//////////////////////////////////////////////////////////////////////////debug only
return 0;
}
void CAbsFSController::GetDeviceAttr(DeviceAttribute& struDeviceAttr)
{
struDeviceAttr = m_struDeviceAttr;