Start integrating user demod label
This commit is contained in:
parent
9c7ff0598c
commit
2f6e83c55e
|
@ -1864,6 +1864,8 @@ bool AppFrame::loadSession(std::string fileName) {
|
||||||
GetStatusBar()->SetStatusText(wxString::Format(wxT("Loaded session file: %s"), currentSessionFile.c_str()));
|
GetStatusBar()->SetStatusText(wxString::Format(wxT("Loaded session file: %s"), currentSessionFile.c_str()));
|
||||||
SetTitle(wxString::Format(wxT("%s: %s"), CUBICSDR_TITLE, filePart.c_str()));
|
SetTitle(wxString::Format(wxT("%s: %s"), CUBICSDR_TITLE, filePart.c_str()));
|
||||||
|
|
||||||
|
wxGetApp().getBookmarkMgr().updateActiveList();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -132,7 +132,11 @@ BookmarkEntry *BookmarkMgr::demodToBookmarkEntry(DemodulatorInstance *demod) {
|
||||||
|
|
||||||
be->bandwidth = demod->getBandwidth();
|
be->bandwidth = demod->getBandwidth();
|
||||||
be->type = demod->getDemodulatorType();
|
be->type = demod->getDemodulatorType();
|
||||||
be->label = demod->getLabel();
|
be->label = demod->getDemodulatorUserLabel();
|
||||||
|
if (be->label == "") {
|
||||||
|
std::string wstr = demod->getLabel();
|
||||||
|
be->label = std::wstring(wstr.begin(),wstr.end());
|
||||||
|
}
|
||||||
be->frequency = demod->getFrequency();
|
be->frequency = demod->getFrequency();
|
||||||
|
|
||||||
be->node = new DataNode;
|
be->node = new DataNode;
|
||||||
|
|
|
@ -12,7 +12,7 @@ public:
|
||||||
std::mutex busy_lock;
|
std::mutex busy_lock;
|
||||||
|
|
||||||
std::string type;
|
std::string type;
|
||||||
std::string label;
|
std::wstring label;
|
||||||
|
|
||||||
long long frequency;
|
long long frequency;
|
||||||
int bandwidth;
|
int bandwidth;
|
||||||
|
|
|
@ -57,7 +57,7 @@ void DemodLabelDialog::OnChar(wxKeyEvent& event) {
|
||||||
else {
|
else {
|
||||||
activeDemod->setDemodulatorUserLabel(L"");
|
activeDemod->setDemodulatorUserLabel(L"");
|
||||||
}
|
}
|
||||||
|
wxGetApp().getBookmarkMgr().updateActiveList();
|
||||||
Close();
|
Close();
|
||||||
break;
|
break;
|
||||||
case WXK_ESCAPE:
|
case WXK_ESCAPE:
|
||||||
|
|
|
@ -143,7 +143,12 @@ void BookmarkView::doUpdateActiveList() {
|
||||||
tvi->type = TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE;
|
tvi->type = TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE;
|
||||||
tvi->demod = demod_i;
|
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);
|
m_treeView->SetItemData(itm, tvi);
|
||||||
|
|
||||||
if (activeDemodulator) {
|
if (activeDemodulator) {
|
||||||
|
@ -310,7 +315,7 @@ void BookmarkView::activeSelection(DemodulatorInstance *dsel) {
|
||||||
m_frequencyVal->SetLabelText(frequencyToStr(dsel->getFrequency()));
|
m_frequencyVal->SetLabelText(frequencyToStr(dsel->getFrequency()));
|
||||||
m_bandwidthVal->SetLabelText(frequencyToStr(dsel->getBandwidth()));
|
m_bandwidthVal->SetLabelText(frequencyToStr(dsel->getBandwidth()));
|
||||||
m_modulationVal->SetLabelText(dsel->getDemodulatorType());
|
m_modulationVal->SetLabelText(dsel->getDemodulatorType());
|
||||||
m_labelText->SetValue(dsel->getLabel());
|
m_labelText->SetValue(dsel->getDemodulatorUserLabel());
|
||||||
|
|
||||||
hideProps();
|
hideProps();
|
||||||
|
|
||||||
|
@ -607,11 +612,15 @@ void BookmarkView::onTreeBeginDrag( wxTreeEvent& event ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool bAllow = false;
|
bool bAllow = false;
|
||||||
std::string dragItemName;
|
std::wstring dragItemName;
|
||||||
|
|
||||||
if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) {
|
if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) {
|
||||||
bAllow = true;
|
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) {
|
} else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {
|
||||||
bAllow = true;
|
bAllow = true;
|
||||||
dragItemName = tvi->bookmarkEnt->label;
|
dragItemName = tvi->bookmarkEnt->label;
|
||||||
|
|
Loading…
Reference in New Issue