Fixed Waterfall/Spectrum axis labels on windows. Rx loop also decodes modem signals...

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

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 6f90c5448a9cd909ab7db8a0ebbf02f7fe642f83..0d4010e5b6fd8e3374eae04055a51d70379906c7 100644 (file)
--- 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 ce79af0e0de4d4c7dd27ab5f602c171794cbb904..4afdde51b5b5ebd121e5f97c1c5baede493426a3 100644 (file)
--- 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 85ff28c2a549359161312c5a00ffd2918e378ea1..7892e5ab0d0d82f76ec1d40789ee6706e2853f08 100644 (file)
--- 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 c75e6e47ff31bef73f38fd07f05da576d68258b8..1cf40eb3f471ef87ebb571db60fb6f05dedae32b 100644 (file)
--- 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;