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

diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
index 792096dedcd5c34f42ecf40bf321b5b052b81f1c..80bf4503f50fb3edb6ca17a06d01c931cf8b1201 100644 (file)
--- 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 1b73e7cc611e462d6ca4523cd09da5ddf5b1bb0c..99ae566e0a8eca90a3ff210064b6a22dc86343bb 100644 (file)
--- 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 34062209e5c0978cba37bc1d02b112aea9c7e29d..4cb71a31a055e5f7c227d6eba79be8993a026a41 100644 (file)
--- 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 9a55271dfbe13dd7ef1460688aaf62b0f8f4205f..d8dcb27691ade1396a58319b0f75e0755332c0a4 100644 (file)
--- 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 d2f734fdffd0774f6d8e5927edafbdbd709e34dc..1f50bf43c91db0cfccfd087ce02ff67d0e829602 100644 (file)
--- 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 bfb4641192a42a125da39dc3fdcd330432c863dc..7340141a697b599f78f866f6153ac7a18a0618c4 100644 (file)
--- 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 e36c8c9b00a33bf35c11eefa42b87c1c5ec39498..91c6b03e61e146816b642b0f8596695a0a20b9d9 100644 (file)
--- 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 d0ce242742075cefea87571681f11da95efc13bb..6fbb2f381ce26e251320602f42ab91f41bddeb83 100644 (file)
--- 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 027b89beae476e9cb4f2c33aa8f2587c0b864294..47c928d17ce55e0ab508b506ff26471c8c6bc8ee 100644 (file)
--- 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 6d4329e4482afd74496848e1cde609fbf3770991..b2729219382d10b6462da1be71afb5a0737fbb47 100644 (file)
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 51ca365e4e64892004252c70e153480930fd48d4..d89141f1ed096132b231a9cffc5f13a91c43a483 100644 (file)
--- 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: