From 73954055e63eed3d89d5b21d0e98c135ec0b1e59 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sun, 20 Nov 2016 23:26:38 -0500 Subject: [PATCH] Resolve 'Ungrouped' logic -- replace button with choice list for bookmarking. --- src/BookmarkMgr.cpp | 6 ++ src/BookmarkMgr.h | 2 + src/forms/Bookmark/BookmarkView.cpp | 88 +++++++++++++++++++++-------- src/forms/Bookmark/BookmarkView.h | 12 ++-- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/src/BookmarkMgr.cpp b/src/BookmarkMgr.cpp index 0e91b99..4dbfa06 100644 --- a/src/BookmarkMgr.cpp +++ b/src/BookmarkMgr.cpp @@ -75,6 +75,12 @@ BookmarkNames BookmarkMgr::getGroups() { return results; } +void BookmarkMgr::getGroups(wxArrayString &arr) { + for (BookmarkMap::iterator i = bmData.begin(); i!= bmData.end(); ++i) { + arr.push_back(i->first); + } +} + void BookmarkMgr::updateActiveList() { BookmarkView *bmv = wxGetApp().getAppFrame()->getBookmarkView(); diff --git a/src/BookmarkMgr.h b/src/BookmarkMgr.h index 9b4728b..7f66710 100644 --- a/src/BookmarkMgr.h +++ b/src/BookmarkMgr.h @@ -2,6 +2,7 @@ #include #include +#include #include "DemodulatorInstance.h" @@ -48,6 +49,7 @@ public: BookmarkGroup getGroup(std::string group); BookmarkNames getGroups(); + void getGroups(wxArrayString &arr); void updateActiveList(); void updateBookmarks(); diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp index f38568a..fdcd0fc 100644 --- a/src/forms/Bookmark/BookmarkView.cpp +++ b/src/forms/Bookmark/BookmarkView.cpp @@ -4,8 +4,12 @@ #include #include #include + #define wxCONTEXT_ADD_GROUP_ID 1000 +#define BOOKMARK_VIEW_CHOICE_DEFAULT "Bookmark.." +#define BOOKMARK_VIEW_CHOICE_NEW "(New Group..)" + BookmarkView::BookmarkView( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : BookmarkPanel(parent, id, pos, size, style) { rootBranch = m_treeView->AddRoot("Root"); @@ -15,6 +19,7 @@ BookmarkView::BookmarkView( wxWindow* parent, wxWindowID id, const wxPoint& pos, doUpdateActive.store(true); doUpdateBookmarks.store(true); + bookmarkChoice = nullptr; activeSel = nullptr; recentSel = nullptr; dragItem = nullptr; @@ -89,7 +94,6 @@ void BookmarkView::updateBookmarks(std::string group) { wxTreeItemId BookmarkView::refreshBookmarks() { groupNames = wxGetApp().getBookmarkMgr().getGroups(); if (!groupNames.size()) { - wxGetApp().getBookmarkMgr().getGroup("Ungrouped"); groupNames = wxGetApp().getBookmarkMgr().getGroups(); } if (doUpdateBookmarkGroup.size()) { // Nothing for the moment.. @@ -280,6 +284,7 @@ void BookmarkView::showProps() { void BookmarkView::clearButtons() { m_buttonPanel->Hide(); m_buttonPanel->DestroyChildren(); + bookmarkChoice = nullptr; } void BookmarkView::showButtons() { @@ -295,7 +300,7 @@ void BookmarkView::refreshLayout() { wxButton *BookmarkView::makeButton(wxWindow *parent, std::string labelVal, wxObjectEventFunction handler) { wxButton *nButton = new wxButton( m_buttonPanel, wxID_ANY, labelVal); - nButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, handler, NULL, this); + nButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, handler, nullptr, this); nButton->SetBackgroundColour(ThemeMgr::mgr.currentTheme->generalBackground); return nButton; } @@ -307,6 +312,60 @@ wxButton *BookmarkView::addButton(wxWindow *parent, std::string labelVal, wxObje return nButton; } +void BookmarkView::updateBookmarkChoices() { + if (!bookmarkChoices.empty()) { + bookmarkChoices.erase(bookmarkChoices.begin(),bookmarkChoices.end()); + } + bookmarkChoices.push_back(BOOKMARK_VIEW_CHOICE_DEFAULT); + wxGetApp().getBookmarkMgr().getGroups(bookmarkChoices); + bookmarkChoices.push_back(BOOKMARK_VIEW_CHOICE_NEW); +} + +void BookmarkView::addBookmarkChoice(wxWindow *parent) { + updateBookmarkChoices(); + bookmarkChoice = new wxChoice(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, bookmarkChoices, wxALL|wxEXPAND, wxDefaultValidator, "Bookmark"); + bookmarkChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction)&BookmarkView::onBookmarkChoice, nullptr, this); + parent->GetSizer()->Add(bookmarkChoice, 0, wxALL | wxEXPAND); +} + + +void BookmarkView::onBookmarkChoice( wxCommandEvent &event ) { + + int numSel = bookmarkChoice->GetCount(); + int sel = bookmarkChoice->GetSelection(); + + if (sel == 0) { + return; + } + + wxString stringVal = ""; + + if (sel == (numSel-1)) { + stringVal = wxGetTextFromUser("Enter Group Name", "Add Group", ""); + } else { + stringVal = bookmarkChoices[sel]; + } + + if (stringVal == "") { + return; + } + + groupSel = stringVal; + + if (activeSel) { + wxGetApp().getBookmarkMgr().addBookmark(groupSel, activeSel); + wxGetApp().getBookmarkMgr().updateBookmarks(); + activeSelection(activeSel); + } + if (recentSel) { + wxGetApp().getBookmarkMgr().removeRecent(recentSel); + wxGetApp().getBookmarkMgr().addBookmark(groupSel, recentSel); + wxGetApp().getBookmarkMgr().updateBookmarks(); + wxGetApp().getBookmarkMgr().updateActiveList(); + bookmarkSelection(recentSel); + } +} + void BookmarkView::activeSelection(DemodulatorInstance *dsel) { activeSel = dsel; @@ -332,8 +391,8 @@ void BookmarkView::activeSelection(DemodulatorInstance *dsel) { m_labelLabel->Show(); clearButtons(); - - addButton(m_buttonPanel, "Bookmark Active", wxCommandEventHandler( BookmarkView::onBookmarkActive )); + + addBookmarkChoice(m_buttonPanel); addButton(m_buttonPanel, "Remove Active", wxCommandEventHandler( BookmarkView::onRemoveActive )); showProps(); @@ -417,7 +476,7 @@ void BookmarkView::recentSelection(BookmarkEntry *bmSel) { clearButtons(); addButton(m_buttonPanel, "Activate Recent", wxCommandEventHandler( BookmarkView::onActivateRecent )); - addButton(m_buttonPanel, "Bookmark Recent", wxCommandEventHandler( BookmarkView::onBookmarkRecent )); + addBookmarkChoice(m_buttonPanel); showProps(); showButtons(); @@ -531,23 +590,6 @@ void BookmarkView::onDoubleClickBandwidth( wxMouseEvent& event ) { } -void BookmarkView::onBookmarkActive( wxCommandEvent& event ) { - if (activeSel) { - wxGetApp().getBookmarkMgr().addBookmark("Ungrouped", activeSel); - wxGetApp().getBookmarkMgr().updateBookmarks(); - } -} - -void BookmarkView::onBookmarkRecent( wxCommandEvent& event ) { - if (recentSel) { - wxGetApp().getBookmarkMgr().removeRecent(recentSel); - wxGetApp().getBookmarkMgr().addBookmark("Ungrouped", recentSel); - wxGetApp().getBookmarkMgr().updateBookmarks(); - wxGetApp().getBookmarkMgr().updateActiveList(); - } -} - - void BookmarkView::onRemoveActive( wxCommandEvent& event ) { if (activeSel != nullptr) { wxGetApp().getDemodMgr().setActiveDemodulator(nullptr, false); @@ -668,7 +710,7 @@ void BookmarkView::onTreeEndDrag( wxTreeEvent& event ) { if (dragItem && dragItem->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) { wxGetApp().getBookmarkMgr().addBookmark("Ungrouped", dragItem->demod); wxGetApp().getBookmarkMgr().updateBookmarks(); - }else if (dragItem && dragItem->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) { + } else if (dragItem && dragItem->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) { wxGetApp().getBookmarkMgr().removeRecent(dragItem->bookmarkEnt); wxGetApp().getBookmarkMgr().addBookmark("Ungrouped", dragItem->bookmarkEnt); m_treeView->Delete(dragItemId); diff --git a/src/forms/Bookmark/BookmarkView.h b/src/forms/Bookmark/BookmarkView.h index 53c33ec..60f4614 100644 --- a/src/forms/Bookmark/BookmarkView.h +++ b/src/forms/Bookmark/BookmarkView.h @@ -1,8 +1,8 @@ #pragma once #include "BookmarkPanel.h" - #include "BookmarkMgr.h" +#include "wx/choice.h" class TreeViewItem : public wxTreeItemData { public: @@ -81,9 +81,10 @@ protected: wxButton *makeButton(wxWindow *parent, std::string labelVal, wxObjectEventFunction handler); wxButton *addButton(wxWindow *parent, std::string labelVal, wxObjectEventFunction handler); - void onBookmarkActive( wxCommandEvent& event ); - void onBookmarkRecent( wxCommandEvent& event ); - + void updateBookmarkChoices(); + void addBookmarkChoice(wxWindow *parent); + void onBookmarkChoice( wxCommandEvent &event ); + void onRemoveActive( wxCommandEvent& event ); void onRemoveBookmark( wxCommandEvent& event ); @@ -109,7 +110,8 @@ protected: BookmarkNames groupNames; std::map groups; BookmarkEntry *bookmarkSel; - + wxArrayString bookmarkChoices; + wxChoice *bookmarkChoice; // Active std::atomic_bool doUpdateActive;