comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-04 22:27:49 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #745 from cjcliffe/general_ux_fixes_May2019

Browse Source 
General ux fixes
This commit is contained in:
Charles J. Cliffe 2019-07-23 22:57:17 -04:00 committed by GitHub
commit 21fc2d605a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 170 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -6,8 +6,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
SET(CUBICSDR_VERSION_MAJOR "0") SET(CUBICSDR_VERSION_MAJOR "0")
SET(CUBICSDR_VERSION_MINOR "2") SET(CUBICSDR_VERSION_MINOR "2")
SET(CUBICSDR_VERSION_PATCH "5") SET(CUBICSDR_VERSION_PATCH "6")
SET(CUBICSDR_VERSION_SUFFIX "") SET(CUBICSDR_VERSION_SUFFIX "a")
SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}${CUBICSDR_VERSION_SUFFIX}") SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}${CUBICSDR_VERSION_SUFFIX}")
SET(CPACK_PACKAGE_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}") SET(CPACK_PACKAGE_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}")

BIN
external/msvc/x64/vc_redist.x64.exe vendored
View File

Binary file not shown.

BIN
external/msvc/x86/vc_redist.x86.exe vendored
View File

Binary file not shown.

38
src/AppFrame.cpp
View File

@ -2769,15 +2769,19 @@ FrequencyDialog::FrequencyDialogTarget AppFrame::getFrequencyDialogTarget() {
return target; return target;
} }
void AppFrame::gkNudgeLeft(DemodulatorInstancePtr demod, int snap) { void AppFrame::gkNudge(DemodulatorInstancePtr demod, int snap) {
if (demod) { if (demod) {
demod->setFrequency(demod->getFrequency()-snap); auto demodFreq = demod->getFrequency()+snap;
demod->updateLabel(demod->getFrequency()); auto demodBw = demod->getBandwidth();
}
} auto ctr = wxGetApp().getFrequency();
auto bw = wxGetApp().getSampleRate();
// Don't let it get nudged out of view.
if (ctr - (bw / 2) > (demodFreq - demodBw / 2) || ctr + (bw / 2) < (demodFreq + demodBw / 2)) {
wxGetApp().setFrequency(ctr+(snap*2));
}
void AppFrame::gkNudgeRight(DemodulatorInstancePtr demod, int snap) {
if (demod) {
demod->setFrequency(demod->getFrequency()+snap); demod->setFrequency(demod->getFrequency()+snap);
demod->updateLabel(demod->getFrequency()); demod->updateLabel(demod->getFrequency());
} }
@ -2821,10 +2825,10 @@ int AppFrame::OnGlobalKeyDown(wxKeyEvent &event) {
#ifdef wxHAS_RAW_KEY_CODES #ifdef wxHAS_RAW_KEY_CODES
switch (event.GetRawKeyCode()) { switch (event.GetRawKeyCode()) {
case 30: case 30:
gkNudgeRight(lastDemod, snap); gkNudge(lastDemod, snap);
return 1; return 1;
case 33: case 33:
gkNudgeLeft(lastDemod, snap); gkNudge(lastDemod, -snap);
return 1; return 1;
} }
#endif #endif
@ -2844,10 +2848,10 @@ int AppFrame::OnGlobalKeyDown(wxKeyEvent &event) {
case 'V': case 'V':
return 1; return 1;
case ']': case ']':
gkNudgeRight(lastDemod, snap); gkNudge(lastDemod, snap);
return 1; return 1;
case '[': case '[':
gkNudgeLeft(lastDemod, snap); gkNudge(lastDemod, -snap);
return 1; return 1;
case 'A': case 'A':
case 'F': case 'F':
@ -2858,6 +2862,18 @@ int AppFrame::OnGlobalKeyDown(wxKeyEvent &event) {
case 'M': case 'M':
case 'R': case 'R':
return 1; return 1;
case WXK_NUMPAD0:
case WXK_NUMPAD1:
case WXK_NUMPAD2:
case WXK_NUMPAD3:
case WXK_NUMPAD4:
case WXK_NUMPAD5:
case WXK_NUMPAD6:
case WXK_NUMPAD7:
case WXK_NUMPAD8:
case WXK_NUMPAD9:
wxGetApp().showFrequencyInput(getFrequencyDialogTarget(), std::to_string(event.GetKeyCode() - WXK_NUMPAD0));
return 1;
case '0': case '0':
case '1': case '1':
case '2': case '2':

3
src/AppFrame.h
View File

@ -197,8 +197,7 @@ private:
/** /**
* Keyboard handlers * Keyboard handlers
*/ */
void gkNudgeLeft(DemodulatorInstancePtr demod, int snap); void gkNudge(DemodulatorInstancePtr demod, int snap);
void gkNudgeRight(DemodulatorInstancePtr demod, int snap);
void toggleActiveDemodRecording(); void toggleActiveDemodRecording();
void toggleAllActiveDemodRecording(); void toggleAllActiveDemodRecording();

9
src/CubicSDR.cpp
View File

@ -945,11 +945,12 @@ void CubicSDR::showFrequencyInput(FrequencyDialog::FrequencyDialogTarget targetM
const wxString gainTitle("Gain Entry: "+wxGetApp().getActiveGainEntry()); const wxString gainTitle("Gain Entry: "+wxGetApp().getActiveGainEntry());
wxString title; wxString title;
auto activeModem = demodMgr.getActiveContextModem();
switch (targetMode) { switch (targetMode) {
case FrequencyDialog::FDIALOG_TARGET_DEFAULT: case FrequencyDialog::FDIALOG_TARGET_DEFAULT:
case FrequencyDialog::FDIALOG_TARGET_FREQ: case FrequencyDialog::FDIALOG_TARGET_FREQ:
title = demodMgr.getActiveContextModem()?demodTitle:freqTitle; title = activeModem ?demodTitle:freqTitle;
break; break;
case FrequencyDialog::FDIALOG_TARGET_BANDWIDTH: case FrequencyDialog::FDIALOG_TARGET_BANDWIDTH:
title = bwTitle; title = bwTitle;
@ -969,8 +970,8 @@ void CubicSDR::showFrequencyInput(FrequencyDialog::FrequencyDialogTarget targetM
default: default:
break; break;
} }
FrequencyDialog fdialog(appframe, -1, title, demodMgr.getActiveContextModem(), wxPoint(-100,-100), wxSize(350, 75), wxDEFAULT_DIALOG_STYLE, targetMode, initString); FrequencyDialog fdialog(appframe, -1, title, activeModem, wxPoint(-100,-100), wxSize(350, 75), wxDEFAULT_DIALOG_STYLE, targetMode, initString);
fdialog.ShowModal(); fdialog.ShowModal();
} }

12
src/FrequencyDialog.cpp
View File

@ -97,7 +97,7 @@ void FrequencyDialog::OnChar(wxKeyEvent& event) {
} }
} }
if (targetMode == FDIALOG_TARGET_DEFAULT) { if (targetMode == FDIALOG_TARGET_DEFAULT || targetMode == FDIALOG_TARGET_FREQ) {
if (ranged) { if (ranged) {
freq = strToFrequency(strValue); freq = strToFrequency(strValue);
freq2 = strToFrequency(strValue2); freq2 = strToFrequency(strValue2);
@ -105,10 +105,16 @@ void FrequencyDialog::OnChar(wxKeyEvent& event) {
freq = strToFrequency(strValue); freq = strToFrequency(strValue);
} }
if (activeDemod) { if (activeDemod) {
activeDemod->setTracking(true);
activeDemod->setFollow(true);
activeDemod->setFrequency(freq); activeDemod->setFrequency(freq);
activeDemod->updateLabel(freq); activeDemod->updateLabel(freq);
freq_ctr = wxGetApp().getFrequency();
range_bw = wxGetApp().getSampleRate();
if (freq_ctr - (range_bw / 2) > freq || freq_ctr + (range_bw / 2) < freq) {
wxGetApp().setFrequency(freq);
}
} else { } else {
if (ranged && (freq || freq2)) { if (ranged && (freq || freq2)) {
if (freq > freq2) { if (freq > freq2) {

2
src/forms/Bookmark/BookmarkPanel.cpp
View File

@ -93,6 +93,7 @@ BookmarkPanel::BookmarkPanel( wxWindow* parent, wxWindowID id, const wxPoint& po
m_searchText->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BookmarkPanel::onSearchText ), NULL, this ); m_searchText->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BookmarkPanel::onSearchText ), NULL, this );
m_clearSearchButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BookmarkPanel::onClearSearch ), NULL, this ); m_clearSearchButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BookmarkPanel::onClearSearch ), NULL, this );
m_treeView->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ), NULL, this ); m_treeView->Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ), NULL, this );
m_treeView->Connect( wxEVT_KEY_UP, wxKeyEventHandler( BookmarkPanel::onKeyUp ), NULL, this );
m_treeView->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ), NULL, this ); m_treeView->Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ), NULL, this );
m_treeView->Connect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ), NULL, this ); m_treeView->Connect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ), NULL, this );
m_treeView->Connect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeBeginDrag ), NULL, this ); m_treeView->Connect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeBeginDrag ), NULL, this );
@ -120,6 +121,7 @@ BookmarkPanel::~BookmarkPanel()
m_searchText->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BookmarkPanel::onSearchText ), NULL, this ); m_searchText->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BookmarkPanel::onSearchText ), NULL, this );
m_clearSearchButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BookmarkPanel::onClearSearch ), NULL, this ); m_clearSearchButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BookmarkPanel::onClearSearch ), NULL, this );
m_treeView->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ), NULL, this ); m_treeView->Disconnect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( BookmarkPanel::onEnterWindow ), NULL, this );
m_treeView->Disconnect( wxEVT_KEY_UP, wxKeyEventHandler( BookmarkPanel::onKeyUp ), NULL, this );
m_treeView->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ), NULL, this ); m_treeView->Disconnect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler( BookmarkPanel::onLeaveWindow ), NULL, this );
m_treeView->Disconnect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ), NULL, this ); m_treeView->Disconnect( wxEVT_MOTION, wxMouseEventHandler( BookmarkPanel::onMotion ), NULL, this );
m_treeView->Disconnect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeBeginDrag ), NULL, this ); m_treeView->Disconnect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( BookmarkPanel::onTreeBeginDrag ), NULL, this );

