comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-07 23:57:50 -04:00
Code Issues Projects Releases Wiki Activity

Fix for ubuntu menu update crash

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-11-02 21:04:02 -05:00
parent 4ffa518dcc
commit 0d928543d8
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/AppFrame.cpp
View File

@ -236,7 +236,7 @@ AppFrame::AppFrame() :
// SetIcon(wxICON(sample)); // SetIcon(wxICON(sample));
// Make a menubar // Make a menubar
wxMenuBar *menuBar = new wxMenuBar; menuBar = new wxMenuBar;
wxMenu *menu = new wxMenu; wxMenu *menu = new wxMenu;
menu->Append(wxID_SDR_DEVICES, "SDR Devices"); menu->Append(wxID_SDR_DEVICES, "SDR Devices");
@ -316,9 +316,6 @@ AppFrame::AppFrame() :
menuBar->Append(menu, wxT("&Color Scheme")); menuBar->Append(menu, wxT("&Color Scheme"));
sampleRateMenu = new wxMenu;
menuBar->Append(sampleRateMenu, wxT("&Input Bandwidth"));
menu = new wxMenu; menu = new wxMenu;
#define NUM_RATES_DEFAULT 4 #define NUM_RATES_DEFAULT 4
@ -367,6 +364,10 @@ AppFrame::AppFrame() :
} }
} }
sampleRateMenu = new wxMenu;
menuBar->Append(sampleRateMenu, wxT("&Input Bandwidth"));
menuBar->Append(menu, wxT("Audio &Bandwidth")); menuBar->Append(menu, wxT("Audio &Bandwidth"));
SetMenuBar(menuBar); SetMenuBar(menuBar);
@ -462,18 +463,14 @@ void AppFrame::updateDeviceParams() {
// Build sample rate menu from device info // Build sample rate menu from device info
sampleRates = devInfo->getRxChannel()->getSampleRates(); sampleRates = devInfo->getRxChannel()->getSampleRates();
for (std::map<int, wxMenuItem *>::iterator i = sampleRateMenuItems.begin(); i != sampleRateMenuItems.end(); i++) {
sampleRateMenu->Remove(i->first);
}
sampleRateMenuItems.erase(sampleRateMenuItems.begin(),sampleRateMenuItems.end()); sampleRateMenuItems.erase(sampleRateMenuItems.begin(),sampleRateMenuItems.end());
wxMenu *newSampleRateMenu = new wxMenu;
int ofs = 0; int ofs = 0;
long sampleRate = wxGetApp().getSampleRate(); long sampleRate = wxGetApp().getSampleRate();
bool checked = false; bool checked = false;
for (vector<long>::iterator i = sampleRates.begin(); i != sampleRates.end(); i++) { for (vector<long>::iterator i = sampleRates.begin(); i != sampleRates.end(); i++) {
sampleRateMenuItems[wxID_BANDWIDTH_BASE+ofs] = sampleRateMenu->AppendRadioItem(wxID_BANDWIDTH_BASE+ofs, frequencyToStr(*i)); sampleRateMenuItems[wxID_BANDWIDTH_BASE+ofs] = newSampleRateMenu->AppendRadioItem(wxID_BANDWIDTH_BASE+ofs, frequencyToStr(*i));
if (sampleRate == (*i)) { if (sampleRate == (*i)) {
sampleRateMenuItems[wxID_BANDWIDTH_BASE+ofs]->Check(true); sampleRateMenuItems[wxID_BANDWIDTH_BASE+ofs]->Check(true);
checked = true; checked = true;
@ -481,12 +478,14 @@ void AppFrame::updateDeviceParams() {
ofs++; ofs++;
} }
sampleRateMenuItems[wxID_BANDWIDTH_MANUAL] = sampleRateMenu->AppendRadioItem(wxID_BANDWIDTH_MANUAL, "Manual Entry"); sampleRateMenuItems[wxID_BANDWIDTH_MANUAL] = newSampleRateMenu->AppendRadioItem(wxID_BANDWIDTH_MANUAL, wxT("Manual Entry"));
if (!checked) { if (!checked) {
sampleRateMenuItems[wxID_BANDWIDTH_MANUAL]->Check(true); sampleRateMenuItems[wxID_BANDWIDTH_MANUAL]->Check(true);
} }
menuBar->Replace(4, newSampleRateMenu, wxT("&Input Bandwidth"));
sampleRateMenu = newSampleRateMenu;
if (!wxGetApp().getAGCMode()) { if (!wxGetApp().getAGCMode()) {
gainSpacerItem->Show(true); gainSpacerItem->Show(true);
gainSizerItem->Show(true); gainSizerItem->Show(true);

1
src/AppFrame.h
View File

@ -101,6 +101,7 @@ private:
std::map<int, wxMenuItem *> sampleRateMenuItems; std::map<int, wxMenuItem *> sampleRateMenuItems;
std::map<int, wxMenuItem *> audioSampleRateMenuItems; std::map<int, wxMenuItem *> audioSampleRateMenuItems;
std::map<int, wxMenuItem *> directSamplingMenuItems; std::map<int, wxMenuItem *> directSamplingMenuItems;
wxMenuBar *menuBar;
wxMenuItem *iqSwapMenuItem; wxMenuItem *iqSwapMenuItem;
wxMenu *sampleRateMenu; wxMenu *sampleRateMenu;
wxMenuItem *agcMenuItem; wxMenuItem *agcMenuItem;