minor tweaks to SNR positioning

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

diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32
index c546c2cd2b0c3de7c4bffc56a26eda95e8876391..062a692635f7b54d417c2fa72c711eb06c0473c0 100644 (file)
--- a/fdmdv2/README.Win32
+++ b/fdmdv2/README.Win32
@@ -5,18 +5,18 @@ Debugging Under Windows
 -----------------------\r
 \r
 printfs don't appear until after the program finishes.  wxLogDebug()\r
-works but you need to run DbgView available from\r
+works but you need to run DebugView available from\r
 http://www.sysinternals.com to capture the messages.\r
 \r
-Notes on building fdmdv2 for Windows\r
-------------------------------------\r
+Building fdmdv2 for Windows\r
+---------------------------\r
 \r
 This is how David R did it, Dave Witten used a different approach.\r
 Many variations are possible.\r
 \r
 1. Install MinGW & the mysys shell\r
    + pwd -W prints true Win32 directory\r
-   + I also installed emacs and a svn binary\r
+   + I also installed emacs, "tortise svn", and DebugView\r
 \r
 2. "make install" for various packages below put DLLs in /usr/local/lib\r
    "cd /usr/local/lib; pwd -W" to find the Win32 directory\r
@@ -44,5 +44,5 @@ Many variations are possible.
 \r
 7. svn co fdmdv2\r
    cd fdmdv2/src\r
-   Make -f Makefile.Win32\r
+   make -f Makefile.Win32\r
 \r

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 08d17db45f637ef6951542121a7c96d6da8d7279..45a1d7735eefc17bc7342ba7a9129956c24cfed1 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -95,7 +95,7 @@ IMPLEMENT_APP(MainApp);
 //-------------------------------------------------------------------------
 bool MainApp::OnInit()
 {
-    g_file = fopen("/home/david/codec2-dev/raw/hts1a.raw","rb");
+    g_file = fopen("../../codec2-dev/raw/hts1a.raw","rb");
     if (g_file == NULL)
         printf("reading hts1a disabled...\n");
 
@@ -423,7 +423,7 @@ void MainFrame::OnTimer(wxTimerEvent &evt)
 
     if (snr_limited < -9.0) snr_limited = -9.0; // stop text box overflow
     char snr[15];
-    sprintf(snr, "%4.1f", snr_limited);
+    sprintf(snr, "%3.1f", snr_limited);
     wxString snr_string(snr);
     m_textSNR->SetLabel(snr_string);
 

diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp
index d34281511dc68d960519e7d81d0e1cbc864f4465..74f18bae4375c50ec5ead4306fdba969ed8b35a2 100644 (file)
--- a/fdmdv2/src/topFrame.cpp
+++ b/fdmdv2/src/topFrame.cpp
@@ -151,26 +151,26 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     m_gaugeSNR = new wxGauge(this, wxID_ANY, 20, wxDefaultPosition, wxSize(15,135), wxGA_SMOOTH|wxGA_VERTICAL);
     m_gaugeSNR->SetToolTip(_("Displays signal to noise ratio in dB."));
     snrSizer->Add(m_gaugeSNR, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 10);
-    wxBoxSizer* bSizer29;
-    bSizer29 = new wxBoxSizer(wxVERTICAL);
 
     //------------------------------
     // Box for S/N ratio (Numeric)
     //------------------------------
-    m_textSNR = new wxStaticText(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
+    //wxBoxSizer* bSizer29;
+    //bSizer29 = new wxBoxSizer(wxVERTICAL);
+    m_textSNR = new wxStaticText(this, wxID_ANY, wxT(" 0.0"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
     //m_textSNR = new wxStaticText(this, wxID_ANY, wxEmptyString, wxPoint(-1,-1), wxSize(35,25), wxTE_READONLY);
-    m_textSNR->SetToolTip(_("Show SNR ratio numerically."));
-    m_textSNR->SetMinSize(wxSize(35,25));
-    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);
+    //m_textSNR->SetToolTip(_("Show SNR ratio numerically."));
+    //m_textSNR->SetMinSize(wxSize(35,25));
+    //bSizer29->Add(m_textSNR, 0, wxALIGN_CENTER|wxALL, 1);
+    //snrSizer->Add(bSizer29, 0, wxEXPAND, 1);
+    snrSizer->Add(m_textSNR, 0, wxALIGN_CENTER_HORIZONTAL, 1);
+    leftSizer->Add(snrSizer, 2, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 1);
 
     //------------------------------
     // Signal Level(vert. bargraph)
     //------------------------------
+    wxStaticBoxSizer* levelSizer;
+    levelSizer = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Level")), wxVERTICAL);
     m_gaugeLevel = new wxGauge(this, wxID_ANY, 100, wxDefaultPosition, wxSize(15,135), wxGA_SMOOTH|wxGA_VERTICAL);
     m_gaugeLevel->SetToolTip(_("Display signal level."));
     levelSizer->Add(m_gaugeLevel, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 10);
@@ -186,7 +186,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     upperSizer = new wxBoxSizer(wxVERTICAL);
 
     //=====================================================
-    // Tabbed Notebook control containing display graphs
+    // Tabbed Notebppk 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;