31
src/forms/Bookmark/BookmarkPanel.fbp
View File

@ -27,7 +27,7 @@
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_enum">0</property> <property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Panel" expanded="1"> <object class="Panel" expanded="0">
<property name="aui_managed">0</property> <property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property> <property name="bg"></property>
@ -52,16 +52,16 @@
<event name="OnEnterWindow">onEnterWindow</event> <event name="OnEnterWindow">onEnterWindow</event>
<event name="OnLeaveWindow">onLeaveWindow</event> <event name="OnLeaveWindow">onLeaveWindow</event>
<event name="OnMotion">onMotion</event> <event name="OnMotion">onMotion</event>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizer1</property> <property name="name">bSizer1</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -123,11 +123,11 @@
<event name="OnText">onSearchText</event> <event name="OnText">onSearchText</event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxButton" expanded="1"> <object class="wxButton" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -196,11 +196,11 @@
<event name="OnButtonClick">onClearSearch</event> <event name="OnButtonClick">onClearSearch</event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxTreeCtrl" expanded="1"> <object class="wxTreeCtrl" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -253,6 +253,7 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnEnterWindow">onEnterWindow</event> <event name="OnEnterWindow">onEnterWindow</event>
<event name="OnKeyUp">onKeyUp</event>
<event name="OnLeaveWindow">onLeaveWindow</event> <event name="OnLeaveWindow">onLeaveWindow</event>
<event name="OnMotion">onMotion</event> <event name="OnMotion">onMotion</event>
<event name="OnTreeBeginDrag">onTreeBeginDrag</event> <event name="OnTreeBeginDrag">onTreeBeginDrag</event>
@ -266,11 +267,11 @@
<event name="OnTreeSelChanging">onTreeSelectChanging</event> <event name="OnTreeSelChanging">onTreeSelectChanging</event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticLine" expanded="1"> <object class="wxStaticLine" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -324,11 +325,11 @@
<property name="window_style"></property> <property name="window_style"></property>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -888,11 +889,11 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -952,7 +953,7 @@
</object> </object>
</object> </object>
</object> </object>
<object class="wxTimer" expanded="1"> <object class="wxTimer" expanded="0">
<property name="enabled">0</property> <property name="enabled">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="name">m_updateTimer</property> <property name="name">m_updateTimer</property>

