diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-05 16:24:41 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-05 16:24:41 -0700 |
| commit | a8f603f23fcb2fce7eaa21cec0753d8393748afb (patch) | |
| tree | 57ce0d3d0800f45ec353846067bd4811b89617e2 /gr-qtgui/lib/TimeDomainDisplayPlot.cc | |
| parent | 61c4e2f62d18b3b2f0663b8c0a54a105d3896883 (diff) | |
| parent | 4ed2622bf4f2a566dbcd22d78ac2e3ab528ceb33 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-qtgui/lib/TimeDomainDisplayPlot.cc')
| -rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 2602c0a609..16ba4a39c6 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -152,6 +152,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) d_semilogx = false; d_semilogy = false; + d_autoscale_shot = false; setAxisScaleEngine(QwtPlot::xBottom, new QwtLinearScaleEngine); setXaxis(0, d_numPoints); @@ -401,6 +402,10 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, } } _autoScale(bottom, top); + if(d_autoscale_shot) { + d_autoscale_state = false; + d_autoscale_shot = false; + } } replot(); @@ -490,6 +495,14 @@ TimeDomainDisplayPlot::setAutoScale(bool state) } void +TimeDomainDisplayPlot::setAutoScaleShot() +{ + d_autoscale_state = true; + d_autoscale_shot = true; +} + + +void TimeDomainDisplayPlot::setSampleRate(double sr, double units, const std::string &strunits) { |