w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-13 14:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Filter general working frequencies in FreqCal mode

Browse Source 
Allow band  drop down list to  be used to select  FreqCal frequencies,
also  resets position  in automatic  cycle. Tidy  up some  unnecessary
code.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7486 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2017-01-12 21:03:30 +00:00
parent ba3087adf8
commit 72a26a8055
4 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FrequencyList.cpp
+18 -3
View File
@@ -310,7 +310,9 @@ bool FrequencyList::filterAcceptsRow (int source_row, QModelIndex const& /* pare
if (m_->mode_filter_ != Modes::NULL_MODE)
{
auto const& item = m_->frequency_list_[source_row];
result = item.mode_ == Modes::NULL_MODE || m_->mode_filter_ == item.mode_;
// we pass NULL_MODE mode rows unless filtering for FreqCal mode
result = (Modes::NULL_MODE == item.mode_ && m_->mode_filter_ != Modes::FreqCal)
|| m_->mode_filter_ == item.mode_;
}
return result;
}
@@ -610,16 +612,29 @@ auto FrequencyList::const_iterator::operator ++ () -> const_iterator&
return *this;
}
auto FrequencyList::begin () const -> FrequencyList::const_iterator
auto FrequencyList::begin () const -> const_iterator
{
return const_iterator (this, 0);
}
auto FrequencyList::end () const -> FrequencyList::const_iterator
auto FrequencyList::end () const -> const_iterator
{
return const_iterator (this, rowCount ());
}
auto FrequencyList::find (Frequency f) const -> const_iterator
{
int row {0};
for (; row < rowCount (); ++row)
{
if (m_->frequency_list_[mapToSource (index (row, 0)).row ()].frequency_ == f)
{
break;
}
}
return const_iterator (this, row);
}
auto FrequencyList::filtered_bands () const -> BandSet
{
BandSet result;