comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-02 22:14:47 -04:00
Code Issues Projects Releases Wiki Activity

Start integrating user demod label

Browse Source
This commit is contained in:
Charles J. Cliffe
2016-11-14 23:52:50 -05:00
parent 9c7ff0598c
commit 2f6e83c55e
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/forms/Bookmark/BookmarkView.cpp
+13 -4
View File
@@ -143,7 +143,12 @@ void BookmarkView::doUpdateActiveList() {
tvi->type = TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE;
tvi->demod = demod_i;
wxTreeItemId itm = m_treeView->AppendItem(activeBranch,demod_i->getLabel());
wxString activeLabel = demod_i->getDemodulatorUserLabel();
if (activeLabel == "") {
activeLabel = demod_i->getLabel();
}
wxTreeItemId itm = m_treeView->AppendItem(activeBranch,activeLabel);
m_treeView->SetItemData(itm, tvi);
if (activeDemodulator) {
@@ -310,7 +315,7 @@ void BookmarkView::activeSelection(DemodulatorInstance *dsel) {
m_frequencyVal->SetLabelText(frequencyToStr(dsel->getFrequency()));
m_bandwidthVal->SetLabelText(frequencyToStr(dsel->getBandwidth()));
m_modulationVal->SetLabelText(dsel->getDemodulatorType());
m_labelText->SetValue(dsel->getLabel());
m_labelText->SetValue(dsel->getDemodulatorUserLabel());
hideProps();
@@ -607,11 +612,15 @@ void BookmarkView::onTreeBeginDrag( wxTreeEvent& event ) {
}
bool bAllow = false;
std::string dragItemName;
std::wstring dragItemName;
if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) {
bAllow = true;
dragItemName = tvi->demod->getLabel();
dragItemName = tvi->demod->getDemodulatorUserLabel();
if (dragItemName == "") {
std::string wstr = tvi->demod->getLabel();
dragItemName = std::wstring(wstr.begin(),wstr.end());
}
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {
bAllow = true;
dragItemName = tvi->bookmarkEnt->label;