diff options
author | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
commit | d97764ce6040aff8023b43323b4bc048a907a1fd (patch) | |
tree | dda4ba74128454fd271ffe7dcbe673f2ae0b4c08 /gr-qtgui/lib/spectrumUpdateEvents.h | |
parent | b142f64573b8b7b15a94fc9c64e2f26264a5b144 (diff) | |
parent | bf8700a226091c5ce0130a3819a4c12b9d9981a6 (diff) |
Merge branch 'master' into my_qtsink
Conflicts:
gr-qtgui/include/qtgui_sink_c.h
gr-qtgui/include/qtgui_sink_f.h
gr-qtgui/include/qtgui_util.h
gr-qtgui/lib/ConstellationDisplayPlot.cc
gr-qtgui/lib/FrequencyDisplayPlot.cc
gr-qtgui/lib/SpectrumGUIClass.cc
gr-qtgui/lib/TimeDomainDisplayPlot.cc
gr-qtgui/lib/WaterfallDisplayPlot.cc
gr-qtgui/lib/qtgui_sink_c.cc
gr-qtgui/lib/qtgui_sink_f.cc
gr-qtgui/lib/spectrumdisplayform.cc
Diffstat (limited to 'gr-qtgui/lib/spectrumUpdateEvents.h')
-rw-r--r-- | gr-qtgui/lib/spectrumUpdateEvents.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gr-qtgui/lib/spectrumUpdateEvents.h b/gr-qtgui/lib/spectrumUpdateEvents.h index 090153c8d8..6b4ed29ea0 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.h +++ b/gr-qtgui/lib/spectrumUpdateEvents.h @@ -100,7 +100,7 @@ class TimeUpdateEvent: public QEvent public: TimeUpdateEvent(const std::vector<double*> timeDomainPoints, const uint64_t numTimeDomainDataPoints); - + ~TimeUpdateEvent(); int which() const; @@ -108,6 +108,9 @@ public: uint64_t getNumTimeDomainDataPoints() const; bool getRepeatDataFlag() const; + static QEvent::Type Type() + { return QEvent::Type(SpectrumUpdateEventType); } + protected: private: |