8 files changed, 59 insertions, 18 deletions
diff --git a/gr-qtgui/include/qtgui/time_raster_sink_b.h b/gr-qtgui/include/qtgui/time_raster_sink_b.h
index 51de65c9cf..1b65646b81 100644
--- a/gr-qtgui/include/qtgui/time_raster_sink_b.h
+++ b/gr-qtgui/include/qtgui/time_raster_sink_b.h
@@ -86,11 +86,16 @@ namespace gr {
       virtual void set_num_rows(double rows) = 0;
       virtual void set_num_cols(double cols) = 0;
 
+      virtual double num_rows() = 0;
+      virtual double num_cols() = 0;
+
       virtual void set_multiplier(const std::vector<float> &mult) = 0;
       virtual void set_offset(const std::vector<float> &offset) = 0;
 
       virtual void set_intensity_range(float min, float max) = 0;
 
+      virtual void reset() = 0;
+
       QApplication *d_qApplication;
     };
 
diff --git a/gr-qtgui/include/qtgui/time_raster_sink_f.h b/gr-qtgui/include/qtgui/time_raster_sink_f.h
index 075b4239cc..1ae4d79bda 100644
--- a/gr-qtgui/include/qtgui/time_raster_sink_f.h
+++ b/gr-qtgui/include/qtgui/time_raster_sink_f.h
@@ -83,11 +83,16 @@ namespace gr {
       virtual void set_num_rows(double rows) = 0;
       virtual void set_num_cols(double cols) = 0;
 
+      virtual double num_rows() = 0;
+      virtual double num_cols() = 0;
+
       virtual void set_multiplier(const std::vector<float> &mult) = 0;
       virtual void set_offset(const std::vector<float> &offset) = 0;
 
       virtual void set_intensity_range(float min, float max) = 0;
 
+      virtual void reset() = 0;
+
       QApplication *d_qApplication;
     };
 
diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc
index 10ba7ececc..f3fb804288 100644
--- a/gr-qtgui/lib/timeRasterGlobalData.cc
+++ b/gr-qtgui/lib/timeRasterGlobalData.cc
@@ -65,7 +65,8 @@ TimeRasterData::~TimeRasterData()
 void TimeRasterData::reset()
 {
   d_resid = 0;
-  memset(d_data, 0x0, d_totalitems*sizeof(double));
+  d_nitems = 0;
+  memset(d_data, 0x0, d_data_size*sizeof(double));
 }
 
 void TimeRasterData::copy(const TimeRasterData* rhs)
@@ -93,7 +94,6 @@ void TimeRasterData::copy(const TimeRasterData* rhs)
 #endif
 
   reset();
-  setDataBuffer(rhs->getDataBuffer());
 
 #if QWT_VERSION < 0x060000
   setRange(rhs->range());
@@ -237,16 +237,4 @@ TimeRasterData::addData(const double* data,
   }
 }
 
-double*
-TimeRasterData::getDataBuffer() const
-{
-  return d_data;
-}
-
-void
-TimeRasterData::setDataBuffer(const double* newData)
-{
-  memcpy(d_data, newData, d_totalitems*sizeof(double));
-}
-
 #endif /* TIMERASTER_GLOBAL_DATA_CPP */
diff --git a/gr-qtgui/lib/timeRasterGlobalData.h b/gr-qtgui/lib/timeRasterGlobalData.h
index 7b450c033b..0a414432d1 100644
--- a/gr-qtgui/lib/timeRasterGlobalData.h
+++ b/gr-qtgui/lib/timeRasterGlobalData.h
@@ -56,9 +56,6 @@ public:
 
   virtual void addData(const double*, const int);
 
-  virtual double* getDataBuffer()const;
-  virtual void setDataBuffer(const double*);
-
   void incrementResidual();
 
 protected:
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index 46d60ba3f5..155e019c76 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -210,6 +210,18 @@ namespace gr {
       d_main_gui->setNumCols(cols);
     }
 
+    double
+    time_raster_sink_b_impl::num_rows()
+    {
+      return d_main_gui->numRows();
+    }
+
+    double
+    time_raster_sink_b_impl::num_cols()
+    {
+      return d_main_gui->numCols();
+    }
+
     void
     time_raster_sink_b_impl::set_multiplier(const std::vector<float> &mult)
     {
@@ -252,6 +264,12 @@ namespace gr {
       d_main_gui->setIntensityRange(min, max);
     }
 
+    void
+    time_raster_sink_b_impl::reset()
+    {
+      d_index = 0;
+    }
+
     int
     time_raster_sink_b_impl::work(int noutput_items,
 				  gr_vector_const_void_star &input_items,
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h
index 248eb8dd67..1997bacd93 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.h
@@ -88,11 +88,16 @@ namespace gr {
       void set_num_rows(double rows);
       void set_num_cols(double cols);
 
+      double num_rows();
+      double num_cols();
+
       void set_multiplier(const std::vector<float> &mult);
       void set_offset(const std::vector<float> &offset);
 
       void set_intensity_range(float min, float max);
 
+      void reset();
+
       int work(int noutput_items,
 	       gr_vector_const_void_star &input_items,
 	       gr_vector_void_star &output_items);
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index be1e66da12..9543b35afe 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -208,6 +208,18 @@ namespace gr {
       d_main_gui->setNumCols(cols);
     }
 
+    double
+    time_raster_sink_f_impl::num_rows()
+    {
+      return d_main_gui->numRows();
+    }
+
+    double
+    time_raster_sink_f_impl::num_cols()
+    {
+      return d_main_gui->numCols();
+    }
+
     void
     time_raster_sink_f_impl::set_multiplier(const std::vector<float> &mult)
     {
@@ -250,6 +262,12 @@ namespace gr {
       d_main_gui->setIntensityRange(min, max);
     }
 
+    void
+    time_raster_sink_f_impl::reset()
+    {
+      d_index = 0;
+    }
+
     int
     time_raster_sink_f_impl::work(int noutput_items,
 				  gr_vector_const_void_star &input_items,
@@ -258,7 +276,7 @@ namespace gr {
       int n=0, j=0, idx=0;
       const float *in = (const float*)input_items[0];
 
-      unsigned int cols = d_main_gui->numCols();
+      double cols = d_main_gui->numCols();
       if(d_cols != cols) {
 	d_cols = cols;
 	d_index = 0;
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h
index c14a5c1147..9c00ac89ba 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.h
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.h
@@ -87,11 +87,16 @@ namespace gr {
       void set_num_rows(double rows);
       void set_num_cols(double cols);
 
+      double num_rows();
+      double num_cols();
+
       void set_multiplier(const std::vector<float> &mult);
       void set_offset(const std::vector<float> &offset);
 
       void set_intensity_range(float min, float max);
 
+      void reset();
+
       int work(int noutput_items,
 	       gr_vector_const_void_star &input_items,
 	       gr_vector_void_star &output_items);