<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9833e279329e61a8dd38ce0903bf76b4335a3022">https://github.com/macports/macports-ports/commit/9833e279329e61a8dd38ce0903bf76b4335a3022</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9833e279329e61a8dd38ce0903bf76b4335a3022
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Oct 16 10:50:52 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gqrx: update version to 2.13
</span>---
science/gqrx/Portfile | 41 +++++-----
...xperimental.patch => experimental_stable.patch} | 88 +++++++++++-----------
2 files changed, 68 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gqrx/Portfile b/science/gqrx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2afa33e03b..60d9ac57970 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gqrx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gqrx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,11 @@ homepage http://gqrx.dk/
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup csete gqrx 2.12.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0cef770c446df9be17837d57f60df6687697c6f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9b12c64f98892781b45b83d8d145fc8bcb44cdecec759326a3f3cbf90a52c7d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1334901
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup csete gqrx 2.13 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d480682fd280b784ec50a435df41b24e60a3e585 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 92d3907ebe0ef63db4f0d106d576b6086ff232181c18e000ca2bdbda564a0b8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1340084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> epoch 1
conflicts gqrx-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,19 +47,6 @@ subport gqrx-devel {
</span> This port is kept up with the Gqrx GIT 'master' branch, is \
typically updated weekly to monthly.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant experimental description "add experimental features to ${name}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- experimental.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The experimental variant enable the following features:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add Band Plan to bottom of FFT (see https://github.com/csete/gqrx/pull/767)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pressing F moves focus to frequency widget
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add support for DX Cluster server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- improved noise blankers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +70,24 @@ variant iqbal description "Enable automatic I/Q phase and gain correction with g
</span> port:gr-iqbalance
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant experimental description "add experimental features to ${name}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ experimental_stable.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ experimental_devel.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The experimental variant enable the following features:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add Band Plan to bottom of FFT (see https://github.com/csete/gqrx/pull/767)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pressing F moves focus to frequency widget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add support for DX Cluster server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- improved noise blankers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> app.create yes
app.name Gqrx
app.executable gqrx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gqrx/files/experimental.patch b/science/gqrx/files/experimental_stable.patch
</span>similarity index 97%
rename from science/gqrx/files/experimental.patch
rename to science/gqrx/files/experimental_stable.patch
<span style='display:block; white-space:pre;color:#808080;'>index 591c6dff20d..d6483f012c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gqrx/files/experimental.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gqrx/files/experimental_stable.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> diff --git gqrx.pro gqrx.pro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index cae9bb6..49addf7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb8cfc9..1414e2d 100644
</span> --- gqrx.pro
+++ gqrx.pro
@@ -123,6 +123,7 @@ SOURCES += \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ index cae9bb6..49addf7 100644
</span> # Use pulseaudio (ps: could use equals? undocumented)
equals(AUDIO_BACKEND, "pulseaudio"): {
diff --git src/applications/gqrx/mainwindow.cpp src/applications/gqrx/mainwindow.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index b6e9407..a669580 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4dda559..3f07580 100644
</span> --- src/applications/gqrx/mainwindow.cpp
+++ src/applications/gqrx/mainwindow.cpp
@@ -48,6 +48,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +112,7 @@ index b6e9407..a669580 100644
</span> setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
setCorner(Qt::BottomLeftCorner, Qt::BottomDockWidgetArea);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,6 +251,7 @@ MainWindow::MainWindow(const QString cfgfile, bool edit_conf, QWidget *parent) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -237,6 +252,7 @@ MainWindow::MainWindow(const QString cfgfile, bool edit_conf, QWidget *parent) :
</span> connect(uiDockFft, SIGNAL(resetFftZoom()), ui->plotter, SLOT(resetHorizontalZoom()));
connect(uiDockFft, SIGNAL(gotoFftCenter()), ui->plotter, SLOT(moveToCenterFreq()));
connect(uiDockFft, SIGNAL(gotoDemodFreq()), ui->plotter, SLOT(moveToDemodFreq()));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +120,7 @@ index b6e9407..a669580 100644
</span> connect(uiDockFft, SIGNAL(wfColormapChanged(const QString)), ui->plotter, SLOT(setWfColormap(const QString)));
connect(uiDockFft, SIGNAL(wfColormapChanged(const QString)), uiDockAudio, SLOT(setWfColormap(const QString)));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -259,6 +275,9 @@ MainWindow::MainWindow(const QString cfgfile, bool edit_conf, QWidget *parent) :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,6 +276,9 @@ MainWindow::MainWindow(const QString cfgfile, bool edit_conf, QWidget *parent) :
</span> connect(uiDockBookmarks, SIGNAL(newBookmarkActivated(qint64, QString, int)), this, SLOT(onBookmarkActivated(qint64, QString, int)));
connect(uiDockBookmarks->actionAddBookmark, SIGNAL(triggered()), this, SLOT(on_actionAddBookmark_triggered()));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +130,7 @@ index b6e9407..a669580 100644
</span>
// I/Q playback
connect(iq_tool, SIGNAL(startRecording(QString)), this, SLOT(startIqRecording(QString)));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,6 +367,9 @@ MainWindow::~MainWindow()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,6 +368,9 @@ MainWindow::~MainWindow()
</span> audio_fft_timer->stop();
delete audio_fft_timer;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@ index b6e9407..a669580 100644
</span> if (m_settings)
{
m_settings->setValue("configversion", 2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,6 +392,7 @@ MainWindow::~MainWindow()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -371,6 +393,7 @@ MainWindow::~MainWindow()
</span> }
delete iq_tool;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@ index b6e9407..a669580 100644
</span> delete ui;
delete uiDockRxOpt;
delete uiDockAudio;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -591,6 +614,7 @@ bool MainWindow::loadConfig(const QString cfgfile, bool check_crash,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,6 +615,7 @@ bool MainWindow::loadConfig(const QString cfgfile, bool check_crash,
</span> uiDockRxOpt->readSettings(m_settings);
uiDockFft->readSettings(m_settings);
uiDockAudio->readSettings(m_settings);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,7 +156,7 @@ index b6e9407..a669580 100644
</span>
{
int64_val = m_settings->value("input/frequency", 14236000).toLongLong(&conv_ok);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -710,6 +734,7 @@ void MainWindow::storeSession()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,6 +735,7 @@ void MainWindow::storeSession()
</span>
remote->saveSettings(m_settings);
iq_tool->saveSettings(m_settings);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +164,7 @@ index b6e9407..a669580 100644
</span>
{
int flo, fhi;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2056,6 +2081,11 @@ void MainWindow::afsk1200win_closed()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2066,6 +2091,11 @@ void MainWindow::afsk1200win_closed()
</span> dec_afsk1200 = 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +176,7 @@ index b6e9407..a669580 100644
</span>
/**
* Cyclic processing for acquiring samples from receiver and processing them
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2335,3 +2365,19 @@ void MainWindow::on_actionAddBookmark_triggered()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2345,3 +2375,19 @@ void MainWindow::on_actionAddBookmark_triggered()
</span> ui->plotter->updateOverlay();
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +197,7 @@ index b6e9407..a669580 100644
</span> + ui->freqCtrl->setFrequencyFocus();
+}
diff --git src/applications/gqrx/mainwindow.h src/applications/gqrx/mainwindow.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index de45c6b..38f15c4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 91e8d37..80f4fda 100644
</span> --- src/applications/gqrx/mainwindow.h
+++ src/applications/gqrx/mainwindow.h
@@ -32,6 +32,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,7 +242,7 @@ index de45c6b..38f15c4 100644
</span>
private slots:
/* rf */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,6 +208,9 @@ private slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,6 +209,9 @@ private slots:
</span> /* Bookmarks */
void onBookmarkActivated(qint64 freq, QString demod, int bandwidth);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,7 +252,7 @@ index de45c6b..38f15c4 100644
</span> /* menu and toolbar actions */
void on_actionDSP_triggered(bool checked);
int on_actionIoConfig_triggered();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -218,6 +228,7 @@ private slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,6 +229,7 @@ private slots:
</span> void on_actionAbout_triggered();
void on_actionAboutQt_triggered();
void on_actionAddBookmark_triggered();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +260,7 @@ index de45c6b..38f15c4 100644
</span>
/* window close signals */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,6 +241,7 @@ private slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,6 +242,7 @@ private slots:
</span> void iqFftTimeout();
void audioFftTimeout();
void rdsTimeout();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1632,7 +1632,7 @@ index 5d8fb7f..b888cd1 100644
</span>
private:
diff --git src/qtgui/dockfft.ui src/qtgui/dockfft.ui
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 033cc19..749eaaf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d353b66..795f4d7 100644
</span> --- src/qtgui/dockfft.ui
+++ src/qtgui/dockfft.ui
@@ -851,7 +851,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2229,10 +2229,10 @@ index 0000000..c7b0d00
</span> +
+#endif // DXC_SPOTS_H
diff --git src/qtgui/freqctrl.cpp src/qtgui/freqctrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed419ed..d9dd132 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fde84e0..f1ad3e7 100644
</span> --- src/qtgui/freqctrl.cpp
+++ src/qtgui/freqctrl.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -484,6 +484,7 @@ void CFreqCtrl::keyPressEvent(QKeyEvent *event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -486,6 +486,7 @@ void CFreqCtrl::keyPressEvent(QKeyEvent *event)
</span> // call base class if dont over ride key
bool fSkipMsg = false;
qint64 tmp;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2240,7 +2240,7 @@ index ed419ed..d9dd132 100644
</span>
// qDebug() <<event->key();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -849,3 +850,16 @@ void CFreqCtrl::cursorEnd()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -851,3 +852,16 @@ void CFreqCtrl::cursorEnd()
</span> center()));
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2258,10 +2258,10 @@ index ed419ed..d9dd132 100644
</span> + mouseMoveEvent(mouseEvent);
+}
diff --git src/qtgui/freqctrl.h src/qtgui/freqctrl.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 08143ab..adeea2a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 71240eb..ff30397 100644
</span> --- src/qtgui/freqctrl.h
+++ src/qtgui/freqctrl.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,6 +56,7 @@ signals:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,6 +61,7 @@ signals:
</span>
public slots:
void setFrequency(qint64 freq);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2270,7 +2270,7 @@ index 08143ab..adeea2a 100644
</span> protected:
void paintEvent(QPaintEvent *);
diff --git src/qtgui/plotter.cpp src/qtgui/plotter.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a9d9cff..aaf5950 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 30e2e9a..5a96516 100644
</span> --- src/qtgui/plotter.cpp
+++ src/qtgui/plotter.cpp
@@ -64,7 +64,9 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2283,7 +2283,7 @@ index a9d9cff..aaf5950 100644
</span>
// Comment out to enable plotter debug messages
//#define PLOTTER_DEBUG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,6 +86,9 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,6 +88,9 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
</span> #define PLOTTER_FILTER_BOX_COLOR 0xFFA0A0A4
// FIXME: Should cache the QColors also
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2293,17 +2293,18 @@ index a9d9cff..aaf5950 100644
</span> static inline bool val_is_out_of_range(float val, float min, float max)
{
return (val < min || val > max);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +151,9 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,8 +153,10 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span>
m_FilterBoxEnabled = true;
m_CenterLineEnabled = true;
+ m_BandPlanEnabled = true;
m_BookmarksEnabled = true;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_InvertScrolling = false;
</span> + m_DXCSpotsEnabled = true;
m_Span = 96000;
m_SampleFreq = 96000;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,6 +175,7 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,6 +178,7 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span> m_Percent2DScreen = 35; //percent of screen used for 2D display
m_VdivDelta = 30;
m_HdivDelta = 70;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2311,7 +2312,7 @@ index a9d9cff..aaf5950 100644
</span>
m_FreqDigits = 3;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,17 +222,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,17 +225,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span> bool onTag = false;
if(pt.y() < 15 * 10) // FIXME
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2336,7 +2337,7 @@ index a9d9cff..aaf5950 100644
</span> }
else if (isPointCloseTo(pt.x(), m_DemodFreqX, m_CursorCaptureDelta))
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,10 +297,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,10 +300,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span> m_CursorCaptured = NOCAP;
}
if (m_TooltipsEnabled)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2361,7 +2362,7 @@ index a9d9cff..aaf5950 100644
</span> }
m_GrabPosition = 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -687,13 +708,13 @@ void CPlotter::mousePressEvent(QMouseEvent * event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -692,13 +713,13 @@ void CPlotter::mousePressEvent(QMouseEvent * event)
</span> resetHorizontalZoom();
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2379,7 +2380,7 @@ index a9d9cff..aaf5950 100644
</span> emit newDemodFreq(m_DemodCenterFreq, m_DemodCenterFreq - m_CenterFreq);
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1271,8 +1292,7 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1277,8 +1298,7 @@ void CPlotter::drawOverlay()
</span> painter.setBrush(Qt::SolidPattern);
painter.fillRect(0, 0, w, h, QColor(PLOTTER_BGD_COLOR));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2388,8 +2389,8 @@ index a9d9cff..aaf5950 100644
</span> + QList<BookmarkInfo> tags;
// X and Y axis areas
<span style='display:block; white-space:pre;background:#ffe0e0;'>- m_YAxisWidth = metrics.width("XXXX") + 2 * HOR_MARGIN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1281,25 +1301,47 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_YAxisWidth = metrics.boundingRect("XXXX").width() + 2 * HOR_MARGIN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1287,25 +1307,47 @@ void CPlotter::drawOverlay()
</span> int xAxisTop = h - xAxisHeight;
int fLabelTop = xAxisTop + VER_MARGIN;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2443,7 +2444,7 @@ index a9d9cff..aaf5950 100644
</span> #endif
int level = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1319,9 +1361,9 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1325,9 +1367,9 @@ void CPlotter::drawOverlay()
</span> const auto levelNHeightBottom = levelNHeight + fontHeight;
const auto levelNHeightBottomSlant = levelNHeightBottom + slant;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2455,7 +2456,7 @@ index a9d9cff..aaf5950 100644
</span> color.setAlpha(0x60);
// Vertical line
painter.setPen(QPen(color, 1, Qt::DashLine));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1340,10 +1382,85 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1346,10 +1388,85 @@ void CPlotter::drawOverlay()
</span> painter.setPen(QPen(color, 2, Qt::SolidLine));
painter.drawText(x + slant, levelNHeight, nameWidth,
fontHeight, Qt::AlignVCenter | Qt::AlignHCenter,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2542,7 +2543,7 @@ index a9d9cff..aaf5950 100644
</span> if (m_CenterLineEnabled)
{
x = xFromFreq(m_CenterFreq);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1515,7 +1632,7 @@ void CPlotter::makeFrequencyStrs()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1521,7 +1638,7 @@ void CPlotter::makeFrequencyStrs()
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2551,7 +2552,7 @@ index a9d9cff..aaf5950 100644
</span> int CPlotter::xFromFreq(qint64 freq)
{
int w = m_OverlayPixmap.width();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1528,7 +1645,7 @@ int CPlotter::xFromFreq(qint64 freq)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1534,7 +1651,7 @@ int CPlotter::xFromFreq(qint64 freq)
</span> return x;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2560,7 +2561,7 @@ index a9d9cff..aaf5950 100644
</span> qint64 CPlotter::freqFromX(int x)
{
int w = m_OverlayPixmap.width();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1674,6 +1791,12 @@ void CPlotter::setPeakDetection(bool enabled, float c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1680,6 +1797,12 @@ void CPlotter::setPeakDetection(bool enabled, float c)
</span> m_PeakDetection = c;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2574,19 +2575,19 @@ index a9d9cff..aaf5950 100644
</span> {
#ifdef PLOTTER_DEBUG
diff --git src/qtgui/plotter.h src/qtgui/plotter.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index f4cb362..aa70fad 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bb765be..db17811 100644
</span> --- src/qtgui/plotter.h
+++ src/qtgui/plotter.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,8 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void setCenterLineEnabled(bool enabled) { m_CenterLineEnabled = enabled; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,8 @@ public:
</span> void setTooltipsEnabled(bool enabled) { m_TooltipsEnabled = enabled; }
void setBookmarksEnabled(bool enabled) { m_BookmarksEnabled = enabled; }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ void setInvertScrolling(bool enabled) { m_InvertScrolling = enabled; }
</span> + void setDXCSpotsEnabled(bool enabled) { m_DXCSpotsEnabled = enabled; }
+ void setBandPlanEnabled(bool enabled) { m_BandPlanEnabled = enabled; }
void setNewFftData(float *fftData, int size);
void setNewFftData(float *fftData, float *wfData, int size);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +148,7 @@ public slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,6 +149,7 @@ public slots:
</span> void setPandapterRange(float min, float max);
void setWaterfallRange(float min, float max);
void setPeakDetection(bool enabled, float c);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2594,7 +2595,7 @@ index f4cb362..aa70fad 100644
</span> void updateOverlay();
void setPercent2DScreen(int percent)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,7 +175,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +176,7 @@ private:
</span> RIGHT,
YAXIS,
XAXIS,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2603,7 +2604,7 @@ index f4cb362..aa70fad 100644
</span> };
void drawOverlay();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,8 +226,10 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,9 +227,11 @@ private:
</span> qint64 m_FreqPerDiv;
bool m_CenterLineEnabled; /*!< Distinguish center line. */
bool m_FilterBoxEnabled; /*!< Draw filter box. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2611,11 +2612,12 @@ index f4cb362..aa70fad 100644
</span> + bool m_TooltipsEnabled; /*!< Tooltips enabled */
+ bool m_BandPlanEnabled; /*!< Show/hide band plan on spectrum */
bool m_BookmarksEnabled; /*!< Show/hide bookmarks on spectrum */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool m_InvertScrolling;
</span> + bool m_DXCSpotsEnabled; /*!< Show/hide DXC Spots on spectrum */
int m_DemodHiCutFreq;
int m_DemodLowCutFreq;
int m_DemodFreqX; //screen coordinate x position
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -261,6 +266,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -263,6 +268,7 @@ private:
</span> QFont m_Font; /*!< Font used for plotter (system font) */
int m_HdivDelta; /*!< Minimum distance in pixels between two horizontal grid lines (vertical division). */
int m_VdivDelta; /*!< Minimum distance in pixels between two vertical grid lines (horizontal division). */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2623,7 +2625,7 @@ index f4cb362..aa70fad 100644
</span>
quint32 m_LastSampleRate;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -270,7 +276,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,7 +278,7 @@ private:
</span> float m_PeakDetection;
QMap<int,int> m_Peaks;
</pre><pre style='margin:0'>
</pre>