diff --git a/Cal/FS1_P1.dat b/Cal/FS1_P1.dat index caaf7bb..9738aef 100644 Binary files a/Cal/FS1_P1.dat and b/Cal/FS1_P1.dat differ diff --git a/Cal/FS1_P2.dat b/Cal/FS1_P2.dat index caaf7bb..9738aef 100644 Binary files a/Cal/FS1_P2.dat and b/Cal/FS1_P2.dat differ diff --git a/Cal/FS1_P3.dat b/Cal/FS1_P3.dat index caaf7bb..9738aef 100644 Binary files a/Cal/FS1_P3.dat and b/Cal/FS1_P3.dat differ diff --git a/Cal/FS1_P4.dat b/Cal/FS1_P4.dat index caaf7bb..9738aef 100644 Binary files a/Cal/FS1_P4.dat and b/Cal/FS1_P4.dat differ diff --git a/Cal/FS2_P1.dat b/Cal/FS2_P1.dat new file mode 100644 index 0000000..caaf7bb Binary files /dev/null and b/Cal/FS2_P1.dat differ diff --git a/Cal/FS2_P2.dat b/Cal/FS2_P2.dat new file mode 100644 index 0000000..caaf7bb Binary files /dev/null and b/Cal/FS2_P2.dat differ diff --git a/Cal/FS2_P3.dat b/Cal/FS2_P3.dat new file mode 100644 index 0000000..caaf7bb Binary files /dev/null and b/Cal/FS2_P3.dat differ diff --git a/Cal/FS2_P4.dat b/Cal/FS2_P4.dat new file mode 100644 index 0000000..caaf7bb Binary files /dev/null and b/Cal/FS2_P4.dat differ diff --git a/main.cpp b/main.cpp index 8adb3f1..6794c58 100644 --- a/main.cpp +++ b/main.cpp @@ -47,11 +47,6 @@ int main(int argc, char *argv[]) //////////////////////////////////////////////////////////////////////////logger ///create main system logger //QT_LOG::ZZ_InitLogger("/home/data/Log/"); - - - //m_test123; - //m_test123.Initialize("COM11"); - //m_test123.GetHumiture(fTemp, fHum); //////////////////////////////////////////////////////////////////////////config ///turn on power supply system("gpio write 1 1");//设备上电 @@ -70,6 +65,7 @@ int main(int argc, char *argv[]) m_dfpSaver.SetManmadeEnviromentalContext(m_struMEC); m_mduUploader.SetContext(m_struEC, m_struMEC); + m_mduUploader.Initialize(); //m_ctrlHumitureDetector.Initialize(m_struHumitureDI.qstrInterfaceName.toStdString()); //////////////////////////////////////////////////////////////////////////prepare m_sTimer.Preheating(); @@ -174,6 +170,23 @@ int main(int argc, char *argv[]) // m_ctrlATP.GetDeviceAttribute(); // m_ctrlATP.SetExposureTime(m_ctrlATP.m_adaDeviceAttr.iMinIntegrationTime); // m_ctrlATP.RecvData(qbTest); + //m_test123; + //m_test123.Initialize("COM11"); + //m_test123.GetHumiture(fTemp, fHum); +// int aaaaa = sizeof(unsigned long int); +// CalFrame OneFile; +// QString aa = "C:/Users/ZhangZhuo/Desktop/qepro.cal"; +// QFile qfCalFile(aa); +// bRes = qfCalFile.open(QFile::ReadOnly); +// using namespace ZZ_MISCDEF; +// qfCalFile.read((char *)&OneFile.uiExposureTimeInMS, sizeof(ZZ_U32));//U32 +// qfCalFile.read((char*)&OneFile.fTemperature, sizeof(double)); +// qfCalFile.read((char*)&OneFile.iPixels, sizeof(int)); +// qfCalFile.read((char*)OneFile.fWaveLength, sizeof(double)*OneFile.iPixels); +// qfCalFile.read((char*)OneFile.dCal_Gain, sizeof(double)*OneFile.iPixels); +// qfCalFile.read((char*)OneFile.dCal_Offset, sizeof(double)*OneFile.iPixels); + + ////////////////////////////////////////////////////////////////////////// return a.exec(); diff --git a/source/CaptureThread/MainDataGrabber.cpp b/source/CaptureThread/MainDataGrabber.cpp index 6c36840..77745ec 100644 --- a/source/CaptureThread/MainDataGrabber.cpp +++ b/source/CaptureThread/MainDataGrabber.cpp @@ -447,7 +447,8 @@ int CMainDataGrabber::GrabOnceFinished() ResetThreadStatus(); ////move to qDebug()<<"Start ILMES_MoveToPos:"<> &struAllCalFrame) { /////param - int iScanPoints = struGrabberRTParams.apsParams.iTotalPosition - 1; - int iDevices = struGrabberRTParams.fscParams.ucDeviceNumber; + //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()) @@ -29,7 +31,7 @@ int RadConverter::LoadCalibrationFrames(RunTimeGrabberParams struGrabberRTParams qslFilter << "*.dat"; qdirPath.setNameFilters(qslFilter); QFileInfoList qfiInfo = qdirPath.entryInfoList(qslFilter); - if (qfiInfo.size()!= iScanPoints * iDevices) + if (qfiInfo.size()