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

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index 7bbbf745f1e5d92f6055f440b3d7f536ede047db..8c701c642fca5b494559c0e4b766d81ad52f4b65 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=OFA-Staff\r
-Date                   :=11/7/2012\r
+Date                   :=11/9/2012\r
 CodeLitePath           :="C:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,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=\"938\"  $(Preprocessors)\r
-CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"938\"  $(Preprocessors)\r
+CXXFLAGS :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"955\"  $(Preprocessors)\r
+CFLAGS   :=  -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no)  -DSVN_REVISION=\"955\"  $(Preprocessors)\r
 \r
 \r
 ##\r

diff --git a/fdmdv2/build/fdmdv2_wsp.mk b/fdmdv2/build/fdmdv2_wsp.mk
index ba22ce2d75b388f7fba2cb51ffe248da72e1825d..e920a49f92d611834cd057fddc19ad80c7942a1c 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:[ rawbits - Release ]----------"
-       @cd "C:\bin\Projects\Radio\fdmdv2\tests\image" && "$(MAKE)" -f "rawbits.mk"
+       @echo "----------Building project:[ fdmdv2 - Release ]----------"
+       @"$(MAKE)" -f "fdmdv2.mk"
 clean:
-       @echo "----------Cleaning project:[ rawbits - Release ]----------"
-       @cd "C:\bin\Projects\Radio\fdmdv2\tests\image" && "$(MAKE)" -f "rawbits.mk" clean
+       @echo "----------Cleaning project:[ fdmdv2 - Release ]----------"
+       @"$(MAKE)" -f "fdmdv2.mk" clean

diff --git a/fdmdv2/src/Makefile b/fdmdv2/src/Makefile
index 64374d498fa97a588f1dcaba15e85d98904dcda7..e32c54126085edcd983f3e7ae27e2295e6a31589 100644 (file)
--- a/fdmdv2/src/Makefile
+++ b/fdmdv2/src/Makefile
@@ -42,11 +42,11 @@ CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/david/fdmdv2/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/david/fdmdv2/missing --run tar
-AUTOCONF = ${SHELL} /home/david/fdmdv2/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/david/fdmdv2/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/david/fdmdv2/missing --run automake-1.11
+ACLOCAL = ${SHELL} /p/Radio/fdmdv2/missing --run aclocal-1.11
+AMTAR = ${SHELL} /p/Radio/fdmdv2/missing --run tar
+AUTOCONF = ${SHELL} /p/Radio/fdmdv2/missing --run autoconf
+AUTOHEADER = ${SHELL} /p/Radio/fdmdv2/missing --run autoheader
+AUTOMAKE = ${SHELL} /p/Radio/fdmdv2/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=none
@@ -60,9 +60,9 @@ ECHO_C =
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
@@ -106,7 +106,7 @@ LIBS = -lsndfile-1 \
 -lwsock32 
 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/david/fdmdv2/missing --run makeinfo
+MAKEINFO = ${SHELL} /p/Radio/fdmdv2/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = fdmdv2
@@ -118,13 +118,13 @@ PACKAGE_URL =
 PACKAGE_VERSION = 0.2
 PATH_SEPARATOR = :
 SET_MAKE = 
-SHELL = /bin/bash
+SHELL = /bin/sh
 STRIP = 
 VERSION = 0.2
-abs_builddir = /home/david/fdmdv2/src
-abs_srcdir = /home/david/fdmdv2/src
-abs_top_builddir = /home/david/fdmdv2
-abs_top_srcdir = /home/david/fdmdv2
+abs_builddir = /p/Radio/fdmdv2/src
+abs_srcdir = /p/Radio/fdmdv2/src
+abs_top_builddir = /p/Radio/fdmdv2
+abs_top_srcdir = /p/Radio/fdmdv2
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -143,7 +143,7 @@ host_alias =
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/david/fdmdv2/install-sh
+install_sh = ${SHELL} /p/Radio/fdmdv2/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp
index d616189ccdf8045b459164f230ebd15095099cd4..d34281511dc68d960519e7d81d0e1cbc864f4465 100644 (file)
--- a/fdmdv2/src/topFrame.cpp
+++ b/fdmdv2/src/topFrame.cpp
@@ -164,6 +164,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     bSizer29->Add(m_textSNR, 0, wxALIGN_CENTER|wxALL, 1);
     snrSizer->Add(bSizer29, 0, wxEXPAND, 1);
     leftSizer->Add(snrSizer, 2, wxALIGN_CENTER|wxALL|wxEXPAND, 1);
+
     wxStaticBoxSizer* levelSizer;
     levelSizer = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Level")), wxVERTICAL);
 
@@ -185,7 +186,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     upperSizer = new wxBoxSizer(wxVERTICAL);
 
     //=====================================================
-    // Tabbed Notebppk control containing display graphs
+    // Tabbed Notebook control containing display graphs
     //=====================================================
     //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;