diff options
| author | Tom Rondeau | 2011-01-22 12:47:58 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-22 12:47:58 -0500 |
| commit | e7b1639edb668face7e9ab611887c4df6e5a0ac8 (patch) | |
| tree | 8399e4b813e04a7aa84ded29acf9f92684b80daa /gr-qtgui/src/lib/WaterfallDisplayPlot.h | |
| parent | fdb0d74ff9aa951f3969c312162881b913098f0c (diff) | |
| parent | e1fd88db9b7edc13a90b5c81263d062ebcf2932b (diff) | |
| download | gnuradio-e7b1639edb668face7e9ab611887c4df6e5a0ac8.tar.gz gnuradio-e7b1639edb668face7e9ab611887c4df6e5a0ac8.tar.bz2 gnuradio-e7b1639edb668face7e9ab611887c4df6e5a0ac8.zip | |
Merge branch 'mergeme/qtgui/plots_static_const_fix' into next
Diffstat (limited to 'gr-qtgui/src/lib/WaterfallDisplayPlot.h')
| -rw-r--r-- | gr-qtgui/src/lib/WaterfallDisplayPlot.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.h b/gr-qtgui/src/lib/WaterfallDisplayPlot.h index 8bd990f2a..6b4e978bb 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 ); |