Now adding y-axis controls for frequency domain plot.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10923 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.cc b/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
index 4f9bfdd952167a49d670cab975409e3ec13bdedc..63d68b9b382fc654ed13efe389bfbf5a15bc5623 100644 (file)
--- a/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
@@ -118,7 +118,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(QWidget* parent)
   setAxisTitle(QwtPlot::xBottom, "Frequency (Hz)");
 
   setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine);
-  setAxisScale(QwtPlot::yLeft, -210, 5);
+  set_yaxis(-210, 5);
   setAxisTitle(QwtPlot::yLeft, "Power (dB)");
 
   // Automatically deleted when parent is deleted
@@ -222,6 +222,12 @@ FrequencyDisplayPlot::~FrequencyDisplayPlot()
   // _zoomer and _panner deleted when parent deleted
 }
 
+void
+FrequencyDisplayPlot::set_yaxis(double min, double max)
+{
+  setAxisScale(QwtPlot::yLeft, min, max);
+}
+
 void
 FrequencyDisplayPlot::SetFrequencyRange(const double constStartFreq,
                                        const double constStopFreq,

diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.h b/gr-qtgui/src/lib/FrequencyDisplayPlot.h
index 061ef6ef8412f3e63856cd7263b2129eade5ee55..31f2055b4a9aad38e7a947b546d59df49514f572 100644 (file)
--- a/gr-qtgui/src/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.h
@@ -39,6 +39,8 @@ public:
                                   
   virtual void replot();
 
+  void set_yaxis(double min, double max);
+
 public slots:
   void SetLowerIntensityLevel(const double);
   void SetUpperIntensityLevel(const double);

diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.cc b/gr-qtgui/src/lib/SpectrumGUIClass.cc
index 58a4e78bc6cc08361f58fb9cb0b25e3142035ca3..e3af3b76d0c9dfb718ad462c6cd90911474d120a 100644 (file)
--- a/gr-qtgui/src/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/src/lib/SpectrumGUIClass.cc
@@ -444,5 +444,10 @@ SpectrumGUIClass::SetConstellationAxis(double xmin, double xmax,
 
 }
 
+void
+SpectrumGUIClass::SetFrequencyAxis(double min, double max)
+{
+  _spectrumDisplayForm->SetFrequencyAxis(min, max);
+}
 
 #endif /* SPECTRUM_GUI_CLASS_CPP */

diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.h b/gr-qtgui/src/lib/SpectrumGUIClass.h
index 8c48475c978cea30cf1ae4c4c60858dfd4ed0bce..2bc5fb34c749d1cf748e5c5543d6554b4d9c2d19 100644 (file)
--- a/gr-qtgui/src/lib/SpectrumGUIClass.h
+++ b/gr-qtgui/src/lib/SpectrumGUIClass.h
@@ -73,6 +73,7 @@ public:
   void SetTimeDomainAxis(double min, double max);
   void SetConstellationAxis(double xmin, double xmax,
                            double ymin, double ymax);
+  void SetFrequencyAxis(double min, double max);
 
 protected:
 

diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i
index b2b283fd50f6ddaa51d49d684d12a41f325886e1..ae7d8a6a45825155878b5507612a62c3bae099bb 100644 (file)
--- a/gr-qtgui/src/lib/qtgui.i
+++ b/gr-qtgui/src/lib/qtgui.i
@@ -65,6 +65,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_frequency_axis(double min, double max);
 };
 
 
@@ -110,5 +111,6 @@ public:
   void set_time_domain_axis(double min, double max);
   void set_constellation_axis(double xmin, double xmax,
                              double ymin, double ymax);
+  void set_frequency_axis(double min, double max);
 };
 

diff --git a/gr-qtgui/src/lib/qtgui_sink_c.cc b/gr-qtgui/src/lib/qtgui_sink_c.cc
index c723f10823e0e46d71be236d1f182641ea19df9c..bfdb25e325eb3bc2eea3d8ae2797703cdb2dd8ea 100644 (file)
--- a/gr-qtgui/src/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/src/lib/qtgui_sink_c.cc
@@ -175,6 +175,12 @@ qtgui_sink_c::set_constellation_axis(double xmin, double xmax,
   d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax);
 }
 
