From 7b9ee11cad9fa4f5c10557927840688ebf19958f Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sat, 27 Oct 2012 05:36:22 +0000
Subject: [PATCH] Fixed Waterfall/Spectrum axis labels on windows.  Rx loop
 also decodes modem signals OK, sounds good, no clicks or pops!

git-svn-id: https://svn.code.sf.net/p/freetel/code@831 01035d8c-6547-0410-b346-abe4f91aad63
---
 fdmdv2/src/Makefile.win32                  | 4 ++--
 fdmdv2/src/fdmdv2_plot_scatter.cpp         | 1 +
 fdmdv2/src/fdmdv2_plot_spectrum.cpp        | 2 ++
 fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 6f90c544..0d4010e5 100644
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -3,7 +3,7 @@
 #
 # Makefile for Win32 on msys/Mingw to help David R get up to speed
 #
-# $ make -f Makefile.linux
+# $ make -f Makefile.Win32
 
 CODEC2_PATH=$(HOME)/codec2-dev
 INCLUDE_PATH=/usr/local/include
@@ -37,7 +37,7 @@ all: fdmdv2
 fdmdv2: $(OBJS) 
 	g++ -o fdmdv2 $(OBJS) $(CPP_FLAGS) $(LIBS)
 
-%.o: %.cpp $(HDRS) Makefile
+%.o: %.cpp $(HDRS) Makefile.win32
 	g++ $(CPP_FLAGS) -c $< -o $@
 
 clean:
diff --git a/fdmdv2/src/fdmdv2_plot_scatter.cpp b/fdmdv2/src/fdmdv2_plot_scatter.cpp
index ce79af0e..4afdde51 100644
--- a/fdmdv2/src/fdmdv2_plot_scatter.cpp
+++ b/fdmdv2/src/fdmdv2_plot_scatter.cpp
@@ -68,6 +68,7 @@ void PlotScatter::draw(wxAutoBufferedPaintDC& dc)
 
     // black background
 
+    dc.Clear();
     m_rPlot = wxRect(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_rGrid.GetWidth(), m_rGrid.GetHeight());
     wxBrush ltGraphBkgBrush = wxBrush(BLACK_COLOR);
     dc.SetBrush(ltGraphBkgBrush);
diff --git a/fdmdv2/src/fdmdv2_plot_spectrum.cpp b/fdmdv2/src/fdmdv2_plot_spectrum.cpp
index 85ff28c2..7892e5ab 100644
--- a/fdmdv2/src/fdmdv2_plot_spectrum.cpp
+++ b/fdmdv2/src/fdmdv2_plot_spectrum.cpp
@@ -102,6 +102,8 @@ void PlotSpectrum::draw(wxAutoBufferedPaintDC& dc)
     m_rGrid  = m_rCtrl;
     m_rGrid = m_rGrid.Deflate(PLOT_BORDER + (XLEFT_OFFSET/2), (PLOT_BORDER + (YBOTTOM_OFFSET/2)));
 
+    dc.Clear();
+
     // black background
 
     m_rPlot = wxRect(PLOT_BORDER + XLEFT_OFFSET, PLOT_BORDER, m_rGrid.GetWidth(), m_rGrid.GetHeight());
diff --git a/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp b/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp
index c75e6e47..1cf40eb3 100644
--- a/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp
+++ b/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp
@@ -174,6 +174,8 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC& dc)
 	m_pBmp = new wxBitmap(m_rGrid.GetWidth(), m_rGrid.GetHeight(), 24);
     }
 
+    dc.Clear();
+
     if(m_newdata)
     {
         m_newdata = false;
-- 
2.25.1