diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:18:00 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:18:00 -0400 |
| commit | 597b93798a804cde1783d6d2ab53b348d57c44cd (patch) | |
| tree | b65e73bb0de634ff5d209b15971ebdabf369a45c /gr-qtgui | |
| parent | 1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff) | |
Removing trailing/extra whitespaces before release.
We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
Diffstat (limited to 'gr-qtgui')
43 files changed, 76 insertions, 76 deletions
diff --git a/gr-qtgui/apps/gr_constellation_plot b/gr-qtgui/apps/gr_constellation_plot index 559b643c53..85caed6d05 100755 --- a/gr-qtgui/apps/gr_constellation_plot +++ b/gr-qtgui/apps/gr_constellation_plot @@ -185,4 +185,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_psd_plot_c b/gr-qtgui/apps/gr_psd_plot_c index 6ade908bd4..6cb065796a 100755 --- a/gr-qtgui/apps/gr_psd_plot_c +++ b/gr-qtgui/apps/gr_psd_plot_c @@ -77,4 +77,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_psd_plot_f b/gr-qtgui/apps/gr_psd_plot_f index 792b04290b..903a237e64 100755 --- a/gr-qtgui/apps/gr_psd_plot_f +++ b/gr-qtgui/apps/gr_psd_plot_f @@ -77,4 +77,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_psd_plot_i b/gr-qtgui/apps/gr_psd_plot_i index b2ae5f7103..3413469b7c 100755 --- a/gr-qtgui/apps/gr_psd_plot_i +++ b/gr-qtgui/apps/gr_psd_plot_i @@ -76,4 +76,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_spectrogram_plot_b b/gr-qtgui/apps/gr_spectrogram_plot_b index 82a443038e..b20567cd2d 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_b +++ b/gr-qtgui/apps/gr_spectrogram_plot_b @@ -76,4 +76,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_spectrogram_plot_c b/gr-qtgui/apps/gr_spectrogram_plot_c index bb4fad1b7a..122f4ec5d6 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_c +++ b/gr-qtgui/apps/gr_spectrogram_plot_c @@ -77,4 +77,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_spectrogram_plot_f b/gr-qtgui/apps/gr_spectrogram_plot_f index dcb0305bf5..41212eaaf7 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_f +++ b/gr-qtgui/apps/gr_spectrogram_plot_f @@ -77,4 +77,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_spectrogram_plot_i b/gr-qtgui/apps/gr_spectrogram_plot_i index 27a1bebd45..6a076c9546 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_i +++ b/gr-qtgui/apps/gr_spectrogram_plot_i @@ -76,4 +76,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_spectrogram_plot_s b/gr-qtgui/apps/gr_spectrogram_plot_s index b41b650a64..61fa826e90 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_s +++ b/gr-qtgui/apps/gr_spectrogram_plot_s @@ -76,4 +76,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/gr_time_plot_c b/gr-qtgui/apps/gr_time_plot_c index 174b3ee1ed..d3d00b5cf1 100755 --- a/gr-qtgui/apps/gr_time_plot_c +++ b/gr-qtgui/apps/gr_time_plot_c @@ -74,4 +74,4 @@ if __name__ == "__main__": main() except KeyboardInterrupt: pass - + diff --git a/gr-qtgui/apps/plot_constellation_form.py b/gr-qtgui/apps/plot_constellation_form.py index d5e37bb33c..01c6ed1865 100644 --- a/gr-qtgui/apps/plot_constellation_form.py +++ b/gr-qtgui/apps/plot_constellation_form.py @@ -62,7 +62,7 @@ class plot_constellation_form(plot_form): self.ybar.setValue(1000*self.top_block._y_value) self.add_line_control(self.right_col_layout) - + def set_auto_scale(self, state): if(state): self.top_block.auto_scale(True) diff --git a/gr-qtgui/apps/plot_form.py b/gr-qtgui/apps/plot_form.py index 2e1a6c5f77..75e39ec98e 100644 --- a/gr-qtgui/apps/plot_form.py +++ b/gr-qtgui/apps/plot_form.py @@ -32,7 +32,7 @@ import numpy class plot_form(QtGui.QWidget): def __init__(self, top_block, title='', scale=1): QtGui.QWidget.__init__(self, None) - + self._start = 0 self._end = 0 self._y_min = 0 @@ -41,7 +41,7 @@ class plot_form(QtGui.QWidget): self.top_block = top_block self.top_block.gui_y_axis = self.gui_y_axis - + self.setWindowTitle(title) self.layout = QtGui.QGridLayout(self) @@ -350,7 +350,7 @@ class plot_form(QtGui.QWidget): if(ret): self._y_min = ret[0] self._y_max = ret[1] - + self.gui_y_axis(self._y_min, self._y_max) else: self.ybar.setValue(self._y_max*self._pos_scale) diff --git a/gr-qtgui/apps/plot_psd_base.py b/gr-qtgui/apps/plot_psd_base.py index bb1567e014..46f903e1b5 100644 --- a/gr-qtgui/apps/plot_psd_base.py +++ b/gr-qtgui/apps/plot_psd_base.py @@ -107,7 +107,7 @@ class plot_base(gr.top_block): self.pyWin = sip.wrapinstance(pyQt, QtGui.QWidget) self._is_setup = True - + def is_setup(self): return self._is_setup diff --git a/gr-qtgui/apps/plot_psd_form.py b/gr-qtgui/apps/plot_psd_form.py index 262734bd67..2d1fcd10bc 100644 --- a/gr-qtgui/apps/plot_psd_form.py +++ b/gr-qtgui/apps/plot_psd_form.py @@ -74,7 +74,7 @@ class plot_psd_form(plot_form): self.update_psd_avg) self.add_line_control(self.right_col_layout) - + def update_psd_size(self): newpsdsize = self.psd_size_edit.text().toInt()[0] if(newpsdsize != self.top_block._psd_size): diff --git a/gr-qtgui/apps/plot_spectrogram_base.py b/gr-qtgui/apps/plot_spectrogram_base.py index a3fdf65117..26c336e36c 100644 --- a/gr-qtgui/apps/plot_spectrogram_base.py +++ b/gr-qtgui/apps/plot_spectrogram_base.py @@ -108,7 +108,7 @@ class plot_base(gr.top_block): self.pyWin = sip.wrapinstance(pyQt, QtGui.QWidget) self._is_setup = True - + def is_setup(self): return self._is_setup @@ -165,4 +165,4 @@ def setup_options(desc): sys.exit(0) return (options, args) - + diff --git a/gr-qtgui/apps/plot_spectrogram_form.py b/gr-qtgui/apps/plot_spectrogram_form.py index 7f8361e6b1..17cb0335bd 100644 --- a/gr-qtgui/apps/plot_spectrogram_form.py +++ b/gr-qtgui/apps/plot_spectrogram_form.py @@ -80,7 +80,7 @@ class plot_spectrogram_form(plot_form): self.spectrogram_auto_scale) self.add_spectrogram_control(self.right_col_layout) - + def update_psd_size(self): newpsdsize = self.psd_size_edit.text().toInt()[0] if(newpsdsize != self.top_block._psd_size): @@ -155,7 +155,7 @@ class plot_spectrogram_form(plot_form): index = self._line_tabs.currentIndex() self.top_block.gui_snk.set_color_map(index, c_index) self.update_line_alpha() - + def spectrogram_auto_scale(self): self.top_block.gui_snk.auto_scale() _min = self.top_block.gui_snk.min_intensity(0) diff --git a/gr-qtgui/apps/plot_time_base.py b/gr-qtgui/apps/plot_time_base.py index 942500c627..007c94d044 100644 --- a/gr-qtgui/apps/plot_time_base.py +++ b/gr-qtgui/apps/plot_time_base.py @@ -111,7 +111,7 @@ class plot_base(gr.top_block): self.pyWin = sip.wrapinstance(pyQt, QtGui.QWidget) self._is_setup = True - + def is_setup(self): return self._is_setup diff --git a/gr-qtgui/apps/plot_time_form.py b/gr-qtgui/apps/plot_time_form.py index 30701c8d37..0ab94e6cfe 100644 --- a/gr-qtgui/apps/plot_time_form.py +++ b/gr-qtgui/apps/plot_time_form.py @@ -57,7 +57,7 @@ class plot_time_form(plot_form): self.right_col_layout.addWidget(self.stem) self.add_line_control(self.right_col_layout) - + def set_auto_scale(self, state): if(state): self.top_block.auto_scale(True) diff --git a/gr-qtgui/apps/plot_time_raster_base.py b/gr-qtgui/apps/plot_time_raster_base.py index 2fc498ba28..856c8c8945 100644 --- a/gr-qtgui/apps/plot_time_raster_base.py +++ b/gr-qtgui/apps/plot_time_raster_base.py @@ -106,7 +106,7 @@ class plot_base(gr.top_block): self.pyWin = sip.wrapinstance(pyQt, QtGui.QWidget) self._is_setup = True - + def is_setup(self): return self._is_setup diff --git a/gr-qtgui/apps/plot_time_raster_form.py b/gr-qtgui/apps/plot_time_raster_form.py index 32d93744d5..32fbba0765 100644 --- a/gr-qtgui/apps/plot_time_raster_form.py +++ b/gr-qtgui/apps/plot_time_raster_form.py @@ -119,12 +119,12 @@ class plot_time_raster_form(plot_form): self._line_tabs.addTab(self._line_pages[-1], "{0}".format(label)) layout.addWidget(self._line_tabs) - + def update_color_map(self, c_index): index = self._line_tabs.currentIndex() self.top_block.gui_snk.set_color_map(index, c_index) self.update_line_alpha() - + def set_auto_scale(self, state): if(state): self.top_block.auto_scale(True) diff --git a/gr-qtgui/examples/pyqt_histogram_f.py b/gr-qtgui/examples/pyqt_histogram_f.py index 7bdcbfcb99..a960275f41 100755 --- a/gr-qtgui/examples/pyqt_histogram_f.py +++ b/gr-qtgui/examples/pyqt_histogram_f.py @@ -150,7 +150,7 @@ class control_box(QtGui.QWidget): res = self.hist_bins.text().toInt() if(res[1]): self.snk.set_bins(res[0]) - + def autoscalex(self): self.snk.autoscalex() diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml index 6e13481397..756b325ebe 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -30,7 +30,7 @@ $(gui_hint()($win)) #if $freqchangevar() is not None def $(id)_callback(p, num): if num == 1 or num == 2: self.set_$(freqchangevar)(p.x()) - + Qt.QObject.connect(self._$(id)_win, Qt.SIGNAL("plotPointSelected(QPointF, int)"), $(id)_callback ) #end if diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h index f22028c3c9..2a49cbddbe 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h @@ -67,7 +67,7 @@ public: void setPlotDimensions(const double rows, const double cols, const double units, const std::string &strunits); - + void plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints); diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h index 156f6bf93d..4fdd065093 100644 --- a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h @@ -48,7 +48,7 @@ class WaterfallDisplayPlot: public DisplayPlot Q_PROPERTY ( int intensity_color_map_type1 READ getIntensityColorMapType1 WRITE setIntensityColorMapType1 ) Q_PROPERTY ( QColor low_intensity_color READ getUserDefinedLowIntensityColor WRITE setUserDefinedLowIntensityColor ) Q_PROPERTY ( QColor high_intensity_color READ getUserDefinedHighIntensityColor WRITE setUserDefinedHighIntensityColor ) - + public: WaterfallDisplayPlot(int nplots, QWidget*); diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index c49b9d9ec0..a6507da3af 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -34,7 +34,7 @@ namespace gr { namespace qtgui { - + /*! * \brief A graphical sink to display multiple signals in frequency. * \ingroup instrumentation_blk diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index 96d2b57732..bedaf103ea 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -33,7 +33,7 @@ namespace gr { namespace qtgui { - + /*! * \brief A graphical sink to display a histogram. * \ingroup instrumentation_blk diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h index 6352e9f0db..57c2c887e6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h @@ -68,7 +68,7 @@ public: #endif virtual int rtti() const; - + virtual void draw(QPainter *p, const QwtScaleMap &xMap, const QwtScaleMap &yMap, diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 2a7b188069..7e09e3c428 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -91,7 +91,7 @@ private: bool d_stem; bool d_semilogx; bool d_semilogy; - + NPointsMenu *d_nptsmenu; QAction *d_stemmenu; QAction *d_semilogxmenu; @@ -105,7 +105,7 @@ private: PopupMenu *d_tr_delay_act; TriggerChannelMenu *d_tr_channel_menu; PopupMenu *d_tr_tag_key_act; - + gr::qtgui::trigger_mode d_trig_mode; gr::qtgui::trigger_slope d_trig_slope; float d_trig_level; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index 17a656949e..4a3e9f0e81 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -87,7 +87,7 @@ namespace gr { #endif virtual void clear_data() = 0; - + virtual void set_fft_size(const int fftsize) = 0; virtual int fft_size() const = 0; virtual void set_fft_average(const float fftavg) = 0; diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index 47e6b0b0de..a3ad6bf035 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -114,7 +114,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(int nplots, QWidget* parent) d_plot_curve.push_back(new QwtPlotCurve(QString("Data %1").arg(i))); d_plot_curve[i]->attach(this); d_plot_curve[i]->setPen(QPen(colors[i])); - + QwtSymbol *symbol = new QwtSymbol(QwtSymbol::NoSymbol, QBrush(colors[i]), QPen(colors[i]), QSize(7,7)); @@ -191,7 +191,7 @@ ConstellationDisplayPlot::plotNewData(const std::vector<double*> realDataPoints, if((numDataPoints > 0)) { if(numDataPoints != d_numPoints) { d_numPoints = numDataPoints; - + for(int i = 0; i < d_nplots; i++) { delete [] d_real_data[i]; delete [] d_imag_data[i]; @@ -226,7 +226,7 @@ ConstellationDisplayPlot::plotNewData(const std::vector<double*> realDataPoints, } } _autoScale(bottom, top); - } + } replot(); diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index 6f1f106f25..dcf5461d25 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -268,7 +268,7 @@ DisplayPlot::setLineWidth(int which, int width) QPen pen(d_plot_curve[which]->pen()); pen.setWidth(width); d_plot_curve[which]->setPen(pen); - + // Scale the marker size proportionally #if QWT_VERSION < 0x060000 QwtSymbol sym = (QwtSymbol)d_plot_curve[which]->symbol(); @@ -361,12 +361,12 @@ DisplayPlot::setMarkerAlpha(int which, int alpha) // Get the pen color QPen pen(d_plot_curve[which]->pen()); QColor color = pen.color(); - + // Set new alpha and update pen color.setAlpha(alpha); pen.setColor(color); d_plot_curve[which]->setPen(pen); - + // And set the new color for the markers #if QWT_VERSION < 0x060000 QwtSymbol sym = (QwtSymbol)d_plot_curve[which]->symbol(); @@ -396,7 +396,7 @@ DisplayPlot::getMarkerAlpha(int which) const void DisplayPlot::setStop(bool on) { - d_stop = on; + d_stop = on; } void diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 60cfcd26fb..e93ced2d14 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -54,7 +54,7 @@ public: { setTrackerMode(QwtPicker::AlwaysOn); } - + virtual void updateTrackerText() { updateDisplay(); @@ -130,7 +130,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) #endif setLineColor(i, default_colors[i]); } - + d_min_fft_plot_curve = new QwtPlotCurve("Minimum Power"); d_min_fft_plot_curve->attach(this); const QColor default_min_fft_color = Qt::magenta; @@ -141,7 +141,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) d_min_fft_plot_curve->setRawSamples(d_xdata, d_min_fft_data, d_numPoints); #endif d_min_fft_plot_curve->setVisible(false); - + d_max_fft_plot_curve = new QwtPlotCurve("Maximum Power"); d_max_fft_plot_curve->attach(this); QColor default_max_fft_color = Qt::darkYellow; @@ -152,13 +152,13 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) d_max_fft_plot_curve->setRawSamples(d_xdata, d_max_fft_data, d_numPoints); #endif d_max_fft_plot_curve->setVisible(false); - + d_lower_intensity_marker= new QwtPlotMarker(); d_lower_intensity_marker->setLineStyle(QwtPlotMarker::HLine); QColor default_marker_lower_intensity_color = Qt::cyan; setMarkerLowerIntensityColor(default_marker_lower_intensity_color); d_lower_intensity_marker->attach(this); - + d_upper_intensity_marker = new QwtPlotMarker(); d_upper_intensity_marker->setLineStyle(QwtPlotMarker::HLine); QColor default_marker_upper_intensity_color = Qt::green; @@ -341,11 +341,11 @@ FrequencyDisplayPlot::plotNewData(const std::vector<double*> dataPoints, d_xdata = new double[d_numPoints]; d_min_fft_data = new double[d_numPoints]; d_max_fft_data = new double[d_numPoints]; - + for(int i = 0; i < d_nplots; i++) { delete[] d_ydata[i]; d_ydata[i] = new double[d_numPoints]; - + #if QWT_VERSION < 0x060000 d_plot_curve[i]->setRawData(d_xdata, d_ydata[i], d_numPoints); #else @@ -363,7 +363,7 @@ FrequencyDisplayPlot::plotNewData(const std::vector<double*> dataPoints, clearMaxData(); clearMinData(); } - + double bottom=1e20, top=-1e20; for(int n = 0; n < d_nplots; n++) { @@ -387,14 +387,14 @@ FrequencyDisplayPlot::plotNewData(const std::vector<double*> dataPoints, } } } - + if(d_autoscale_state) _autoScale(bottom, top); - + d_noise_floor_amplitude = noiseFloorAmplitude; d_peak_frequency = peakFrequency; d_peak_amplitude = peakAmplitude; - + setUpperIntensityLevel(d_peak_amplitude); replot(); @@ -413,7 +413,7 @@ FrequencyDisplayPlot::plotNewData(const double* dataPoints, plotNewData(vecDataPoints, numDataPoints, noiseFloorAmplitude, peakFrequency, peakAmplitude, timeInterval); } - + void FrequencyDisplayPlot::clearMaxData() { @@ -548,7 +548,7 @@ void FrequencyDisplayPlot::setMinFFTColor (QColor c) { d_min_fft_color = c; - d_min_fft_plot_curve->setPen(QPen(c)); + d_min_fft_plot_curve->setPen(QPen(c)); } const QColor FrequencyDisplayPlot::getMinFFTColor() const @@ -560,7 +560,7 @@ void FrequencyDisplayPlot::setMaxFFTColor (QColor c) { d_max_fft_color = c; - d_max_fft_plot_curve->setPen(QPen(c)); + d_max_fft_plot_curve->setPen(QPen(c)); } const QColor diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc index ce9ed3c00d..0124cc73f2 100644 --- a/gr-qtgui/lib/HistogramDisplayPlot.cc +++ b/gr-qtgui/lib/HistogramDisplayPlot.cc @@ -156,7 +156,7 @@ HistogramDisplayPlot::HistogramDisplayPlot(int nplots, QWidget* parent) setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); setYaxis(-2.0, d_bins); setAxisTitle(QwtPlot::yLeft, "Count"); - + QList<QColor> colors; colors << QColor(Qt::blue) << QColor(Qt::red) << QColor(Qt::green) << QColor(Qt::black) << QColor(Qt::cyan) << QColor(Qt::magenta) @@ -391,7 +391,7 @@ HistogramDisplayPlot::setMarkerAlpha(int which, int alpha) QPen pen(d_plot_curve[which]->pen()); QBrush brush(d_plot_curve[which]->brush()); QColor color = brush.color(); - + // Set new alpha and update pen color.setAlpha(alpha); brush.setColor(color); @@ -463,7 +463,7 @@ void HistogramDisplayPlot::setNumBins(int bins) { d_bins = bins; - + delete [] d_xdata; d_xdata = new double[d_bins]; _resetXAxisPoints(d_left, d_right); diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index 80980187ff..8708ff0207 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -93,7 +93,7 @@ SpectrumGUIClass::openSpectrumWindow(QWidget* parent, _realTimeDomainPoints = new double[_dataPoints]; _imagTimeDomainPoints = new double[_dataPoints]; _fftBuffersCreatedFlag = true; - + memset(_fftPoints, 0x0, _dataPoints*sizeof(float)); memset(_realTimeDomainPoints, 0x0, _dataPoints*sizeof(double)); memset(_imagTimeDomainPoints, 0x0, _dataPoints*sizeof(double)); diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 8be3f904a6..8c0601a5b5 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -147,7 +147,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) setAxisScaleEngine(QwtPlot::yLeft, new QwtLinearScaleEngine); setYaxis(-2.0, 2.0); setAxisTitle(QwtPlot::yLeft, "Amplitude"); - + QList<QColor> colors; colors << QColor(Qt::blue) << QColor(Qt::red) << QColor(Qt::green) << QColor(Qt::black) << QColor(Qt::cyan) << QColor(Qt::magenta) @@ -167,7 +167,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) QwtSymbol *symbol = new QwtSymbol(QwtSymbol::NoSymbol, QBrush(colors[i]), QPen(colors[i]), QSize(7,7)); - + #if QWT_VERSION < 0x060000 d_plot_curve[i]->setRawData(d_xdata, d_ydata[i], d_numPoints); d_plot_curve[i]->setSymbol(*symbol); @@ -337,7 +337,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, m->setLabel(QwtText(s.str().c_str())); m->attach(this); - + if(!(show && d_tag_markers_en[which])) { m->hide(); } @@ -373,7 +373,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, } } _autoScale(bottom, top); - } + } replot(); } diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index afe326bdbb..ffacd80bad 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -239,7 +239,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot(int nplots, Qt::RightButton, Qt::ControlModifier); d_zoomer->setMousePattern(QwtEventPattern::MouseSelect3, Qt::RightButton); - + const QColor c(Qt::red); d_zoomer->setRubberBandPen(c); d_zoomer->setTrackerPen(c); @@ -301,7 +301,7 @@ TimeRasterDisplayPlot::reset() newSize.setWidth(d_cols); newSize.setBottom(0); newSize.setHeight(d_rows); - + d_zoomer->zoom(newSize); d_zoomer->setZoomBase(newSize); d_zoomer->zoom(0); diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index 92fcb38eaa..2d783d01a0 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -81,7 +81,7 @@ private: /*********************************************************************** * Widget to provide mouse pointer coordinate text **********************************************************************/ -class WaterfallZoomer: public QwtPlotZoomer, public TimeScaleData, +class WaterfallZoomer: public QwtPlotZoomer, public TimeScaleData, public FreqOffsetAndPrecisionClass { public: @@ -168,7 +168,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget* parent) d_intensity_color_map_type.push_back(INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR); setIntensityColorMapType(i, d_intensity_color_map_type[i], - QColor("white"), QColor("white")); + QColor("white"), QColor("white")); setAlpha(i, 255/d_nplots); } diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index 58d43e49d1..a3cb03eab1 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace qtgui { - + class QTGUI_API histogram_sink_f_impl : public histogram_sink_f { private: diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index 62eac5e13f..b40513506d 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -64,7 +64,7 @@ public: data = NULL; colorMap = new QwtLinearColorMap(); } - + ~PrivateData() { delete colorMap; diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc index bd88ead8d3..018b7e5ea6 100644 --- a/gr-qtgui/lib/timeRasterGlobalData.cc +++ b/gr-qtgui/lib/timeRasterGlobalData.cc @@ -44,7 +44,7 @@ TimeRasterData::TimeRasterData(const double rows, const double cols) // (helps when d_cols is fractional and we have to slide). d_totalitems = static_cast<int>((d_rows+1)*floor(d_cols)); d_data_size = d_totalitems + static_cast<int>(floor(d_cols)); - + d_intensityRange = QwtDoubleInterval(0.0, 10.0); d_data = new double[d_data_size]; @@ -171,7 +171,7 @@ double TimeRasterData::value(double x, double y) const { double returnValue = 0.0; - + #if QWT_VERSION < 0x060000 double top = boundingRect().top(); double bottom = top - boundingRect().height(); diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 6a75789059..c3c5bde5e9 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace qtgui { - + class QTGUI_API time_sink_c_impl : public time_sink_c { private: @@ -116,7 +116,7 @@ namespace gr { double line_alpha(int which); void set_size(int width, int height); - + int nsamps() const; void enable_menu(bool en); diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 7505642389..32e860a89c 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -30,7 +30,7 @@ namespace gr { namespace qtgui { - + class QTGUI_API time_sink_f_impl : public time_sink_f { private: diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index 8fcbac68a3..c3d83f6034 100644 --- a/gr-qtgui/python/qtgui/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt @@ -36,7 +36,7 @@ if(ENABLE_TESTING) set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gnuradio-runtime/python ) - + include(GrTest) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) |