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

4444444444444444444444445555555555555555555

Browse Source
This commit is contained in:
zhangzhuo
2021-12-03 11:34:49 +08:00
parent a9014a5a85
commit 34451f2910
15 changed files with 93 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/2021_12_03/beijing_10_43_54.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_01_57.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_02_53.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_03_49.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_05_13.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_18_04.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_19_02.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_19_11.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_19_28.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_26_01.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_27_02.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_27_45.txt Normal file
View File

@ -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,

1
Data/2021_12_03/beijing_11_30_48.txt Normal file
View File

@ -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,

112
source/Thread/MainDataGrabber.cpp
View File

@ -5,7 +5,7 @@ CMainDataGrabber::CMainDataGrabber(QObject* parent /*= nullptr*/)
m_piFlagCaptureThreadStatus_Signal = NULL; m_piFlagCaptureThreadStatus_Signal = NULL;
m_piFlagCaptureThreadStatus_Dark = NULL; m_piFlagCaptureThreadStatus_Dark = NULL;
//m_GrabTimer = new QTimer(this); m_GrabTimer = new QTimer(this);
m_iFlagIsCapturing = false; m_iFlagIsCapturing = false;
m_iFlagIsCapturing_Signal = false; m_iFlagIsCapturing_Signal = false;
@ -34,11 +34,11 @@ CMainDataGrabber::~CMainDataGrabber()
} }
// if (m_GrabTimer!=NULL) if (m_GrabTimer!=NULL)
// { {
// m_GrabTimer->stop(); m_GrabTimer->stop();
// delete m_GrabTimer; delete m_GrabTimer;
// } }
} }
void CMainDataGrabber::Delay_MSec(ZZ_U16 usMS) void CMainDataGrabber::Delay_MSec(ZZ_U16 usMS)
@ -131,12 +131,12 @@ int CMainDataGrabber::SetupMsgPipelines()
connect(this, &CMainDataGrabber::SignalGrabOnceFinished, this, &CMainDataGrabber::GrabOnceFinished); 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::SignalStartGrab, this, &CMainDataGrabber::StartGrabTimer);
connect(this, &CMainDataGrabber::SignalGrabOnceFinished_Signal, this, &CMainDataGrabber::GrabOnceFinished_Signal); 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; return 0;
} }
@ -203,6 +203,8 @@ int CMainDataGrabber::GrabOnceFinished_Dark()
int CMainDataGrabber::StartGrabTimer() int CMainDataGrabber::StartGrabTimer()
{ {
//////////////////////////////////////////////////////////////////////////start //////////////////////////////////////////////////////////////////////////start
////check start time ////check start time
// bool bStopWait = false; // bool bStopWait = false;
@ -215,9 +217,9 @@ int CMainDataGrabber::StartGrabTimer()
// } // }
// } // }
////start //start
//int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000; int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000;
//m_GrabTimer->start(iIntervalInMS); m_GrabTimer->start(3000);
//////////////////////////////////////////////////////////////////////////test //////////////////////////////////////////////////////////////////////////test
// m_iFlagIsCapturing = true; // m_iFlagIsCapturing = true;
@ -235,22 +237,39 @@ int CMainDataGrabber::StartGrabTimer()
// QThread::msleep(1000); // QThread::msleep(1000);
// } // }
// qDebug() << "Allgrab stopped" << " Thread ID:" <<2; // qDebug() << "Allgrab stopped" << " Thread ID:" <<2;
emit SignalStartGrabOnce_Signal();
m_iFlagIsCapturing = 1;
m_iFlagIsCapturing_Signal = 1;
while (m_iFlagIsCapturing_Signal)
{ ////final test code eat my ass
Delay_MSec(200); // m_iFlagIsCapturing = 1;
qDebug() << "msleep" << 200; //
} //
qDebug() << "msleep quit"; // 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; return 0;
} }
int CMainDataGrabber::GrabOnceFinished() int CMainDataGrabber::GrabOnceFinished()
{ {
//m_iFlagIsCapturing = false; m_iFlagIsCapturing = false;
// QTimer t; // QTimer t;
// t.start(); // t.start();
// while (1) // while (1)
@ -261,17 +280,42 @@ int CMainDataGrabber::GrabOnceFinished()
return 0; return 0;
} }
// int CMainDataGrabber::OnTimeCounter() int CMainDataGrabber::OnTimeCounter()
// { {
//
// if (m_iFlagIsCapturing) if (m_iFlagIsCapturing)
// { {
// qDebug() << "busy"; qDebug() << "-------------------------------------------busy";
// return 0; return 0;
// } }
// m_iFlagIsCapturing = true; m_iFlagIsCapturing = 1;
// //qDebug() << "-------------------------------------------return";
// emit SignalGrabOnceFinished(); //return 1;
// return 0; 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;
}

4
source/Thread/MainDataGrabber.h
View File

@ -33,7 +33,7 @@ private:
AcqTimeSettings m_struAcqTime; AcqTimeSettings m_struAcqTime;
//QTimer *m_GrabTimer; QTimer *m_GrabTimer;
private: private:
void Delay_MSec(ZZ_U16 usMS); void Delay_MSec(ZZ_U16 usMS);
public: public:
@ -49,7 +49,7 @@ public:
public slots: public slots:
int StartGrabTimer(); int StartGrabTimer();
//int OnTimeCounter(); int OnTimeCounter();
int HandleThreadEvent_Signal(int iThreadID, int iFlagStatus); int HandleThreadEvent_Signal(int iThreadID, int iFlagStatus);
int HandleThreadEvent_Dark(int iThreadID, int iFlagStatus); int HandleThreadEvent_Dark(int iThreadID, int iFlagStatus);