From 420f1274bfd7cb40cd6d7851f6541f80ac6616be Mon Sep 17 00:00:00 2001
From: trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Tue, 11 Aug 2009 22:11:33 +0000
Subject: Adding function to be able to set the size of the points in the
constellation plot.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11573 221aa14e-8319-0410-a670-987f0aec2ac5
---
gr-qtgui/src/lib/ConstellationDisplayPlot.cc | 13 ++++++++++++-
gr-qtgui/src/lib/ConstellationDisplayPlot.h | 2 ++
gr-qtgui/src/lib/SpectrumGUIClass.cc | 6 ++++++
gr-qtgui/src/lib/SpectrumGUIClass.h | 1 +
gr-qtgui/src/lib/qtgui.i | 2 ++
gr-qtgui/src/lib/qtgui_sink_c.cc | 7 +++++++
gr-qtgui/src/lib/qtgui_sink_c.h | 1 +
gr-qtgui/src/lib/qtgui_sink_f.cc | 7 +++++++
gr-qtgui/src/lib/qtgui_sink_f.h | 1 +
gr-qtgui/src/lib/spectrumdisplayform.cc | Bin 27246 -> 27362 bytes
gr-qtgui/src/lib/spectrumdisplayform.h | 1 +
11 files changed, 40 insertions(+), 1 deletion(-)
(limited to 'gr-qtgui/src')
diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
index 792096dedc..80bf4503f5 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 1b73e7cc61..99ae566e0a 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 34062209e5..4cb71a31a0 100644
--- a/gr-qtgui/src/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/src/lib/SpectrumGUIClass.cc
@@ -448,6 +448,12 @@ SpectrumGUIClass::SetConstellationAxis(double xmin, double xmax,
}
+void
+SpectrumGUIClass::SetConstellationPenSize(int size){
+ _spectrumDisplayForm->SetConstellationPenSize(size);
+}
+
+
void
SpectrumGUIClass::SetFrequencyAxis(double min, double max)
{
diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.h b/gr-qtgui/src/lib/SpectrumGUIClass.h
index 9a55271dfb..d8dcb27691 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 d2f734fdff..1f50bf43c9 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 bfb4641192..7340141a69 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 e36c8c9b00..91c6b03e61 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 d0ce242742..6fbb2f381c 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 027b89beae..47c928d17c 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
index 6d4329e448..b272921938 100644
Binary files a/gr-qtgui/src/lib/spectrumdisplayform.cc and b/gr-qtgui/src/lib/spectrumdisplayform.cc differ
diff --git a/gr-qtgui/src/lib/spectrumdisplayform.h b/gr-qtgui/src/lib/spectrumdisplayform.h
index 51ca365e4e..d89141f1ed 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:
--
cgit v1.2.3