forked from xin/TowerOptoSifAndSpectral
机载第一版
This commit is contained in:
@ -1,6 +1,12 @@
|
||||
#include "AbstractFSController.h"
|
||||
#include "ZZ_Math_HDRONLY.h"
|
||||
#include <math.h>
|
||||
void Delay_MSec(ZZ_U16 usMS)
|
||||
{
|
||||
QEventLoop qeLoop;
|
||||
QTimer::singleShot(usMS, &qeLoop, SLOT(quit()));
|
||||
qeLoop.exec();
|
||||
}
|
||||
CAbstractFSController::CAbstractFSController(QObject* parent /*= nullptr*/)
|
||||
{
|
||||
iFlagInit = 0;
|
||||
@ -13,6 +19,11 @@ CAbstractFSController::CAbstractFSController(QObject* parent /*= nullptr*/)
|
||||
m_qstrCalFilePath = "/home/data/Cal";
|
||||
|
||||
m_vecNonLinearCalP.clear();
|
||||
for (int i=0;i<10;i++) {
|
||||
m_taginfolast.ITtimeChange[i] =true;
|
||||
m_taginfolast.LastMAXValue[i] = 0;
|
||||
m_taginfolast.lastITTIME[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
CAbstractFSController::~CAbstractFSController()
|
||||
@ -21,6 +32,7 @@ CAbstractFSController::~CAbstractFSController()
|
||||
{
|
||||
delete m_pFSCtrl;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int CAbstractFSController::SetRunParas(int iThreadID, FSInfo fsInfo)
|
||||
@ -135,8 +147,19 @@ int CAbstractFSController::GetDeviceAttr(DeviceAttribute &daAttr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CAbstractFSController::PerformAutoExposure()
|
||||
int CAbstractFSController::PerformAutoExposure(int position)
|
||||
{
|
||||
if (position!=0) {
|
||||
// m_taginfolast.ITtimeChange[position] = true;
|
||||
m_taginfolast.lastITTIME[position] = m_taginfolast.lastITTIME[0]*0.5 ;
|
||||
m_pFSCtrl->SetExposureTime(m_taginfolast.lastITTIME[position] );
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
qDebug() << "--------------------------Starting PerformAutoExposure" << " Thread ID:" << m_iThreadID;
|
||||
using namespace ZZ_MATH;
|
||||
float fPredictedExposureTime;
|
||||
@ -153,7 +176,7 @@ int CAbstractFSController::PerformAutoExposure()
|
||||
bool bIsValueOverflow = false;
|
||||
bool bIsLastValueOverflow = false;
|
||||
|
||||
int iExposureTime = 0;
|
||||
int iExposureTime = 1000;
|
||||
float fTempExposureTime = 0;
|
||||
double fLastExposureTime = 0.1;
|
||||
int iRepeatCount = 0;
|
||||
@ -177,9 +200,9 @@ int CAbstractFSController::PerformAutoExposure()
|
||||
break;
|
||||
}
|
||||
//m_pFSCtrl->SetExposureTime(5000);
|
||||
m_pFSCtrl->GetExposureTime(iExposureTime);
|
||||
qDebug() << "Current ExpTime:" << iExposureTime << " Thread ID:" << m_iThreadID;
|
||||
//m_pFSCtrl->SetExposureTime(2500);
|
||||
// m_pFSCtrl->GetExposureTime(iExposureTime);
|
||||
// qDebug() << "Current ExpTime:" << iExposureTime << " Thread ID:" << m_iThreadID;
|
||||
m_pFSCtrl->SetExposureTime(iExposureTime);
|
||||
//fExposureTime = (float)m_daDeviceAttr.iMinIntegrationTimeInMS;
|
||||
fTempExposureTime = iExposureTime;
|
||||
|
||||
@ -270,7 +293,8 @@ int CAbstractFSController::PerformAutoExposure()
|
||||
// {
|
||||
// qDebug() << "Success:PerformAutoExposure. Value" << iExposureTime << " Thread ID:" << m_iThreadID;
|
||||
// }
|
||||
|
||||
m_taginfolast.ITtimeChange[position] = true;
|
||||
m_taginfolast.lastITTIME[position] = m_daDeviceAttr.iMinIntegrationTimeInMS;
|
||||
iRes = m_pFSCtrl->SetExposureTime(m_daDeviceAttr.iMinIntegrationTimeInMS);
|
||||
if (iRes != 0)
|
||||
{
|
||||
@ -301,7 +325,8 @@ int CAbstractFSController::PerformAutoExposure()
|
||||
//{
|
||||
//qDebug() << "Warning:PerformAutoExposure exceed max integration time.Will be limited to 30sec";
|
||||
//}
|
||||
|
||||
m_taginfolast.ITtimeChange[position] = true;
|
||||
m_taginfolast.lastITTIME[position] =m_daDeviceAttr.iMaxIntegrationTimeInMS - 1;
|
||||
iRes = m_pFSCtrl->SetExposureTime(m_daDeviceAttr.iMaxIntegrationTimeInMS - 1);
|
||||
if (iRes != 0)
|
||||
{
|
||||
@ -315,7 +340,8 @@ int CAbstractFSController::PerformAutoExposure()
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
m_taginfolast.ITtimeChange[position] = true;
|
||||
m_taginfolast.lastITTIME[position] =(int)iExposureTime;
|
||||
iRes = m_pFSCtrl->SetExposureTime((int)iExposureTime);
|
||||
if (iRes != 0)
|
||||
{
|
||||
@ -335,11 +361,69 @@ int CAbstractFSController::PerformAutoExposure()
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CAbstractFSController::TakeDarkFrame()
|
||||
{
|
||||
qDebug() << "Starting TakeDarkFrame" << " Thread ID:" << m_iThreadID;
|
||||
int CAbstractFSController::ComputExposure(int position) {
|
||||
if (position==0) {
|
||||
|
||||
m_vecDataFrameDark.push_back(TakeOneFrame());
|
||||
|
||||
int lastittime=m_taginfolast.lastITTIME[position];
|
||||
int lastmaxvalue=m_taginfolast.LastMAXValue[position];
|
||||
|
||||
int maxallowvalue=m_fsInfo.lDepth * m_fsInfo.fMaxFactor;
|
||||
int minallowvalue=m_fsInfo.lDepth * m_fsInfo.fMinFactor;
|
||||
if (lastmaxvalue>maxallowvalue) {
|
||||
if (lastmaxvalue>=m_fsInfo.lDepth) {
|
||||
lastittime=lastittime/2;
|
||||
|
||||
}else {
|
||||
lastittime=lastittime*(maxallowvalue*1.0/lastmaxvalue)*0.95;
|
||||
}
|
||||
|
||||
m_taginfolast.ITtimeChange[position]=true;
|
||||
m_taginfolast.lastITTIME[position]=lastittime;
|
||||
m_pFSCtrl->SetExposureTime(lastittime);
|
||||
qDebug()<< "Set exposure time for position"<<position<<" to "<<lastittime;
|
||||
return lastittime;
|
||||
|
||||
}
|
||||
if (lastmaxvalue<minallowvalue) {
|
||||
lastittime=lastittime*(minallowvalue*1.0/lastmaxvalue)*1.05;
|
||||
if (lastittime>=60000) {
|
||||
lastittime=60000;
|
||||
}
|
||||
m_taginfolast.ITtimeChange[position]=true;
|
||||
m_taginfolast.lastITTIME[position]=lastittime;
|
||||
m_pFSCtrl->SetExposureTime(lastittime);
|
||||
qDebug()<< "Set exposure time for position"<<position<<" to "<<lastittime;
|
||||
return lastittime;
|
||||
}
|
||||
m_taginfolast.ITtimeChange[position]=false;
|
||||
m_pFSCtrl->SetExposureTime(lastittime);
|
||||
qDebug()<< "Set exposure time for position"<<position<<" to "<<lastittime;
|
||||
return lastittime;
|
||||
}
|
||||
int lasttimeindev=0;
|
||||
m_pFSCtrl->GetExposureTime(lasttimeindev);
|
||||
|
||||
m_pFSCtrl->SetExposureTime(m_taginfolast.lastITTIME[0]*0.5);
|
||||
if (lasttimeindev!=m_taginfolast.lastITTIME[0]*0.5) {
|
||||
Delay_MSec(lasttimeindev);
|
||||
}
|
||||
qDebug()<< "Set exposure time for position"<<position<<" to "<<m_taginfolast.lastITTIME[0]*0.5;
|
||||
return m_taginfolast.lastITTIME[0]*0.5;
|
||||
|
||||
}
|
||||
|
||||
int CAbstractFSController::TakeDarkFrame(int position)
|
||||
{
|
||||
int shuttertime = 0;
|
||||
m_pFSCtrl->GetExposureTime(shuttertime);
|
||||
qDebug() << "Starting TakeDarkFrame" << " position ID:" << position<<" ITtime:"<<shuttertime<<"\n";
|
||||
if (m_taginfolast.ITtimeChange[0]) {
|
||||
m_taginfolast.LastDarkframe[position]=TakeOneFrame();
|
||||
}
|
||||
|
||||
|
||||
m_vecDataFrameDark.push_back(m_taginfolast.LastDarkframe[position]);
|
||||
|
||||
|
||||
qDebug() << "Stop TakeDarkFrame" << " Thread ID:" << m_iThreadID;
|
||||
@ -347,13 +431,77 @@ int CAbstractFSController::TakeDarkFrame()
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CAbstractFSController::TakeSignalFrame()
|
||||
|
||||
int CAbstractFSController::ComputeMaxValue(DataFrame Data) {
|
||||
ZZ_S32 *pData = Data.lData;
|
||||
int number = 4096;
|
||||
int maxvalue=0;
|
||||
for (int i=0;i<number-1;i++) {
|
||||
if (pData[i]>maxvalue) {
|
||||
maxvalue=pData[i];
|
||||
}
|
||||
}
|
||||
return maxvalue;
|
||||
|
||||
// if (number <= 10) {
|
||||
// // 如果数据量小,直接排序计算
|
||||
// int sum = 0;
|
||||
// for (int i = 0; i < number; i++) {
|
||||
// sum += pData[i];
|
||||
// }
|
||||
// return number > 0 ? sum / number : 0;
|
||||
// }
|
||||
//
|
||||
// // 复制数据(或者直接操作原数组如果允许修改)
|
||||
// std::vector<int> temp(pData, pData + number);
|
||||
//
|
||||
// // 使用nth_element找到第10大的元素
|
||||
// std::nth_element(temp.begin(), temp.begin() + 9, temp.end(), std::greater<int>());
|
||||
//
|
||||
// // 计算前10个最大值的平均
|
||||
// int sum = 0;
|
||||
// for (int i = 0; i < 10; i++) {
|
||||
// sum += temp[i];
|
||||
// }
|
||||
//
|
||||
// return sum / 10;
|
||||
|
||||
|
||||
|
||||
|
||||
// int maxvalue[10]={0};
|
||||
// ZZ_S32 *pData=Data.lData;
|
||||
// int number=4096;
|
||||
// //获取pdata中最大的10个值
|
||||
// for (int i=0;i<number;i++) {
|
||||
// int val=pData[i];
|
||||
// for (int j=0;j<10;j++) {
|
||||
// if (val>maxvalue[j]) {
|
||||
// //插入到maxvalue中
|
||||
// for (int k=9;k>j;k--) {
|
||||
// maxvalue[k]=maxvalue[k-1];
|
||||
// }
|
||||
// maxvalue[j]=val;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
int CAbstractFSController::TakeSignalFrame(int position)
|
||||
{
|
||||
qDebug() << "Starting TakeSignal" << " Thread ID:" << m_iThreadID;
|
||||
int shuttertime = 0;
|
||||
m_pFSCtrl->GetExposureTime(shuttertime);
|
||||
qDebug() << "Starting TakeSignal" << " position" << position<<" ITtime:"<<shuttertime<<"\n";
|
||||
|
||||
m_vecDataFrameSignal.push_back(TakeOneFrame());
|
||||
|
||||
// todo: compute max ten value 计算前10个值平均值
|
||||
m_taginfolast.LastMAXValue[position]=ComputeMaxValue(m_vecDataFrameSignal.at(m_vecDataFrameSignal.size()-1));
|
||||
if (m_taginfolast.LastMAXValue[position]>=65535) {
|
||||
m_vecDataFrameSignal.at(m_vecDataFrameSignal.size()-1).bIsValid=false;
|
||||
}
|
||||
qDebug() << "Stop TakeSignal" << " Thread ID:" << m_iThreadID;
|
||||
qDebug()<< "Max 10 Average Value:" << m_taginfolast.LastMAXValue[position] << " Thread ID:" << m_iThreadID;
|
||||
//emit SignalAcqFinished(m_iThreadID, 1);
|
||||
return 0;
|
||||
}
|
||||
@ -417,6 +565,8 @@ DataFrame CAbstractFSController::TakeOneFrame()
|
||||
// return dfTemp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int CAbstractFSController::SaveDataFile()
|
||||
{
|
||||
return 0;
|
||||
@ -460,7 +610,7 @@ int CAbstractFSController::LoadQEProLinearCalibrationFile()
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CAbstractFSController::StartAcquisitionSignal()
|
||||
int CAbstractFSController::StartAcquisitionSignal(int position)
|
||||
{
|
||||
//
|
||||
qDebug() << "Starting acq Signal" << " Thread ID:" << m_iThreadID;
|
||||
@ -471,18 +621,24 @@ int CAbstractFSController::StartAcquisitionSignal()
|
||||
// m_pFSCtrl->GetExposureTime(iii);
|
||||
// m_pFSCtrl->SingleShot(struDF);
|
||||
|
||||
PerformAutoExposure();
|
||||
TakeSignalFrame();
|
||||
if (m_taginfolast.lastITTIME[position]==0) {
|
||||
PerformAutoExposure(position);
|
||||
}else {
|
||||
ComputExposure(position);
|
||||
}
|
||||
|
||||
|
||||
TakeSignalFrame(position);
|
||||
|
||||
qDebug() << "Stop acq Signal" << " Thread ID:" << m_iThreadID;
|
||||
emit SignalAcqFinished_Signal(m_iThreadID, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CAbstractFSController::StartAcquisitionDark()
|
||||
int CAbstractFSController::StartAcquisitionDark(int position)
|
||||
{
|
||||
qDebug() << "Starting acq Dark" << " Thread ID:" << m_iThreadID;
|
||||
TakeDarkFrame();
|
||||
TakeDarkFrame(position);
|
||||
qDebug() << "Stop acq Dark"<< " Thread ID:" << m_iThreadID;
|
||||
emit SignalAcqFinished_Dark(m_iThreadID, 1);
|
||||
|
||||
|
||||
@ -15,6 +15,15 @@ typedef struct tagFSInfo
|
||||
float fMaxFactor;
|
||||
}FSInfo;
|
||||
|
||||
struct tagINFOOFLOST {
|
||||
int LastMAXValue[10];
|
||||
int lastITTIME[10];
|
||||
bool ITtimeChange[10];
|
||||
DataFrame LastDarkframe[10];
|
||||
|
||||
};
|
||||
|
||||
|
||||
class CAbstractFSController :public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@ -34,6 +43,8 @@ public:
|
||||
//sync info
|
||||
virtual int GetDeviceAttr(DeviceAttribute &daAttr);
|
||||
//DataFrame GetLastDataFrame();
|
||||
tagINFOOFLOST m_taginfolast;
|
||||
int positionnow=0;
|
||||
|
||||
private:
|
||||
CIrisFSBase *m_pFSCtrl;
|
||||
@ -48,17 +59,19 @@ private:
|
||||
QString m_qstrCalFilePath;
|
||||
std::vector<double> m_vecNonLinearCalP;
|
||||
private:
|
||||
int PerformAutoExposure();
|
||||
int TakeDarkFrame();
|
||||
int TakeSignalFrame();
|
||||
int PerformAutoExposure(int position);
|
||||
int ComputExposure(int position);
|
||||
int TakeDarkFrame(int position);
|
||||
int TakeSignalFrame(int position);
|
||||
DataFrame TakeOneFrame();
|
||||
int ComputeMaxValue(DataFrame Data);
|
||||
int SaveDataFile();
|
||||
|
||||
//QE NLC
|
||||
int LoadQEProLinearCalibrationFile();
|
||||
public slots:
|
||||
virtual int StartAcquisitionSignal();
|
||||
virtual int StartAcquisitionDark();
|
||||
virtual int StartAcquisitionSignal(int position);
|
||||
virtual int StartAcquisitionDark(int position);
|
||||
virtual int StopAcquisition();
|
||||
virtual int ClearBuffer();
|
||||
virtual int GetBuffer(std::vector<DataFrame> &pvecDataFrameDark, std::vector<DataFrame> &pvecDataFrameSignal);
|
||||
|
||||
@ -467,7 +467,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
|
||||
if (m_iFlagIsCapturing)
|
||||
{
|
||||
qDebug() << "Fatal Warning.Last capture not finished.New acquisition will not start";
|
||||
// qDebug() << "Fatal Warning.Last capture not finished.New acquisition will not start";
|
||||
return 1000;
|
||||
}
|
||||
m_iFlagIsCapturing = 1;
|
||||
@ -521,7 +521,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
qDebug() << qstrCMD_A;
|
||||
qDebug() << qstrCMD_B;
|
||||
|
||||
Delay_MSec(500);
|
||||
Delay_MSec(200);
|
||||
}
|
||||
else if (/*i==1*/i%2==1)
|
||||
{
|
||||
@ -537,7 +537,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
qDebug() << qstrCMD_A;
|
||||
qDebug() << qstrCMD_B;
|
||||
|
||||
Delay_MSec(500);
|
||||
Delay_MSec(200);
|
||||
}
|
||||
|
||||
|
||||
@ -545,6 +545,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
}
|
||||
else
|
||||
{
|
||||
//线性马达
|
||||
qDebug() << "Start ILMES_MoveToPos:" << i + 1;
|
||||
if (i == 0)
|
||||
{
|
||||
@ -563,10 +564,10 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
// m_struAcqPosSetting.iPosition[i + 1];
|
||||
m_iFlagIsCapturing_Signal = 1;
|
||||
|
||||
emit SignalStartGrabOnce_Signal();
|
||||
emit SignalStartGrabOnce_Signal(i);
|
||||
while (m_iFlagIsCapturing_Signal)
|
||||
{
|
||||
Delay_MSec(1000);
|
||||
Delay_MSec(100);
|
||||
}
|
||||
|
||||
|
||||
@ -586,6 +587,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
|
||||
qDebug() << qstrCMD_A;
|
||||
qDebug() << qstrCMD_B;
|
||||
Delay_MSec(200);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -598,10 +600,10 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
//m_struAcqPosSetting.iPosition[0];
|
||||
m_iFlagIsCapturing_Dark = 1;
|
||||
// todo : 机载时是否有实时采集暗电流
|
||||
emit SignalStartGrabOnce_Dark();
|
||||
emit SignalStartGrabOnce_Dark(i);
|
||||
while (m_iFlagIsCapturing_Dark)
|
||||
{
|
||||
Delay_MSec(1000);
|
||||
Delay_MSec(100);
|
||||
}
|
||||
}
|
||||
|
||||
@ -632,6 +634,7 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
for (size_t j=0;j< vecDark.size();j++)
|
||||
{
|
||||
SubDataFrame(vecSignal[j], vecDark[j], m_struDeviceContext.usPixels[i]);
|
||||
vecDark[j].bIsValid=vecSignal[j].bIsValid;
|
||||
}
|
||||
vecData.push_back(vecSignal);
|
||||
if (savedarkfile) {
|
||||
@ -658,7 +661,9 @@ int CMainDataGrabber::GrabOnceFinished()
|
||||
m_pdfpSaver->WriteDarkDataFile();
|
||||
}
|
||||
}
|
||||
|
||||
system("gpio write 13 1");
|
||||
Delay_MSec(100);
|
||||
system("gpio write 13 0");
|
||||
m_iFlagIsCapturing = 0;
|
||||
|
||||
// qDebug() << "-------------------------------------------busy" << QTime::currentTime().toString();
|
||||
|
||||
@ -89,8 +89,8 @@ public slots:
|
||||
int GrabOnceFinished();
|
||||
|
||||
signals:
|
||||
void SignalStartGrabOnce_Signal();
|
||||
void SignalStartGrabOnce_Dark();
|
||||
void SignalStartGrabOnce_Signal(int position);
|
||||
void SignalStartGrabOnce_Dark(int position);
|
||||
|
||||
void SignalGrabOnceFinished_Signal();
|
||||
void SignalGrabOnceFinished_Dark();
|
||||
|
||||
@ -54,10 +54,10 @@ void Scheduler::StartAsPlanned()
|
||||
}
|
||||
|
||||
int iIntervalInMS = m_struAcqTime.qtInterval.hour() * 3600 * 1000 + m_struAcqTime.qtInterval.minute() * 60 * 1000 + m_struAcqTime.qtInterval.second() * 1000;
|
||||
|
||||
//iIntervalInMS =1000;
|
||||
m_GrabTimer->start(iIntervalInMS);
|
||||
|
||||
QThread::msleep(5000);
|
||||
QThread::msleep(1000);
|
||||
qDebug() << "it's time to start work.";
|
||||
emit SignalGrabOnce();
|
||||
//this->OnTimeCounter();
|
||||
@ -74,7 +74,7 @@ int Scheduler::OnTimeCounter()
|
||||
|
||||
}
|
||||
|
||||
qDebug() << "it's time to work...work work.";
|
||||
// qDebug() << "it's time to work...work work.";
|
||||
emit SignalGrabOnce();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -728,6 +728,7 @@ int ZZ_ATPControl_Serial_Qt::SetExposureTime(int iExposureTimeInMS)
|
||||
//return 1;
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -275,7 +275,9 @@ bool DataFileProcessor::WriteData(QString path)
|
||||
qstrTemp = QString("_P%1").arg(j + 1);
|
||||
qfData.write(qstrTemp.toLatin1());
|
||||
qfData.write(",");
|
||||
if ((m_vecData[i][j].fTemperature < 5) /*&& (m_vecData[i][j].fTemperature> -5)*/)
|
||||
// if ((m_vecData[i][j].fTemperature < 5) /*&& (m_vecData[i][j].fTemperature> -5)*/)
|
||||
if (m_vecDarkData[i][j].bIsValid)
|
||||
|
||||
{
|
||||
qfData.write("valid");
|
||||
}
|
||||
@ -327,7 +329,8 @@ bool DataFileProcessor::WriteDarkData(QString path)
|
||||
qstrTemp = QString("_P%1").arg(j + 1);
|
||||
qfData.write(qstrTemp.toLatin1());
|
||||
qfData.write(",");
|
||||
if ((m_vecDarkData[i][j].fTemperature < 5) /*&& (m_vecDarkData[i][j].fTemperature> -5)*/)
|
||||
// if ((m_vecDarkData[i][j].fTemperature < 5&&m_vecDarkData[i][j].bIsValid) /*&& (m_vecDarkData[i][j].fTemperature> -5)*/)
|
||||
if (m_vecDarkData[i][j].bIsValid)
|
||||
{
|
||||
qfData.write("valid");
|
||||
}
|
||||
|
||||
@ -27,6 +27,7 @@ namespace ZZ_MISCDEF
|
||||
ZZ_S32 lData[4096] = {0};
|
||||
float fTemperature = 0;
|
||||
double dTimes = 0;
|
||||
bool bIsValid = true;
|
||||
}DataFrame;
|
||||
|
||||
|
||||
|
||||
@ -235,11 +235,11 @@
|
||||
{
|
||||
qstrTemp = "0" + qstrTemp;
|
||||
}
|
||||
m_struAcqTime.qtInterval = QTime::fromString(qstrTemp, "mm");
|
||||
m_struAcqTime.qtInterval = QTime::fromString(qstrTemp, "mm:ss");
|
||||
}
|
||||
else
|
||||
{
|
||||
m_struAcqTime.qtInterval = QTime::fromString(m_qjoJObj.value("IntervalTime").toString(), "mm");
|
||||
m_struAcqTime.qtInterval = QTime::fromString(m_qjoJObj.value("IntervalTime").toString(), "mm:ss");
|
||||
}
|
||||
if (!m_struAcqTime.qtInterval.isValid())
|
||||
{
|
||||
|
||||
@ -117,6 +117,7 @@ int CMainDataUploader::Initialize()
|
||||
|
||||
int CMainDataUploader::SlotPushOneDataFrame()
|
||||
{
|
||||
return 0;
|
||||
Calibration();
|
||||
UploadData();
|
||||
m_vecData.clear();
|
||||
|
||||
Reference in New Issue
Block a user