comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-29 07:10:41 -05:00
Code Issues Projects Releases Wiki Activity

Settings menu now functional.

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-11-03 23:44:35 -05:00
parent 97cf6c4b23
commit efbdb2d69f
2 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/AppFrame.cpp
View File

@ -439,21 +439,22 @@ void AppFrame::updateDeviceParams() {
agcMenuItem = newSettingsMenu->AppendCheckItem(wxID_AGC_CONTROL, "Automatic Gain"); agcMenuItem = newSettingsMenu->AppendCheckItem(wxID_AGC_CONTROL, "Automatic Gain");
agcMenuItem->Check(wxGetApp().getAGCMode()); agcMenuItem->Check(wxGetApp().getAGCMode());
SoapySDR::ArgInfoList args = devInfo->getSettingsArgInfo();
SoapySDR::ArgInfoList::const_iterator args_i; SoapySDR::ArgInfoList::const_iterator args_i;
int i = 0; int i = 0;
for (args_i = args.begin(); args_i != args.end(); args_i++) { settingArgs = devInfo->getSettingsArgInfo();
for (args_i = settingArgs.begin(); args_i != settingArgs.end(); args_i++) {
SoapySDR::ArgInfo arg = (*args_i); SoapySDR::ArgInfo arg = (*args_i);
std::string currentVal = wxGetApp().getSDRThread()->readSetting(arg.key);
if (arg.type == SoapySDR::ArgInfo::BOOL) { if (arg.type == SoapySDR::ArgInfo::BOOL) {
wxMenuItem *item = newSettingsMenu->AppendCheckItem(wxID_SETTINGS_BASE+i, arg.name, arg.description); wxMenuItem *item = newSettingsMenu->AppendCheckItem(wxID_SETTINGS_BASE+i, arg.name, arg.description);
item->Check(arg.value=="true"); item->Check(currentVal=="true");
i++; i++;
} else if (arg.type == SoapySDR::ArgInfo::INT) { } else if (arg.type == SoapySDR::ArgInfo::INT) {
wxMenuItem *item = newSettingsMenu->Append(wxID_SETTINGS_BASE+i, arg.name, arg.description); newSettingsMenu->Append(wxID_SETTINGS_BASE+i, arg.name, arg.description);
i++; i++;
} else if (arg.type == SoapySDR::ArgInfo::FLOAT) { } else if (arg.type == SoapySDR::ArgInfo::FLOAT) {
wxMenuItem *item = newSettingsMenu->Append(wxID_SETTINGS_BASE+i, arg.name, arg.description); newSettingsMenu->Append(wxID_SETTINGS_BASE+i, arg.name, arg.description);
i++; i++;
} else if (arg.type == SoapySDR::ArgInfo::STRING) { } else if (arg.type == SoapySDR::ArgInfo::STRING) {
if (arg.options.size()) { if (arg.options.size()) {
@ -466,19 +467,20 @@ void AppFrame::updateDeviceParams() {
displayName = arg.optionNames[j]; displayName = arg.optionNames[j];
} }
wxMenuItem *item = subMenu->AppendRadioItem(wxID_SETTINGS_BASE+i, displayName); wxMenuItem *item = subMenu->AppendRadioItem(wxID_SETTINGS_BASE+i, displayName);
if (arg.value == (*str_i)) { if (currentVal == (*str_i)) {
item->Check(); item->Check();
} }
i++;
j++; j++;
i++;
} }
newSettingsMenu->AppendSubMenu(subMenu, arg.name, arg.description); newSettingsMenu->AppendSubMenu(subMenu, arg.name, arg.description);
} else { } else {
wxMenuItem *item = newSettingsMenu->Append(wxID_SETTINGS_BASE+i, arg.name, arg.description); newSettingsMenu->Append(wxID_SETTINGS_BASE+i, arg.name, arg.description);
i++; i++;
} }
} }
} }
settingsIdMax = wxID_SETTINGS_BASE+i;
menuBar->Replace(1, newSettingsMenu, wxT("&Settings")); menuBar->Replace(1, newSettingsMenu, wxT("&Settings"));
settingsMenu = newSettingsMenu; settingsMenu = newSettingsMenu;
@ -645,6 +647,53 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
ThemeMgr::mgr.setTheme(COLOR_THEME_RADAR); ThemeMgr::mgr.setTheme(COLOR_THEME_RADAR);
} }
if (event.GetId() >= wxID_SETTINGS_BASE && event.GetId() < settingsIdMax) {
int setIdx = event.GetId()-wxID_SETTINGS_BASE;
int menuIdx = 0;
for (std::vector<SoapySDR::ArgInfo>::iterator arg_i = settingArgs.begin(); arg_i != settingArgs.end(); arg_i++) {
SoapySDR::ArgInfo &arg = (*arg_i);
if (arg.type == SoapySDR::ArgInfo::STRING && arg.options.size() && setIdx >= menuIdx && setIdx < menuIdx+arg.options.size()) {
int optIdx = setIdx-menuIdx;
wxGetApp().getSDRThread()->writeSetting(arg.key, arg.options[optIdx]);
break;
} else if (arg.type == SoapySDR::ArgInfo::STRING && arg.options.size()) {
menuIdx += arg.options.size();
} else if (menuIdx == setIdx) {
if (arg.type == SoapySDR::ArgInfo::BOOL) {
wxGetApp().getSDRThread()->writeSetting(arg.key, (wxGetApp().getSDRThread()->readSetting(arg.key)=="true")?"false":"true");
break;
} else if (arg.type == SoapySDR::ArgInfo::STRING) {
menuIdx++;
} else if (arg.type == SoapySDR::ArgInfo::INT) {
int currentVal;
try {
currentVal = std::stoi(wxGetApp().getSDRThread()->readSetting(arg.key));
} catch (std::invalid_argument e) {
currentVal = 0;
}
int intVal = wxGetNumberFromUser(arg.description, arg.units, arg.name, currentVal, arg.range.minimum(), arg.range.maximum(), this);
if (intVal != -1) {
wxGetApp().getSDRThread()->writeSetting(arg.key, std::to_string(intVal));
}
break;
} else if (arg.type == SoapySDR::ArgInfo::FLOAT) {
wxString floatVal = wxGetTextFromUser(arg.description, arg.name, wxGetApp().getSDRThread()->readSetting(arg.key));
try {
wxGetApp().getSDRThread()->writeSetting(arg.key, floatVal.ToStdString());
} catch (std::invalid_argument e) {
// ...
}
break;
} else {
menuIdx++;
}
} else {
menuIdx++;
}
}
}
if (event.GetId() >= wxID_THEME_DEFAULT && event.GetId() <= wxID_THEME_RADAR) { if (event.GetId() >= wxID_THEME_DEFAULT && event.GetId() <= wxID_THEME_RADAR) {
demodTuner->Refresh(); demodTuner->Refresh();
demodModeSelector->Refresh(); demodModeSelector->Refresh();

3
src/AppFrame.h
View File

@ -52,7 +52,6 @@
#define wxID_AUDIO_BANDWIDTH_BASE 9000 #define wxID_AUDIO_BANDWIDTH_BASE 9000
#define wxID_AUDIO_DEVICE_MULTIPLIER 50 #define wxID_AUDIO_DEVICE_MULTIPLIER 50
// Define a new frame type // Define a new frame type
class AppFrame: public wxFrame { class AppFrame: public wxFrame {
public: public:
@ -107,6 +106,8 @@ private:
wxMenu *sampleRateMenu; wxMenu *sampleRateMenu;
wxMenuItem *agcMenuItem; wxMenuItem *agcMenuItem;
wxMenu *settingsMenu; wxMenu *settingsMenu;
SoapySDR::ArgInfoList settingArgs;
int settingsIdMax;
std::vector<long> sampleRates; std::vector<long> sampleRates;
std::string currentSessionFile; std::string currentSessionFile;