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

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index 0f717de6300fdf0d12f44009f7634e33f5ea6eb1..4f9c0d966a6f62202e3ebcf6a421ad799c76df8c 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -2,18 +2,18 @@
 ## Auto Generated makefile by CodeLite IDE\r
 ## any manual changes will be erased      \r
 ##\r
-## Release\r
+## Debug\r
 ProjectName            :=fdmdv2\r
-ConfigurationName      :=Release\r
+ConfigurationName      :=Debug\r
 WorkspacePath          := "C:\bin\Projects\Radio\fdmdv2\build"\r
 ProjectPath            := "C:\bin\Projects\Radio\fdmdv2\build"\r
-IntermediateDirectory  :=./Release\r
+IntermediateDirectory  :=./Debug\r
 OutDir                 := $(IntermediateDirectory)\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=10/18/2012\r
+Date                   :=10/19/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -35,8 +35,8 @@ PreprocessOnlySwitch   :=-E
 ObjectsFileList        :="C:\bin\Projects\Radio\fdmdv2\build\fdmdv2.txt"\r
 PCHCompileFlags        :=\r
 MakeDirCommand         :=makedir\r
-LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)\r
-IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/ \r
+LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
+IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include \r
 IncludePCH             := \r
 RcIncludePath          := \r
 Libs                   := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp \r
@@ -50,8 +50,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Project
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"761\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"761\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"777\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"777\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -78,7 +78,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
        $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
 \r
 $(IntermediateDirectory)/.d:\r
-       @$(MakeDirCommand) "./Release"\r
+       @$(MakeDirCommand) "./Debug"\r
 \r
 PreBuild:\r
 \r
@@ -237,6 +237,6 @@ clean:
        $(RM) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2"\r
+       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2"\r
 \r
 \r

diff --git a/fdmdv2/build/fdmdv2.txt b/fdmdv2/build/fdmdv2.txt
index 4221d1f3a2589f80b3891a132c6e1e731378990b..4368000624e11ec720e306a265978e474ee7b86a 100644 (file)
--- a/fdmdv2/build/fdmdv2.txt
+++ b/fdmdv2/build/fdmdv2.txt
@@ -1 +1 @@
-./Release/src_dlg_about.o ./Release/src_dlg_audio.o ./Release/src_dlg_comports.o ./Release/src_dlg_options.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_waterfall.o ./Release/src_fdmdv2_plot_spectrum.o  ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o  \r
+./Debug/src_dlg_about.o ./Debug/src_dlg_audio.o ./Debug/src_dlg_comports.o ./Debug/src_dlg_options.o ./Debug/src_fdmdv2_main.o ./Debug/src_fdmdv2_plot.o ./Debug/src_topFrame.o ./Debug/src_fdmdv2_plot_scatter.o ./Debug/src_fdmdv2_plot_waterfall.o ./Debug/src_fdmdv2_plot_spectrum.o  ./Debug/src_fdmdv2_pa_wrapper.o ./Debug/src_fdmdv2_plot_scalar.o ./Debug/src_fdmdv2_hdw_ports.o  \r

diff --git a/fdmdv2/build/fdmdv2.workspace b/fdmdv2/build/fdmdv2.workspace
index 6c12b0fd2ddc29d71092b062d17d9f07a36a6e4e..e1c35c73f733b7704e58c9a2e76789b35734b55e 100644 (file)
--- a/fdmdv2/build/fdmdv2.workspace
+++ b/fdmdv2/build/fdmdv2.workspace
@@ -4,12 +4,15 @@
   <Environment>
     <![CDATA[]]>
   </Environment>
+  <Project Name="rawbits" Path="../tests/image/rawbits.project" Active="No"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="no">
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="fdmdv2" ConfigName="Debug"/>
+      <Project Name="rawbits" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
+    <WorkspaceConfiguration Name="Release" Selected="no">
       <Project Name="fdmdv2" ConfigName="Release"/>
+      <Project Name="rawbits" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>

diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk
index 59fb53ea6a70e2d3e0e9130c933698d6a46b4b21..4ea617a27f67fd1c8affb214583d0600e2a5783b 100644 (file)
--- a/fdmdv2/build/fdmdv2_wsp.mk
+++ b/fdmdv2/build/fdmdv2_wsp.mk
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-       @echo ----------Building project:[ fdmdv2 - Release ]----------
+       @echo ----------Building project:[ fdmdv2 - Debug ]----------
        @"$(MAKE)" -f "fdmdv2.mk"
 clean:
