Merge branch 'qtgui_time'

Conflicts:
	gr-qtgui/apps/pyqt_example_f.py

1 files changed, 24 insertions, 0 deletions

diff --git a/gr-qtgui/lib/spectrumUpdateEvents.h b/gr-qtgui/lib/spectrumUpdateEvents.h
index ccc072c3e..a5e359a4c 100644
--- a/gr-qtgui/lib/spectrumUpdateEvents.h
+++ b/gr-qtgui/lib/spectrumUpdateEvents.h
@@ -5,6 +5,7 @@
 #include <QEvent>
 #include <QString>
 #include <complex>
+#include <vector>
 #include <highResTimeFunctions.h>
 
 class SpectrumUpdateEvent:public QEvent{
@@ -89,4 +90,27 @@ private:
 };
 
 
+class TimeUpdateEvent: public QEvent
+{
+public:
+  TimeUpdateEvent(const std::vector<double*> timeDomainPoints,
+		  const uint64_t numTimeDomainDataPoints);
+  
+  ~TimeUpdateEvent();
+
+  int which() const;
+  const std::vector<double*> getTimeDomainPoints() const;
+  uint64_t getNumTimeDomainDataPoints() const;
+  timespec getDataTimestamp() const;
+  bool getRepeatDataFlag() const;
+
+protected:
+
+private:
+  size_t _nplots;
+  std::vector<double*> _dataTimeDomainPoints;
+  uint64_t _numTimeDomainDataPoints;
+};
+
+
 #endif /* SPECTRUM_UPDATE_EVENTS_H */