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

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index 3df229a2ea8173a7a6eb33829a7004f69c404082..804ec4cf48ca1f2016663279b6cc240d34200750 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
-## Debug\r
+## Release\r
 ProjectName            :=fdmdv2\r
-ConfigurationName      :=Debug\r
+ConfigurationName      :=Release\r
 WorkspacePath          := "C:\bin\Projects\Radio\fdmdv2\build"\r
 ProjectPath            := "C:\bin\Projects\Radio\fdmdv2\build"\r
-IntermediateDirectory  :=./Debug\r
+IntermediateDirectory  :=./Release\r
 OutDir                 := $(IntermediateDirectory)\r
 CurrentFileName        :=\r
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=10/22/2012\r
+Date                   :=10/23/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 $(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
+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
 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 :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"791\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"791\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"794\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"794\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -62,8 +62,8 @@ WXWIN:=C:\bin\wxWidgets-2.9.4
 PATH:=$(WXWIN)\lib\gcc_dll;$(PATH)\r
 WXCFG:=gcc_dll\mswu\r
 UNIT_TEST_PP_SRC_DIR:=C:\bin\UnitTest++-1.3\r
-Objects=$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_audio$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) \\r
-       $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) \r
+Objects=$(IntermediateDirectory)/src_dlg_about$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_audio$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_options$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) \\r
+       $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) \r
 \r
 ##\r
 ## Main Build Targets \r