1
src/forms/Bookmark/BookmarkPanel.h
View File

@ -60,6 +60,7 @@ class BookmarkPanel : public wxPanel
virtual void onSearchTextFocus( wxMouseEvent& event ) { event.Skip(); } virtual void onSearchTextFocus( wxMouseEvent& event ) { event.Skip(); }
virtual void onSearchText( wxCommandEvent& event ) { event.Skip(); } virtual void onSearchText( wxCommandEvent& event ) { event.Skip(); }
virtual void onClearSearch( wxCommandEvent& event ) { event.Skip(); } virtual void onClearSearch( wxCommandEvent& event ) { event.Skip(); }
virtual void onKeyUp( wxKeyEvent& event ) { event.Skip(); }
virtual void onTreeBeginDrag( wxTreeEvent& event ) { event.Skip(); } virtual void onTreeBeginDrag( wxTreeEvent& event ) { event.Skip(); }
virtual void onTreeEndDrag( wxTreeEvent& event ) { event.Skip(); } virtual void onTreeEndDrag( wxTreeEvent& event ) { event.Skip(); }
virtual void onTreeActivate( wxTreeEvent& event ) { event.Skip(); } virtual void onTreeActivate( wxTreeEvent& event ) { event.Skip(); }

142
src/forms/Bookmark/BookmarkView.cpp
View File

