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

1、增加输出定标文件：将定标文件通过结构体写入文件；

Browse Source 
2、修改atp的最高定标时间：13s → 65s，此问题是由于2022-4-21-14:00更新卓哥atp代码到最新版导致；
This commit is contained in:
tangchao0503
2022-08-03 10:59:27 +08:00
committed by xin
parent 49b96d29e9
commit 2efa3fb879
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
othersoft/calibration_console/Header_Files/calibration.h
View File

@ -1,4 +1,5 @@
#pragma once
#pragma pack(1)//结构体按照1字节对齐存储
#include <qthread.h>
//#include <QFileDialog>
#include <QFile>

6
othersoft/calibration_console/Source_Files/ATPControl_Serial_QT.cpp
View File

@ -612,12 +612,12 @@ int ZZ_ATPControl_Serial_Qt::PerformAutoExposure(float fMinScaleFactor, float fM
bIsLastValueOverflow = bIsValueOverflow;
fLastExposureTime = fTempExposureTime;
if (fExposureTime > 13000)
if (fExposureTime > 65000)
{
bFlagIsAutoExposureOK = false;
bFlagIsAutoExposureFailed = true;
fPredictedExposureTime = 13000;
iRes = SetExposureTime(13000);
fPredictedExposureTime = 65000;
iRes = SetExposureTime(65000);
if (iRes != 0)
{
qDebug() << "Err:PerformAutoExposure Failed.Exit Code:3";

25
othersoft/calibration_console/Source_Files/calibration.cpp
View File

@ -242,5 +242,30 @@ void CalibrationAlgorithm::produceCalfile(QString calFilePath, DeviceAttribute d
}
outfile.close();
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>ʱ<EFBFBD><CAB1>ֱ<EFBFBD><D6B1>д<EFBFBD>ṹ<EFBFBD><E1B9B9>
using namespace ZZ_MISCDEF::ZZ_DATAFILE;//tagCalibrationFrame
tagCalibrationFrame calibrationFrame;
calibrationFrame.uiExposureTimeInMS = integratingSphereData.usExposureTimeInMS;
calibrationFrame.fTemperature = integratingSphereData.fTemperature;
calibrationFrame.iPixels = deviceAttribute.iPixels;
for (size_t i = 0; i < deviceAttribute.iPixels; i++)
{
calibrationFrame.fWaveLength[i] = deviceAttribute.fWaveLengthInNM[i];
calibrationFrame.dCal_Gain[i] = m_gain[i];
}
QStringList tmp = calFilePath.split('.');
QString calFilePath2 = tmp[0] + "_structure." + tmp[1];
FILE * calFileHandle2 = fopen(calFilePath2.toStdString().c_str(), "wb");
writeCounter = fwrite(&calibrationFrame,sizeof(tagCalibrationFrame), 1, calFileHandle2);
fclose(calFileHandle2);
delete[] m_gain;
delete[] m_offset;
}

4
othersoft/calibration_console/Source_Files/main.cpp
View File

@ -124,7 +124,7 @@ int main(int argc, char *argv[])
//<2F>Զ<EFBFBD><D4B6>ع<EFBFBD>
logout("<br><b style=\"color:red\">AutoExpose!</b>");
m_FiberSpectrometer->autoExpose();//
m_FiberSpectrometer->autoExpose();
int iExposureTime;
m_FiberSpectrometer->getExposureTime(iExposureTime);
@ -166,7 +166,7 @@ int main(int argc, char *argv[])
{
QDateTime curDateTime = QDateTime::currentDateTime();
QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss");
QString calFileName = QDir::cleanPath(query.calFileOutputDirectory + QDir::separator() + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + ".dat");
QString calFileName = QDir::cleanPath(query.calFileOutputDirectory + QDir::separator() + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + ".cal");
query.calFileOutputName=calFileName;
}