Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bandplan stacking and dynamic bookmark levels #1156

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bandplan stacking and dynamic bookmark levels #1156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5fb0cc
Bandplan stacking and dynamic bookmark levels
shawnj007 Oct 30, 2022
18bc530
Remove unnecessary capture
shawnj007 Nov 16, 2022
293e41e
move sort logic to bandplan.h
shawnj007 Nov 16, 2022
a2aeaf1
remove redundant setRect() call
shawnj007 Nov 16, 2022
e157893
Fix bandplan.csv extra commas
shawnj007 Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/qtgui/bandplan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ struct BandInfo

bool operator<(const BandInfo &other) const
{
if (minFrequency == other.minFrequency)
{
if (maxFrequency != other.maxFrequency)
return maxFrequency > other.maxFrequency;
else
return name < other.name;
}
return minFrequency < other.minFrequency;
}
};
Expand Down
22 changes: 9 additions & 13 deletions src/qtgui/plotter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,12 +751,12 @@ void CPlotter::zoomStepX(float step, int x)
qint64 new_FftCenter;
if( limit_hit ) // cannot keep fixed_hz fixed
{
new_FftCenter = qRound64((f_min + f_max) / 2.0) - m_CenterFreq;
new_FftCenter = qRound64((f_min + f_max) / 2.0) - m_CenterFreq;
shawnj007 marked this conversation as resolved.
Show resolved Hide resolved
}
else // calculate new FFT center frequency that really keeps fixed_hz fixed
{
qint64 wouldbe_hz = (m_CenterFreq + m_FftCenter - new_span / 2) + ratio * new_span;
new_FftCenter = m_FftCenter + (fixed_hz - wouldbe_hz);
qint64 wouldbe_hz = (m_CenterFreq + m_FftCenter - new_span / 2) + ratio * new_span;
new_FftCenter = m_FftCenter + (fixed_hz - wouldbe_hz);
}
setFftCenterFreq(new_FftCenter);
setSpanFreq(new_span);
Expand Down Expand Up @@ -1299,6 +1299,7 @@ void CPlotter::drawOverlay()
static const int slant = 5;
static const int levelHeight = fontHeight + 5;
int nLevels = h / (levelHeight + slant);
shawnj007 marked this conversation as resolved.
Show resolved Hide resolved

if (m_BookmarksEnabled)
{
tags = Bookmarks::Get().getBookmarksInRange(m_CenterFreq + m_FftCenter - m_Span / 2,
Expand Down Expand Up @@ -1375,19 +1376,12 @@ void CPlotter::drawOverlay()
{
QList<BandInfo> bands = BandPlan::Get().getBandsInRange(m_CenterFreq + m_FftCenter - m_Span / 2,
m_CenterFreq + m_FftCenter + m_Span / 2);

int bandLevel = 0;
qint64 last_max = 0;
qint64 last_max_0 = 0;

std::sort(bands.begin(), bands.end(), [=]( const BandInfo& band1 , const BandInfo& band2 )->bool {
if (band1.minFrequency == band2.minFrequency) {
if (band1.maxFrequency != band2.maxFrequency)
return band1.maxFrequency > band2.maxFrequency;
else
return band1.name < band2.name;
}
return band1.minFrequency < band2.minFrequency;
});

std::sort(bands.begin(), bands.end());

for (auto & band : bands)
{
Expand All @@ -1406,8 +1400,10 @@ void CPlotter::drawOverlay()
int band_right = xFromFreq(band.maxFrequency);
int band_width = band_right - band_left;
int band_bottom = bandLevel * m_BandPlanHeight;

rect.setRect(band_left, xAxisTop - m_BandPlanHeight + band_bottom, band_width, m_BandPlanHeight);
painter.fillRect(rect, band.color);

QString band_label = band.name + " (" + band.modulation + ")";
int textWidth = metrics.boundingRect(band_label).width();
if (band_left < w && band_width > textWidth + 20)
Expand Down