diff --git a/Data/2021_12_02/beijing_18_08_00.txt b/Data/2021_12_02/beijing_18_08_00.txt new file mode 100644 index 0000000..a3c7a16 --- /dev/null +++ b/Data/2021_12_02/beijing_18_08_00.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_02/beijing_18_09_27.txt b/Data/2021_12_02/beijing_18_09_27.txt new file mode 100644 index 0000000..dcaa036 --- /dev/null +++ b/Data/2021_12_02/beijing_18_09_27.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_02/beijing_18_11_07.txt b/Data/2021_12_02/beijing_18_11_07.txt new file mode 100644 index 0000000..6a77f9b --- /dev/null +++ b/Data/2021_12_02/beijing_18_11_07.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_02/beijing_18_11_20.txt b/Data/2021_12_02/beijing_18_11_20.txt new file mode 100644 index 0000000..18b5d52 --- /dev/null +++ b/Data/2021_12_02/beijing_18_11_20.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_02/beijing_18_13_36.txt b/Data/2021_12_02/beijing_18_13_36.txt new file mode 100644 index 0000000..668f753 --- /dev/null +++ b/Data/2021_12_02/beijing_18_13_36.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_02/beijing_18_14_30.txt b/Data/2021_12_02/beijing_18_14_30.txt new file mode 100644 index 0000000..67710d5 --- /dev/null +++ b/Data/2021_12_02/beijing_18_14_30.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_02/beijing_18_15_41.txt b/Data/2021_12_02/beijing_18_15_41.txt new file mode 100644 index 0000000..831d51c --- /dev/null +++ b/Data/2021_12_02/beijing_18_15_41.txt @@ -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, \ No newline at end of file diff --git a/Data/2021_12_03/beijing_09_50_36.txt b/Data/2021_12_03/beijing_09_50_36.txt new file mode 100644 index 0000000..4674c83 --- /dev/null +++ b/Data/2021_12_03/beijing_09_50_36.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 01:50:36,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_09_51_49.txt b/Data/2021_12_03/beijing_09_51_49.txt new file mode 100644 index 0000000..533294b --- /dev/null +++ b/Data/2021_12_03/beijing_09_51_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 01:51: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_09_52_15.txt b/Data/2021_12_03/beijing_09_52_15.txt new file mode 100644 index 0000000..67deddd --- /dev/null +++ b/Data/2021_12_03/beijing_09_52_15.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 01:52:15,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_10_09_45.txt b/Data/2021_12_03/beijing_10_09_45.txt new file mode 100644 index 0000000..b047383 --- /dev/null +++ b/Data/2021_12_03/beijing_10_09_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 02:09: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_10_15_37.txt b/Data/2021_12_03/beijing_10_15_37.txt new file mode 100644 index 0000000..4df0c1b --- /dev/null +++ b/Data/2021_12_03/beijing_10_15_37.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:15:37,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_10_22_22.txt b/Data/2021_12_03/beijing_10_22_22.txt new file mode 100644 index 0000000..ad41dc9 --- /dev/null +++ b/Data/2021_12_03/beijing_10_22_22.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:22:22,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_10_22_54.txt b/Data/2021_12_03/beijing_10_22_54.txt new file mode 100644 index 0000000..2ccc97a --- /dev/null +++ b/Data/2021_12_03/beijing_10_22_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:22: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_10_25_26.txt b/Data/2021_12_03/beijing_10_25_26.txt new file mode 100644 index 0000000..56013a6 --- /dev/null +++ b/Data/2021_12_03/beijing_10_25_26.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:25:26,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_10_26_51.txt b/Data/2021_12_03/beijing_10_26_51.txt new file mode 100644 index 0000000..ca4fd5b --- /dev/null +++ b/Data/2021_12_03/beijing_10_26_51.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:26:51,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_10_27_30.txt b/Data/2021_12_03/beijing_10_27_30.txt new file mode 100644 index 0000000..ea75a8c --- /dev/null +++ b/Data/2021_12_03/beijing_10_27_30.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:27:30,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_10_28_30.txt b/Data/2021_12_03/beijing_10_28_30.txt new file mode 100644 index 0000000..ee07135 --- /dev/null +++ b/Data/2021_12_03/beijing_10_28_30.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:28:30,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_10_29_07.txt b/Data/2021_12_03/beijing_10_29_07.txt new file mode 100644 index 0000000..1f5a685 --- /dev/null +++ b/Data/2021_12_03/beijing_10_29_07.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:29:07,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_10_29_49.txt b/Data/2021_12_03/beijing_10_29_49.txt new file mode 100644 index 0000000..2c5809e --- /dev/null +++ b/Data/2021_12_03/beijing_10_29_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 02:29: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_10_31_39.txt b/Data/2021_12_03/beijing_10_31_39.txt new file mode 100644 index 0000000..3b87ad4 --- /dev/null +++ b/Data/2021_12_03/beijing_10_31_39.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:31:39,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_10_32_27.txt b/Data/2021_12_03/beijing_10_32_27.txt new file mode 100644 index 0000000..50e1a15 --- /dev/null +++ b/Data/2021_12_03/beijing_10_32_27.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:32:27,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_10_37_08.txt b/Data/2021_12_03/beijing_10_37_08.txt new file mode 100644 index 0000000..ac9cfeb --- /dev/null +++ b/Data/2021_12_03/beijing_10_37_08.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:37:08,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_10_41_27.txt b/Data/2021_12_03/beijing_10_41_27.txt new file mode 100644 index 0000000..d41049b --- /dev/null +++ b/Data/2021_12_03/beijing_10_41_27.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:41:27,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 838eb15..ca9c329 100644 --- a/source/Thread/MainDataGrabber.cpp +++ b/source/Thread/MainDataGrabber.cpp @@ -4,8 +4,12 @@ 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; + m_iFlagIsCapturing_Dark = false; } CMainDataGrabber::~CMainDataGrabber() @@ -30,11 +34,18 @@ 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) +{ + QEventLoop qeLoop; + QTimer::singleShot(usMS, &qeLoop, SLOT(quit())); + qeLoop.exec(); } int CMainDataGrabber::SetGrabberParams(RunTimeGrabberParams struGrabberRTParams) @@ -120,9 +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); return 0; } @@ -149,7 +163,7 @@ int CMainDataGrabber::HandleThreadEvent_Signal(int iThreadID, int iFlagStatus) if (bFinished) { - emit SignalStartGrabOnce_Dark(); + emit SignalGrabOnceFinished_Signal(); } return 0; } @@ -170,11 +184,23 @@ int CMainDataGrabber::HandleThreadEvent_Dark(int iThreadID, int iFlagStatus) if (bFinished) { - emit SignalGrabOnceFinished(); + emit SignalGrabOnceFinished_Dark(); } 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() { //////////////////////////////////////////////////////////////////////////start @@ -190,8 +216,8 @@ 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); + //int iIntervalInMS =m_struAcqTime.qtInterval.hour()*3600*1000+ m_struAcqTime.qtInterval.minute()*60*1000+ m_struAcqTime.qtInterval.second()*1000; + //m_GrabTimer->start(iIntervalInMS); //////////////////////////////////////////////////////////////////////////test // m_iFlagIsCapturing = true; @@ -209,40 +235,43 @@ 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"; return 0; } int CMainDataGrabber::GrabOnceFinished() { - m_iFlagIsCapturing = false; + //m_iFlagIsCapturing = false; +// QTimer t; +// t.start(); +// while (1) +// { +// QThread::msleep(1); +// QCoreApplication::processEvents(); +// } return 0; } -int CMainDataGrabber::OnTimeCounter() -{ - - if (m_iFlagIsCapturing) - { - qDebug() << "busy"; - return 0; - } - m_iFlagIsCapturing = true; - m_struAcqPosSetting.iTotalPosition = 5; - - emit SignalStartGrabOnce_Signal(); - for (int i=0;i< m_struAcqPosSetting.iTotalPosition;i++) - { - - - m_iFlagIsCapturing = true; - while (m_iFlagIsCapturing) - { - QThread::msleep(1000); - } - - } - - - return 0; -} +// int CMainDataGrabber::OnTimeCounter() +// { +// +// if (m_iFlagIsCapturing) +// { +// qDebug() << "busy"; +// return 0; +// } +// m_iFlagIsCapturing = true; +// +// emit SignalGrabOnceFinished(); +// return 0; +// } diff --git a/source/Thread/MainDataGrabber.h b/source/Thread/MainDataGrabber.h index b0b943a..2bc9b7b 100644 --- a/source/Thread/MainDataGrabber.h +++ b/source/Thread/MainDataGrabber.h @@ -19,8 +19,12 @@ private: int *m_piFlagCaptureThreadStatus_Signal; int *m_piFlagCaptureThreadStatus_Dark; + int m_iTotalThreads; + int m_iFlagIsCapturing; + int m_iFlagIsCapturing_Signal; + int m_iFlagIsCapturing_Dark; FSContext m_struDeviceContext; @@ -29,8 +33,9 @@ private: AcqTimeSettings m_struAcqTime; - QTimer *m_GrabTimer; - + //QTimer *m_GrabTimer; +private: + void Delay_MSec(ZZ_U16 usMS); public: //Call this first int SetGrabberParams(RunTimeGrabberParams struGrabberRTParams); @@ -43,16 +48,22 @@ public: int StartGrab(); public slots: + int StartGrabTimer(); + //int OnTimeCounter(); + int HandleThreadEvent_Signal(int iThreadID, int iFlagStatus); int HandleThreadEvent_Dark(int iThreadID, int iFlagStatus); - int StartGrabTimer(); + + int GrabOnceFinished_Signal(); + int GrabOnceFinished_Dark(); int GrabOnceFinished(); - int OnTimeCounter(); - + signals: void SignalStartGrabOnce_Signal(); void SignalStartGrabOnce_Dark(); + void SignalGrabOnceFinished_Signal(); + void SignalGrabOnceFinished_Dark(); void SignalGrabOnceFinished();