diff options
author | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-07 08:42:36 -0500 |
---|---|---|
committer | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-07 08:42:36 -0500 |
commit | 1d72dbaf448cb4a398223835b69b71ae3d2a6c22 (patch) | |
tree | 2e84446576313fe2df21fd982364073dc76e8a26 /gr-qtgui/lib/TimeDomainDisplayPlot.cc | |
parent | c03114f9861920b246c36bb7e6b2098dadacd60e (diff) | |
parent | 6ac84d93d4e41a68f9e2885ffc403ed2e0e11a27 (diff) |
Merge branch 'next' into fix_build_dir_order_next
Diffstat (limited to 'gr-qtgui/lib/TimeDomainDisplayPlot.cc')
-rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index a10418bddf..f3c3b4deb3 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -43,12 +43,12 @@ public: { } - virtual unsigned int GetTimePrecision() const + virtual unsigned int getTimePrecision() const { return _timePrecision; } - virtual void SetTimePrecision(const unsigned int newPrecision) + virtual void setTimePrecision(const unsigned int newPrecision) { _timePrecision = newPrecision; } @@ -74,7 +74,7 @@ public: updateDisplay(); } - void SetUnitType(const std::string &type) + void setUnitType(const std::string &type) { _unitType = type; } @@ -84,7 +84,7 @@ protected: virtual QwtText trackerText( const QPoint& p ) const { QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); - QwtText t(QString("%1 %2, %3 V").arg(dp.x(), 0, 'f', GetTimePrecision()). + QwtText t(QString("%1 %2, %3 V").arg(dp.x(), 0, 'f', getTimePrecision()). arg(_unitType.c_str()). arg(dp.y(), 0, 'f', 4)); @@ -176,7 +176,7 @@ TimeDomainDisplayPlot::replot() } void -TimeDomainDisplayPlot::PlotNewData(const std::vector<double*> dataPoints, +TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints, const double timeInterval) { @@ -231,7 +231,7 @@ void TimeDomainDisplayPlot::_resetXAxisPoints() } void -TimeDomainDisplayPlot::SetSampleRate(double sr, double units, +TimeDomainDisplayPlot::setSampleRate(double sr, double units, const std::string &strunits) { double newsr = sr/units; @@ -244,8 +244,8 @@ TimeDomainDisplayPlot::SetSampleRate(double sr, double units, //double display_units = ceil(log10(units)/2.0); double display_units = 4; setAxisTitle(QwtPlot::xBottom, QString("Time (%1)").arg(strunits.c_str())); - ((TimeDomainDisplayZoomer*)_zoomer)->SetTimePrecision(display_units); - ((TimeDomainDisplayZoomer*)_zoomer)->SetUnitType(strunits); + ((TimeDomainDisplayZoomer*)_zoomer)->setTimePrecision(display_units); + ((TimeDomainDisplayZoomer*)_zoomer)->setUnitType(strunits); } } |