diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-12 21:55:23 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-12 21:55:23 -0500 |
| commit | bbbbf8b042c3443415ae766bf7b6a26134c0119d (patch) | |
| tree | a604bad094914ec9cb6d76ce189986befa5e6547 /gr-qtgui/lib/WaterfallDisplayPlot.h | |
| parent | ea539a77938c81bb046a6d83f3cf3f40eaa33c49 (diff) | |
| parent | 8740eb0d9460060ae97f9d252cae81cdcf0e20e5 (diff) | |
Merge branch 'qtgui_stylesheets' into next
Conflicts:
gr-qtgui/lib/DisplayPlot.cc
gr-qtgui/lib/DisplayPlot.h
gr-qtgui/lib/displayform.cc
Fixed some function name issues and updated qtgui examples.
Diffstat (limited to 'gr-qtgui/lib/WaterfallDisplayPlot.h')
| -rw-r--r-- | gr-qtgui/lib/WaterfallDisplayPlot.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.h b/gr-qtgui/lib/WaterfallDisplayPlot.h index adf5278059..fbb0131563 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.h +++ b/gr-qtgui/lib/WaterfallDisplayPlot.h @@ -41,6 +41,11 @@ class WaterfallDisplayPlot: public DisplayPlot { Q_OBJECT + Q_PROPERTY ( int intensity_color_map_type1 READ GetIntensityColorMapType1 WRITE SetIntensityColorMapType1 ) + Q_PROPERTY ( QColor low_intensity_color READ GetUserDefinedLowIntensityColor WRITE SetUserDefinedLowIntensityColor ) + Q_PROPERTY ( QColor high_intensity_color READ GetUserDefinedHighIntensityColor WRITE SetUserDefinedHighIntensityColor ) + + public: WaterfallDisplayPlot(int nplots, QWidget*); virtual ~WaterfallDisplayPlot(); @@ -72,10 +77,16 @@ public: void replot(void); int GetIntensityColorMapType(int) const; - void SetIntensityColorMapType(const int, const int, const QColor, const QColor); + int GetIntensityColorMapType1() const; const QColor GetUserDefinedLowIntensityColor() const; const QColor GetUserDefinedHighIntensityColor() const; +public slots: + void SetIntensityColorMapType(const int, const int, const QColor, const QColor); + void SetIntensityColorMapType1(int); + void SetUserDefinedLowIntensityColor(QColor); + void SetUserDefinedHighIntensityColor(QColor); + signals: void UpdatedLowerIntensityLevel(const double); void UpdatedUpperIntensityLevel(const double); |