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

Merge remote-tracking branch 'origin/zhangzhuo'

Browse Source
This commit is contained in:
xin
2022-03-01 10:59:17 +08:00
parent 90e9c23596 9da7bc31aa
commit 017d69fdeb
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/CaptureThread/AbstractFSController.cpp
View File

@ -260,7 +260,7 @@ int CAbstractFSController::PerformAutoExposure()
//} //}
break; break;
} }
}
iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime); iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
if (iRes != 0) if (iRes != 0)
{ {
@ -271,7 +271,6 @@ int CAbstractFSController::PerformAutoExposure()
{ {
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;
//emit SignalAcqFinished(m_iThreadID, 1); //emit SignalAcqFinished(m_iThreadID, 1);
@ -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;

1
source/Uploader/DataFileTransfer.cpp
View File

@ -51,7 +51,6 @@ int ZZ_HttpTransfer::SendData()
qstrSend += /*"ExpTime:" +*/ QString("%1").arg(m_vecCalcedData[i][j].usExposureTimeInMS) + "##"; qstrSend += /*"ExpTime:" +*/ QString("%1").arg(m_vecCalcedData[i][j].usExposureTimeInMS) + "##";
qstrSend += /*"Bands:" +*/ QString("%1").arg(m_vecCalcedData[i][j].iPixels) + "##"; qstrSend += /*"Bands:" +*/ QString("%1").arg(m_vecCalcedData[i][j].iPixels) + "##";
qstrSend += /*"temp:" +*/ QString("%1").arg(m_vecCalcedData[i][j].fTemperature) + "##"; qstrSend += /*"temp:" +*/ QString("%1").arg(m_vecCalcedData[i][j].fTemperature) + "##";
//send //send
qbSend.clear(); qbSend.clear();
qbSend.append(qstrSend.toLatin1()); qbSend.append(qstrSend.toLatin1());

8
source/Uploader/RadianceConverter.cpp
View File

@ -15,10 +15,10 @@ RadConverter::~RadConverter()
int RadConverter::LoadCalibrationFrames(RunTimeGrabberParams struGrabberRTParams, vector<vector<CalFrame>> &struAllCalFrame) int RadConverter::LoadCalibrationFrames(RunTimeGrabberParams struGrabberRTParams, vector<vector<CalFrame>> &struAllCalFrame)
{ {
/////param /////param
//int iScanPoints = struGrabberRTParams.apsParams.iTotalPosition - 1; int iScanPoints = struGrabberRTParams.apsParams.iTotalPosition - 1;
//int iDevices = struGrabberRTParams.fscParams.ucDeviceNumber; int iDevices = struGrabberRTParams.fscParams.ucDeviceNumber;
int iScanPoints = 4; //int iScanPoints = 4;
int iDevices = 1; //int iDevices = 1;
/////check dir /////check dir
QDir qdirPath(m_qstrCalFilePath); QDir qdirPath(m_qstrCalFilePath);
if (!qdirPath.exists()) if (!qdirPath.exists())