1 files changed, 18 insertions, 53 deletions
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.h b/gr-qtgui/lib/TimeDomainDisplayPlot.h
index 356da25ad4..9996f84fc3 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008,2009,2010,2011 Free Software Foundation, Inc.
+ * Copyright 2008-2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -20,83 +20,48 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef TIME_DOMAIN_DISPLAY_PLOT_HPP
-#define TIME_DOMAIN_DISPLAY_PLOT_HPP
+#ifndef TIME_DOMAIN_DISPLAY_PLOT_H
+#define TIME_DOMAIN_DISPLAY_PLOT_H
 
 #include <stdint.h>
 #include <cstdio>
 #include <vector>
-#include <qwt_plot.h>
-#include <qwt_painter.h>
-#include <qwt_plot_canvas.h>
-#include <qwt_plot_curve.h>
-#include <qwt_scale_engine.h>
-#include <qwt_scale_widget.h>
-#include <qwt_plot_zoomer.h>
-#include <qwt_plot_panner.h>
-#include <qwt_plot_magnifier.h>
-#include <qwt_plot_marker.h>
-#include <qwt_symbol.h>
-#include <qtgui_util.h>
+#include "DisplayPlot.h"
 
-#if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#endif
-
-class TimeDomainDisplayPlot:public QwtPlot{
+class TimeDomainDisplayPlot: public DisplayPlot
+{
   Q_OBJECT
 
 public:
   TimeDomainDisplayPlot(int nplots, QWidget*);
   virtual ~TimeDomainDisplayPlot();
 
-  void PlotNewData(const std::vector<double*> dataPoints,
+  void plotNewData(const std::vector<double*> dataPoints,
 		   const int64_t numDataPoints, const double timeInterval);
 
-  virtual void replot();
+  void replot();
 
-public slots:
-  void setYaxis(double min, double max);
-  void setXaxis(double min, double max);
-  void setTitle(int which, QString title);
-  void setColor(int which, QString color);
+  void stemPlot(bool en);
 
-  void resizeSlot( QSize *s );
-  void SetSampleRate(double sr, double units,
+public slots:
+  void setSampleRate(double sr, double units,
 		     const std::string &strunits);
 
-  // Because of the preprocessing of slots in QT, these are no
-  // easily separated by the version check. Make one for each
-  // version until it's worked out.
-  void OnPickerPointSelected(const QwtDoublePoint & p);
-  void OnPickerPointSelected6(const QPointF & p);
-
-signals:
-  void plotPointSelected(const QPointF p);
-
-protected slots:
-  void LegendEntryChecked(QwtPlotItem *plotItem, bool on);
-
-protected:
+  void setAutoScale(bool state);
+  void setSemilogx(bool en);
+  void setSemilogy(bool en);
 
 private:
   void _resetXAxisPoints();
-
-  int _nplots;
-  std::vector<QwtPlotCurve*> _plot_curve;
-
-  QwtPlotPanner* _panner;
-  QwtPlotZoomer* _zoomer;
-
-  QwtDblClickPlotPicker *_picker;
-  QwtPlotMagnifier *_magnifier;
+  void _autoScale(double bottom, double top);
 
   std::vector<double*> _dataPoints;
   double* _xAxisPoints;
 
   double _sampleRate;
 
-  int64_t _numPoints;
+  bool d_semilogx;
+  bool d_semilogy;
 };
 
-#endif /* TIME_DOMAIN_DISPLAY_PLOT_HPP */
+#endif /* TIME_DOMAIN_DISPLAY_PLOT_H */