From: drowe67 Date: Tue, 4 Dec 2012 06:52:27 +0000 (+0000) Subject: removed a few prints and #ifdefed out the display of txid/rxid buttons for now as... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=9afc1649a283d367ac1236662902aae1969a130f;p=freetel-svn-tracking.git removed a few prints and #ifdefed out the display of txid/rxid buttons for now as feature wont be implemented for the beta git-svn-id: https://svn.code.sf.net/p/freetel/code@1118 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/dlg_filter.cpp b/fdmdv2/src/dlg_filter.cpp index 100ee796..6eed6564 100644 --- a/fdmdv2/src/dlg_filter.cpp +++ b/fdmdv2/src/dlg_filter.cpp @@ -564,7 +564,7 @@ void FilterDlg::OnMicInEnable(wxScrollEvent& event) { void FilterDlg::OnSpkOutEnable(wxScrollEvent& event) { wxGetApp().m_SpkOutEQEnable = m_SpkOutEnable->GetValue(); - printf("wxGetApp().m_SpkOutEQEnable: %d\n", wxGetApp().m_SpkOutEQEnable); + //printf("wxGetApp().m_SpkOutEQEnable: %d\n", wxGetApp().m_SpkOutEQEnable); } void FilterDlg::setFreq(EQ *eq) diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 50beb336..f92d4eaf 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -359,7 +359,7 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) // this->Connect(m_menuItemHelpUpdates->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnHelpCheckUpdatesUI)); //m_togRxID->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnRxIDUI), NULL, this); - m_togTxID->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTxIDUI), NULL, this); + //m_togTxID->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTxIDUI), NULL, this); 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); @@ -367,8 +367,8 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) m_btnTogPTT->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTXClickUI), NULL, this); m_togBtnSplit->Disable(); - m_togRxID->Disable(); - m_togTxID->Disable(); + //m_togRxID->Disable(); + //m_togTxID->Disable(); m_togBtnAnalog->Disable(); //m_togBtnALC->Disable(); @@ -508,7 +508,7 @@ MainFrame::~MainFrame() } //m_togRxID->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnRxIDUI), NULL, this); - m_togTxID->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTxIDUI), NULL, this); + //m_togTxID->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTxIDUI), NULL, this); 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); @@ -717,7 +717,6 @@ void MainFrame::OnTimer(wxTimerEvent &evt) // Run time upodate of EQ filters ----------------------------------- if (m_newMicInFilter || m_newSpkOutFilter) { - printf("new filter...\n"); g_mutexProtectingCallbackData.Lock(); deleteEQFilters(g_rxUserdata); designEQFilters(g_rxUserdata); @@ -1338,8 +1337,8 @@ void MainFrame::OnExit(wxCommandEvent& event) stopRxStream(); } m_togBtnSplit->Disable(); - m_togRxID->Disable(); - m_togTxID->Disable(); + //m_togRxID->Disable(); + //m_togTxID->Disable(); m_togBtnAnalog->Disable(); //m_togBtnALC->Disable(); //m_btnTogPTT->Disable(); @@ -1378,11 +1377,9 @@ void MainFrame::OnToolsAudio(wxCommandEvent& event) void MainFrame::OnToolsFilter(wxCommandEvent& event) { wxUnusedVar(event); - printf("OnToolsFilter Start: wxGetApp().m_SpkOutBassFreqHz: %f\n",wxGetApp().m_SpkOutBassFreqHz); FilterDlg *dlg = new FilterDlg(NULL, m_RxRunning, &m_newMicInFilter, &m_newSpkOutFilter); dlg->ShowModal(); delete dlg; - printf("OnToolsFilter End: wxGetApp().m_SpkOutBassFreqHz: %f\n",wxGetApp().m_SpkOutBassFreqHz); } //------------------------------------------------------------------------- @@ -1608,8 +1605,8 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) m_newMicInFilter = m_newSpkOutFilter = true; m_togBtnSplit->Disable(); - m_togRxID->Disable(); - m_togTxID->Disable(); + //m_togRxID->Disable(); + //m_togTxID->Disable(); m_togBtnAnalog->Disable(); //m_btnTogPTT->Disable(); m_togBtnOnOff->SetLabel(wxT("Start")); diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index ee0d7b92..6d20da57 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -194,6 +194,9 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const // These are the buttons that autosend the userid (?) //===================================================== + // DR 4 Dec - taken off for screen for Beta release to avoid questions on their use until + // we implemen this feature + #ifdef UNIMPLEMENTED // TxID //--------- m_togTxID = new wxToggleButton(this, wxID_ANY, _("TxID"), wxDefaultPosition, wxDefaultSize, 0); @@ -207,6 +210,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const bSizer141->Add(m_togRxID, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_LEFT|wxALL|wxFIXED_MINSIZE, 5); lowerSizer->Add(bSizer141, 0, wxALIGN_RIGHT, 5); +#endif centerSizer->Add(lowerSizer, 0, wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 2); bSizer1->Add(centerSizer, 4, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 1); @@ -388,7 +392,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const this->Connect(m_menuItemHelpUpdates->GetId(), wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnHelpCheckUpdatesUI)); this->Connect(m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnHelpAbout)); //m_togRxID->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnRxID), NULL, this); - m_togTxID->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnTxID), NULL, this); + //m_togTxID->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnTxID), NULL, this); m_sliderSQ->Connect(wxEVT_SCROLL_TOP, wxScrollEventHandler(TopFrame::OnCmdSliderScroll), NULL, this); m_sliderSQ->Connect(wxEVT_SCROLL_BOTTOM, wxScrollEventHandler(TopFrame::OnCmdSliderScroll), NULL, this); m_sliderSQ->Connect(wxEVT_SCROLL_LINEUP, wxScrollEventHandler(TopFrame::OnCmdSliderScroll), NULL, this); @@ -439,7 +443,7 @@ TopFrame::~TopFrame() this->Disconnect(wxID_ANY, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(TopFrame::OnHelpCheckUpdatesUI)); this->Disconnect(ID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(TopFrame::OnHelpAbout)); //m_togRxID->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnRxID), NULL, this); - m_togTxID->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnTxID), NULL, this); + //m_togTxID->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnTxID), NULL, this); m_sliderSQ->Disconnect(wxEVT_SCROLL_TOP, wxScrollEventHandler(TopFrame::OnCmdSliderScroll), NULL, this); m_sliderSQ->Disconnect(wxEVT_SCROLL_BOTTOM, wxScrollEventHandler(TopFrame::OnCmdSliderScroll), NULL, this); m_sliderSQ->Disconnect(wxEVT_SCROLL_LINEUP, wxScrollEventHandler(TopFrame::OnCmdSliderScroll), NULL, this);