comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-04 08:21:16 -05:00
Code Issues Projects Releases Wiki Activity

Show/Hide modem properties when available

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-11-24 23:00:43 -05:00
parent d14dfed063
commit 67edfab862
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppFrame.cpp
View File

@ -96,6 +96,7 @@ AppFrame::AppFrame() :
modemPropertiesUpdated.store(false);
modemProps = new ModemProperties(demodPanel, wxID_ANY);
modemProps->Hide();
demodTray->Add(modemProps, 15, wxEXPAND | wxALL, 0);
#endif
@ -1052,6 +1053,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
if (modemPropertiesUpdated.load()) {
modemProps->initProperties(newModemArgs);
modemPropertiesUpdated.store(false);
demodTray->Layout();
}
// waterfallCanvas->processInputQueue();
// waterfallCanvas->Refresh();

22
src/ModemProperties.cpp
View File

@ -5,8 +5,6 @@ ModemProperties::ModemProperties(wxWindow *parent, wxWindowID winid,
const wxPoint& pos, const wxSize& size, long style, const wxString& name) : wxPanel(parent, winid, pos, size, style, name) {
m_propertyGrid = new wxPropertyGrid(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxPG_DEFAULT_STYLE);
wxBoxSizer* bSizer;
bSizer = new wxBoxSizer( wxVERTICAL );
@ -15,6 +13,11 @@ ModemProperties::ModemProperties(wxWindow *parent, wxWindowID winid,
this->SetSizer(bSizer);
m_propertyGrid->Connect( wxEVT_PG_CHANGED, wxPropertyGridEventHandler( ModemProperties::OnChange ), NULL, this );
this->Connect( wxEVT_SHOW, wxShowEventHandler( ModemProperties::OnShow ), NULL, this );
}
void ModemProperties::OnShow(wxShowEvent &event) {
m_propertyGrid->FitColumns();
}
ModemProperties::~ModemProperties() {
@ -23,8 +26,19 @@ ModemProperties::~ModemProperties() {
void ModemProperties::initProperties(ModemArgInfoList newArgs) {
args = newArgs;
m_propertyGrid->Clear();
if (newArgs.size() == 0) {
Hide();
return;
} else {
Show();
}
bSizer->Layout();
Layout();
m_propertyGrid->Append(new wxPropertyCategory("Modem Settings"));
ModemArgInfoList::const_iterator args_i;
@ -33,6 +47,8 @@ void ModemProperties::initProperties(ModemArgInfoList newArgs) {
ModemArgInfo arg = (*args_i);
props[arg.key] = addArgInfoProperty(m_propertyGrid, arg);
}
m_propertyGrid->FitColumns();
}
wxPGProperty *ModemProperties::addArgInfoProperty(wxPropertyGrid *pg, ModemArgInfo arg) {

4
src/ModemProperties.h
View File

@ -25,7 +25,9 @@ private:
wxPGProperty *addArgInfoProperty(wxPropertyGrid *pg, ModemArgInfo arg);
std::string readProperty(std::string);
void OnChange(wxPropertyGridEvent &event);
void OnShow(wxShowEvent &event);
wxBoxSizer* bSizer;
wxPropertyGrid* m_propertyGrid;
ModemArgInfoList args;
std::map<std::string, wxPGProperty *> props;