From f94173dba35bcde09a5a792f50496cf208406c47 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 1 Mar 2022 09:53:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=B1=8F=E8=94=BD=E4=BA=86IS1=E7=9A=84?= =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CaptureThread/AbstractFSController.cpp | 34 +++++++++++++------ source/FS/ATPControl_Serial_QT.cpp | 4 +-- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/source/CaptureThread/AbstractFSController.cpp b/source/CaptureThread/AbstractFSController.cpp index a16978e..84e9ba8 100644 --- a/source/CaptureThread/AbstractFSController.cpp +++ b/source/CaptureThread/AbstractFSController.cpp @@ -260,17 +260,16 @@ int CAbstractFSController::PerformAutoExposure() //} break; } - - iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime); - if (iRes != 0) - { - qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" << " Thread ID:" << m_iThreadID; - return 3; - } - else - { - qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID; - } + } + iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime); + if (iRes != 0) + { + qDebug() << "Err:PerformAutoExposure Failed.Exit Code:4" << " Thread ID:" << m_iThreadID; + return 3; + } + else + { + qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID; } fPredictedExposureTime = iExposureTime; qDebug() << "--------------------------Stop PerformAutoExposure" << " Thread ID:" << m_iThreadID; @@ -304,11 +303,24 @@ int CAbstractFSController::TakeSignalFrame() DataFrame CAbstractFSController::TakeOneFrame() { + using namespace ZZ_MISCDEF::IRIS; //int iExpTime = 0; DataFrame dfTemp; // m_pFSCtrl->GetExposureTime(iExpTime); // dfTemp.usExposureTimeInMS = iExpTime; // 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); if (iRes != 0) { diff --git a/source/FS/ATPControl_Serial_QT.cpp b/source/FS/ATPControl_Serial_QT.cpp index b75ff5b..f2127c5 100644 --- a/source/FS/ATPControl_Serial_QT.cpp +++ b/source/FS/ATPControl_Serial_QT.cpp @@ -731,11 +731,9 @@ int ZZ_ATPControl_Serial_Qt::SingleShot(DataFrame &dfData) // dfData.lData[i] = usData[i]; // } } - float fTemp; - GetDeviceTemperature(fTemp); dfData.usExposureTimeInMS = m_iExposureTime; - dfData.fTemperature = fTemp; + return 0; From 9da7bc31aa767a5fbab3c4b8ad026d8c4b0dff7a Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 1 Mar 2022 10:56:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E7=BD=91=E7=BB=9C=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=81=A2=E5=A4=8D=E4=BA=86=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Uploader/DataFileTransfer.cpp | 1 - source/Uploader/RadianceConverter.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/Uploader/DataFileTransfer.cpp b/source/Uploader/DataFileTransfer.cpp index 409aa69..5998ab5 100644 --- a/source/Uploader/DataFileTransfer.cpp +++ b/source/Uploader/DataFileTransfer.cpp @@ -51,7 +51,6 @@ int ZZ_HttpTransfer::SendData() qstrSend += /*"ExpTime:" +*/ QString("%1").arg(m_vecCalcedData[i][j].usExposureTimeInMS) + "##"; qstrSend += /*"Bands:" +*/ QString("%1").arg(m_vecCalcedData[i][j].iPixels) + "##"; qstrSend += /*"temp:" +*/ QString("%1").arg(m_vecCalcedData[i][j].fTemperature) + "##"; - //send qbSend.clear(); qbSend.append(qstrSend.toLatin1()); diff --git a/source/Uploader/RadianceConverter.cpp b/source/Uploader/RadianceConverter.cpp index 653a0f5..5468819 100644 --- a/source/Uploader/RadianceConverter.cpp +++ b/source/Uploader/RadianceConverter.cpp @@ -15,10 +15,10 @@ RadConverter::~RadConverter() int RadConverter::LoadCalibrationFrames(RunTimeGrabberParams struGrabberRTParams, vector> &struAllCalFrame) { /////param - //int iScanPoints = struGrabberRTParams.apsParams.iTotalPosition - 1; - //int iDevices = struGrabberRTParams.fscParams.ucDeviceNumber; - int iScanPoints = 4; - int iDevices = 1; + int iScanPoints = struGrabberRTParams.apsParams.iTotalPosition - 1; + int iDevices = struGrabberRTParams.fscParams.ucDeviceNumber; + //int iScanPoints = 4; + //int iDevices = 1; /////check dir QDir qdirPath(m_qstrCalFilePath); if (!qdirPath.exists())