+void
+qtgui_sink_c::set_frequency_axis(double min, double max)
+{
+  d_main_gui->SetFrequencyAxis(min, max);
+}
+
 void
 qtgui_sink_c::fft(const gr_complex *data_in, int size, gr_complex *data_out)
 {

diff --git a/gr-qtgui/src/lib/qtgui_sink_c.h b/gr-qtgui/src/lib/qtgui_sink_c.h
index 0b918465519c49d7ebf96c1b077fc82b8811769d..7618bae959a671425f226f6a14be141fda09d391 100644 (file)
--- a/gr-qtgui/src/lib/qtgui_sink_c.h
+++ b/gr-qtgui/src/lib/qtgui_sink_c.h
@@ -103,6 +103,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_frequency_axis(double min, double max);
 
   QApplication *d_qApplication;
   qtgui_obj *d_object;

diff --git a/gr-qtgui/src/lib/qtgui_sink_f.cc b/gr-qtgui/src/lib/qtgui_sink_f.cc
index 9491b76a7dc42c31269956f69916bcc7100afe63..1f76bb3591607867c4676295fe32c7d8aa54c6e6 100644 (file)
--- a/gr-qtgui/src/lib/qtgui_sink_f.cc
+++ b/gr-qtgui/src/lib/qtgui_sink_f.cc
@@ -173,6 +173,12 @@ qtgui_sink_f::set_constellation_axis(double xmin, double xmax,
   d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax);
 }
 
+void
+qtgui_sink_f::set_frequency_axis(double min, double max)
+{
+  d_main_gui->SetFrequencyAxis(min, max);
+}
+
 void
 qtgui_sink_f::fft(const float *data_in, int size, gr_complex *data_out)
 {

diff --git a/gr-qtgui/src/lib/qtgui_sink_f.h b/gr-qtgui/src/lib/qtgui_sink_f.h
index 676a3f80b8d80d12ca1c6fd768a01a28d8d9ff6c..31baa1deff106f75f0d3bccec16903089f402341 100644 (file)
--- a/gr-qtgui/src/lib/qtgui_sink_f.h
+++ b/gr-qtgui/src/lib/qtgui_sink_f.h
@@ -103,6 +103,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_frequency_axis(double min, double max);
 
   QApplication *d_qApplication;
   qtgui_obj *d_object;

diff --git a/gr-qtgui/src/lib/spectrumdisplayform.cc b/gr-qtgui/src/lib/spectrumdisplayform.cc
index 523fe51bf9ae74f03ec0a385ec7f1df5c87984e3..b8e3982dfcd1e2f7ddd1433479007d62066e5b02 100644 (file)
--- a/gr-qtgui/src/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/src/lib/spectrumdisplayform.cc
@@ -870,3 +870,9 @@ SpectrumDisplayForm::SetConstellationAxis(double xmin, double xmax,
 {
   _constellationDisplayPlot->set_axis(xmin, xmax, ymin, ymax);
 }
+
+void
+SpectrumDisplayForm::SetFrequencyAxis(double min, double max)
+{
+  _frequencyDisplayPlot->set_yaxis(min, max);
+}

diff --git a/gr-qtgui/src/lib/spectrumdisplayform.h b/gr-qtgui/src/lib/spectrumdisplayform.h
index a623776c6d1b8e35db06ebb3ff3ef16d9686ae61..aed5d728e6afbd6fe97440a74cd895e7e157ba1e 100644 (file)
--- a/gr-qtgui/src/lib/spectrumdisplayform.h
+++ b/gr-qtgui/src/lib/spectrumdisplayform.h
@@ -67,6 +67,7 @@ public slots:
   void SetTimeDomainAxis(double min, double max);
   void SetConstellationAxis(double xmin, double xmax,
                            double ymin, double ymax);
+  void SetFrequencyAxis(double min, double max);
 
 private slots:
   void newFrequencyData( const SpectrumUpdateEvent* );