Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gr-qtgui / src / lib / FrequencyDisplayPlot.h

diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.h b/gr-qtgui/src/lib/FrequencyDisplayPlot.h
index fb647d96411c4020aed303d598e713d25971fb76..c78e1667ea55ec99e929fedd8bd8af8d9cdc4a38 100644 (file)
--- a/gr-qtgui/src/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.h
@@ -1,6 +1,7 @@
 #ifndef FREQUENCY_DISPLAY_PLOT_HPP
 #define FREQUENCY_DISPLAY_PLOT_HPP
 
+#include <cstdio>
 #include <qwt_plot.h>
 #include <qwt_painter.h>
 #include <qwt_plot_canvas.h>
@@ -20,11 +21,16 @@ public:
   FrequencyDisplayPlot(QWidget*);
   virtual ~FrequencyDisplayPlot();
 
-  void SetFrequencyRange(const double, const double, const double, const bool);
+  void SetFrequencyRange(const double, const double, 
+                        const double, const bool,
+                        const double units=1000.0, 
+                        const std::string &strunits = "kHz");
   double GetStartFrequency()const;
   double GetStopFrequency()const;
 
-  void PlotNewData(const double* dataPoints, const int64_t numDataPoints, const double noiseFloorAmplitude, const double peakFrequency, const double peakAmplitude);
+  void PlotNewData(const double* dataPoints, const int64_t numDataPoints,
+                  const double noiseFloorAmplitude, const double peakFrequency,
+                  const double peakAmplitude, const double timeInterval);
   
   void ClearMaxData();
   void ClearMinData();
@@ -34,18 +40,24 @@ public:
                                   
   virtual void replot();
 
+  void set_yaxis(double min, double max);
+
 public slots:
+  void resizeSlot( QSize *e );
   void SetLowerIntensityLevel(const double);
   void SetUpperIntensityLevel(const double);
 
 protected:
 
 private:
+
   void _resetXAxisPoints();
   
   double _startFrequency;
   double _stopFrequency;
-
+  double _maxYAxis;
+  double _minYAxis;
+  
   QwtPlotCurve* _fft_plot_curve;
   QwtPlotCurve* _min_fft_plot_curve;
   QwtPlotCurve* _max_fft_plot_curve;
@@ -74,8 +86,6 @@ private:
   timespec _lastReplot;
 
   bool _useCenterFrequencyFlag;
-
-  double _displayIntervalTime;
 };
 
 #endif /* FREQUENCY_DISPLAY_PLOT_HPP */