diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 11:50:35 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 12:37:40 -0400 |
commit | 8b1303bbb0bf72569a5149082796f50b6e8f9a5b (patch) | |
tree | 5809962a19338db21f28957535529552d12992a1 /gr-qtgui/include/qtgui/plot_raster.h | |
parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-qtgui/include/qtgui/plot_raster.h')
-rw-r--r-- | gr-qtgui/include/qtgui/plot_raster.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gr-qtgui/include/qtgui/plot_raster.h b/gr-qtgui/include/qtgui/plot_raster.h index 5692cc4ba8..2a5159e00e 100644 --- a/gr-qtgui/include/qtgui/plot_raster.h +++ b/gr-qtgui/include/qtgui/plot_raster.h @@ -35,15 +35,16 @@ class QwtColorMap; /*! - \brief A plot item, which displays a time raster. - - A time raster displays threedimenional data, where the 3rd dimension - ( the intensity ) is displayed using colors. The colors are calculated - from the values using a color map. - - \sa QwtRasterData, QwtColorMap -*/ - + * \brief A plot item, which displays a time raster. + * \ingroup qtgui_blk + * + * \details + * A time raster displays threedimenional data, where the 3rd dimension + * (the intensity) is displayed using colors. The colors are calculated + * from the values using a color map. + * + * \sa QwtRasterData, QwtColorMap + */ class PlotTimeRaster: public QwtPlotRasterItem { public: |