From 8b1303bbb0bf72569a5149082796f50b6e8f9a5b Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Thu, 4 Apr 2013 11:50:35 -0400
Subject: docs: fixes for merge conflicts and differences between master/next.
---
gr-qtgui/include/qtgui/plot_raster.h | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'gr-qtgui/include/qtgui/plot_raster.h')
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:
--
cgit v1.2.3