summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-07 12:18:00 -0400
commit597b93798a804cde1783d6d2ab53b348d57c44cd (patch)
treeb65e73bb0de634ff5d209b15971ebdabf369a45c /gr-qtgui/lib
parent1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (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/lib')
-rw-r--r--gr-qtgui/lib/ConstellationDisplayPlot.cc6
-rw-r--r--gr-qtgui/lib/DisplayPlot.cc8
-rw-r--r--gr-qtgui/lib/FrequencyDisplayPlot.cc28
-rw-r--r--gr-qtgui/lib/HistogramDisplayPlot.cc6
-rw-r--r--gr-qtgui/lib/SpectrumGUIClass.cc2
-rw-r--r--gr-qtgui/lib/TimeDomainDisplayPlot.cc8
-rw-r--r--gr-qtgui/lib/TimeRasterDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/WaterfallDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/histogram_sink_f_impl.h2
-rw-r--r--gr-qtgui/lib/plot_raster.cc2
-rw-r--r--gr-qtgui/lib/timeRasterGlobalData.cc4
-rw-r--r--gr-qtgui/lib/time_sink_c_impl.h4
-rw-r--r--gr-qtgui/lib/time_sink_f_impl.h2
13 files changed, 40 insertions, 40 deletions
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: