diff --git a/main.cpp b/main.cpp index e6d327a..cc74c72 100644 --- a/main.cpp +++ b/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) m_pqDataGrabberThreadHolder->start(); - m_test.TestGrabOnce(); + m_test.StartGrab(); //QThread::msleep(5000); diff --git a/source/ATP/ZZ_Types.h b/source/ATP/ZZ_Types.h index c6a5aaf..1651293 100644 --- a/source/ATP/ZZ_Types.h +++ b/source/ATP/ZZ_Types.h @@ -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; diff --git a/source/Settings/SystemConfigger.cpp b/source/Settings/SystemConfigger.cpp index 97c731f..b12d211 100644 --- a/source/Settings/SystemConfigger.cpp +++ b/source/Settings/SystemConfigger.cpp @@ -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; } diff --git a/source/Thread/ThreadDataGrabber.cpp b/source/Thread/ThreadDataGrabber.cpp index 1e8c0f9..30c20f7 100644 --- a/source/Thread/ThreadDataGrabber.cpp +++ b/source/Thread/ThreadDataGrabber.cpp @@ -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; +} diff --git a/source/Thread/ThreadDataGrabber.h b/source/Thread/ThreadDataGrabber.h index 52c5126..0c0fd64 100644 --- a/source/Thread/ThreadDataGrabber.h +++ b/source/Thread/ThreadDataGrabber.h @@ -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(); diff --git a/source/pch.h b/source/pch.h index 32f6d26..892a364 100644 --- a/source/pch.h +++ b/source/pch.h @@ -1,7 +1,6 @@ #pragma once #include #include -#include #include #include #include @@ -18,4 +17,6 @@ #include #include ////////////////////////////time +#include #include +#include