-       @echo ----------Cleaning project:[ fdmdv2 - Release ]----------
+       @echo ----------Cleaning project:[ fdmdv2 - Debug ]----------
        @"$(MAKE)" -f "fdmdv2.mk" clean

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index b46c4b9b05905ef77e4700916702a28e7ad008c1..9634ec4690990dcff4a8ca1074134da4b9d87243 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -163,7 +163,6 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
 
 //    m_menuItemPlayAudioFile->Enable(false);
 
-
 #ifdef _USE_TIMER
     Bind(wxEVT_TIMER, &MainFrame::OnTimer, this);       // ID_MY_WINDOW);
     m_plotTimer.SetOwner(this, ID_TIMER_WATERFALL);

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.cpp b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
index 6466ae5e2407d5ce7661b67c56648daa4a963c55..38ec1faf35112254350977df83d262fcfad4df88 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall.cpp
+++ b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
@@ -186,7 +186,7 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC& pDC)
     if(m_newdata)
     {
         m_newdata = false;
-//        plotPixelData(dc);
+        plotPixelData(pDC);
 //#ifdef _USE_TIMER
         int t = m_rPlot.GetTop();
         int l = m_rPlot.GetLeft();
@@ -196,7 +196,7 @@ void PlotWaterfall::draw(wxAutoBufferedPaintDC& pDC)
         int w2 = w - 1;
         int ht = (h - DATA_LINE_HEIGHT);
 
-        drawData();     //  m_mDC, PLOT_BOTTOM);
+        //drawData();     //  m_mDC, PLOT_BOTTOM);
         m_mDC.StretchBlit(l, t2, w2, ht, &m_mDC, l, t2 + DATA_LINE_HEIGHT, w2, ht - 2);
 //        pDC.Blit(l, t, w, h, &m_mDC, l, t);                                                   // Scroll Up from Bottom
         pDC.StretchBlit(l, (h - t) + 4, w, (-h) + 4, &m_mDC, l, t, w, h);                       // Scroll Down from top

diff --git a/fdmdv2/tests/image/image.cpp b/fdmdv2/tests/image/image.cpp
index 33642116e96b45763bd863f15f1ba0cc584b9a83..7903e759e210556913d6df024b8b9653325a869e 100644 (file)
--- a/fdmdv2/tests/image/image.cpp
+++ b/fdmdv2/tests/image/image.cpp
@@ -9,8 +9,6 @@
 //              (c) 2005-2009 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
-
-
 #include "wx/wx.h"
 #include "wx/image.h"
 #include "wx/file.h"
@@ -24,11 +22,9 @@
 #include "wx/versioninfo.h"
 #include "wx/rawbmp.h"
 
-
 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------
-
 class MyApp: public wxApp
 {
 public:
@@ -52,14 +48,10 @@ public:
         m_alphaBitmap(SIZE, SIZE, 32)
     */
 
-    MyRawBitmapFrame(): wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxImage sample"),
-                               wxPoint(20, 20), wxSize(950, 700) ),
-                      m_bitmap(SIZE, SIZE, 24)
+    MyRawBitmapFrame(): wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxImage sample"), wxPoint(20, 20), wxSize(950, 700)), m_bitmap(SIZE, SIZE, 24)
     {
-        SetClientSize(SIZE, SIZE*2+25);
-
+        SetClientSize(SIZE, SIZE * 2 + 25);
         InitBitmap();
-
     }
 
     void InitBitmap()
@@ -80,7 +72,6 @@ public:
             int r = y < SIZE/3 ? 255 : 0,
                 g = (SIZE/3 <= y) && (y < 2*(SIZE/3)) ? 255 : 0,
                 b = 2*(SIZE/3) <= y ? 255 : 0;
-
             for ( int x = 0; x < SIZE; ++x )
             {
                 p.Red() = r;
@@ -88,7 +79,6 @@ public:
                 p.Blue() = b;
                 ++p; // same as p.OffsetX(1)
             }
-
             p = rowStart;
             p.OffsetY(data, 1);
         }