From: wittend99 Date: Wed, 5 Sep 2012 02:54:00 +0000 (+0000) Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@663 01035d8c-6547-0410-b346-abe4f9... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=c845381f1bed591b43972426e9fe4f153736cfeb;p=freetel-svn-tracking.git git-svn-id: https://svn.code.sf.net/p/freetel/code@663 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.cpp b/fdmdv2/src/fdmdv2_plot_waterfall.cpp index cdad731a..8454cbda 100644 --- a/fdmdv2/src/fdmdv2_plot_waterfall.cpp +++ b/fdmdv2/src/fdmdv2_plot_waterfall.cpp @@ -201,24 +201,6 @@ void PlotWaterfall::drawGraticule(wxAutoBufferedPaintDC& dc) //---------------------------------------------------------------- void PlotWaterfall::draw(wxAutoBufferedPaintDC& dc) { - float spec_index_per_px; - float intensity_per_dB; - int px_per_sec; - int index; - int dy; - int dy_blocks; - int bytes_in_row_of_blocks; - int b; - int px; - int py; - int intensity; - unsigned *last_row; - unsigned *pdest; - unsigned *psrc; - //int p; - //char buf[15]; - //wxString s; - m_rectCtrl = GetClientRect(); m_rectGrid = m_rectCtrl; @@ -240,7 +222,28 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC& dc) dc.DrawRectangle(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_w, m_h); drawGraticule(dc); + //plotData(dc); +} +//---------------------------------------------------------------- +// plotData() +//---------------------------------------------------------------- +void PlotWaterfall::plotData(wxAutoBufferedPaintDC& dc) +{ + float spec_index_per_px; + float intensity_per_dB; + int px_per_sec; + int index; + int dy; + int dy_blocks; + int bytes_in_row_of_blocks; + int b; + int px; + int py; + int intensity; + unsigned *last_row; + unsigned *pdest; + unsigned *psrc; /* detect resizing of window */ /* 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 c431c4d1..be28fcde 100644 --- a/fdmdv2/src/fdmdv2_plot_waterfall.h +++ b/fdmdv2/src/fdmdv2_plot_waterfall.h @@ -53,7 +53,7 @@ protected: void OnShow(wxShowEvent& event); void drawGraticule(wxAutoBufferedPaintDC& dc); void draw(wxAutoBufferedPaintDC& dc); - + void plotData(wxAutoBufferedPaintDC& dc); DECLARE_EVENT_TABLE() };