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

test

Browse Source
This commit is contained in:
zhangzhuo
2021-11-19 15:39:31 +08:00
parent fdffb86c96
commit 6452b3a514
6 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@ -30,7 +30,7 @@ int main(int argc, char *argv[])
m_pqDataGrabberThreadHolder->start();
m_test.TestGrabOnce();
m_test.StartGrab();
//QThread::msleep(5000);

2
source/ATP/ZZ_Types.h
View File

@ -108,7 +108,7 @@ namespace ZZ_MISCDEF
{
QString qstrUTCDateTime;
QString qstrLocation;
QString qstrGPS_longtitude;
QString qstrGPS_Longtitude;
QString qstrGPS_Latitude;
QString qstrGPS_Altitude;
QString qstrGPS_North;

22
source/Settings/SystemConfigger.cpp
View File

@ -41,12 +41,22 @@
int ZZ_SysConfigger::LoadSettingsFromFile_IS1()
{
m_struIS1Info.qstrCalFile_U0 = m_qjoJObj.value("IS1UpCalFile").toString();
m_struIS1Info.qstrCalFile_D1 = m_qjoJObj.value("IS1DownCalFile1").toString();
m_struIS1Info.qstrCalFile_D2 = m_qjoJObj.value("IS1DownCalFile2").toString();
m_struIS1Info.qstrCalFile_D3 = m_qjoJObj.value("IS1DownCalFile3").toString();
return 0;
}
int ZZ_SysConfigger::LoadSettingsFromFile_iSIF()
{
return 0;
m_struISIFInfo.qstrCalFile_U0 = m_qjoJObj.value("SIFUpCalFile").toString();
m_struISIFInfo.qstrCalFile_D1 = m_qjoJObj.value("SIFDownCalFile1").toString();
m_struISIFInfo.qstrCalFile_D2 = m_qjoJObj.value("SIFDownCalFile2").toString();
m_struISIFInfo.qstrCalFile_D3 = m_qjoJObj.value("SIFDownCalFile3").toString();
return 0;
}
int ZZ_SysConfigger::LoadSettingsFromFile_System()
@ -81,7 +91,7 @@
m_struEC.qstrLocation = m_qjoJObj.value("Location").toString();
m_struEC.qstrGPS_Altitude = m_qjoJObj.value("GPS_Altitude").toString();
m_struEC.qstrGPS_Latitude = m_qjoJObj.value("GPS_Latitude").toString();
m_struEC.qstrGPS_longtitude = m_qjoJObj.value("GPS_Longtitude").toString();
m_struEC.qstrGPS_Longtitude = m_qjoJObj.value("GPS_Longtitude").toString();
m_struEC.qstrGPS_North = m_qjoJObj.value("GPS_North").toString();
m_struMEC.qstrInstallationTime = m_qjoJObj.value("InstallationTime").toString();
@ -92,15 +102,7 @@
m_struMEC.qstrDownloadUserID = m_qjoJObj.value("DownloadUserID").toString();
m_struMEC.qstrDownlaodAddress = m_qjoJObj.value("DownlaodAddress").toString();
m_struIS1Info.qstrCalFile_U0 = m_qjoJObj.value("IS1UpCalFile").toString();
m_struIS1Info.qstrCalFile_D1 = m_qjoJObj.value("IS1DownCalFile1").toString();
m_struIS1Info.qstrCalFile_D2 = m_qjoJObj.value("IS1DownCalFile2").toString();
m_struIS1Info.qstrCalFile_D3 = m_qjoJObj.value("IS1DownCalFile3").toString();
m_struISIFInfo.qstrCalFile_U0 = m_qjoJObj.value("SIFUpCalFile").toString();
m_struISIFInfo.qstrCalFile_D1 = m_qjoJObj.value("SIFDownCalFile1").toString();
m_struISIFInfo.qstrCalFile_D2 = m_qjoJObj.value("SIFDownCalFile2").toString();
m_struISIFInfo.qstrCalFile_D3 = m_qjoJObj.value("SIFDownCalFile3").toString();
return 0;
}

20
source/Thread/ThreadDataGrabber.cpp
View File

@ -2,6 +2,7 @@
ZZ_DataGrabberThread::ZZ_DataGrabberThread(QObject* parent /*= nullptr*/)
{
m_GrabTimer = new QTimer(this);
m_bFlagIsCollecting = false;
InitThreadStatus();
SetupSignals();
@ -18,8 +19,15 @@ ZZ_DataGrabberThread::~ZZ_DataGrabberThread()
}
}
void ZZ_DataGrabberThread::SetGrabTimer(AcqTimeSettings struAcqTime)
{
m_struAcqTime = struAcqTime;
}
int ZZ_DataGrabberThread::SetupSignals()
{
connect(m_GrabTimer, &QTimer::timeout, this, &ZZ_DataGrabberThread::OnTimeCounter);
connect(this, &ZZ_DataGrabberThread::SignalStartGrabOnce, &m_tcISIFCtrlThread, &ZZ_iSIFControlThread::StartTestAcquisition);
connect(this, &ZZ_DataGrabberThread::SignalStartGrabOnce, &m_tcIS1CtrlThread, &ZZ_IS1ControlThread::StartTestAcquisition);
@ -35,6 +43,12 @@ int ZZ_DataGrabberThread::SetupSignals()
return 0;
}
int ZZ_DataGrabberThread::StartGrab()
{
m_GrabTimer->start(1000);
return 0;
}
int ZZ_DataGrabberThread::StartGrabberThread()
{
m_pqISIFThreadHolder = new QThread();
@ -110,3 +124,9 @@ int ZZ_DataGrabberThread::HandleThreadEvent(int iThreadID, int iFlagStatus)
}
return 0;
}
int ZZ_DataGrabberThread::OnTimeCounter()
{
qDebug() << "OnTimeCounter";
return 0;
}

11
source/Thread/ThreadDataGrabber.h
View File

@ -5,7 +5,7 @@
#include"pch.h"
#include "ThreadIS1Controller.h"
#include "ThreadiSIFController.h"
using namespace ZZ_MISCDEF::ZZ_RUNPARAMS;
class ZZ_DataGrabberThread :public QObject
{
Q_OBJECT
@ -27,11 +27,18 @@ private:
int *m_piFlagCaptureThreadStatus;
const int m_iTotalThreads = 2;
QTimer *m_GrabTimer;
AcqTimeSettings m_struAcqTime;
public:
void SetGrabTimer(AcqTimeSettings struAcqTime);
int SetupSignals();
int StartGrabberThread();
int StartGrab();
private:
int OnTimeCounter();
int InitThreadStatus();
int StartGrabberThread();
public slots:
int TestGrab();
int TestGrabOnce();

3
source/pch.h
View File

@ -1,7 +1,6 @@
#pragma once
#include <iostream>
#include <QtCore/QCoreApplication>
#include <QtCore/QTime>
#include <QString>
#include <QDebug>
#include <QtSerialPort/QSerialPort>
@ -18,4 +17,6 @@
#include <QJsonValue>
#include <QJsonParseError>
////////////////////////////time
#include <QtCore/QTime>
#include <QDateTime>
#include <QTimer>