From: drowe67 Date: Fri, 9 Nov 2012 02:29:35 +0000 (+0000) Subject: removed ALC X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=92c4d1660dcdca0214b13f51fd1de7bed3c5b362;p=freetel-svn-tracking.git removed ALC git-svn-id: https://svn.code.sf.net/p/freetel/code@952 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 600270dc..5455df2c 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -197,17 +197,13 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) 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, 5.0, DT, -0.5, 0.5, 1, 0.1, "%2.1f"); - m_auiNbookCtrl->AddPage(m_panelTimeOffset, L"Timing \u0394", true, wxNullBitmap); - } - if(wxGetApp().m_show_freq) + if(wxGetApp().m_show_demod_in) { - // Add Frequency Offset window - m_panelFreqOffset = new PlotScalar((wxFrame*) m_auiNbookCtrl, 5.0, DT, -200, 200, 1, 50, "%3.0fHz"); - m_auiNbookCtrl->AddPage(m_panelFreqOffset, L"Frequency \u0394", true, wxNullBitmap); + // Add Demod Input window + + m_panelDemodIn = new PlotScalar((wxFrame*) m_auiNbookCtrl, WAVEFORM_PLOT_TIME, 1.0/WAVEFORM_PLOT_FS, -1, 1, 1, 0.2, "%2.1f"); + m_auiNbookCtrl->AddPage(m_panelDemodIn, _("Demod In"), true, wxNullBitmap); + g_plotDemodInFifo = fifo_create(2*WAVEFORM_PLOT_BUF); } if(wxGetApp().m_show_speech_in) @@ -228,13 +224,17 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) g_plotSpeechOutFifo = fifo_create(2*WAVEFORM_PLOT_BUF); } - if(wxGetApp().m_show_demod_in) + if(wxGetApp().m_show_timing) { - // Add Demod Input window - - m_panelDemodIn = new PlotScalar((wxFrame*) m_auiNbookCtrl, WAVEFORM_PLOT_TIME, 1.0/WAVEFORM_PLOT_FS, -1, 1, 1, 0.2, "%2.1f"); - m_auiNbookCtrl->AddPage(m_panelDemodIn, _("Demod In"), true, wxNullBitmap); - g_plotDemodInFifo = fifo_create(2*WAVEFORM_PLOT_BUF); + // Add Timing Offset window + m_panelTimeOffset = new PlotScalar((wxFrame*) m_auiNbookCtrl, 5.0, DT, -0.5, 0.5, 1, 0.1, "%2.1f"); + 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, 5.0, DT, -200, 200, 1, 50, "%3.0fHz"); + m_auiNbookCtrl->AddPage(m_panelFreqOffset, L"Frequency \u0394", true, wxNullBitmap); } wxGetApp().m_strRxInAudio = pConfig->Read(wxT("/Audio/RxIn"), wxT("")); @@ -257,14 +257,14 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) m_togBtnOnOff->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnOnOffUI), NULL, this); m_togBtnSplit->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnSplitClickUI), NULL, this); m_togBtnAnalog->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnAnalogClickUI), NULL, this); - m_togBtnALC->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnALCClickUI), NULL, this); + //m_togBtnALC->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnALCClickUI), NULL, this); m_btnTogTX->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTXClickUI), NULL, this); m_togBtnSplit->Disable(); m_togRxID->Disable(); m_togTxID->Disable(); m_togBtnAnalog->Disable(); - m_togBtnALC->Disable(); + //m_togBtnALC->Disable(); m_btnTogTX->Disable(); m_togBtnLoopRx->Disable(); m_togBtnLoopTx->Disable(); @@ -335,7 +335,7 @@ MainFrame::~MainFrame() m_togBtnOnOff->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnOnOffUI), NULL, this); m_togBtnSplit->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnSplitClickUI), NULL, this); m_togBtnAnalog->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnAnalogClickUI), NULL, this); - m_togBtnALC->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnALCClickUI), NULL, this); + //m_togBtnALC->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnALCClickUI), NULL, this); m_btnTogTX->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTXClickUI), NULL, this); if(m_sfFile != NULL) { @@ -598,6 +598,7 @@ void MainFrame::OnTogBtnAnalogClick (wxCommandEvent& event) event.Skip(); } +#ifdef ALC //------------------------------------------------------------------------- // OnTogBtnALCClick() //------------------------------------------------------------------------- @@ -607,6 +608,7 @@ void MainFrame::OnTogBtnALCClick(wxCommandEvent& event) event.Skip(); } +#endif //------------------------------------------------------------------------- // OnOpen() @@ -730,7 +732,7 @@ void MainFrame::OnClose(wxCommandEvent& event) m_togRxID->Disable(); m_togTxID->Disable(); m_togBtnAnalog->Disable(); - m_togBtnALC->Disable(); + //m_togBtnALC->Disable(); m_btnTogTX->Disable(); m_togBtnLoopRx->Disable(); m_togBtnLoopTx->Disable(); @@ -974,7 +976,7 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) m_togRxID->Enable(); m_togTxID->Enable(); m_togBtnAnalog->Enable(); - m_togBtnALC->Enable(); + //m_togBtnALC->Enable(); m_btnTogTX->Enable(); m_togBtnLoopRx->Enable(); m_togBtnLoopTx->Enable(); @@ -1009,7 +1011,7 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) m_togRxID->Disable(); m_togTxID->Disable(); m_togBtnAnalog->Disable(); - m_togBtnALC->Disable(); + //m_togBtnALC->Disable(); m_btnTogTX->Disable(); m_togBtnLoopRx->Disable(); m_togBtnLoopTx->Disable(); diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h index b741fcd3..08439076 100644 --- a/fdmdv2/src/fdmdv2_main.h +++ b/fdmdv2/src/fdmdv2_main.h @@ -283,7 +283,7 @@ class MainFrame : public TopFrame // Toggle Buttons void OnTogBtnSplitClick(wxCommandEvent& event); void OnTogBtnAnalogClick(wxCommandEvent& event); - void OnTogBtnALCClick(wxCommandEvent& event); + //void OnTogBtnALCClick(wxCommandEvent& event); void OnTogBtnRxID( wxCommandEvent& event ); void OnTogBtnTxID( wxCommandEvent& event ); void OnTogBtnTXClick( wxCommandEvent& event ); diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index 7e9c31fc..bca53434 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -234,7 +234,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const // Squelch Slider Control //===================================================== wxStaticBoxSizer* sbSizer3; - sbSizer3 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("SQ")), wxVERTICAL); + sbSizer3 = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Squelch")), wxVERTICAL); m_sliderSQ = new wxSlider(this, wxID_ANY, 0, 0, 40, wxDefaultPosition, wxSize(-1,80), wxSL_AUTOTICKS|wxSL_INVERSE|wxSL_VERTICAL); m_sliderSQ->SetToolTip(_("Set Squelch level in dB.")); @@ -245,7 +245,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const // Squelch Level static text box //------------------------------ - m_textSQ = new wxStaticText(this, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE); + m_textSQ = new wxStaticText(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE); sbSizer3->Add(m_textSQ, 0, wxALIGN_CENTER_HORIZONTAL, 0); @@ -253,7 +253,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const // Squelch Toggle Checkbox //------------------------------ - m_ckboxSQ = new wxCheckBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE); + m_ckboxSQ = new wxCheckBox(this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE); m_ckboxSQ->SetToolTip(_("Activate/Deactivate Squelch")); sbSizer3->Add(m_ckboxSQ, 0, wxALIGN_CENTER_HORIZONTAL, 0); @@ -282,7 +282,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const bSizer1511 = new wxBoxSizer(wxVERTICAL); //------------------------------- - // Begin/End receiving data + // Stop/Stop signal processing (rx and tx) //------------------------------- m_togBtnOnOff = new wxToggleButton(this, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0); m_togBtnOnOff->SetToolTip(_("Begin/End receiving data.")); @@ -342,6 +342,8 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const bSizer13->Add(m_togBtnAnalog, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); sbSizer5->Add(bSizer13, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); + // not implemented on fdmdv2 +#ifdef ALC //------------------------------ // Toggle for ALC //------------------------------ @@ -350,17 +352,15 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_togBtnALC = new wxToggleButton(this, wxID_ANY, _("ALC"), wxDefaultPosition, wxDefaultSize, 0); m_togBtnALC->SetToolTip(_("Toggle automatic level control mode.")); - //------------------------------ - // ALC Toggle - //------------------------------ bSizer14->Add(m_togBtnALC, 0, wxALL, 1); sbSizer5->Add(bSizer14, 0, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALL, 1); - wxBoxSizer* bSizer11; - bSizer11 = new wxBoxSizer(wxVERTICAL); +#endif //------------------------------ // Toggle Transmit/Receive relays //------------------------------ + wxBoxSizer* bSizer11; + bSizer11 = new wxBoxSizer(wxVERTICAL); m_btnTogTX = new wxToggleButton(this, wxID_ANY, _("TX"), wxDefaultPosition, wxDefaultSize, 0); m_btnTogTX->SetToolTip(_("Switch between Receive and Transmit")); bSizer11->Add(m_btnTogTX, 1, wxALIGN_CENTER|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); @@ -428,7 +428,9 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_togBtnLoopTx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); m_togBtnSplit->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); +#ifdef ALC m_togBtnALC->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnALCClick), NULL, this); +#endif m_btnTogTX->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnTXClick), NULL, this); } @@ -487,7 +489,9 @@ TopFrame::~TopFrame() m_togBtnLoopTx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); m_togBtnSplit->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); +#ifdef ALC m_togBtnALC->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnALCClick), NULL, this); +#endif m_btnTogTX->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnTXClick), NULL, this); }