<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/cfad0a5c4b2d34ce598e9b9702c81054d1453d4e">https://github.com/macports/macports-ports/commit/cfad0a5c4b2d34ce598e9b9702c81054d1453d4e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cfad0a5c4b2d34ce598e9b9702c81054d1453d4e
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Mon Oct 26 12:43:13 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> gqrx: update version to 2.13.2
</span>---
science/gqrx/Portfile | 8 +-
science/gqrx/files/experimental_stable.patch | 109 +++++++++++++--------------
2 files changed, 55 insertions(+), 62 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 596a60cc1ed..95a1179bfe3 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,10 +22,10 @@ homepage http://gqrx.dk/
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup csete gqrx 2.13 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d480682fd280b784ec50a435df41b24e60a3e585 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 92d3907ebe0ef63db4f0d106d576b6086ff232181c18e000ca2bdbda564a0b8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1340084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup csete gqrx 2.13.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7a1cd6eb4dbf541e96aa32e02381dcf03e8c8d9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0194b22024b047cca7ec96831fa88c56a0107a2aded35e3d506c7562f5b21732 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1344628
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gqrx/files/experimental_stable.patch b/science/gqrx/files/experimental_stable.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d6483f012c2..7d19871eabd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gqrx/files/experimental_stable.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 bb8cfc9..1414e2d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 905a454..6150a42 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 bb8cfc9..1414e2d 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 4dda559..3f07580 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b6a5d23..729a743 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;'>@@ -308,7 +308,7 @@ index 0fb1f36..dc39a81 100644
</span> <layoutdefault spacing="6" margin="11"/>
<customwidgets>
diff --git src/dsp/rx_noise_blanker_cc.cpp src/dsp/rx_noise_blanker_cc.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index c8e2447..ae9fd2b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7abdad9..2001ffb 100644
</span> --- src/dsp/rx_noise_blanker_cc.cpp
+++ src/dsp/rx_noise_blanker_cc.cpp
@@ -26,6 +26,14 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,10 +337,11 @@ index c8e2447..ae9fd2b 100644
</span> d_nb1_on(false),
d_nb2_on(false),
d_sample_rate(sample_rate),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,10 +60,293 @@ rx_nb_cc::rx_nb_cc(double sample_rate, float thld1, float thld2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,10 +61,294 @@ rx_nb_cc::rx_nb_cc(double sample_rate, float thld1, float thld2)
</span> d_hangtime(0)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- memset(d_delay, 0, 8 * sizeof(gr_complex));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memset(d_delay, 0, 8 * sizeof(gr_complex));
</span> +
+
+ // Init nb1 params
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -631,7 +632,7 @@ index c8e2447..ae9fd2b 100644
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,30 +359,38 @@ int rx_nb_cc::work(int noutput_items,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,30 +361,38 @@ int rx_nb_cc::work(int noutput_items,
</span> gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -641,7 +642,7 @@ index c8e2447..ae9fd2b 100644
</span> + float *out = (float *) output_items[0];
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::mutex::scoped_lock lock(d_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::lock_guard<std::mutex> lock(d_mutex);
</span>
// copy data into output buffer then perform the processing on that buffer
- for (i = 0; i < noutput_items; i++)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -682,7 +683,7 @@ index c8e2447..ae9fd2b 100644
</span> /*! \brief Perform noise blanker 1 processing.
* \param buf The data buffer holding gr_complex samples.
* \param num The number of samples in the buffer.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,35 +400,156 @@ int rx_nb_cc::work(int noutput_items,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,35 +402,156 @@ int rx_nb_cc::work(int noutput_items,
</span> *
* FIXME: Needs different constants for higher sample rates?
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -854,7 +855,7 @@ index c8e2447..ae9fd2b 100644
</span> /*! \brief Perform noise blanker 2 processing.
* \param buf The data buffer holding gr_complex samples.
* \param num The number of samples in the buffer.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,21 +559,246 @@ void rx_nb_cc::process_nb1(gr_complex *buf, int num)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,21 +561,246 @@ void rx_nb_cc::process_nb1(gr_complex *buf, int num)
</span> *
* FIXME: Needs different constants for higher sample rates?
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1114,18 +1115,19 @@ index c8e2447..ae9fd2b 100644
</span>
void rx_nb_cc::set_threshold1(float threshold)
diff --git src/dsp/rx_noise_blanker_cc.h src/dsp/rx_noise_blanker_cc.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8b4907e..a99924b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f532c84..c8e9b02 100644
</span> --- src/dsp/rx_noise_blanker_cc.h
+++ src/dsp/rx_noise_blanker_cc.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mutex>
</span> #include <gnuradio/sync_block.h>
#include <gnuradio/gr_complex.h>
+#include <gnuradio/fft/fft.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/thread/mutex.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <boost/thread/mutex.hpp>
</span>
class rx_nb_cc;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,22 +61,46 @@ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,22 +66,46 @@ protected:
</span>
public:
~rx_nb_cc();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1175,8 +1177,8 @@ index 8b4907e..a99924b 100644
</span> +
private:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::mutex d_mutex; /*! Used to lock internal data while processing or setting parameters. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,8 +114,145 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::mutex d_mutex; /*! Used to lock internal data while processing or setting parameters. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,8 +119,145 @@ private:
</span> float d_avgmag_nb2; /*! Average magnitude. */
gr_complex d_avgsig, d_delay[8];
int d_delidx, d_sigidx, d_hangtime; // FIXME: need longer buffer for higher sampel rates?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1560,7 +1562,7 @@ index 0000000..115dcda
</span> +
+#endif // BANDPLAN_H
diff --git src/qtgui/dockaudio.cpp src/qtgui/dockaudio.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ff920ec..c20b07e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2748a32..cc95b79 100644
</span> --- src/qtgui/dockaudio.cpp
+++ src/qtgui/dockaudio.cpp
@@ -74,6 +74,7 @@ DockAudio::DockAudio(QWidget *parent) :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1572,10 +1574,10 @@ index ff920ec..c20b07e 100644
</span> ui->audioSpectrum->setVdivDelta(40);
ui->audioSpectrum->setHdivDelta(40);
diff --git src/qtgui/dockfft.cpp src/qtgui/dockfft.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e91cfa1..3ec577f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0bed78b..83be531 100644
</span> --- src/qtgui/dockfft.cpp
+++ src/qtgui/dockfft.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,6 +274,12 @@ void DockFft::saveSettings(QSettings *settings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,6 +275,12 @@ void DockFft::saveSettings(QSettings *settings)
</span> else
settings->remove("db_ranges_locked");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1588,7 +1590,7 @@ index e91cfa1..3ec577f 100644
</span> if (QString::compare(ui->cmapComboBox->currentData().toString(), DEFAULT_COLORMAP))
settings->setValue("waterfall_colormap", ui->cmapComboBox->currentData().toString());
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,6 +352,10 @@ void DockFft::readSettings(QSettings *settings)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,6 +353,10 @@ void DockFft::readSettings(QSettings *settings)
</span> bool_val = settings->value("db_ranges_locked", false).toBool();
ui->lockButton->setChecked(bool_val);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1599,7 +1601,7 @@ index e91cfa1..3ec577f 100644
</span> QString cmap = settings->value("waterfall_colormap", "gqrx").toString();
ui->cmapComboBox->setCurrentIndex(ui->cmapComboBox->findData(cmap));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -522,6 +532,11 @@ void DockFft::on_peakDetectionButton_toggled(bool checked)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -523,6 +533,11 @@ void DockFft::on_peakDetectionButton_toggled(bool checked)
</span> emit peakDetectionToggled(checked);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1632,7 +1634,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 d353b66..795f4d7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1cdf387..80fd28a 100644
</span> --- src/qtgui/dockfft.ui
+++ src/qtgui/dockfft.ui
@@ -851,7 +851,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2270,10 +2272,10 @@ index 71240eb..ff30397 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 30e2e9a..5a96516 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1240e8e..3734d5c 100644
</span> --- src/qtgui/plotter.cpp
+++ src/qtgui/plotter.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,7 +64,9 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +65,9 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
</span> #include <QtGlobal>
#include <QToolTip>
#include "plotter.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2283,9 +2285,9 @@ index 30e2e9a..5a96516 100644
</span>
// Comment out to enable plotter debug messages
//#define PLOTTER_DEBUG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,6 +88,9 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PLOTTER_FILTER_BOX_COLOR 0xFFA0A0A4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: Should cache the QColors also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,6 +94,9 @@ int F2B(float f)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return b;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
+#define HOR_MARGIN 5
+#define VER_MARGIN 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2293,7 +2295,7 @@ index 30e2e9a..5a96516 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;'>-@@ -148,8 +153,10 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,8 +159,10 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span>
m_FilterBoxEnabled = true;
m_CenterLineEnabled = true;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2304,7 +2306,7 @@ index 30e2e9a..5a96516 100644
</span>
m_Span = 96000;
m_SampleFreq = 96000;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,6 +178,7 @@ CPlotter::CPlotter(QWidget *parent) : QFrame(parent)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,6 +184,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;'>@@ -2312,7 +2314,7 @@ index 30e2e9a..5a96516 100644
</span>
m_FreqDigits = 3;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,17 +225,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -223,17 +231,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;'>@@ -2337,13 +2339,13 @@ index 30e2e9a..5a96516 100644
</span> }
else if (isPointCloseTo(pt.x(), m_DemodFreqX, m_CursorCaptureDelta))
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,10 +300,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,10 +306,20 @@ void CPlotter::mouseMoveEvent(QMouseEvent* event)
</span> m_CursorCaptured = NOCAP;
}
if (m_TooltipsEnabled)
- QToolTip::showText(event->globalPos(),
- QString("F: %1 kHz")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- .arg(freqFromX(pt.x())/1.e3f, 0, 'f', 3),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .arg(freqFromX(pt.x())/1.e3f, 0, 'f', 3),
</span> - this);
+ {
+ qint64 hoverFrequency = freqFromX(pt.x());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2362,7 +2364,7 @@ index 30e2e9a..5a96516 100644
</span> }
m_GrabPosition = 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -692,13 +713,13 @@ void CPlotter::mousePressEvent(QMouseEvent * event)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -698,13 +719,13 @@ void CPlotter::mousePressEvent(QMouseEvent * event)
</span> resetHorizontalZoom();
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2380,7 +2382,7 @@ index 30e2e9a..5a96516 100644
</span> emit newDemodFreq(m_DemodCenterFreq, m_DemodCenterFreq - m_CenterFreq);
break;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1277,8 +1298,7 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1282,8 +1303,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;'>@@ -2390,7 +2392,7 @@ index 30e2e9a..5a96516 100644
</span>
// X and Y axis areas
m_YAxisWidth = metrics.boundingRect("XXXX").width() + 2 * HOR_MARGIN;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1287,25 +1307,47 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1292,25 +1312,47 @@ void CPlotter::drawOverlay()
</span> int xAxisTop = h - xAxisHeight;
int fLabelTop = xAxisTop + VER_MARGIN;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2444,7 +2446,7 @@ index 30e2e9a..5a96516 100644
</span> #endif
int level = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1325,9 +1367,9 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1330,9 +1372,9 @@ void CPlotter::drawOverlay()
</span> const auto levelNHeightBottom = levelNHeight + fontHeight;
const auto levelNHeightBottomSlant = levelNHeightBottom + slant;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2456,15 +2458,15 @@ index 30e2e9a..5a96516 100644
</span> color.setAlpha(0x60);
// Vertical line
painter.setPen(QPen(color, 1, Qt::DashLine));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1346,10 +1388,85 @@ void CPlotter::drawOverlay()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1351,10 +1393,85 @@ void CPlotter::drawOverlay()
</span> painter.setPen(QPen(color, 2, Qt::SolidLine));
painter.drawText(x + slant, levelNHeight, nameWidth,
fontHeight, Qt::AlignVCenter | Qt::AlignHCenter,
- bookmarks[i].name);
+ tags[i].name);
<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><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> + if (m_BandPlanEnabled)
+ {
+ QList<BandInfo> bands = BandPlan::Get().getBandsInRange(m_CenterFreq + m_FftCenter - m_Span / 2,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2486,9 +2488,9 @@ index 30e2e9a..5a96516 100644
</span> + painter.setPen(QColor(PLOTTER_TEXT_COLOR));
+ painter.drawText(rect, Qt::AlignCenter, band_label);
+ }
<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><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> +/*
+ if (m_DXCSpotsEnabled)
+ {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2543,16 +2545,7 @@ index 30e2e9a..5a96516 100644
</span> if (m_CenterLineEnabled)
{
x = xFromFreq(m_CenterFreq);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1521,7 +1638,7 @@ void CPlotter::makeFrequencyStrs()
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Convert from screen coordinate to frequency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Convert from frequency to screen coordinate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int CPlotter::xFromFreq(qint64 freq)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int w = m_OverlayPixmap.width();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1534,7 +1651,7 @@ int CPlotter::xFromFreq(qint64 freq)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1539,7 +1656,7 @@ int CPlotter::xFromFreq(qint64 freq)
</span> return x;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2560,8 +2553,8 @@ index 30e2e9a..5a96516 100644
</span> +// Convert from screen coordinate to frequency
qint64 CPlotter::freqFromX(int x)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int w = m_OverlayPixmap.width();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1680,6 +1797,12 @@ void CPlotter::setPeakDetection(bool enabled, float c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qint64 w = m_OverlayPixmap.width();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1685,6 +1802,12 @@ void CPlotter::setPeakDetection(bool enabled, float c)
</span> m_PeakDetection = c;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2635,7 +2628,7 @@ index bb765be..db17811 100644
</span> // Waterfall averaging
quint64 tlast_wf_ms; // last time waterfall has been updated
diff --git src/receivers/nbrx.cpp src/receivers/nbrx.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9370c70..fa1507c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c775dba..7687b7a 100644
</span> --- src/receivers/nbrx.cpp
+++ src/receivers/nbrx.cpp
@@ -63,8 +63,7 @@ nbrx::nbrx(float quad_rate, float audio_rate)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2752,7 +2745,7 @@ index 9370c70..fa1507c 100644
</span> }
}
diff --git src/receivers/nbrx.h src/receivers/nbrx.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1aa845c..a57909d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2e76738..ac3e2c1 100644
</span> --- src/receivers/nbrx.h
+++ src/receivers/nbrx.h
@@ -36,6 +36,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2763,7 +2756,7 @@ index 1aa845c..a57909d 100644
</span>
class nbrx;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,6 +123,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,6 +127,7 @@ private:
</span> gr::analog::simple_squelch_cc::sptr sql; /*!< Squelch. */
gr::blocks::complex_to_float::sptr demod_raw; /*!< Raw I/Q passthrough. */
gr::blocks::complex_to_real::sptr demod_ssb; /*!< SSB demodulator. */
</pre><pre style='margin:0'>
</pre>