xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-19 11:49:42 +08:00
Code Issues Projects Releases Wiki Activity

1.屏蔽了IS1的温度获取

Browse Source
This commit is contained in:
zhangzhuo
2022-03-01 09:53:11 +08:00
committed by xin
parent a25d4eb86d
commit 5471807a40
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/CaptureThread/AbstractFSController.cpp
View File

@ -260,17 +260,16 @@ int CAbstractFSController::PerformAutoExposure()
//} //}
break; break;
} }
}
iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime); iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
if (iRes != 0) if (iRes != 0)
{ {
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" << " Thread ID:" << m_iThreadID; qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" << " Thread ID:" << m_iThreadID;
return 3; return 3;
} }
else else
{ {
qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID; qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID;
}
} }
fPredictedExposureTime = iExposureTime; fPredictedExposureTime = iExposureTime;
qDebug() << "--------------------------Stop PerformAutoExposure" << " Thread ID:" << m_iThreadID; qDebug() << "--------------------------Stop PerformAutoExposure" << " Thread ID:" << m_iThreadID;
@ -304,11 +303,24 @@ int CAbstractFSController::TakeSignalFrame()
DataFrame CAbstractFSController::TakeOneFrame() DataFrame CAbstractFSController::TakeOneFrame()
{ {
using namespace ZZ_MISCDEF::IRIS;
//int iExpTime = 0; //int iExpTime = 0;
DataFrame dfTemp; DataFrame dfTemp;
// m_pFSCtrl->GetExposureTime(iExpTime); // m_pFSCtrl->GetExposureTime(iExpTime);
// dfTemp.usExposureTimeInMS = iExpTime; // dfTemp.usExposureTimeInMS = iExpTime;
// m_pFSCtrl->GetDeviceTemperature(dfTemp.fTemperature); // m_pFSCtrl->GetDeviceTemperature(dfTemp.fTemperature);
if (m_fsInfo.ucDeviceModel== DeviceModel::ISIF)
{
float fTemp;
m_pFSCtrl->GetDeviceTemperature(fTemp);
dfTemp.fTemperature = fTemp;
}
else if(m_fsInfo.ucDeviceModel == DeviceModel::IS1)
{
dfTemp.fTemperature = 0;
}
int iRes = m_pFSCtrl->SingleShot(dfTemp); int iRes = m_pFSCtrl->SingleShot(dfTemp);
if (iRes != 0) if (iRes != 0)
{ {

4
source/FS/ATPControl_Serial_QT.cpp
View File

@ -731,11 +731,9 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData)
// dfData.lData[i] = usData[i]; // dfData.lData[i] = usData[i];
// } // }
} }
float fTemp;
GetDeviceTemperature(fTemp);
dfData.usExposureTimeInMS = m_iExposureTime; dfData.usExposureTimeInMS = m_iExposureTime;
dfData.fTemperature = fTemp;
return 0; return 0;