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

111111111222222333

Browse Source
This commit is contained in:
zhangzhuo
2021-12-03 10:43:25 +08:00
parent efbcde38d7
commit a9014a5a85
26 changed files with 108 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Data/2021_12_02/beijing_18_08_00.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_02 10:08:00,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_02/beijing_18_09_27.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_02 10:09:27,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_02/beijing_18_11_07.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_02 10:11:07,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_02/beijing_18_11_20.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_02 10:11:20,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_02/beijing_18_13_36.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_02 10:13:36,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_02/beijing_18_14_30.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_02 10:14:30,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_02/beijing_18_15_41.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_02 10:15:41,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_09_50_36.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 01:50:36,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_09_51_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 01:51:49,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_09_52_15.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 01:52:15,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_09_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 02:09:45,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_15_37.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:15:37,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_22_22.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:22:22,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_22_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:22:54,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_25_26.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:25:26,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_26_51.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:26:51,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_27_30.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:27:30,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_28_30.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:28:30,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_29_07.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:29:07,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_29_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 02:29:49,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_31_39.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:31:39,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_32_27.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:32:27,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_37_08.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:37:08,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

1
Data/2021_12_03/beijing_10_41_27.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:41:27,DownlaodAddress,http://www.iris-rs.cn,DownloadUserID,newuser,HTTPServer,,InstallationTime,2021-11-18,NameOfMaintenanceStaff,renlixin,PhoneNumberOfMaintenanceStaff,110110110,

107
source/Thread/MainDataGrabber.cpp
View File

@ -4,8 +4,12 @@ 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_Dark = false;
} }
CMainDataGrabber::~CMainDataGrabber() CMainDataGrabber::~CMainDataGrabber()
@ -30,11 +34,18 @@ 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)
{
QEventLoop qeLoop;
QTimer::singleShot(usMS, &qeLoop, SLOT(quit()));
qeLoop.exec();
} }
int CMainDataGrabber::SetGrabberParams(RunTimeGrabberParams struGrabberRTParams) int CMainDataGrabber::SetGrabberParams(RunTimeGrabberParams struGrabberRTParams)
@ -120,10 +131,13 @@ 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_Dark, this, &CMainDataGrabber::SignalGrabOnceFinished_Dark);
return 0; return 0;
} }
@ -149,7 +163,7 @@ int CMainDataGrabber::HandleThreadEvent_Signal(int iThreadID, int iFlagStatus)
if (bFinished) if (bFinished)
{ {
emit SignalStartGrabOnce_Dark(); emit SignalGrabOnceFinished_Signal();
} }
return 0; return 0;
} }
@ -170,11 +184,23 @@ int CMainDataGrabber::HandleThreadEvent_Dark(int iThreadID, int iFlagStatus)
if (bFinished) if (bFinished)
{ {
emit SignalGrabOnceFinished(); emit SignalGrabOnceFinished_Dark();
} }
return 0; return 0;
} }
int CMainDataGrabber::GrabOnceFinished_Signal()
{
m_iFlagIsCapturing_Signal = false;
return 0;
}
int CMainDataGrabber::GrabOnceFinished_Dark()
{
m_iFlagIsCapturing_Dark = false;
return 0;
}
int CMainDataGrabber::StartGrabTimer() int CMainDataGrabber::StartGrabTimer()
{ {
//////////////////////////////////////////////////////////////////////////start //////////////////////////////////////////////////////////////////////////start
@ -190,8 +216,8 @@ 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(iIntervalInMS);
//////////////////////////////////////////////////////////////////////////test //////////////////////////////////////////////////////////////////////////test
// m_iFlagIsCapturing = true; // m_iFlagIsCapturing = true;
@ -209,40 +235,43 @@ 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)
{
Delay_MSec(200);
qDebug() << "msleep" << 200;
}
qDebug() << "msleep quit";
return 0; return 0;
} }
int CMainDataGrabber::GrabOnceFinished() int CMainDataGrabber::GrabOnceFinished()
{ {
m_iFlagIsCapturing = false; //m_iFlagIsCapturing = false;
// QTimer t;
// t.start();
// while (1)
// {
// QThread::msleep(1);
// QCoreApplication::processEvents();
// }
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 = true;
m_struAcqPosSetting.iTotalPosition = 5; //
// emit SignalGrabOnceFinished();
emit SignalStartGrabOnce_Signal(); // return 0;
for (int i=0;i< m_struAcqPosSetting.iTotalPosition;i++) // }
{
m_iFlagIsCapturing = true;
while (m_iFlagIsCapturing)
{
QThread::msleep(1000);
}
}
return 0;
}

19
source/Thread/MainDataGrabber.h
View File

@ -19,8 +19,12 @@ private:
int *m_piFlagCaptureThreadStatus_Signal; int *m_piFlagCaptureThreadStatus_Signal;
int *m_piFlagCaptureThreadStatus_Dark; int *m_piFlagCaptureThreadStatus_Dark;
int m_iTotalThreads; int m_iTotalThreads;
int m_iFlagIsCapturing; int m_iFlagIsCapturing;
int m_iFlagIsCapturing_Signal;
int m_iFlagIsCapturing_Dark;
FSContext m_struDeviceContext; FSContext m_struDeviceContext;
@ -29,8 +33,9 @@ private:
AcqTimeSettings m_struAcqTime; AcqTimeSettings m_struAcqTime;
QTimer *m_GrabTimer; //QTimer *m_GrabTimer;
private:
void Delay_MSec(ZZ_U16 usMS);
public: public:
//Call this first //Call this first
int SetGrabberParams(RunTimeGrabberParams struGrabberRTParams); int SetGrabberParams(RunTimeGrabberParams struGrabberRTParams);
@ -43,16 +48,22 @@ public:
int StartGrab(); int StartGrab();
public slots: public slots:
int StartGrabTimer();
//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);
int StartGrabTimer();
int GrabOnceFinished_Signal();
int GrabOnceFinished_Dark();
int GrabOnceFinished(); int GrabOnceFinished();
int OnTimeCounter();
signals: signals:
void SignalStartGrabOnce_Signal(); void SignalStartGrabOnce_Signal();
void SignalStartGrabOnce_Dark(); void SignalStartGrabOnce_Dark();
void SignalGrabOnceFinished_Signal();
void SignalGrabOnceFinished_Dark();
void SignalGrabOnceFinished(); void SignalGrabOnceFinished();