diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-06-24 18:55:46 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-06-26 14:05:21 -0400 |
| commit | 40b9339f9c891574d02399fa91c66f32fab65779 (patch) | |
| tree | e81e1ee5d2ee4d6e4751cda34dc53510aa76723c /gr-qtgui/lib | |
| parent | 0b5f9ebf537ea1d40aac5355fd0f8c4089632610 (diff) | |
qtgui: Mostly adds sunset and cool color schemes for waterfall/raster plots.
Diffstat (limited to 'gr-qtgui/lib')
| -rw-r--r-- | gr-qtgui/lib/TimeRasterDisplayPlot.cc | 18 | ||||
| -rw-r--r-- | gr-qtgui/lib/WaterfallDisplayPlot.cc | 28 | ||||
| -rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.ui | 10 |
3 files changed, 52 insertions, 4 deletions
diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index afe326bdbb..2d4ed41d96 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -239,7 +239,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot(int nplots, Qt::RightButton, Qt::ControlModifier); d_zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton); - + const QColor c(Qt::red); d_zoomer->setRubberBandPen(c); d_zoomer->setTrackerPen(c); @@ -301,7 +301,7 @@ TimeRasterDisplayPlot::reset() newSize.setWidth(d_cols); newSize.setBottom(0); newSize.setHeight(d_rows); - + d_zoomer->zoom(newSize); d_zoomer->setZoomBase(newSize); d_zoomer->zoom(0); @@ -504,6 +504,16 @@ TimeRasterDisplayPlot::setIntensityColorMapType(const int which, d_raster[which]->setColorMap(new ColorMap_Incandescent()); break; } + case INTENSITY_COLOR_MAP_TYPE_SUNSET: { + d_color_map_type[which] = newType; + d_raster[which]->setColorMap(new ColorMap_Sunset()); + break; + } + case INTENSITY_COLOR_MAP_TYPE_COOL: { + d_color_map_type[which] = newType; + d_raster[which]->setColorMap(new ColorMap_Cool()); + break; + } case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: { d_low_intensity = lowColor; d_high_intensity = highColor; @@ -555,6 +565,10 @@ TimeRasterDisplayPlot::_updateIntensityRangeDisplay() rightAxis->setColorMap(intv, new ColorMap_BlackHot()); break; case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: rightAxis->setColorMap(intv, new ColorMap_Incandescent()); break; + case INTENSITY_COLOR_MAP_TYPE_SUNSET: + rightAxis->setColorMap(intv, new ColorMap_Sunset()); break; + case INTENSITY_COLOR_MAP_TYPE_COOL: + rightAxis->setColorMap(intv, new ColorMap_Cool()); break; case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: rightAxis->setColorMap(intv, new ColorMap_UserDefined(d_low_intensity, d_high_intensity)); diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index 92fcb38eaa..eb33cba921 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -81,7 +81,7 @@ private: /*********************************************************************** * Widget to provide mouse pointer coordinate text **********************************************************************/ -class WaterfallZoomer: public QwtPlotZoomer, public TimeScaleData, +class WaterfallZoomer: public QwtPlotZoomer, public TimeScaleData, public FreqOffsetAndPrecisionClass { public: @@ -168,7 +168,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget* parent) d_intensity_color_map_type.push_back(INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR); setIntensityColorMapType(i, d_intensity_color_map_type[i], - QColor("white"), QColor("white")); + QColor("white"), QColor("white")); setAlpha(i, 255/d_nplots); } @@ -456,6 +456,26 @@ WaterfallDisplayPlot::setIntensityColorMapType(const int which, #endif break; } + case INTENSITY_COLOR_MAP_TYPE_SUNSET: { + d_intensity_color_map_type[which] = newType; +#if QWT_VERSION < 0x060000 + ColorMap_Sunset colorMap; + d_spectrogram[which]->setColorMap(colorMap); +#else + d_spectrogram[which]->setColorMap(new ColorMap_Sunset()); +#endif + break; + } + case INTENSITY_COLOR_MAP_TYPE_COOL: { + d_intensity_color_map_type[which] = newType; +#if QWT_VERSION < 0x060000 + ColorMap_Cool colorMap; + d_spectrogram[which]->setColorMap(colorMap); +#else + d_spectrogram[which]->setColorMap(new ColorMap_Cool()); +#endif + break; + } case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED:{ d_user_defined_low_intensity_color = lowColor; d_user_defined_high_intensity_color = highColor; @@ -549,6 +569,10 @@ WaterfallDisplayPlot::_updateIntensityRangeDisplay() rightAxis->setColorMap(intv, new ColorMap_BlackHot()); break; case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: rightAxis->setColorMap(intv, new ColorMap_Incandescent()); break; + case INTENSITY_COLOR_MAP_TYPE_SUNSET: + rightAxis->setColorMap(intv, new ColorMap_Sunset()); break; + case INTENSITY_COLOR_MAP_TYPE_COOL: + rightAxis->setColorMap(intv, new ColorMap_Cool()); break; case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: rightAxis->setColorMap(intv, new ColorMap_UserDefined(d_user_defined_low_intensity_color, d_user_defined_high_intensity_color)); diff --git a/gr-qtgui/lib/spectrumdisplayform.ui b/gr-qtgui/lib/spectrumdisplayform.ui index ceab55b049..1176aec4de 100644 --- a/gr-qtgui/lib/spectrumdisplayform.ui +++ b/gr-qtgui/lib/spectrumdisplayform.ui @@ -448,6 +448,16 @@ </item> <item> <property name="text"> + <string>Sunset</string> + </property> + </item> + <item> + <property name="text"> + <string>Cool</string> + </property> + </item> + <item> + <property name="text"> <string>User Defined</string> </property> </item> |