diff options
Diffstat (limited to 'gr-qtgui')
-rw-r--r-- | gr-qtgui/src/lib/ConstellationDisplayPlot.cc | 13 | ||||
-rw-r--r-- | gr-qtgui/src/lib/ConstellationDisplayPlot.h | 2 | ||||
-rw-r--r-- | gr-qtgui/src/lib/SpectrumGUIClass.cc | 6 | ||||
-rw-r--r-- | gr-qtgui/src/lib/SpectrumGUIClass.h | 1 | ||||
-rw-r--r-- | gr-qtgui/src/lib/qtgui.i | 2 | ||||
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_c.cc | 7 | ||||
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_c.h | 1 | ||||
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_f.cc | 7 | ||||
-rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_f.h | 1 | ||||
-rw-r--r-- | gr-qtgui/src/lib/spectrumdisplayform.cc | bin | 27246 -> 27362 bytes | |||
-rw-r--r-- | gr-qtgui/src/lib/spectrumdisplayform.h | 1 |
11 files changed, 40 insertions, 1 deletions
diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc index 792096ded..80bf4503f 100644 --- a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc @@ -42,6 +42,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent) _displayIntervalTime = (1.0/10.0); // 1/10 of a second between updates _numPoints = 1024; + _penSize = 5; _realDataPoints = new double[_numPoints]; _imagDataPoints = new double[_numPoints]; @@ -69,7 +70,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent) // Automatically deleted when parent is deleted _plot_curve = new QwtPlotCurve("Constellation Points"); _plot_curve->attach(this); - _plot_curve->setPen(QPen(Qt::blue, 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + _plot_curve->setPen(QPen(Qt::blue, _penSize, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); _plot_curve->setStyle(QwtPlotCurve::Dots); _plot_curve->setRawData(_realDataPoints, _imagDataPoints, _numPoints); @@ -117,6 +118,16 @@ ConstellationDisplayPlot::~ConstellationDisplayPlot() // _zoomer and _panner deleted when parent deleted } +void +ConstellationDisplayPlot::set_pen_size(int size) +{ + if(size > 0 && size < 30){ + _penSize = size; + _plot_curve->setPen(QPen(Qt::blue, _penSize, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + } +} + + void ConstellationDisplayPlot::set_xaxis(double min, double max) { diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.h b/gr-qtgui/src/lib/ConstellationDisplayPlot.h index 1b73e7cc6..99ae566e0 100644 --- a/gr-qtgui/src/lib/ConstellationDisplayPlot.h +++ b/gr-qtgui/src/lib/ConstellationDisplayPlot.h @@ -32,6 +32,7 @@ public: void set_yaxis(double min, double max); void set_axis(double xmin, double xmax, double ymin, double ymax); + void set_pen_size(int size); public slots: void resizeSlot( QSize *s ); @@ -53,6 +54,7 @@ private: timespec _lastReplot; int64_t _numPoints; + int64_t _penSize; double _displayIntervalTime; }; diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.cc b/gr-qtgui/src/lib/SpectrumGUIClass.cc index 34062209e..4cb71a31a 100644 --- a/gr-qtgui/src/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/src/lib/SpectrumGUIClass.cc @@ -449,6 +449,12 @@ SpectrumGUIClass::SetConstellationAxis(double xmin, double xmax, } void +SpectrumGUIClass::SetConstellationPenSize(int size){ + _spectrumDisplayForm->SetConstellationPenSize(size); +} + + +void SpectrumGUIClass::SetFrequencyAxis(double min, double max) { _spectrumDisplayForm->SetFrequencyAxis(min, max); diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.h b/gr-qtgui/src/lib/SpectrumGUIClass.h index 9a55271df..d8dcb2769 100644 --- a/gr-qtgui/src/lib/SpectrumGUIClass.h +++ b/gr-qtgui/src/lib/SpectrumGUIClass.h @@ -76,6 +76,7 @@ public: void SetTimeDomainAxis(double min, double max); void SetConstellationAxis(double xmin, double xmax, double ymin, double ymax); + void SetConstellationPenSize(int size); void SetFrequencyAxis(double min, double max); protected: diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i index d2f734fdf..1f50bf43c 100644 --- a/gr-qtgui/src/lib/qtgui.i +++ b/gr-qtgui/src/lib/qtgui.i @@ -68,6 +68,7 @@ public: void set_constellation_axis(double xmin, double xmax, double ymin, double ymax); void set_frequency_axis(double min, double max); + void set_constellation_pen_size(int size); }; @@ -116,5 +117,6 @@ public: void set_constellation_axis(double xmin, double xmax, double ymin, double ymax); void set_frequency_axis(double min, double max); + void set_constellation_pen_size(int size); }; diff --git a/gr-qtgui/src/lib/qtgui_sink_c.cc b/gr-qtgui/src/lib/qtgui_sink_c.cc index bfb464119..7340141a6 100644 --- a/gr-qtgui/src/lib/qtgui_sink_c.cc +++ b/gr-qtgui/src/lib/qtgui_sink_c.cc @@ -194,6 +194,13 @@ qtgui_sink_c::set_constellation_axis(double xmin, double xmax, d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax); } +void +qtgui_sink_c::set_constellation_pen_size(int size) +{ + d_main_gui->SetConstellationPenSize(size); +} + + void qtgui_sink_c::set_frequency_axis(double min, double max) { diff --git a/gr-qtgui/src/lib/qtgui_sink_c.h b/gr-qtgui/src/lib/qtgui_sink_c.h index e36c8c9b0..91c6b03e6 100644 --- a/gr-qtgui/src/lib/qtgui_sink_c.h +++ b/gr-qtgui/src/lib/qtgui_sink_c.h @@ -108,6 +108,7 @@ public: void set_time_domain_axis(double min, double max); void set_constellation_axis(double xmin, double xmax, double ymin, double ymax); + void set_constellation_pen_size(int size); void set_frequency_axis(double min, double max); QApplication *d_qApplication; diff --git a/gr-qtgui/src/lib/qtgui_sink_f.cc b/gr-qtgui/src/lib/qtgui_sink_f.cc index d0ce24274..6fbb2f381 100644 --- a/gr-qtgui/src/lib/qtgui_sink_f.cc +++ b/gr-qtgui/src/lib/qtgui_sink_f.cc @@ -188,6 +188,13 @@ qtgui_sink_f::set_constellation_axis(double xmin, double xmax, d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax); } +void +qtgui_sink_f::set_constellation_pen_size(int size) +{ + d_main_gui->SetConstellationPenSize(size); +} + + void qtgui_sink_f::set_frequency_axis(double min, double max) { diff --git a/gr-qtgui/src/lib/qtgui_sink_f.h b/gr-qtgui/src/lib/qtgui_sink_f.h index 027b89bea..47c928d17 100644 --- a/gr-qtgui/src/lib/qtgui_sink_f.h +++ b/gr-qtgui/src/lib/qtgui_sink_f.h @@ -106,6 +106,7 @@ public: void set_time_domain_axis(double min, double max); void set_constellation_axis(double xmin, double xmax, double ymin, double ymax); + void set_constellation_pen_size(int size); void set_frequency_axis(double min, double max); QApplication *d_qApplication; diff --git a/gr-qtgui/src/lib/spectrumdisplayform.cc b/gr-qtgui/src/lib/spectrumdisplayform.cc Binary files differindex 6d4329e44..b27292193 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.cc +++ b/gr-qtgui/src/lib/spectrumdisplayform.cc diff --git a/gr-qtgui/src/lib/spectrumdisplayform.h b/gr-qtgui/src/lib/spectrumdisplayform.h index 51ca365e4..d89141f1e 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.h +++ b/gr-qtgui/src/lib/spectrumdisplayform.h @@ -69,6 +69,7 @@ public slots: void SetTimeDomainAxis(double min, double max); void SetConstellationAxis(double xmin, double xmax, double ymin, double ymax); + void SetConstellationPenSize(int size); void SetFrequencyAxis(double min, double max); private slots: |