git-svn-id: https://svn.code.sf.net/p/freetel/code@663 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.cpp b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
index cdad731a88c172ae3463c252f4b01d593728fdfa..8454cbda4ace17bd82c1e2fc98068087fe133f8b 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall.cpp
+++ b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
@@ -201,24 +201,6 @@ void PlotWaterfall::drawGraticule(wxAutoBufferedPaintDC&  dc)
 //----------------------------------------------------------------\r
 void PlotWaterfall::draw(wxAutoBufferedPaintDC&  dc)
 {
-    float       spec_index_per_px;\r
-    float       intensity_per_dB;
-    int         px_per_sec;
-    int         index;\r
-    int         dy;\r
-    int         dy_blocks;\r
-    int         bytes_in_row_of_blocks;\r
-    int         b;
-    int         px;\r
-    int         py;\r
-    int         intensity;
-    unsigned    *last_row;\r
-    unsigned    *pdest;\r
-    unsigned    *psrc;
-    //int p;\r
-    //char buf[15];\r
-    //wxString s;\r
-
     m_rectCtrl  = GetClientRect();\r
     m_rectGrid  = m_rectCtrl;\r
 \r
@@ -240,7 +222,28 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC&  dc)
     dc.DrawRectangle(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_w, m_h);\r
 \r
     drawGraticule(dc);\r
+    //plotData(dc);\r
+}\r
 \r
+//----------------------------------------------------------------\r
+// plotData()\r
+//----------------------------------------------------------------\r
+void PlotWaterfall::plotData(wxAutoBufferedPaintDC&  dc)
+{
+    float       spec_index_per_px;\r
+    float       intensity_per_dB;
+    int         px_per_sec;
+    int         index;\r
+    int         dy;\r
+    int         dy_blocks;\r
+    int         bytes_in_row_of_blocks;\r
+    int         b;
+    int         px;\r
+    int         py;\r
+    int         intensity;
+    unsigned    *last_row;\r
+    unsigned    *pdest;\r
+    unsigned    *psrc;
     /* detect resizing of window */
 /*\r
     if ((m_h != m_prev_h) || (m_w != m_prev_w))

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.h b/fdmdv2/src/fdmdv2_plot_waterfall.h
index c431c4d14ceabb47bbd45e28ad5af9ff071cea19..be28fcde829b0d2a4b6c3ea68940bfd97ae32157 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall.h
+++ b/fdmdv2/src/fdmdv2_plot_waterfall.h
@@ -53,7 +53,7 @@ protected:
     void        OnShow(wxShowEvent& event);\r
     void        drawGraticule(wxAutoBufferedPaintDC&  dc);\r
     void        draw(wxAutoBufferedPaintDC&  dc);\r
-\r
+    void        plotData(wxAutoBufferedPaintDC&  dc);\r
     DECLARE_EVENT_TABLE()\r
 };\r
 \r