diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-10-10 17:21:17 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-10-10 18:46:53 -0400 |
| commit | 93f4ca6187c409ab30e41fbdf5dace854d9d4c36 (patch) | |
| tree | 9a67d19c4617e37da2609b16360dc4f198ada713 /gr-qtgui | |
| parent | da14674efba47b8d194a462f95a80613d5098e1c (diff) | |
qtgui: allowing setting of axes in GRC.
For time and freq, a y-axis range can be defined. The constellation plot has an x- and y-axis setting.
Also made methods more consistent in their names and styles.
Diffstat (limited to 'gr-qtgui')
28 files changed, 182 insertions, 89 deletions
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml index 536237d164..31b13fe136 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -16,6 +16,8 @@ qtgui.$(type.fcn)( $name, \#name $nconnections \#number of inputs ) +self.$(id).set_y_axis($ymin, $ymax) +self.$(id).set_x_axis($xmin, $xmax) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> <callback>set_resize($width, $height)</callback> @@ -43,6 +45,34 @@ $(gui_hint()($win))</make> <type>int</type> </param> <param> + <name>Y min</name> + <key>ymin</key> + <value>-2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>Y max</name> + <key>ymax</key> + <value>2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>X min</name> + <key>xmin</key> + <value>-2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>X max</name> + <key>xmax</key> + <value>2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> <name>Number of Inputs</name> <key>nconnections</key> <value>1</value> diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml index 69ce5f4e68..0844a7cbc9 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -20,6 +20,7 @@ qtgui.$(type.fcn)( $name, \#name $nconnections \#number of inputs ) +self.$(id).set_y_axis($ymin, $ymax) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> <callback>set_frequency_range($fc, $bw)</callback> @@ -96,6 +97,20 @@ $(gui_hint()($win))</make> <type>real</type> </param> <param> + <name>Y min</name> + <key>ymin</key> + <value>-140</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>Y max</name> + <key>ymax</key> + <value>10</value> + <type>real</type> + <hide>part</hide> + </param> + <param> <name>Number of Inputs</name> <key>nconnections</key> <value>1</value> diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index 17b2cfd016..6fe910ca35 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -18,12 +18,14 @@ qtgui.$(type.fcn)( $name, \#name $nconnections \#number of inputs ) +self.$(id).set_y_axis($ymin, $ymax) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> <callback>set_time_domain_axis($min, $max)</callback> <callback>set_update_time($t)</callback> <callback>set_title($which, $title)</callback> <callback>set_color($which, $color)</callback> + <callback>set_y_axis($ymin, $ymax)</callback> <param> <name>Type</name> <key>type</key> @@ -51,6 +53,20 @@ $(gui_hint()($win))</make> <type>real</type> </param> <param> + <name>Y min</name> + <key>ymin</key> + <value>-1</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>Y max</name> + <key>ymax</key> + <value>1</value> + <type>real</type> + <hide>part</hide> + </param> + <param> <name>Number of Inputs</name> <key>nconnections</key> <value>1</value> diff --git a/gr-qtgui/include/qtgui/const_sink_c.h b/gr-qtgui/include/qtgui/const_sink_c.h index b7a2faca9b..dece60f196 100644 --- a/gr-qtgui/include/qtgui/const_sink_c.h +++ b/gr-qtgui/include/qtgui/const_sink_c.h @@ -62,6 +62,9 @@ namespace gr { virtual void exec_() = 0; virtual PyObject* pyqwidget() = 0; + virtual void set_y_axis(double min, double max) = 0; + virtual void set_x_axis(double min, double max) = 0; + virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_line_label(int which, const std::string &label) = 0; diff --git a/gr-qtgui/include/qtgui/freq_sink_c.h b/gr-qtgui/include/qtgui/freq_sink_c.h index a3a25ccb82..07728e2abe 100644 --- a/gr-qtgui/include/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/qtgui/freq_sink_c.h @@ -75,7 +75,7 @@ namespace gr { virtual float fft_average() const = 0; virtual void set_frequency_range(const double centerfreq, const double bandwidth) = 0; - virtual void set_fft_power_db(double min, double max) = 0; + virtual void set_y_axis(double min, double max) = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; diff --git a/gr-qtgui/include/qtgui/freq_sink_f.h b/gr-qtgui/include/qtgui/freq_sink_f.h index 54e89e3b4e..0ed81c62b2 100644 --- a/gr-qtgui/include/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/qtgui/freq_sink_f.h @@ -75,7 +75,7 @@ namespace gr { virtual float fft_average() const = 0; virtual void set_frequency_range(const double centerfreq, const double bandwidth) = 0; - virtual void set_fft_power_db(double min, double max) = 0; + virtual void set_y_axis(double min, double max) = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; diff --git a/gr-qtgui/include/qtgui/time_sink_c.h b/gr-qtgui/include/qtgui/time_sink_c.h index 525fdff4cf..ea618ab758 100644 --- a/gr-qtgui/include/qtgui/time_sink_c.h +++ b/gr-qtgui/include/qtgui/time_sink_c.h @@ -67,7 +67,7 @@ namespace gr { virtual void exec_() = 0; virtual PyObject* pyqwidget() = 0; - virtual void set_time_domain_axis(double min, double max) = 0; + virtual void set_y_axis(double min, double max) = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_line_label(int which, const std::string &label) = 0; diff --git a/gr-qtgui/include/qtgui/time_sink_f.h b/gr-qtgui/include/qtgui/time_sink_f.h index bd78be1658..34210e08a7 100644 --- a/gr-qtgui/include/qtgui/time_sink_f.h +++ b/gr-qtgui/include/qtgui/time_sink_f.h @@ -65,7 +65,7 @@ namespace gr { virtual void exec_() = 0; virtual PyObject* pyqwidget() = 0; - virtual void set_time_domain_axis(double min, double max) = 0; + virtual void set_y_axis(double min, double max) = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_line_label(int which, const std::string &line) = 0; diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index 5bc89f83fa..51000cab17 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -65,14 +65,6 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(int nplots, QWidget* parent) _numPoints = 1024; _penSize = 5; - setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); - set_xaxis(-2.0, 2.0); - setAxisTitle(QwtPlot::xBottom, "In-phase"); - - setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); - set_yaxis(-2.0, 2.0); - setAxisTitle(QwtPlot::yLeft, "Quadrature"); - _zoomer = new ConstellationDisplayZoomer(canvas()); #if QWT_VERSION < 0x060000 @@ -88,6 +80,15 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(int nplots, QWidget* parent) _zoomer->setRubberBandPen(c); _zoomer->setTrackerPen(c); + setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); + set_xaxis(-2.0, 2.0); + setAxisTitle(QwtPlot::xBottom, "In-phase"); + + setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); + set_yaxis(-2.0, 2.0); + setAxisTitle(QwtPlot::yLeft, "Quadrature"); + updateAxes(); + QList<QColor> colors; colors << QColor(Qt::blue) << QColor(Qt::red) << QColor(Qt::green) << QColor(Qt::black) << QColor(Qt::cyan) << QColor(Qt::magenta) @@ -135,13 +136,13 @@ ConstellationDisplayPlot::~ConstellationDisplayPlot() void ConstellationDisplayPlot::set_xaxis(double min, double max) { - setAxisScale(QwtPlot::xBottom, min, max); + setXaxis(min, max); } void ConstellationDisplayPlot::set_yaxis(double min, double max) { - setAxisScale(QwtPlot::yLeft, min, max); + setYaxis(min, max); } void diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index c9fb94ad68..f090039f96 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -239,7 +239,7 @@ FrequencyDisplayPlot::~FrequencyDisplayPlot() } void -FrequencyDisplayPlot::set_yaxis(double min, double max) +FrequencyDisplayPlot::setYaxis(double min, double max) { // Get the new max/min values for the plot _minYAxis = min; diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h index 17bb9d2391..54a10f5d81 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.h +++ b/gr-qtgui/lib/FrequencyDisplayPlot.h @@ -62,7 +62,7 @@ public: void replot(); - void set_yaxis(double min, double max); + void setYaxis(double min, double max); void SetTraceColour (QColor); void SetBGColour (QColor c); diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 1bd2253dbf..547530c823 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -94,7 +94,7 @@ namespace gr { } d_main_gui = new ConstellationDisplayForm(d_nconnections, d_parent); - d_main_gui->SetNPoints(d_size); + d_main_gui->setNPoints(d_size); // initialize update time to 10 times a second set_update_time(0.1); d_last_time = 0; @@ -121,6 +121,18 @@ namespace gr { } void + const_sink_c_impl::set_y_axis(double min, double max) + { + d_main_gui->setYaxis(min, max); + } + + void + const_sink_c_impl::set_x_axis(double min, double max) + { + d_main_gui->setXaxis(min, max); + } + + void const_sink_c_impl::set_update_time(double t) { //convert update time to ticks @@ -193,14 +205,14 @@ namespace gr { d_size = newsize; d_index = 0; - d_main_gui->SetNPoints(d_size); + d_main_gui->setNPoints(d_size); } } void const_sink_c_impl::npoints_resize() { - int newsize = d_main_gui->GetNPoints(); + int newsize = d_main_gui->getNPoints(); set_nsamps(newsize); } diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index c11c30ff53..8bb2344c9f 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -65,6 +65,9 @@ namespace gr { QWidget* qwidget(); PyObject* pyqwidget(); + void set_y_axis(double min, double max); + void set_x_axis(double min, double max); + void set_update_time(double t); void set_title(const std::string &title); void set_line_label(int which, const std::string &label); diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index 98375ebaed..5f742de991 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -39,7 +39,7 @@ ConstellationDisplayForm::ConstellationDisplayForm(int nplots, QWidget* parent) NPointsMenu *nptsmenu = new NPointsMenu(this); _menu->addAction(nptsmenu); connect(nptsmenu, SIGNAL(whichTrigger(int)), - this, SLOT(SetNPoints(const int))); + this, SLOT(setNPoints(const int))); Reset(); @@ -84,13 +84,25 @@ ConstellationDisplayForm::customEvent(QEvent * e) } int -ConstellationDisplayForm::GetNPoints() const +ConstellationDisplayForm::getNPoints() const { return d_npoints; } void -ConstellationDisplayForm::SetNPoints(const int npoints) +ConstellationDisplayForm::setNPoints(const int npoints) { d_npoints = npoints; } + +void +ConstellationDisplayForm::setYaxis(double min, double max) +{ + getPlot()->set_yaxis(min, max); +} + +void +ConstellationDisplayForm::setXaxis(double min, double max) +{ + getPlot()->set_xaxis(min, max); +} diff --git a/gr-qtgui/lib/constellationdisplayform.h b/gr-qtgui/lib/constellationdisplayform.h index 6832bd44cc..d9715d3dd9 100644 --- a/gr-qtgui/lib/constellationdisplayform.h +++ b/gr-qtgui/lib/constellationdisplayform.h @@ -40,13 +40,14 @@ public: ConstellationDisplayPlot* getPlot(); - int GetNPoints() const; + int getNPoints() const; public slots: void customEvent(QEvent * e); - void SetNPoints(const int); + void setNPoints(const int); - // add set x/y axis + void setYaxis(double min, double max); + void setXaxis(double min, double max); private slots: void newData(const QEvent*); diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 2deac65fe3..e495dfcc25 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -115,9 +115,9 @@ namespace gr { } d_main_gui = new FreqDisplayForm(d_nconnections, d_parent); - d_main_gui->SetFFTSize(d_fftsize); - d_main_gui->SetFFTWindowType(d_wintype); - d_main_gui->SetFrequencyRange(d_center_freq, + d_main_gui->setFFTSize(d_fftsize); + d_main_gui->setFFTWindowType(d_wintype); + d_main_gui->setFrequencyRange(d_center_freq, d_center_freq - d_bandwidth/2.0, d_center_freq + d_bandwidth/2.0); @@ -150,7 +150,7 @@ namespace gr { freq_sink_c_impl::set_fft_size(const int fftsize) { d_fftsize = fftsize; - d_main_gui->SetFFTSize(fftsize); + d_main_gui->setFFTSize(fftsize); } int @@ -163,7 +163,7 @@ namespace gr { freq_sink_c_impl::set_fft_average(const float fftavg) { d_fftavg = fftavg; - d_main_gui->SetFFTAverage(fftavg); + d_main_gui->setFFTAverage(fftavg); } float @@ -178,15 +178,15 @@ namespace gr { { d_center_freq = centerfreq; d_bandwidth = bandwidth; - d_main_gui->SetFrequencyRange(d_center_freq, + d_main_gui->setFrequencyRange(d_center_freq, -d_bandwidth/2.0, d_bandwidth/2.0); } void - freq_sink_c_impl::set_fft_power_db(double min, double max) + freq_sink_c_impl::set_y_axis(double min, double max) { - d_main_gui->SetFrequencyAxis(min, max); + d_main_gui->setYaxis(min, max); } void @@ -275,7 +275,7 @@ namespace gr { freq_sink_c_impl::windowreset() { filter::firdes::win_type newwintype; - newwintype = d_main_gui->GetFFTWindowType(); + newwintype = d_main_gui->getFFTWindowType(); if(d_wintype != newwintype) { d_wintype = newwintype; buildwindow(); @@ -296,8 +296,8 @@ namespace gr { { gruel::scoped_lock lock(d_mutex); - int newfftsize = d_main_gui->GetFFTSize(); - d_fftavg = d_main_gui->GetFFTAverage(); + int newfftsize = d_main_gui->getFFTSize(); + d_fftavg = d_main_gui->getFFTAverage(); if(newfftsize != d_fftsize) { // Resize residbuf and replace data diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 54d447cac6..d162ab03bd 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -88,7 +88,7 @@ namespace gr { float fft_average() const; void set_frequency_range(const double centerfreq, const double bandwidth); - void set_fft_power_db(double min, double max); + void set_y_axis(double min, double max); void set_update_time(double t); void set_title(const std::string &title); diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 694502ea51..c9ec1f52aa 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -115,9 +115,9 @@ namespace gr { } d_main_gui = new FreqDisplayForm(d_nconnections, d_parent); - d_main_gui->SetFFTSize(d_fftsize); - d_main_gui->SetFFTWindowType(d_wintype); - d_main_gui->SetFrequencyRange(d_center_freq, + d_main_gui->setFFTSize(d_fftsize); + d_main_gui->setFFTWindowType(d_wintype); + d_main_gui->setFrequencyRange(d_center_freq, d_center_freq - d_bandwidth/2.0, d_center_freq + d_bandwidth/2.0); @@ -150,7 +150,7 @@ namespace gr { freq_sink_f_impl::set_fft_size(const int fftsize) { d_fftsize = fftsize; - d_main_gui->SetFFTSize(fftsize); + d_main_gui->setFFTSize(fftsize); } int @@ -163,7 +163,7 @@ namespace gr { freq_sink_f_impl::set_fft_average(const float fftavg) { d_fftavg = fftavg; - d_main_gui->SetFFTAverage(fftavg); + d_main_gui->setFFTAverage(fftavg); } float @@ -178,15 +178,15 @@ namespace gr { { d_center_freq = centerfreq; d_bandwidth = bandwidth; - d_main_gui->SetFrequencyRange(d_center_freq, + d_main_gui->setFrequencyRange(d_center_freq, -d_bandwidth/2.0, d_bandwidth/2.0); } void - freq_sink_f_impl::set_fft_power_db(double min, double max) + freq_sink_f_impl::set_y_axis(double min, double max) { - d_main_gui->SetFrequencyAxis(min, max); + d_main_gui->setYaxis(min, max); } void @@ -279,7 +279,7 @@ namespace gr { gruel::scoped_lock lock(d_mutex); filter::firdes::win_type newwintype; - newwintype = d_main_gui->GetFFTWindowType(); + newwintype = d_main_gui->getFFTWindowType(); if(d_wintype != newwintype) { d_wintype = newwintype; buildwindow(); @@ -300,8 +300,8 @@ namespace gr { { gruel::scoped_lock lock(d_mutex); - int newfftsize = d_main_gui->GetFFTSize(); - d_fftavg = d_main_gui->GetFFTAverage(); + int newfftsize = d_main_gui->getFFTSize(); + d_fftavg = d_main_gui->getFFTAverage(); if(newfftsize != d_fftsize) { // Resize residbuf and replace data diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index a6dfdb79be..ffb2c4bf59 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -88,7 +88,7 @@ namespace gr { float fft_average() const; void set_frequency_range(const double centerfreq, const double bandwidth); - void set_fft_power_db(double min, double max); + void set_y_axis(double min, double max); void set_update_time(double t); void set_title(const std::string &title); diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 6f12fe5090..410bb4a048 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -47,11 +47,11 @@ FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) _menu->addMenu(avgmenu); _menu->addMenu(winmenu); connect(sizemenu, SIGNAL(whichTrigger(int)), - this, SLOT(SetFFTSize(const int))); + this, SLOT(setFFTSize(const int))); connect(avgmenu, SIGNAL(whichTrigger(float)), - this, SLOT(SetFFTAverage(const float))); + this, SLOT(setFFTAverage(const float))); connect(winmenu, SIGNAL(whichTrigger(gr::filter::firdes::win_type)), - this, SLOT(SetFFTWindowType(const gr::filter::firdes::win_type))); + this, SLOT(setFFTWindowType(const gr::filter::firdes::win_type))); Reset(); @@ -93,44 +93,44 @@ FreqDisplayForm::customEvent( QEvent * e) } int -FreqDisplayForm::GetFFTSize() const +FreqDisplayForm::getFFTSize() const { return _fftsize; } float -FreqDisplayForm::GetFFTAverage() const +FreqDisplayForm::getFFTAverage() const { return _fftavg; } gr::filter::firdes::win_type -FreqDisplayForm::GetFFTWindowType() const +FreqDisplayForm::getFFTWindowType() const { return _fftwintype; } void -FreqDisplayForm::SetFFTSize(const int newsize) +FreqDisplayForm::setFFTSize(const int newsize) { _fftsize = newsize; } void -FreqDisplayForm::SetFFTAverage(const float newavg) +FreqDisplayForm::setFFTAverage(const float newavg) { _fftavg = newavg; getPlot()->replot(); } void -FreqDisplayForm::SetFFTWindowType(const gr::filter::firdes::win_type newwin) +FreqDisplayForm::setFFTWindowType(const gr::filter::firdes::win_type newwin) { _fftwintype = newwin; } void -FreqDisplayForm::SetFrequencyRange(const double newCenterFrequency, +FreqDisplayForm::setFrequencyRange(const double newCenterFrequency, const double newStartFrequency, const double newStopFrequency) { @@ -156,7 +156,7 @@ FreqDisplayForm::SetFrequencyRange(const double newCenterFrequency, } void -FreqDisplayForm::SetFrequencyAxis(double min, double max) +FreqDisplayForm::setYaxis(double min, double max) { - getPlot()->set_yaxis(min, max); + getPlot()->setYaxis(min, max); } diff --git a/gr-qtgui/lib/freqdisplayform.h b/gr-qtgui/lib/freqdisplayform.h index ffce317c4f..4a7fc7d2e5 100644 --- a/gr-qtgui/lib/freqdisplayform.h +++ b/gr-qtgui/lib/freqdisplayform.h @@ -41,21 +41,21 @@ class FreqDisplayForm : public DisplayForm FrequencyDisplayPlot* getPlot(); - int GetFFTSize() const; - float GetFFTAverage() const; - gr::filter::firdes::win_type GetFFTWindowType() const; + int getFFTSize() const; + float getFFTAverage() const; + gr::filter::firdes::win_type getFFTWindowType() const; public slots: void customEvent(QEvent *e); - void SetFFTSize(const int); - void SetFFTAverage(const float); - void SetFFTWindowType(const gr::filter::firdes::win_type); + void setFFTSize(const int); + void setFFTAverage(const float); + void setFFTWindowType(const gr::filter::firdes::win_type); - void SetFrequencyRange(const double newCenterFrequency, + void setFrequencyRange(const double newCenterFrequency, const double newStartFrequency, const double newStopFrequency); - void SetFrequencyAxis(double min, double max); + void setYaxis(double min, double max); private slots: void newData(const QEvent *updateEvent); diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 21a49725af..93853cead1 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -729,7 +729,7 @@ SpectrumDisplayForm::SetConstellationPenSize(int size) void SpectrumDisplayForm::SetFrequencyAxis(double min, double max) { - _frequencyDisplayPlot->set_yaxis(min, max); + _frequencyDisplayPlot->setYaxis(min, max); } void diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 1465ce2525..d3819b5d5c 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -91,7 +91,7 @@ namespace gr { } d_main_gui = new TimeDisplayForm(d_nconnections, d_parent); - d_main_gui->SetNPoints(d_size); + d_main_gui->setNPoints(d_size); // initialize update time to 10 times a second set_update_time(0.1); @@ -119,9 +119,9 @@ namespace gr { } void - time_sink_c_impl::set_time_domain_axis(double min, double max) + time_sink_c_impl::set_y_axis(double min, double max) { - d_main_gui->setTimeDomainAxis(min, max); + d_main_gui->setYaxis(min, max); } void @@ -194,14 +194,14 @@ namespace gr { d_size = newsize; d_index = 0; - d_main_gui->SetNPoints(d_size); + d_main_gui->setNPoints(d_size); } } void time_sink_c_impl::npoints_resize() { - int newsize = d_main_gui->GetNPoints(); + int newsize = d_main_gui->getNPoints(); set_nsamps(newsize); } diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 040aad0480..7e96e3ef5c 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -65,7 +65,7 @@ namespace gr { QWidget* qwidget(); PyObject* pyqwidget(); - void set_time_domain_axis(double min, double max); + void set_y_axis(double min, double max); void set_update_time(double t); void set_title(const std::string &title); void set_line_label(int which, const std::string &label); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 2cd8815086..3f1b161519 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -91,7 +91,7 @@ namespace gr { } d_main_gui = new TimeDisplayForm(d_nconnections, d_parent); - d_main_gui->SetNPoints(d_size); + d_main_gui->setNPoints(d_size); // initialize update time to 10 times a second set_update_time(0.1); @@ -119,9 +119,9 @@ namespace gr { } void - time_sink_f_impl::set_time_domain_axis(double min, double max) + time_sink_f_impl::set_y_axis(double min, double max) { - d_main_gui->setTimeDomainAxis(min, max); + d_main_gui->setYaxis(min, max); } void @@ -194,7 +194,7 @@ namespace gr { d_size = newsize; d_index = 0; - d_main_gui->SetNPoints(d_size); + d_main_gui->setNPoints(d_size); } } @@ -207,7 +207,7 @@ namespace gr { void time_sink_f_impl::npoints_resize() { - int newsize = d_main_gui->GetNPoints(); + int newsize = d_main_gui->getNPoints(); set_nsamps(newsize); } diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 00335c5a30..6f665d9354 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -65,7 +65,7 @@ namespace gr { QWidget* qwidget(); PyObject* pyqwidget(); - void set_time_domain_axis(double min, double max); + void set_y_axis(double min, double max); void set_update_time(double t); void set_title(const std::string &title); void set_line_label(int which, const std::string &label); diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 3d94d20094..f42c979da5 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -39,7 +39,7 @@ TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent) NPointsMenu *nptsmenu = new NPointsMenu(this); _menu->addAction(nptsmenu); connect(nptsmenu, SIGNAL(whichTrigger(int)), - this, SLOT(SetNPoints(const int))); + this, SLOT(setNPoints(const int))); Reset(); @@ -104,19 +104,19 @@ TimeDisplayForm::setFrequencyRange(const double newCenterFrequency, } void -TimeDisplayForm::setTimeDomainAxis(double min, double max) +TimeDisplayForm::setYaxis(double min, double max) { getPlot()->setYaxis(min, max); } int -TimeDisplayForm::GetNPoints() const +TimeDisplayForm::getNPoints() const { return d_npoints; } void -TimeDisplayForm::SetNPoints(const int npoints) +TimeDisplayForm::setNPoints(const int npoints) { d_npoints = npoints; } diff --git a/gr-qtgui/lib/timedisplayform.h b/gr-qtgui/lib/timedisplayform.h index 806fc4053f..52772a02ca 100644 --- a/gr-qtgui/lib/timedisplayform.h +++ b/gr-qtgui/lib/timedisplayform.h @@ -40,7 +40,7 @@ class TimeDisplayForm : public DisplayForm TimeDomainDisplayPlot* getPlot(); - int GetNPoints() const; + int getNPoints() const; public slots: void customEvent(QEvent * e); @@ -48,8 +48,8 @@ public slots: void setFrequencyRange(const double newCenterFrequency, const double newStartFrequency, const double newStopFrequency); - void setTimeDomainAxis(double min, double max); - void SetNPoints(const int); + void setYaxis(double min, double max); + void setNPoints(const int); private slots: void newData(const QEvent*); |