comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-07-31 04:42:25 -04:00
Code Issues Projects Releases Wiki Activity

Add OSX About.. dialog, fix menu agc init logic, fix some queue limits

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-02-28 22:44:17 -05:00
parent ed57350866
commit 3df7461a15
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/AppFrame.cpp
View File

@ -328,10 +328,16 @@ AppFrame::AppFrame() :
menu->Append(wxID_RESET, "&Reset Session"); menu->Append(wxID_RESET, "&Reset Session");
#ifndef __APPLE__ #ifndef __APPLE__
menu->AppendSeparator(); menu->AppendSeparator();
menu->Append(wxID_CLOSE); menu->Append(wxID_CLOSE);
#else
if ( wxApp::s_macAboutMenuItemId != wxID_NONE ) {
wxString aboutLabel;
aboutLabel.Printf(_("About %s"), wxTheApp->GetAppDisplayName());
menu->Append( wxApp::s_macAboutMenuItemId, aboutLabel);
}
#endif #endif
menuBar->Append(menu, wxT("&File")); menuBar->Append(menu, wxT("&File"));
settingsMenu = new wxMenu; settingsMenu = new wxMenu;
@ -542,7 +548,7 @@ AppFrame::AppFrame() :
waterfallCanvas->setLinesPerSecond(wflps); waterfallCanvas->setLinesPerSecond(wflps);
ThemeMgr::mgr.setTheme(wxGetApp().getConfig()->getTheme()); ThemeMgr::mgr.setTheme(wxGetApp().getConfig()->getTheme());
Show(); Show();
#ifdef _WIN32 #ifdef _WIN32
@ -604,8 +610,8 @@ void AppFrame::updateDeviceParams() {
if (soapyDev->listGains(SOAPY_SDR_RX, 0).size()) { if (soapyDev->listGains(SOAPY_SDR_RX, 0).size()) {
agcMenuItem = newSettingsMenu->AppendCheckItem(wxID_AGC_CONTROL, "Automatic Gain"); agcMenuItem = newSettingsMenu->AppendCheckItem(wxID_AGC_CONTROL, "Automatic Gain");
agcMenuItem->Check(wxGetApp().getAGCMode()); agcMenuItem->Check(wxGetApp().getAGCMode());
} else if (wxGetApp().getAGCMode()) { } else if (!wxGetApp().getAGCMode()) {
wxGetApp().setAGCMode(false); wxGetApp().setAGCMode(true);
} }
SoapySDR::ArgInfoList::const_iterator args_i; SoapySDR::ArgInfoList::const_iterator args_i;
@ -749,6 +755,9 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
activeDemodulator->setOutputDevice(event.GetId() - wxID_RT_AUDIO_DEVICE); activeDemodulator->setOutputDevice(event.GetId() - wxID_RT_AUDIO_DEVICE);
activeDemodulator = NULL; activeDemodulator = NULL;
} }
} else if (event.GetId() == wxApp::s_macAboutMenuItemId) {
wxMessageDialog *aboutDlg = new wxMessageDialog(NULL, wxT("CubicSDR v" CUBICSDR_VERSION "\nby Charles J. Cliffe (@ccliffe)\nwww.cubicsdr.com"), wxT("CubicSDR v" CUBICSDR_VERSION), wxOK);
aboutDlg->ShowModal();
} else if (event.GetId() == wxID_SET_TIPS ) { } else if (event.GetId() == wxID_SET_TIPS ) {
if (wxGetApp().getConfig()->getShowTips()) { if (wxGetApp().getConfig()->getShowTips()) {
wxGetApp().getConfig()->setShowTips(false); wxGetApp().getConfig()->setShowTips(false);

4
src/process/FFTVisualDataThread.cpp
View File

@ -27,8 +27,8 @@ void FFTVisualDataThread::run() {
DemodulatorThreadInputQueue *pipeIQDataIn = (DemodulatorThreadInputQueue *)getInputQueue("IQDataInput"); DemodulatorThreadInputQueue *pipeIQDataIn = (DemodulatorThreadInputQueue *)getInputQueue("IQDataInput");
SpectrumVisualDataQueue *pipeFFTDataOut = (SpectrumVisualDataQueue *)getOutputQueue("FFTDataOutput"); SpectrumVisualDataQueue *pipeFFTDataOut = (SpectrumVisualDataQueue *)getOutputQueue("FFTDataOutput");
fftQueue.set_max_num_items(256); fftQueue.set_max_num_items(100);
pipeFFTDataOut->set_max_num_items(512); pipeFFTDataOut->set_max_num_items(100);
fftDistrib.setInput(pipeIQDataIn); fftDistrib.setInput(pipeIQDataIn);
fftDistrib.attachOutput(&fftQueue); fftDistrib.attachOutput(&fftQueue);
wproc.setInput(&fftQueue); wproc.setInput(&fftQueue);