@ -517,29 +517,73 @@ void BookmarkView::doUpdateActiveList() {
} }
void BookmarkView::onKeyUp( wxKeyEvent& event ) {
// Check for active selection
wxTreeItemId itm = m_treeView->GetSelection();
if (itm == nullptr) {
event.Skip();
return;
}
// Create event to pass to appropriate function
wxTreeEvent treeEvent;
treeEvent.SetItem(itm);
// Pull TreeViewItem data
auto tvi = dynamic_cast<TreeViewItem*>(m_treeView->GetItemData(itm));
// Not selected?
if (tvi == nullptr) {
event.Skip();
return;
}
// Handlers
if (event.m_keyCode == WXK_DELETE || event.m_keyCode == WXK_NUMPAD_DELETE) {
if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) {
onRemoveActive(treeEvent);
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {
onRemoveRecent(treeEvent);
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_BOOKMARK) {
onRemoveBookmark(treeEvent);
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RANGE) {
onRemoveRange(treeEvent);
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_GROUP) {
onRemoveGroup(treeEvent);
}
// TODO: keys for other actions?
}
}
void BookmarkView::onTreeActivate( wxTreeEvent& event ) { void BookmarkView::onTreeActivate( wxTreeEvent& event ) {
wxTreeItemId itm = event.GetItem(); wxTreeItemId itm = event.GetItem();
TreeViewItem* tvi = dynamic_cast<TreeViewItem*>(m_treeView->GetItemData(itm)); TreeViewItem* tvi = dynamic_cast<TreeViewItem*>(m_treeView->GetItemData(itm));
if (tvi) { if (tvi == nullptr) {
if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) { event.Skip();
if (!tvi->demod->isActive()) { return;
wxGetApp().setFrequency(tvi->demod->getFrequency()); }
nextDemod = tvi->demod;
wxGetApp().getDemodMgr().setActiveDemodulator(nextDemod, false);
}
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {
nextEnt = tvi->bookmarkEnt;
wxGetApp().getBookmarkMgr().removeRecent(tvi->bookmarkEnt);
activateBookmark(tvi->bookmarkEnt); if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) {
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_BOOKMARK) { if (!tvi->demod->isActive()) {
activateBookmark(tvi->bookmarkEnt); wxGetApp().setFrequency(tvi->demod->getFrequency());
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RANGE) { nextDemod = tvi->demod;
activateRange(tvi->rangeEnt); wxGetApp().getDemodMgr().setActiveDemodulator(nextDemod, false);
} }
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {
nextEnt = tvi->bookmarkEnt;
wxGetApp().getBookmarkMgr().removeRecent(tvi->bookmarkEnt);
activateBookmark(tvi->bookmarkEnt);
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_BOOKMARK) {
activateBookmark(tvi->bookmarkEnt);
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RANGE) {
activateRange(tvi->rangeEnt);
} }
} }
@ -647,7 +691,19 @@ void BookmarkView::setExpandState(std::string branchName, bool state) {
} }
void BookmarkView::hideProps() { void BookmarkView::ensureSelectionInView() {
// Ensure current selection is visible; useful when a layout action
// may have covered the active selection
auto sel = m_treeView->GetSelection();
if (sel != nullptr) {
if (!m_treeView->IsVisible(sel)) {
m_treeView->EnsureVisible(sel);
}
}
}
void BookmarkView::hideProps(bool hidePanel) {
m_frequencyLabel->Hide(); m_frequencyLabel->Hide();
m_frequencyVal->Hide(); m_frequencyVal->Hide();
@ -660,16 +716,17 @@ void BookmarkView::hideProps() {
m_labelText->Hide(); m_labelText->Hide();
m_labelLabel->Hide(); m_labelLabel->Hide();
m_propPanelDivider->Hide(); if (hidePanel) {
m_propPanel->Hide(); m_propPanelDivider->Hide();
m_buttonPanel->Hide(); m_propPanel->Hide();
m_buttonPanel->Hide();
}
} }
void BookmarkView::showProps() { void BookmarkView::showProps() {
m_propPanelDivider->Show(); m_propPanelDivider->Show();
m_propPanel->Show(); m_propPanel->Show();
m_propPanel->GetSizer()->Layout();
} }
@ -681,13 +738,11 @@ void BookmarkView::clearButtons() {
void BookmarkView::showButtons() { void BookmarkView::showButtons() {
m_buttonPanel->Show(); m_buttonPanel->Show();
m_buttonPanel->GetSizer()->Layout();
} }
void BookmarkView::refreshLayout() { void BookmarkView::refreshLayout() {
GetSizer()->Layout(); GetSizer()->Layout();
Update(); ensureSelectionInView();
Refresh();
} }
@ -810,8 +865,6 @@ void BookmarkView::activeSelection(DemodulatorInstancePtr dsel) {
if (dsel == nullptr) { if (dsel == nullptr) {
hideProps(); hideProps();
clearButtons(); clearButtons();
showProps();
showButtons();
refreshLayout(); refreshLayout();
return; return;
} }
@ -821,8 +874,8 @@ void BookmarkView::activeSelection(DemodulatorInstancePtr dsel) {
m_modulationVal->SetLabelText(dsel->getDemodulatorType()); m_modulationVal->SetLabelText(dsel->getDemodulatorType());
m_labelText->SetValue(dsel->getDemodulatorUserLabel()); m_labelText->SetValue(dsel->getDemodulatorUserLabel());
hideProps(); hideProps(false);
m_frequencyVal->Show(); m_frequencyVal->Show();
m_frequencyLabel->Show(); m_frequencyLabel->Show();
@ -911,7 +964,7 @@ void BookmarkView::bookmarkSelection(BookmarkEntryPtr bmSel) {
m_modulationVal->SetLabelText(bmSel->type); m_modulationVal->SetLabelText(bmSel->type);
m_labelText->SetValue(bmSel->label); m_labelText->SetValue(bmSel->label);
hideProps(); hideProps(false);
m_frequencyVal->Show(); m_frequencyVal->Show();
m_frequencyLabel->Show(); m_frequencyLabel->Show();
@ -944,8 +997,8 @@ void BookmarkView::recentSelection(BookmarkEntryPtr bmSel) {
m_modulationVal->SetLabelText(bmSel->type); m_modulationVal->SetLabelText(bmSel->type);
m_labelText->SetValue(bmSel->label); m_labelText->SetValue(bmSel->label);
hideProps(); hideProps(false);
m_frequencyVal->Show(); m_frequencyVal->Show();
m_frequencyLabel->Show(); m_frequencyLabel->Show();
@ -973,8 +1026,8 @@ void BookmarkView::groupSelection(std::string groupName) {
clearButtons(); clearButtons();
hideProps(); hideProps(false);
m_labelText->SetValue(groupName); m_labelText->SetValue(groupName);
m_labelText->Show(); m_labelText->Show();
@ -992,9 +1045,8 @@ void BookmarkView::groupSelection(std::string groupName) {
void BookmarkView::rangeSelection(BookmarkRangeEntryPtr re) { void BookmarkView::rangeSelection(BookmarkRangeEntryPtr re) {
clearButtons(); clearButtons();
hideProps(false);
hideProps();
m_labelText->SetValue(re->label); m_labelText->SetValue(re->label);
m_labelText->Show(); m_labelText->Show();
@ -1022,7 +1074,7 @@ void BookmarkView::bookmarkBranchSelection() {
clearButtons(); clearButtons();
hideProps(); hideProps();
addButton(m_buttonPanel, BOOKMARK_VIEW_STR_ADD_GROUP, wxCommandEventHandler( BookmarkView::onAddGroup )); addButton(m_buttonPanel, BOOKMARK_VIEW_STR_ADD_GROUP, wxCommandEventHandler( BookmarkView::onAddGroup ));
showButtons(); showButtons();
@ -1033,20 +1085,18 @@ void BookmarkView::bookmarkBranchSelection() {
void BookmarkView::recentBranchSelection() { void BookmarkView::recentBranchSelection() {
clearButtons(); clearButtons();
hideProps(); hideProps();
addButton(m_buttonPanel, BOOKMARK_VIEW_STR_CLEAR_RECENT, wxCommandEventHandler( BookmarkView::onClearRecents )); addButton(m_buttonPanel, BOOKMARK_VIEW_STR_CLEAR_RECENT, wxCommandEventHandler( BookmarkView::onClearRecents ));
showButtons(); showButtons();
refreshLayout(); refreshLayout();
this->Layout();
} }
void BookmarkView::rangeBranchSelection() { void BookmarkView::rangeBranchSelection() {
clearButtons(); clearButtons();
hideProps(); hideProps(false);
m_labelText->SetValue(wxT("")); m_labelText->SetValue(wxT(""));
m_labelText->Show(); m_labelText->Show();
m_labelLabel->Show(); m_labelLabel->Show();
@ -1057,14 +1107,12 @@ void BookmarkView::rangeBranchSelection() {
showButtons(); showButtons();
refreshLayout(); refreshLayout();
this->Layout();
} }
void BookmarkView::activeBranchSelection() { void BookmarkView::activeBranchSelection() {
hideProps(); hideProps();
this->Layout(); refreshLayout();
} }
@ -1089,7 +1137,7 @@ void BookmarkView::onTreeSelect( wxTreeEvent& event ) {
rangeBranchSelection(); rangeBranchSelection();
} else { } else {
hideProps(); hideProps();
this->Layout(); refreshLayout();
} }
return; return;
@ -1112,7 +1160,7 @@ void BookmarkView::onTreeSelect( wxTreeEvent& event ) {
rangeSelection(tvi->rangeEnt); rangeSelection(tvi->rangeEnt);
} else { } else {
hideProps(); hideProps();
this->Layout(); refreshLayout();
} }
} }

6
src/forms/Bookmark/BookmarkView.h
View File

@ -96,8 +96,9 @@ protected:
void recentBranchSelection(); void recentBranchSelection();
void rangeBranchSelection(); void rangeBranchSelection();
void activeBranchSelection(); void activeBranchSelection();
void hideProps(); void ensureSelectionInView();
void hideProps(bool hidePanel = true);
void showProps(); void showProps();
void onUpdateTimer( wxTimerEvent& event ); void onUpdateTimer( wxTimerEvent& event );
@ -105,6 +106,7 @@ protected:
//refresh / rebuild the whole tree item immediatly //refresh / rebuild the whole tree item immediatly
void doUpdateActiveList(); void doUpdateActiveList();
void onKeyUp( wxKeyEvent& event );
void onTreeActivate( wxTreeEvent& event ); void onTreeActivate( wxTreeEvent& event );
void onTreeCollapse( wxTreeEvent& event ); void onTreeCollapse( wxTreeEvent& event );
void onTreeExpanded( wxTreeEvent& event ); void onTreeExpanded( wxTreeEvent& event );

2
src/ui/UITestCanvas.cpp
View File

@ -38,7 +38,7 @@ UITestCanvas::~UITestCanvas() {
} }
void UITestCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void UITestCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
glContext->SetCurrent(*this); glContext->SetCurrent(*this);

2
src/visual/GainCanvas.cpp
View File

@ -51,7 +51,7 @@ GainCanvas::~GainCanvas() {
} }
void GainCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void GainCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
glContext->SetCurrent(*this); glContext->SetCurrent(*this);

2
src/visual/MeterCanvas.cpp
View File

@ -82,7 +82,7 @@ void MeterCanvas::setShowUserInput(bool showUserInput) {
} }
void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
glContext->SetCurrent(*this); glContext->SetCurrent(*this);

2
src/visual/ModeSelectorCanvas.cpp
View File

@ -51,7 +51,7 @@ int ModeSelectorCanvas::getHoveredSelection() {
} }
void ModeSelectorCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void ModeSelectorCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
glContext->SetCurrent(*this); glContext->SetCurrent(*this);

2
src/visual/ScopeCanvas.cpp
View File

@ -101,7 +101,7 @@ bool ScopeCanvas::getShowDb() {
} }
void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
ScopeRenderDataPtr avData; ScopeRenderDataPtr avData;

2
src/visual/SpectrumCanvas.cpp
View File

@ -51,7 +51,7 @@ SpectrumCanvas::~SpectrumCanvas() {
} }
void SpectrumCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void SpectrumCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
SpectrumVisualDataPtr vData; SpectrumVisualDataPtr vData;

2
src/visual/TuningCanvas.cpp
View File

@ -84,7 +84,7 @@ void TuningCanvas::setHalfBand(bool hb) {
} }
void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
glContext->SetCurrent(*this); glContext->SetCurrent(*this);

2
src/visual/WaterfallCanvas.cpp
View File

@ -128,7 +128,7 @@ void WaterfallCanvas::processInputQueue() {
void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) { void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
std::lock_guard < std::mutex > lock(tex_update); std::lock_guard < std::mutex > lock(tex_update);
wxPaintDC dc(this); // wxPaintDC dc(this);
const wxSize ClientSize = GetClientSize(); const wxSize ClientSize = GetClientSize();
long double currentZoom = zoom; long double currentZoom = zoom;