@@ -78,7 +78,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
        $(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
 \r
 $(IntermediateDirectory)/.d:\r
-       @$(MakeDirCommand) "./Debug"\r
+       @$(MakeDirCommand) "./Release"\r
 \r
 PreBuild:\r
 \r
@@ -150,14 +150,6 @@ $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(DependSuffix): ../src/fdmdv2_p
 $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(PreprocessSuffix): ../src/fdmdv2_plot_scatter.cpp\r
        @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_scatter.cpp"\r
 \r
-$(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(ObjectSuffix): ../src/fdmdv2_plot_waterfall.cpp $(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(DependSuffix)\r
-       $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(ObjectSuffix) $(IncludePath)\r
-$(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(DependSuffix): ../src/fdmdv2_plot_waterfall.cpp\r
-       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(ObjectSuffix) -MF$(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(DependSuffix) -MM "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall.cpp"\r
-\r
-$(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(PreprocessSuffix): ../src/fdmdv2_plot_waterfall.cpp\r
-       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall.cpp"\r
-\r
 $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix): ../src/fdmdv2_plot_spectrum.cpp $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(DependSuffix)\r
        $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_spectrum.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IncludePath)\r
 $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(DependSuffix): ../src/fdmdv2_plot_spectrum.cpp\r
@@ -190,6 +182,14 @@ $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(DependSuffix): ../src/fdmdv2_hdw_
 $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(PreprocessSuffix): ../src/fdmdv2_hdw_ports.cpp\r
        @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_hdw_ports.cpp"\r
 \r
+$(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix): ../src/fdmdv2_plot_waterfall_linux.cpp $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(DependSuffix)\r
+       $(CXX) $(IncludePCH) $(SourceSwitch) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) $(IncludePath)\r
+$(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(DependSuffix): ../src/fdmdv2_plot_waterfall_linux.cpp\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) -MF$(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(DependSuffix) -MM "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp"\r
+\r
+$(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(PreprocessSuffix): ../src/fdmdv2_plot_waterfall_linux.cpp\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(PreprocessSuffix) "C:/bin/Projects/Radio/fdmdv2/src/fdmdv2_plot_waterfall_linux.cpp"\r
+\r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
 ##\r
@@ -220,9 +220,6 @@ clean:
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(DependSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(PreprocessSuffix)\r
-       $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(ObjectSuffix)\r
-       $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(DependSuffix)\r
-       $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall$(PreprocessSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(DependSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(PreprocessSuffix)\r
@@ -235,8 +232,11 @@ clean:
        $(RM) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(DependSuffix)\r
        $(RM) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(PreprocessSuffix)\r
+       $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix)\r
+       $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(DependSuffix)\r
+       $(RM) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
-       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2"\r
+       $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2"\r
 \r
 \r

diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project
index 62371813c20dd17dae956e8937b9f20a0e8404b3..2865c69a5d4c496491f2af1bb6f54dd9c018b6d6 100644 (file)
--- a/fdmdv2/build/fdmdv2.project
+++ b/fdmdv2/build/fdmdv2.project
@@ -16,11 +16,11 @@
     <File Name="../src/fdmdv2_plot.cpp"/>
     <File Name="../src/topFrame.cpp"/>
     <File Name="../src/fdmdv2_plot_scatter.cpp"/>
-    <File Name="../src/fdmdv2_plot_waterfall.cpp"/>
     <File Name="../src/fdmdv2_plot_spectrum.cpp"/>
     <File Name="../src/fdmdv2_pa_wrapper.cpp"/>
     <File Name="../src/fdmdv2_plot_scalar.cpp"/>
     <File Name="../src/fdmdv2_hdw_ports.cpp"/>
+    <File Name="../src/fdmdv2_plot_waterfall_linux.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
     <File Name="../src/dlg_about.h"/>
@@ -57,7 +57,6 @@
       <File Name="../extern/include/portaudiocpp/SystemHostApiIterator.hxx"/>
     </VirtualDirectory>
     <File Name="../src/fdmdv2_plot_scatter.h"/>
-    <File Name="../src/fdmdv2_plot_waterfall.h"/>
     <File Name="../src/fdmdv2_plot_spectrum.h"/>
     <File Name="../src/fdmdv2_pa_wrapper.h"/>
     <File Name="../src/comp.h"/>
@@ -68,6 +67,7 @@
     <File Name="../src/fdmdv2_hdw_ports.h"/>
     <File Name="../../../Audio/portaudio/include/portaudio.h"/>
     <File Name="../../../Audio/libsndfile/include/sndfile.h"/>
+    <File Name="../src/fdmdv2_plot_waterfall_linux.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="../src/FDMDV2.fbp"/>

diff --git a/fdmdv2/build/fdmdv2.txt b/fdmdv2/build/fdmdv2.txt
index 4368000624e11ec720e306a265978e474ee7b86a..9dc601beca74fc10feef6727b39ad9c65ed00fa3 100644 (file)
--- a/fdmdv2/build/fdmdv2.txt
+++ b/fdmdv2/build/fdmdv2.txt
@@ -1 +1 @@
-./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
+./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_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o  ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o ./Release/src_fdmdv2_plot_waterfall_linux.o  \r

diff --git a/fdmdv2/build/fdmdv2.workspace b/fdmdv2/build/fdmdv2.workspace
index e1c35c73f733b7704e58c9a2e76789b35734b55e..9d2905da4e44d270e3f9e3c39c57379665c91d56 100644 (file)
--- a/fdmdv2/build/fdmdv2.workspace
+++ b/fdmdv2/build/fdmdv2.workspace
@@ -6,11 +6,11 @@
   </Environment>
   <Project Name="rawbits" Path="../tests/image/rawbits.project" Active="No"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="yes">
+    <WorkspaceConfiguration Name="Debug" Selected="no">
       <Project Name="fdmdv2" ConfigName="Debug"/>
       <Project Name="rawbits" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="no">
+    <WorkspaceConfiguration Name="Release" Selected="yes">
       <Project Name="fdmdv2" ConfigName="Release"/>
       <Project Name="rawbits" ConfigName="Release"/>
     </WorkspaceConfiguration>

diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk
index 4ea617a27f67fd1c8affb214583d0600e2a5783b..59fb53ea6a70e2d3e0e9130c933698d6a46b4b21 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 - Debug ]----------
+       @echo ----------Building project:[ fdmdv2 - Release ]----------
        @"$(MAKE)" -f "fdmdv2.mk"
 clean:
-       @echo ----------Cleaning project:[ fdmdv2 - Debug ]----------
+       @echo ----------Cleaning project:[ fdmdv2 - Release ]----------
        @"$(MAKE)" -f "fdmdv2.mk" clean

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 9c8182e22ac72bc74886b27621233b6c5cd92d4b..29af342aeaf1076f1fd5db12d3ea9fc66b8630ab 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -106,14 +106,6 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
 
     tools->Append(m_menuItemToolsConfigDelete);
 
-    // Add Waterfall Plot window
-    m_panelWaterfall = new PlotWaterfall((wxFrame*) m_auiNbookCtrl);
-    m_auiNbookCtrl->AddPage(m_panelWaterfall, _("Waterfall"), true, wxNullBitmap);
-
-    // Add Spectrum Plot window
-    m_panelSpectrum = new PlotSpectrum((wxFrame*) m_auiNbookCtrl);
-    m_auiNbookCtrl->AddPage(m_panelSpectrum, _("Spectrum"), true, wxNullBitmap);
-
     wxConfigBase *pConfig = wxConfigBase::Get();
 
     // restore frame position and size
@@ -121,9 +113,44 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
     int y = pConfig->Read(wxT("/MainFrame/left"),      50);
     int w = pConfig->Read(wxT("/MainFrame/width"),     650);
     int h = pConfig->Read(wxT("/MainFrame/height"),    400);
+    wxGetApp().m_show_wf      = pConfig->Read(wxT("/MainFrame/show_wf"),      1);
+    wxGetApp().m_show_spect   = pConfig->Read(wxT("/MainFrame/show_spect"),   1);
+    wxGetApp().m_show_scatter = pConfig->Read(wxT("/MainFrame/show_scatter"), 1);
+    wxGetApp().m_show_timing  = pConfig->Read(wxT("/MainFrame/show_timing"),  1);
+    wxGetApp().m_show_freq    = pConfig->Read(wxT("/MainFrame/show_freq"),    1);
     Move(x, y);
     SetClientSize(w, h);
 
+    if(wxGetApp().m_show_wf)
+    {
+        // Add Waterfall Plot window
+        m_panelWaterfall = new PlotWaterfall((wxFrame*) m_auiNbookCtrl);
+        m_auiNbookCtrl->AddPage(m_panelWaterfall, _("Waterfall"), true, wxNullBitmap);
+    }
+    if(wxGetApp().m_show_spect)
+    {
+        // Add Spectrum Plot window
+        m_panelSpectrum = new PlotSpectrum((wxFrame*) m_auiNbookCtrl);
+        m_auiNbookCtrl->AddPage(m_panelSpectrum, _("Spectrum"), true, wxNullBitmap);
+    }
+    if(wxGetApp().m_show_scatter)
+    {
+        // Add Scatter Plot window
+        m_panelScatter = new PlotScatter((wxFrame*) m_auiNbookCtrl);
+        m_auiNbookCtrl->AddPage(m_panelScatter, _("Scatter"), true, wxNullBitmap);
+    }
+    if(wxGetApp().m_show_timing)
+    {
+        // Add Timing Offset window
+        m_panelTimeOffset = new PlotScalar((wxFrame*) m_auiNbookCtrl);
+        m_auiNbookCtrl->AddPage(m_panelTimeOffset, L"Timing \u0394", true, wxNullBitmap);
+    }
+    if(wxGetApp().m_show_freq )
+    {
+        // Add Frequency Offset window
+        m_panelFreqOffset = new PlotScalar((wxFrame*) m_auiNbookCtrl);
+        m_auiNbookCtrl->AddPage(m_panelFreqOffset, L"Frequency \u0394", true, wxNullBitmap);
+    }
     wxGetApp().m_strRxInAudio       = pConfig->Read(wxT("/Audio/RxIn"),         wxT("<m_strRxInAudio>"));
     wxGetApp().m_strRxOutAudio      = pConfig->Read(wxT("/Audio/RxOut"),        wxT("<m_strRxOutAudio>"));
     wxGetApp().m_textVoiceInput     = pConfig->Read(wxT("/Audio/TxIn"),         wxT("<m_textVoiceInput>"));
@@ -184,22 +211,27 @@ MainFrame::~MainFrame()
     {
         GetClientSize(&w, &h);
         GetPosition(&x, &y);
-        pConfig->Write(wxT("/MainFrame/top"),       (long) x);
-        pConfig->Write(wxT("/MainFrame/left"),      (long) y);
-        pConfig->Write(wxT("/MainFrame/width"),     (long) w);
-        pConfig->Write(wxT("/MainFrame/height"),    (long) h);
-
-        pConfig->Write(wxT("/Audio/RxIn"),          wxGetApp().m_strRxInAudio);
-        pConfig->Write(wxT("/Audio/RxOut"),         wxGetApp().m_strRxOutAudio);
-        pConfig->Write(wxT("/Audio/TxIn"),          wxGetApp().m_textVoiceInput);
-        pConfig->Write(wxT("/Audio/TxOut"),         wxGetApp().m_textVoiceOutput);
-        pConfig->Write(wxT("/Audio/SampleRate"),    wxGetApp().m_strSampleRate);
-
-        pConfig->Write(wxT("/Rig/Port"),            wxGetApp().m_strRigCtrlPort);
-        pConfig->Write(wxT("/Rig/Baud"),            wxGetApp().m_strRigCtrlBaud);
-        pConfig->Write(wxT("/Rig/DataBits"),        wxGetApp().m_strRigCtrlDatabits);
-        pConfig->Write(wxT("/Rig/StopBits"),        wxGetApp().m_strRigCtrlStopbits);
-        pConfig->Write(wxT("/Rig/Parity"),          wxGetApp().m_strRigCtrlParity);
+        pConfig->Write(wxT("/MainFrame/top"),           (long) x);
+        pConfig->Write(wxT("/MainFrame/left"),          (long) y);
+        pConfig->Write(wxT("/MainFrame/width"),         (long) w);
+        pConfig->Write(wxT("/MainFrame/height"),        (long) h);
+        pConfig->Write(wxT("/MainFrame/show_wf"),       wxGetApp().m_show_wf);
+        pConfig->Write(wxT("/MainFrame/show_spect"),    wxGetApp().m_show_spect);
+        pConfig->Write(wxT("/MainFrame/show_scatter"),  wxGetApp().m_show_scatter);
+        pConfig->Write(wxT("/MainFrame/show_timing"),   wxGetApp().m_show_timing);
+        pConfig->Write(wxT("/MainFrame/show_freq"),     wxGetApp().m_show_freq);
+
+        pConfig->Write(wxT("/Audio/RxIn"),              wxGetApp().m_strRxInAudio);
+        pConfig->Write(wxT("/Audio/RxOut"),             wxGetApp().m_strRxOutAudio);
+        pConfig->Write(wxT("/Audio/TxIn"),              wxGetApp().m_textVoiceInput);
+        pConfig->Write(wxT("/Audio/TxOut"),             wxGetApp().m_textVoiceOutput);
+        pConfig->Write(wxT("/Audio/SampleRate"),        wxGetApp().m_strSampleRate);
+
+        pConfig->Write(wxT("/Rig/Port"),                wxGetApp().m_strRigCtrlPort);
+        pConfig->Write(wxT("/Rig/Baud"),                wxGetApp().m_strRigCtrlBaud);
+        pConfig->Write(wxT("/Rig/DataBits"),            wxGetApp().m_strRigCtrlDatabits);
+        pConfig->Write(wxT("/Rig/StopBits"),            wxGetApp().m_strRigCtrlStopbits);
+        pConfig->Write(wxT("/Rig/Parity"),              wxGetApp().m_strRigCtrlParity);
     }
     m_togRxID->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnRxIDUI), NULL, this);
     m_togTxID->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTxIDUI), NULL, this);

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index 14e6e8ef17b176deec3331cc277ba2ca429cd084..101509ba27dd2dc7a8baf8a44f0b1d9204dff41e 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -40,11 +40,11 @@
 #include "fdmdv2_plot.h"
 #include "fdmdv2_plot_scalar.h"
 #include "fdmdv2_plot_scatter.h"
-#ifdef __LINUX__
+//#ifdef __LINUX__
 #include "fdmdv2_plot_waterfall_linux.h"
-#else
-#include "fdmdv2_plot_waterfall.h"
-#endif
+//#else
+//#include "fdmdv2_plot_waterfall.h"
+//#endif
 #include "fdmdv2_plot_spectrum.h"
 #include "fdmdv2_pa_wrapper.h"
 #include "sndfile.h"
@@ -105,6 +105,11 @@ class MainApp : public wxApp
         wxString            m_strRigCtrlDatabits;
         wxString            m_strRigCtrlStopbits;
         wxString            m_strRigCtrlParity;
+        int                 m_show_wf;
+        int                 m_show_spect;
+        int                 m_show_scatter;
+        int                 m_show_timing;
+        int                 m_show_freq;
 
         wxRect              m_rTopWindow;
 
@@ -147,11 +152,11 @@ class MainFrame : public TopFrame
         MainFrame(wxWindow *parent);
         virtual ~MainFrame();
 
-//        PlotPanel*              m_panelDefaultA;
         PlotSpectrum*           m_panelSpectrum;
         PlotWaterfall*          m_panelWaterfall;
         PlotScatter*            m_panelScatter;
-        PlotScalar*             m_panelScalar;
+        PlotScalar*             m_panelTimeOffset;
+        PlotScalar*             m_panelFreqOffset;
         bool                    m_SquelchActive;
         bool                    m_RxRunning;
         bool                    m_TxRunning;
@@ -165,7 +170,6 @@ class MainFrame : public TopFrame
         PaDeviceIndex           m_txDevOut;
         PaError                 m_rxErr;
         PaError                 m_txErr;
-//        wxSound                 *m_sound;
 #ifdef _USE_TIMER
         wxTimer                 m_plotTimer;
 #endif

diff --git a/fdmdv2/src/fdmdv2_plot_scalar.cpp b/fdmdv2/src/fdmdv2_plot_scalar.cpp
index edb3221286a35bf17fa123f9b6eb06e77674ae0b..3f0cc88b0b280f06ea8afc612f46b6504f51ff41 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_scalar.cpp
+++ b/fdmdv2/src/fdmdv2_plot_scalar.cpp
@@ -41,15 +41,16 @@ END_EVENT_TABLE()
 //----------------------------------------------------------------
 // PlotScalar()
 //----------------------------------------------------------------
-PlotScalar::PlotScalar(wxFrame* parent, int x_max_, int y_max_): PlotPanel(parent)
+//PlotScalar::PlotScalar(wxFrame* parent, int x_max_, int y_max_): PlotPanel(parent)
+PlotScalar::PlotScalar(wxFrame* parent): PlotPanel(parent)
 {
     int i;
 
     //align(FL_ALIGN_TOP);
     //labelsize(10);
 
-    m_x_max = x_max_;
-    m_y_max = y_max_;
+//    m_x_max = x_max_;
+//    m_y_max = y_max_;
     m_mem = new float[m_x_max];
 
     for(i = 0; i < m_x_max; i++)

diff --git a/fdmdv2/src/fdmdv2_plot_scalar.h b/fdmdv2/src/fdmdv2_plot_scalar.h
index 493248b4572d4716a85d97a47cc44531b284508f..a49862c8e622d4e6244c9fceda5bd4067e6e1fc7 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_scalar.h
+++ b/fdmdv2/src/fdmdv2_plot_scalar.h
@@ -36,7 +36,7 @@ class PlotScalar: public PlotPanel
     public:
 
         //PlotScalar(wxFrame* parent, int x, int y, int w, int h, int x_max_, int y_max_, const char name[]);
-        PlotScalar(wxFrame* parent, int x_max_, int y_max_);
+        PlotScalar(wxFrame* parent);
         ~PlotScalar();
          void add_new_sample(float sample);
 

diff --git a/fdmdv2/src/fdmdv2_plot_waterfall.cpp b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
index 7a9c8c3cf8f4f5842d1b637e68e761f12e47ce31..01ea6b0e8cf803268e8aa707d2123f4bc3c8c5da 100644 (file)
--- a/fdmdv2/src/fdmdv2_plot_waterfall.cpp
+++ b/fdmdv2/src/fdmdv2_plot_waterfall.cpp
@@ -228,10 +228,6 @@ void PlotWaterfall::drawData()  //wxMemoryDC&  pDC)
         wxNativePixelData::Iterator rowStart = p;
         for(int x = 0; x < (w - 1); ++x, ++p)
         {
-//            p.Red()     = m_pTopFrame->m_rxPa->m_av_mag[x];
-//            p.Green()   = m_pTopFrame->m_rxPa->m_av_mag[x];
-//            p.Blue()    = m_pTopFrame->m_rxPa->m_av_mag[x];
-
             p.Red()     = g_avmag[x];
             p.Green()   = g_avmag[x];
             p.Blue()    = g_avmag[x];
@@ -339,14 +335,7 @@ void PlotWaterfall::plotPixelData(wxAutoBufferedPaintDC&  dc)
     for(px = 0; px < m_rCtrl.GetWidth(); px++)
     {
         index = px * spec_index_per_px;
-        // intensity = intensity_per_dB * (m_av_mag[index] - MIN_DB);
         intensity = intensity_per_dB * (g_avmag[index] - MIN_DB);
-//        intensity = intensity_per_dB * (((MainFrame *)GetParent())->m_rxPa->m_av_mag[index] - MIN_DB);
-//        intensity = intensity_per_dB * (((MainFrame *)GetParent())->m_av_mag[index] - MIN_DB);
-        if(intensity > 255)
-        {
-            intensity = 255;
-        }
         if(intensity > 255)
         {
             intensity = 255;

diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp
index 5e9fdb91b897435c9839562925815b638449a695..cb6c3b5adfbadf4d52e656212ba0c6bb0c970bfb 100644 (file)
--- a/fdmdv2/src/topFrame.cpp
+++ b/fdmdv2/src/topFrame.cpp
@@ -162,7 +162,10 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     wxBoxSizer* upperSizer;
     upperSizer = new wxBoxSizer(wxVERTICAL);
 
-    m_auiNbookCtrl = new wxAuiNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_BOTTOM|wxAUI_NB_DEFAULT_STYLE);
+    //m_auiNbookCtrl = new wxAuiNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_BOTTOM|wxAUI_NB_DEFAULT_STYLE);
+    //long style = wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS | wxAUI_NB_CLOSE_ON_ACTIVE_TAB | wxAUI_NB_MIDDLE_CLICK_CLOSE;
+    long nb_style = wxAUI_NB_BOTTOM | wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS;
+    m_auiNbookCtrl = new wxAuiNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, nb_style);
     m_auiNbookCtrl->SetFont(wxFont(6, 70, 90, 90, false, wxEmptyString));