From ba59e6384ac558f97a4530a69f8b8fc1b99ace0b Mon Sep 17 00:00:00 2001 From: trondeau Date: Sun, 26 Apr 2009 22:00:50 +0000 Subject: [PATCH] Bringing out set axis function to the qtgui sinks for user-settable axis ranges. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10922 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-qtgui/src/lib/SpectrumGUIClass.cc | 14 ++++++++++++++ gr-qtgui/src/lib/SpectrumGUIClass.h | 4 ++++ gr-qtgui/src/lib/qtgui.i | 10 ++++++++++ gr-qtgui/src/lib/qtgui_sink_c.cc | 13 +++++++++++++ gr-qtgui/src/lib/qtgui_sink_c.h | 4 ++++ gr-qtgui/src/lib/qtgui_sink_f.cc | 13 +++++++++++++ gr-qtgui/src/lib/qtgui_sink_f.h | 4 ++++ gr-qtgui/src/lib/spectrumdisplayform.cc | 14 ++++++++++++++ gr-qtgui/src/lib/spectrumdisplayform.h | 3 +++ 9 files changed, 79 insertions(+) diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.cc b/gr-qtgui/src/lib/SpectrumGUIClass.cc index 06450845..58a4e78b 100644 --- a/gr-qtgui/src/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/src/lib/SpectrumGUIClass.cc @@ -430,5 +430,19 @@ SpectrumGUIClass::qwidget() return (QWidget*)_spectrumDisplayForm; } +void +SpectrumGUIClass::SetTimeDomainAxis(double min, double max) +{ + _spectrumDisplayForm->SetTimeDomainAxis(min, max); +} + +void +SpectrumGUIClass::SetConstellationAxis(double xmin, double xmax, + double ymin, double ymax) +{ + _spectrumDisplayForm->SetConstellationAxis(xmin, xmax, ymin, ymax); + +} + #endif /* SPECTRUM_GUI_CLASS_CPP */ diff --git a/gr-qtgui/src/lib/SpectrumGUIClass.h b/gr-qtgui/src/lib/SpectrumGUIClass.h index fafae0c6..8c48475c 100644 --- a/gr-qtgui/src/lib/SpectrumGUIClass.h +++ b/gr-qtgui/src/lib/SpectrumGUIClass.h @@ -70,6 +70,10 @@ public: QWidget* qwidget(); + void SetTimeDomainAxis(double min, double max); + void SetConstellationAxis(double xmin, double xmax, + double ymin, double ymax); + protected: private: diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i index 1113d647..b2b283fd 100644 --- a/gr-qtgui/src/lib/qtgui.i +++ b/gr-qtgui/src/lib/qtgui.i @@ -62,6 +62,9 @@ public: void set_frequency_range(const double centerfreq, const double startfreq, const double stopfreq); + void set_time_domain_axis(double min, double max); + void set_constellation_axis(double xmin, double xmax, + double ymin, double ymax); }; @@ -100,5 +103,12 @@ private: public: void exec_(); PyObject* pyqwidget(); + + void set_frequency_range(const double centerfreq, + const double startfreq, + const double stopfreq); + void set_time_domain_axis(double min, double max); + void set_constellation_axis(double xmin, double xmax, + double ymin, double ymax); }; diff --git a/gr-qtgui/src/lib/qtgui_sink_c.cc b/gr-qtgui/src/lib/qtgui_sink_c.cc index a2b1366e..c723f108 100644 --- a/gr-qtgui/src/lib/qtgui_sink_c.cc +++ b/gr-qtgui/src/lib/qtgui_sink_c.cc @@ -162,6 +162,19 @@ qtgui_sink_c::set_frequency_range(const double centerfreq, d_main_gui->SetFrequencyRange(centerfreq, startfreq, stopfreq); } +void +qtgui_sink_c::set_time_domain_axis(double min, double max) +{ + d_main_gui->SetTimeDomainAxis(min, max); +} + +void +qtgui_sink_c::set_constellation_axis(double xmin, double xmax, + double ymin, double ymax) +{ + d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax); +} + 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 305b1cf2..0b918465 100644 --- a/gr-qtgui/src/lib/qtgui_sink_c.h +++ b/gr-qtgui/src/lib/qtgui_sink_c.h @@ -100,6 +100,10 @@ public: const double startfreq, const double stopfreq); + void set_time_domain_axis(double min, double max); + void set_constellation_axis(double xmin, double xmax, + double ymin, double ymax); + 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 94d4cf27..9491b76a 100644 --- a/gr-qtgui/src/lib/qtgui_sink_f.cc +++ b/gr-qtgui/src/lib/qtgui_sink_f.cc @@ -160,6 +160,19 @@ qtgui_sink_f::set_frequency_range(const double centerfreq, d_main_gui->SetFrequencyRange(centerfreq, startfreq, stopfreq); } +void +qtgui_sink_f::set_time_domain_axis(double min, double max) +{ + d_main_gui->SetTimeDomainAxis(min, max); +} + +void +qtgui_sink_f::set_constellation_axis(double xmin, double xmax, + double ymin, double ymax) +{ + d_main_gui->SetConstellationAxis(xmin, xmax, ymin, ymax); +} + 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 f220bc6c..676a3f80 100644 --- a/gr-qtgui/src/lib/qtgui_sink_f.h +++ b/gr-qtgui/src/lib/qtgui_sink_f.h @@ -100,6 +100,10 @@ public: const double startfreq, const double stopfreq); + void set_time_domain_axis(double min, double max); + void set_constellation_axis(double xmin, double xmax, + double ymin, double ymax); + QApplication *d_qApplication; qtgui_obj *d_object; diff --git a/gr-qtgui/src/lib/spectrumdisplayform.cc b/gr-qtgui/src/lib/spectrumdisplayform.cc index 3249463d..523fe51b 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.cc +++ b/gr-qtgui/src/lib/spectrumdisplayform.cc @@ -856,3 +856,17 @@ SpectrumDisplayForm::ToggleTabConstellation(const bool state) d_plot_constellation = -1; } } + + +void +SpectrumDisplayForm::SetTimeDomainAxis(double min, double max) +{ + _timeDomainDisplayPlot->set_yaxis(min, max); +} + +void +SpectrumDisplayForm::SetConstellationAxis(double xmin, double xmax, + double ymin, double ymax) +{ + _constellationDisplayPlot->set_axis(xmin, xmax, ymin, ymax); +} diff --git a/gr-qtgui/src/lib/spectrumdisplayform.h b/gr-qtgui/src/lib/spectrumdisplayform.h index eba087bf..a623776c 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.h +++ b/gr-qtgui/src/lib/spectrumdisplayform.h @@ -64,6 +64,9 @@ public slots: void ToggleTabTime(const bool state); void ToggleTabConstellation(const bool state); + void SetTimeDomainAxis(double min, double max); + void SetConstellationAxis(double xmin, double xmax, + double ymin, double ymax); private slots: void newFrequencyData( const SpectrumUpdateEvent* ); -- 2.39.5