diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-01-22 12:47:58 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-01-22 12:47:58 -0500 |
| commit | e7b1639edb668face7e9ab611887c4df6e5a0ac8 (patch) | |
| tree | 8399e4b813e04a7aa84ded29acf9f92684b80daa | |
| parent | fdb0d74ff9aa951f3969c312162881b913098f0c (diff) | |
| parent | e1fd88db9b7edc13a90b5c81263d062ebcf2932b (diff) | |
Merge branch 'mergeme/qtgui/plots_static_const_fix' into next
| -rw-r--r-- | gr-qtgui/src/lib/SpectrumGUIClass.cc | 4 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/SpectrumGUIClass.h | 4 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/WaterfallDisplayPlot.cc | 6 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/WaterfallDisplayPlot.h | 12 |
4 files changed, 11 insertions, 15 deletions
diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.cc b/gr-qtgui/src/lib/SpectrumGUIClass.cc index 563ed34bae..052730fc26 100644 --- a/gr-qtgui/src/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/src/lib/SpectrumGUIClass.cc @@ -6,8 +6,8 @@ #include <QEvent> #include <QCustomEvent> -const long SpectrumGUIClass::MAX_FFT_SIZE; -const long SpectrumGUIClass::MIN_FFT_SIZE; +const long SpectrumGUIClass::MAX_FFT_SIZE = 32768; +const long SpectrumGUIClass::MIN_FFT_SIZE = 1024; SpectrumGUIClass::SpectrumGUIClass(const uint64_t maxDataSize, const uint64_t fftSize, diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.h b/gr-qtgui/src/lib/SpectrumGUIClass.h index 63a340c340..57a749a6a2 100644 --- a/gr-qtgui/src/lib/SpectrumGUIClass.h +++ b/gr-qtgui/src/lib/SpectrumGUIClass.h @@ -67,8 +67,8 @@ public: void DecrementPendingGUIUpdateEvents(); void ResetPendingGUIUpdateEvents(); - static const long MAX_FFT_SIZE = /*1048576*/32768; - static const long MIN_FFT_SIZE = 1024; + static const long MAX_FFT_SIZE; + static const long MIN_FFT_SIZE; QWidget* qwidget(); diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc index 680c447565..805af1d8d5 100644 --- a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc @@ -210,12 +210,6 @@ private: }; -const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR; -const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT; -const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT; -const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT; -const int WaterfallDisplayPlot::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED; - WaterfallDisplayPlot::WaterfallDisplayPlot(QWidget* parent) : QwtPlot(parent) { diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.h b/gr-qtgui/src/lib/WaterfallDisplayPlot.h index 8bd990f2a5..6b4e978bb3 100644 --- a/gr-qtgui/src/lib/WaterfallDisplayPlot.h +++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.h @@ -40,11 +40,13 @@ public: const QColor GetUserDefinedLowIntensityColor()const; const QColor GetUserDefinedHighIntensityColor()const; - static const int INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0; - static const int INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1; - static const int INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2; - static const int INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3; - static const int INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4; + enum{ + INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0, + INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1, + INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2, + INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3, + INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4 + }; public slots: void resizeSlot( QSize *s ); |