From 34451f29105c91d309bffa6b76ad8c2ca5314d4e Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Fri, 3 Dec 2021 11:34:49 +0800 Subject: [PATCH] 4444444444444444444444445555555555555555555 --- Data/2021_12_03/beijing_10_43_54.txt | 1 + Data/2021_12_03/beijing_11_01_57.txt | 1 + Data/2021_12_03/beijing_11_02_53.txt | 1 + Data/2021_12_03/beijing_11_03_49.txt | 1 + Data/2021_12_03/beijing_11_05_13.txt | 1 + Data/2021_12_03/beijing_11_18_04.txt | 1 + Data/2021_12_03/beijing_11_19_02.txt | 1 + Data/2021_12_03/beijing_11_19_11.txt | 1 + Data/2021_12_03/beijing_11_19_28.txt | 1 + Data/2021_12_03/beijing_11_26_01.txt | 1 + Data/2021_12_03/beijing_11_27_02.txt | 1 + Data/2021_12_03/beijing_11_27_45.txt | 1 + Data/2021_12_03/beijing_11_30_48.txt | 1 + source/Thread/MainDataGrabber.cpp | 112 +++++++++++++++++++-------- source/Thread/MainDataGrabber.h | 4 +- 15 files changed, 93 insertions(+), 36 deletions(-) create mode 100644 Data/2021_12_03/beijing_10_43_54.txt create mode 100644 Data/2021_12_03/beijing_11_01_57.txt create mode 100644 Data/2021_12_03/beijing_11_02_53.txt create mode 100644 Data/2021_12_03/beijing_11_03_49.txt create mode 100644 Data/2021_12_03/beijing_11_05_13.txt create mode 100644 Data/2021_12_03/beijing_11_18_04.txt create mode 100644 Data/2021_12_03/beijing_11_19_02.txt create mode 100644 Data/2021_12_03/beijing_11_19_11.txt create mode 100644 Data/2021_12_03/beijing_11_19_28.txt create mode 100644 Data/2021_12_03/beijing_11_26_01.txt create mode 100644 Data/2021_12_03/beijing_11_27_02.txt create mode 100644 Data/2021_12_03/beijing_11_27_45.txt create mode 100644 Data/2021_12_03/beijing_11_30_48.txt diff --git a/Data/2021_12_03/beijing_10_43_54.txt b/Data/2021_12_03/beijing_10_43_54.txt new file mode 100644 index 0000000..9f94357 --- /dev/null +++ b/Data/2021_12_03/beijing_10_43_54.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 02:43:54,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_01_57.txt b/Data/2021_12_03/beijing_11_01_57.txt new file mode 100644 index 0000000..99eb2d1 --- /dev/null +++ b/Data/2021_12_03/beijing_11_01_57.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:01:57,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_02_53.txt b/Data/2021_12_03/beijing_11_02_53.txt new file mode 100644 index 0000000..f99ed40 --- /dev/null +++ b/Data/2021_12_03/beijing_11_02_53.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:02:53,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_03_49.txt b/Data/2021_12_03/beijing_11_03_49.txt new file mode 100644 index 0000000..5dcd00b --- /dev/null +++ b/Data/2021_12_03/beijing_11_03_49.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:03:49,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_05_13.txt b/Data/2021_12_03/beijing_11_05_13.txt new file mode 100644 index 0000000..41cba17 --- /dev/null +++ b/Data/2021_12_03/beijing_11_05_13.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:05:13,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_18_04.txt b/Data/2021_12_03/beijing_11_18_04.txt new file mode 100644 index 0000000..30f8dcc --- /dev/null +++ b/Data/2021_12_03/beijing_11_18_04.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:18:04,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_19_02.txt b/Data/2021_12_03/beijing_11_19_02.txt new file mode 100644 index 0000000..0e6cc60 --- /dev/null +++ b/Data/2021_12_03/beijing_11_19_02.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:19:02,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_19_11.txt b/Data/2021_12_03/beijing_11_19_11.txt new file mode 100644 index 0000000..5f290fe --- /dev/null +++ b/Data/2021_12_03/beijing_11_19_11.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:19:11,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_19_28.txt b/Data/2021_12_03/beijing_11_19_28.txt new file mode 100644 index 0000000..b3d4e1e --- /dev/null +++ b/Data/2021_12_03/beijing_11_19_28.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:19:28,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_26_01.txt b/Data/2021_12_03/beijing_11_26_01.txt new file mode 100644 index 0000000..b914fd9 --- /dev/null +++ b/Data/2021_12_03/beijing_11_26_01.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:26:01,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_27_02.txt b/Data/2021_12_03/beijing_11_27_02.txt new file mode 100644 index 0000000..dc34412 --- /dev/null +++ b/Data/2021_12_03/beijing_11_27_02.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:27:02,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_27_45.txt b/Data/2021_12_03/beijing_11_27_45.txt new file mode 100644 index 0000000..07263ea --- /dev/null +++ b/Data/2021_12_03/beijing_11_27_45.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:27:45,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_11_30_48.txt b/Data/2021_12_03/beijing_11_30_48.txt new file mode 100644 index 0000000..7d5c20d --- /dev/null +++ b/Data/2021_12_03/beijing_11_30_48.txt @@ -0,0 +1 @@ +EnvironmentalContext,CaseHumidity,,CaseTemperature,,GPS_Altitude,50,GPS_Latitude,118,GPS_Longtitude,117,GPS_North,on,Location,beijing,UTCDateTime,2021_12_03 03:30:48,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110, \ No newline at end of file diff --git a/source/Thread/MainDataGrabber.cpp b/source/Thread/MainDataGrabber.cpp index ca9c329..50c1b13 100644 --- a/source/Thread/MainDataGrabber.cpp +++ b/source/Thread/MainDataGrabber.cpp @@ -5,7 +5,7 @@ CMainDataGrabber::CMainDataGrabber(QObject* parent /*= nullptr*/) m_piFlagCaptureThreadStatus_Signal = NULL; m_piFlagCaptureThreadStatus_Dark = NULL; - //m_GrabTimer = new QTimer(this); + m_GrabTimer = new QTimer(this); m_iFlagIsCapturing = false; m_iFlagIsCapturing_Signal = false; @@ -34,11 +34,11 @@ CMainDataGrabber::~CMainDataGrabber() } -// if (m_GrabTimer!=NULL) -// { -// m_GrabTimer->stop(); -// delete m_GrabTimer; -// } + if (m_GrabTimer!=NULL) + { + m_GrabTimer->stop(); + delete m_GrabTimer; + } } void CMainDataGrabber::Delay_MSec(ZZ_U16 usMS) @@ -131,12 +131,12 @@ int CMainDataGrabber::SetupMsgPipelines() connect(this, &CMainDataGrabber::SignalGrabOnceFinished, this, &CMainDataGrabber::GrabOnceFinished); - //connect(m_GrabTimer, &QTimer::timeout, this, &CMainDataGrabber::OnTimeCounter); + connect(m_GrabTimer, &QTimer::timeout, this, &CMainDataGrabber::OnTimeCounter); connect(this, &CMainDataGrabber::SignalStartGrab, this, &CMainDataGrabber::StartGrabTimer); connect(this, &CMainDataGrabber::SignalGrabOnceFinished_Signal, this, &CMainDataGrabber::GrabOnceFinished_Signal); - connect(this, &CMainDataGrabber::SignalGrabOnceFinished_Dark, this, &CMainDataGrabber::SignalGrabOnceFinished_Dark); + connect(this, &CMainDataGrabber::SignalGrabOnceFinished_Dark, this, &CMainDataGrabber::GrabOnceFinished_Dark); return 0; } @@ -203,6 +203,8 @@ int CMainDataGrabber::GrabOnceFinished_Dark() int CMainDataGrabber::StartGrabTimer() { + + //////////////////////////////////////////////////////////////////////////start ////check start time // bool bStopWait = false; @@ -215,9 +217,9 @@ int CMainDataGrabber::StartGrabTimer() // } // } - ////start - //int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000; - //m_GrabTimer->start(iIntervalInMS); + //start + int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000; + m_GrabTimer->start(3000); //////////////////////////////////////////////////////////////////////////test // m_iFlagIsCapturing = true; @@ -235,22 +237,39 @@ int CMainDataGrabber::StartGrabTimer() // QThread::msleep(1000); // } // qDebug() << "Allgrab stopped" << " Thread ID:" <<2; - emit SignalStartGrabOnce_Signal(); - m_iFlagIsCapturing = 1; - m_iFlagIsCapturing_Signal = 1; - while (m_iFlagIsCapturing_Signal) - { - Delay_MSec(200); - qDebug() << "msleep" << 200; - } - qDebug() << "msleep quit"; + + ////final test code eat my ass +// m_iFlagIsCapturing = 1; +// +// +// for (int i=0;i<5;i++) +// { +// m_iFlagIsCapturing_Signal = 1; +// emit SignalStartGrabOnce_Signal(); +// while (m_iFlagIsCapturing_Signal) +// { +// Delay_MSec(200); +// qDebug() << "msleep" << 200; +// } +// +// m_iFlagIsCapturing_Dark = 1; +// emit SignalStartGrabOnce_Dark(); +// while (m_iFlagIsCapturing_Dark) +// { +// Delay_MSec(200); +// qDebug() << "msleep" << 200; +// } +// +// } +// qDebug() << "for quit"; +// return 0; } int CMainDataGrabber::GrabOnceFinished() { - //m_iFlagIsCapturing = false; + m_iFlagIsCapturing = false; // QTimer t; // t.start(); // while (1) @@ -261,17 +280,42 @@ int CMainDataGrabber::GrabOnceFinished() return 0; } -// int CMainDataGrabber::OnTimeCounter() -// { -// -// if (m_iFlagIsCapturing) -// { -// qDebug() << "busy"; -// return 0; -// } -// m_iFlagIsCapturing = true; -// -// emit SignalGrabOnceFinished(); -// return 0; -// } + int CMainDataGrabber::OnTimeCounter() + { + + if (m_iFlagIsCapturing) + { + qDebug() << "-------------------------------------------busy"; + return 0; + } + m_iFlagIsCapturing = 1; + //qDebug() << "-------------------------------------------return"; + //return 1; + for (int i = 0; i < 5; i++) + { + m_iFlagIsCapturing_Signal = 1; + emit SignalStartGrabOnce_Signal(); + while (m_iFlagIsCapturing_Signal) + { + Delay_MSec(1000); + //QThread::msleep(1000); + qDebug() << "msleep" << 1000; + } + + m_iFlagIsCapturing_Dark = 1; + emit SignalStartGrabOnce_Dark(); + while (m_iFlagIsCapturing_Dark) + { + Delay_MSec(1000); + //QThread::msleep(1000); + qDebug() << "msleep" << 1000; + } + + } + qDebug() << "for quit"; + + + emit SignalGrabOnceFinished(); + return 0; + } diff --git a/source/Thread/MainDataGrabber.h b/source/Thread/MainDataGrabber.h index 2bc9b7b..7038a91 100644 --- a/source/Thread/MainDataGrabber.h +++ b/source/Thread/MainDataGrabber.h @@ -33,7 +33,7 @@ private: AcqTimeSettings m_struAcqTime; - //QTimer *m_GrabTimer; + QTimer *m_GrabTimer; private: void Delay_MSec(ZZ_U16 usMS); public: @@ -49,7 +49,7 @@ public: public slots: int StartGrabTimer(); - //int OnTimeCounter(); + int OnTimeCounter(); int HandleThreadEvent_Signal(int iThreadID, int iFlagStatus); int HandleThreadEvent_Dark(int iThreadID, int iFlagStatus);