(.*?)<\\/div>", QRegularExpression::DotMatchesEverythingOption);
+ html.replace(divName, "\\1");
+
QRegularExpression div("
(.*?)<\\/div>", QRegularExpression::DotMatchesEverythingOption);
QRegularExpressionMatchIterator divItr = div.globalMatch(html);
diff --git a/sdrbase/util/sdrangelserverlist.cpp b/sdrbase/util/sdrangelserverlist.cpp
new file mode 100644
index 0000000000..eed5e9cd6d
--- /dev/null
+++ b/sdrbase/util/sdrangelserverlist.cpp
@@ -0,0 +1,186 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE
//
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include "sdrangelserverlist.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+SDRangelServerList::SDRangelServerList()
+{
+ m_networkManager = new QNetworkAccessManager();
+ QObject::connect(m_networkManager, &QNetworkAccessManager::finished, this, &SDRangelServerList::handleReply);
+
+ QStringList locations = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
+ QDir writeableDir(locations[0]);
+ if (!writeableDir.mkpath(QStringLiteral("cache") + QDir::separator() + QStringLiteral("sdrangelserver"))) {
+ qDebug() << "Failed to create cache/sdrangelserver";
+ }
+
+ m_cache = new QNetworkDiskCache();
+ m_cache->setCacheDirectory(locations[0] + QDir::separator() + QStringLiteral("cache") + QDir::separator() + QStringLiteral("sdrangelserver"));
+ m_cache->setMaximumCacheSize(100000000);
+ m_networkManager->setCache(m_cache);
+
+ connect(&m_timer, &QTimer::timeout, this, &SDRangelServerList::update);
+}
+
+SDRangelServerList::~SDRangelServerList()
+{
+ QObject::disconnect(m_networkManager, &QNetworkAccessManager::finished, this, &SDRangelServerList::handleReply);
+ delete m_networkManager;
+}
+
+void SDRangelServerList::getData()
+{
+ QUrl url = QUrl("https://sdrangel.org/websdr/websdrs.json");
+ m_networkManager->get(QNetworkRequest(url));
+}
+
+void SDRangelServerList::getDataPeriodically(int periodInMins)
+{
+ m_timer.setInterval(periodInMins*60*1000);
+ m_timer.start();
+ update();
+}
+
+void SDRangelServerList::update()
+{
+ getData();
+}
+
+void SDRangelServerList::handleReply(QNetworkReply* reply)
+{
+ if (reply)
+ {
+ if (!reply->error())
+ {
+ QString url = reply->url().toEncoded().constData();
+ QByteArray bytes = reply->readAll();
+
+ handleJSON(url, bytes);
+ }
+ else
+ {
+ qDebug() << "SDRangelServerList::handleReply: error: " << reply->error();
+ }
+ reply->deleteLater();
+ }
+ else
+ {
+ qDebug() << "SDRangelServerList::handleReply: reply is null";
+ }
+}
+
+void SDRangelServerList::handleJSON(const QString& url, const QByteArray& bytes)
+{
+ (void) url;
+
+ QList sdrs;
+ QJsonDocument document = QJsonDocument::fromJson(bytes);
+
+ if (document.isArray())
+ {
+ QJsonArray servers = document.array();
+
+ for (auto valRef : servers)
+ {
+ if (valRef.isObject())
+ {
+ QJsonObject serverObj = valRef.toObject();
+ SDRangelServer sdr;
+
+ if (serverObj.contains(QStringLiteral("address"))) {
+ sdr.m_address = serverObj.value(QStringLiteral("address")).toString();
+ }
+ if (serverObj.contains(QStringLiteral("port"))) {
+ sdr.m_port = serverObj.value(QStringLiteral("port")).toInt();
+ }
+ if (serverObj.contains(QStringLiteral("protocol"))) {
+ sdr.m_protocol = serverObj.value(QStringLiteral("protocol")).toString();
+ }
+ if (serverObj.contains(QStringLiteral("minFrequency"))) {
+ sdr.m_minFrequency = serverObj.value(QStringLiteral("minFrequency")).toInt();
+ }
+ if (serverObj.contains(QStringLiteral("maxFrequency"))) {
+ sdr.m_maxFrequency = serverObj.value(QStringLiteral("maxFrequency")).toInt();
+ }
+ if (serverObj.contains(QStringLiteral("maxSampleRate"))) {
+ sdr.m_maxSampleRate = serverObj.value(QStringLiteral("maxSampleRate")).toInt();
+ }
+ if (serverObj.contains(QStringLiteral("device"))) {
+ sdr.m_device = serverObj.value(QStringLiteral("device")).toString();
+ }
+ if (serverObj.contains(QStringLiteral("antenna"))) {
+ sdr.m_antenna = serverObj.value(QStringLiteral("antenna")).toString();
+ }
+ if (serverObj.contains(QStringLiteral("remoteControl"))) {
+ sdr.m_remoteControl = serverObj.value(QStringLiteral("remoteControl")).toInt() == 1;
+ }
+ if (serverObj.contains(QStringLiteral("stationName"))) {
+ sdr.m_stationName = serverObj.value(QStringLiteral("stationName")).toString();
+ }
+ if (serverObj.contains(QStringLiteral("location"))) {
+ sdr.m_location = serverObj.value(QStringLiteral("location")).toString();
+ }
+ if (serverObj.contains(QStringLiteral("latitude"))) {
+ sdr.m_latitude = serverObj.value(QStringLiteral("latitude")).toDouble();
+ }
+ if (serverObj.contains(QStringLiteral("longitude"))) {
+ sdr.m_longitude = serverObj.value(QStringLiteral("longitude")).toDouble();
+ }
+ if (serverObj.contains(QStringLiteral("altitude"))) {
+ sdr.m_altitude = serverObj.value(QStringLiteral("altitude")).toDouble();
+ }
+ if (serverObj.contains(QStringLiteral("isotropic"))) {
+ sdr.m_isotropic = serverObj.value(QStringLiteral("isotropic")).toInt() == 1;
+ }
+ if (serverObj.contains(QStringLiteral("azimuth"))) {
+ sdr.m_azimuth = serverObj.value(QStringLiteral("azimuth")).toDouble();
+ }
+ if (serverObj.contains(QStringLiteral("elevation"))) {
+ sdr.m_elevation = serverObj.value(QStringLiteral("elevation")).toDouble();
+ }
+ if (serverObj.contains(QStringLiteral("clients"))) {
+ sdr.m_clients = serverObj.value(QStringLiteral("clients")).toInt();
+ }
+ if (serverObj.contains(QStringLiteral("maxClients"))) {
+ sdr.m_maxClients = serverObj.value(QStringLiteral("maxClients")).toInt();
+ }
+ if (serverObj.contains(QStringLiteral("timeLimit"))) {
+ sdr.m_timeLimit = serverObj.value(QStringLiteral("timeLimit")).toInt();
+ }
+
+ sdrs.append(sdr);
+ }
+ else
+ {
+ qDebug() << "SDRangelServerList::handleJSON: Element not an object:\n" << valRef;
+ }
+ }
+ }
+ else
+ {
+ qDebug() << "SDRangelServerList::handleJSON: Doc doesn't contain an array:\n" << document;
+ }
+
+ emit dataUpdated(sdrs);
+}
diff --git a/sdrbase/util/sdrangelserverlist.h b/sdrbase/util/sdrangelserverlist.h
new file mode 100644
index 0000000000..9cb08b483d
--- /dev/null
+++ b/sdrbase/util/sdrangelserverlist.h
@@ -0,0 +1,82 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDE_SDRANGELSERVERLIST_H
+#define INCLUDE_SDRANGELSERVERLIST_H
+
+#include
+#include
+
+#include "export.h"
+
+class QNetworkAccessManager;
+class QNetworkReply;
+class QNetworkDiskCache;
+
+// Gets a list of public SDRangel Servers from https://sdrangel.org/websdr/
+class SDRBASE_API SDRangelServerList : public QObject
+{
+ Q_OBJECT
+
+public:
+
+ struct SDRangelServer {
+ QString m_address;
+ quint16 m_port;
+ QString m_protocol;
+ qint64 m_minFrequency;
+ qint64 m_maxFrequency;
+ int m_maxSampleRate;
+ QString m_device;
+ QString m_antenna;
+ bool m_remoteControl;
+ QString m_stationName;
+ QString m_location;
+ float m_latitude;
+ float m_longitude;
+ float m_altitude;
+ bool m_isotropic;
+ float m_azimuth;
+ float m_elevation;
+ int m_clients;
+ int m_maxClients;
+ int m_timeLimit; // In minutes
+ };
+
+ SDRangelServerList();
+ ~SDRangelServerList();
+
+ void getData();
+ void getDataPeriodically(int periodInMins=1);
+
+public slots:
+ void handleReply(QNetworkReply* reply);
+ void update();
+
+signals:
+ void dataUpdated(const QList& sdrs); // Emitted when data are available.
+
+private:
+ QNetworkAccessManager *m_networkManager;
+ QNetworkDiskCache *m_cache;
+ QTimer m_timer; // Timer for periodic updates
+
+ void handleJSON(const QString& url, const QByteArray& bytes);
+
+};
+
+#endif /* INCLUDE_SDRANGELSERVERLIST_H */
diff --git a/sdrbase/util/socket.cpp b/sdrbase/util/socket.cpp
new file mode 100644
index 0000000000..300a04e6f0
--- /dev/null
+++ b/sdrbase/util/socket.cpp
@@ -0,0 +1,193 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include
+
+#include "socket.h"
+
+Socket::Socket(QObject *socket, QObject *parent) :
+ QObject(parent),
+ m_socket(socket)
+{
+}
+
+Socket::~Socket()
+{
+ delete m_socket;
+}
+
+TCPSocket::TCPSocket(QTcpSocket *socket) :
+ Socket(socket)
+{
+}
+
+qint64 TCPSocket::write(const char *data, qint64 length)
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->write(data, length);
+}
+
+qint64 TCPSocket::read(char *data, qint64 length)
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->read(data, length);
+}
+
+QByteArray TCPSocket::readAll()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->readAll();
+}
+
+void TCPSocket::close()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ socket->close();
+}
+
+qint64 TCPSocket::bytesAvailable()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->bytesAvailable();
+}
+
+void TCPSocket::flush()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ socket->flush();
+}
+
+QHostAddress TCPSocket::peerAddress()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->peerAddress();
+}
+
+quint16 TCPSocket::peerPort()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->peerPort();
+}
+
+bool TCPSocket::isConnected()
+{
+ QTcpSocket *socket = qobject_cast(m_socket);
+
+ return socket->state() == QAbstractSocket::ConnectedState;
+}
+
+WebSocket::WebSocket(QWebSocket *socket) :
+ Socket(socket)
+{
+ m_rxBuffer.reserve(64000);
+ m_txBuffer.reserve(64000);
+ connect(socket, &QWebSocket::binaryFrameReceived, this, &WebSocket::binaryFrameReceived);
+}
+
+ qint64 WebSocket::write(const char *data, qint64 length)
+{
+ //QWebSocket *socket = qobject_cast(m_socket);
+ //return socket->sendBinaryMessage(QByteArray(data, length));
+
+ m_txBuffer.append(data, length);
+ return length;
+}
+
+void WebSocket::flush()
+{
+ QWebSocket *socket = qobject_cast(m_socket);
+ if (m_txBuffer.size() > 0)
+ {
+ qint64 len = socket->sendBinaryMessage(m_txBuffer);
+ if (len != m_txBuffer.size()) {
+ qDebug() << "WebSocket::flush: Failed to send all of message" << len << "/" << m_txBuffer.size();
+ }
+ m_txBuffer.clear();
+ }
+ socket->flush();
+}
+
+qint64 WebSocket::read(char *data, qint64 length)
+{
+ length = std::min(length, (qint64)m_rxBuffer.size());
+
+ memcpy(data, m_rxBuffer.constData(), length);
+
+ m_rxBuffer = m_rxBuffer.mid(length); // Yep, not very efficient
+
+ return length;
+}
+
+QByteArray WebSocket::readAll()
+{
+ QByteArray b = m_rxBuffer;
+
+ m_rxBuffer.clear();
+
+ return b;
+}
+
+void WebSocket::close()
+{
+ QWebSocket *socket = qobject_cast(m_socket);
+
+ // Will crash if we call close on unopened socket
+ if (socket->state() != QAbstractSocket::UnconnectedState) {
+ socket->close();
+ }
+}
+
+qint64 WebSocket::bytesAvailable()
+{
+ return m_rxBuffer.size();
+}
+
+void WebSocket::binaryFrameReceived(const QByteArray &frame, bool isLastFrame)
+{
+ (void) isLastFrame;
+
+ m_rxBuffer.append(frame);
+}
+
+QHostAddress WebSocket::peerAddress()
+{
+ QWebSocket *socket = qobject_cast(m_socket);
+
+ return socket->peerAddress();
+}
+
+quint16 WebSocket::peerPort()
+{
+ QWebSocket *socket = qobject_cast(m_socket);
+
+ return socket->peerPort();
+}
+
+bool WebSocket::isConnected()
+{
+ QWebSocket *socket = qobject_cast(m_socket);
+
+ return socket->state() == QAbstractSocket::ConnectedState;
+}
diff --git a/sdrbase/util/socket.h b/sdrbase/util/socket.h
new file mode 100644
index 0000000000..28adb865d5
--- /dev/null
+++ b/sdrbase/util/socket.h
@@ -0,0 +1,97 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef INCLUDE_SOCKET_H_
+#define INCLUDE_SOCKET_H_
+
+#include
+#include
+
+#include "export.h"
+
+// Class to allow easy use of either QTCPSocket or QWebSocket
+class SDRBASE_API Socket : public QObject {
+ Q_OBJECT
+protected:
+ Socket(QObject *socket, QObject *parent=nullptr);
+
+public:
+ virtual ~Socket();
+ virtual qint64 write(const char *data, qint64 length) = 0;
+ virtual void flush() = 0;
+ virtual qint64 read(char *data, qint64 length) = 0;
+ virtual qint64 bytesAvailable() = 0;
+ virtual QByteArray readAll() = 0;
+ virtual void close() = 0;
+ virtual QHostAddress peerAddress() = 0;
+ virtual quint16 peerPort() = 0;
+ virtual bool isConnected() = 0;
+
+ QObject *socket() { return m_socket; }
+
+protected:
+
+ QObject *m_socket;
+
+};
+
+class SDRBASE_API TCPSocket : public Socket {
+ Q_OBJECT
+
+public:
+
+ explicit TCPSocket(QTcpSocket *socket) ;
+ qint64 write(const char *data, qint64 length) override;
+ void flush() override;
+ qint64 read(char *data, qint64 length) override;
+ qint64 bytesAvailable() override;
+ QByteArray readAll() override;
+ void close() override;
+ QHostAddress peerAddress() override;
+ quint16 peerPort() override;
+ bool isConnected() override;
+
+};
+
+class SDRBASE_API WebSocket : public Socket {
+ Q_OBJECT
+
+public:
+
+ explicit WebSocket(QWebSocket *socket);
+ qint64 write(const char *data, qint64 length) override;
+ void flush() override;
+ qint64 read(char *data, qint64 length) override;
+ qint64 bytesAvailable() override;
+ QByteArray readAll() override;
+ void close() override;
+ QHostAddress peerAddress() override;
+ quint16 peerPort() override;
+ bool isConnected() override;
+
+private slots:
+
+ void binaryFrameReceived(const QByteArray &frame, bool isLastFrame);
+
+private:
+
+ QByteArray m_rxBuffer;
+ QByteArray m_txBuffer;
+
+};
+
+#endif // INCLUDE_SOCKET_H_
diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt
index c911490143..d524583d58 100644
--- a/sdrgui/CMakeLists.txt
+++ b/sdrgui/CMakeLists.txt
@@ -74,6 +74,7 @@ set(sdrgui_SOURCES
gui/mdiutils.cpp
gui/mypositiondialog.cpp
gui/nanosecondsdelegate.cpp
+ gui/perioddial.cpp
gui/pluginsdialog.cpp
gui/pluginpresetsdialog.cpp
gui/presetitem.cpp
@@ -103,6 +104,8 @@ set(sdrgui_SOURCES
gui/workspaceselectiondialog.cpp
gui/wsspectrumsettingsdialog.cpp
gui/wrappingdatetimeedit.cpp
+ gui/wrappingdial.cpp
+ gui/wrappingspinbox.cpp
dsp/scopevisxy.cpp
@@ -201,6 +204,7 @@ set(sdrgui_HEADERS
gui/mdiutils.h
gui/mypositiondialog.h
gui/nanosecondsdelegate.h
+ gui/perioddial.h
gui/physicalunit.h
gui/pluginsdialog.h
gui/pluginpresetsdialog.h
@@ -233,6 +237,8 @@ set(sdrgui_HEADERS
gui/workspaceselectiondialog.h
gui/wsspectrumsettingsdialog.h
gui/wrappingdatetimeedit.h
+ gui/wrappingdial.h
+ gui/wrappingspinbox.h
dsp/scopevisxy.h
diff --git a/sdrgui/gui/perioddial.cpp b/sdrgui/gui/perioddial.cpp
new file mode 100644
index 0000000000..e5658e8c81
--- /dev/null
+++ b/sdrgui/gui/perioddial.cpp
@@ -0,0 +1,125 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include
+
+#include "perioddial.h"
+#include "wrappingdial.h"
+#include "wrappingspinbox.h"
+
+#include
+#include
+
+PeriodDial::PeriodDial(QWidget *parent) :
+ QWidget(parent)
+{
+ m_layout = new QHBoxLayout(this);
+ m_layout->setContentsMargins(0, 0, 0, 0);
+
+ m_dial = new WrappingDial();
+ m_dial->setMinimum(1);
+ m_dial->setMaximum(999);
+ m_dial->setMaximumSize(24, 24);
+
+ m_spinBox = new WrappingSpinBox();
+ m_spinBox->setMinimum(1);
+ m_spinBox->setMaximum(999);
+ m_spinBox->setButtonSymbols(QAbstractSpinBox::NoButtons);
+
+ m_units = new QComboBox();
+ m_units->addItem(QString("%1s").arg(QChar(0x3bc)));
+ m_units->addItem("ms");
+ m_units->addItem("s");
+
+ m_layout->addWidget(m_dial);
+ m_layout->addWidget(m_spinBox);
+ m_layout->addWidget(m_units);
+
+ connect(m_dial, &WrappingDial::valueChanged, this, &PeriodDial::on_dial_valueChanged);
+ connect(m_dial, &WrappingDial::wrapUp, this, &PeriodDial::on_wrapUp);
+ connect(m_dial, &WrappingDial::wrapDown, this, &PeriodDial::on_wrapDown);
+ connect(m_spinBox, QOverload::of(&WrappingSpinBox::valueChanged), this, &PeriodDial::on_spinBox_valueChanged);
+ connect(m_spinBox, &WrappingSpinBox::wrapUp, this, &PeriodDial::on_wrapUp);
+ connect(m_spinBox, &WrappingSpinBox::wrapDown, this, &PeriodDial::on_wrapDown);
+ connect(m_units, QOverload::of(&QComboBox::currentIndexChanged), this, &PeriodDial::on_units_currentIndexChanged);
+}
+
+void PeriodDial::on_dial_valueChanged(int dialValue)
+{
+ m_spinBox->setValue(dialValue);
+ emit valueChanged(value());
+}
+
+void PeriodDial::on_spinBox_valueChanged(int boxValue)
+{
+ m_dial->setValue(boxValue);
+}
+
+void PeriodDial::on_units_currentIndexChanged(int index)
+{
+ (void) index;
+
+ emit valueChanged(value());
+}
+
+void PeriodDial::on_wrapUp()
+{
+ int index = m_units->currentIndex();
+ if (index < m_units->count() - 1) {
+ m_units->setCurrentIndex(index + 1);
+ }
+}
+
+void PeriodDial::on_wrapDown()
+{
+ int index = m_units->currentIndex();
+ if (index > 0) {
+ m_units->setCurrentIndex(index - 1);
+ }
+}
+
+void PeriodDial::setValue(double newValue)
+{
+ double oldValue = value();
+ int index;
+ if (newValue < 1e-3) {
+ index = 0;
+ } else if (newValue < 1.0) {
+ index = 1;
+ } else {
+ index = 2;
+ }
+ double scale = std::pow(10.0, 3 * (2 - index));
+ int mantissa = std::round(newValue * scale);
+
+ bool blocked = blockSignals(true);
+ m_dial->setValue(mantissa);
+ m_units->setCurrentIndex(index);
+ blockSignals(blocked);
+
+ if (newValue != oldValue) {
+ emit valueChanged(value());
+ }
+}
+
+double PeriodDial::value()
+{
+ int index = -3 * (2 - m_units->currentIndex()); // 0=s -3=ms -6=us
+ double scale = std::pow(10.0, index);
+ int mantissa = m_dial->value();
+ return mantissa * scale;
+}
diff --git a/sdrgui/gui/perioddial.h b/sdrgui/gui/perioddial.h
new file mode 100644
index 0000000000..18cf9e6ae2
--- /dev/null
+++ b/sdrgui/gui/perioddial.h
@@ -0,0 +1,60 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SDRGUI_GUI_PERIODDIAL_H
+#define SDRGUI_GUI_PERIODDIAL_H
+
+#include
+
+#include "export.h"
+
+class QHBoxLayout;
+class WrappingDial;
+class WrappingSpinBox;
+class QComboBox;
+
+// Combines QDial, QSpinBox and QComboBox to allow user to enter time period in s, ms or us
+class SDRGUI_API PeriodDial : public QWidget {
+ Q_OBJECT
+
+public:
+ explicit PeriodDial(QWidget *parent = nullptr);
+
+ void setValue(double value);
+ double value();
+
+private:
+
+ QHBoxLayout *m_layout;
+ WrappingDial *m_dial;
+ WrappingSpinBox *m_spinBox;
+ QComboBox *m_units;
+
+private slots:
+
+ void on_dial_valueChanged(int value);
+ void on_spinBox_valueChanged(int value);
+ void on_units_currentIndexChanged(int index);
+ void on_wrapUp();
+ void on_wrapDown();
+
+signals:
+ void valueChanged(double value);
+
+};
+
+#endif // SDRGUI_GUI_PERIODDIAL_H
diff --git a/sdrgui/gui/wrappingdial.cpp b/sdrgui/gui/wrappingdial.cpp
new file mode 100644
index 0000000000..b21c076b31
--- /dev/null
+++ b/sdrgui/gui/wrappingdial.cpp
@@ -0,0 +1,63 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include "wrappingdial.h"
+
+#include
+
+WrappingDial::WrappingDial(QWidget *parent) :
+ QDial(parent),
+ m_wheelEvent(false),
+ m_wheelUp(false)
+{
+ setWrapping(true);
+
+ connect(this, &QDial::actionTriggered, this, &WrappingDial::on_actionTriggered);
+}
+
+void WrappingDial::on_actionTriggered(int action)
+{
+ if (wrapping())
+ {
+ if ( ( (action == QAbstractSlider::SliderSingleStepSub)
+ || (action == QAbstractSlider::SliderPageStepSub)
+ || ((action == QAbstractSlider::SliderMove) && m_wheelEvent && !m_wheelUp)
+ )
+ && (value() < sliderPosition()))
+ {
+ emit wrapDown();
+ }
+ if ( ( (action == QAbstractSlider::SliderSingleStepAdd)
+ || (action == QAbstractSlider::SliderPageStepAdd)
+ || ((action == QAbstractSlider::SliderMove) && m_wheelEvent && m_wheelUp)
+ )
+ && (value() > sliderPosition()))
+ {
+ emit wrapUp();
+ }
+ }
+}
+
+// QAbstractSlider just generates SliderMove actions for wheel events, so we can't distinguish between
+// wheel and dial being clicked to a new position - so we set a flag here, before passing up the event
+void WrappingDial::wheelEvent(QWheelEvent *e)
+{
+ m_wheelEvent = true;
+ m_wheelUp = e->angleDelta().y() > 0;
+ QDial::wheelEvent(e);
+ m_wheelEvent = false;
+}
diff --git a/sdrgui/gui/wrappingdial.h b/sdrgui/gui/wrappingdial.h
new file mode 100644
index 0000000000..fa3b63ff0b
--- /dev/null
+++ b/sdrgui/gui/wrappingdial.h
@@ -0,0 +1,48 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SDRGUI_GUI_WRAPPINGDDIAL_H
+#define SDRGUI_GUI_WRAPPINGDDIAL_H
+
+#include
+
+#include "export.h"
+
+// Extends QDial to generate a signal when dial wraps
+class SDRGUI_API WrappingDial : public QDial {
+ Q_OBJECT
+
+public:
+ explicit WrappingDial(QWidget *parent = nullptr);
+
+protected:
+ void wheelEvent(QWheelEvent *e) override;
+
+private:
+ bool m_wheelEvent;
+ bool m_wheelUp;
+
+private slots:
+ void on_actionTriggered(int action);
+
+signals:
+ void wrapUp();
+ void wrapDown();
+
+};
+
+#endif // SDRGUI_GUI_WRAPPINGDDIAL_H
diff --git a/sdrgui/gui/wrappingspinbox.cpp b/sdrgui/gui/wrappingspinbox.cpp
new file mode 100644
index 0000000000..3c2c7ee23b
--- /dev/null
+++ b/sdrgui/gui/wrappingspinbox.cpp
@@ -0,0 +1,53 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#include "wrappingspinbox.h"
+
+#include
+
+WrappingSpinBox::WrappingSpinBox(QWidget *parent) :
+ QSpinBox(parent),
+ m_wheelEvent(false),
+ m_wheelUp(false)
+{
+ setWrapping(true);
+}
+
+void WrappingSpinBox::stepBy(int steps)
+{
+ int v = value();
+ QSpinBox::stepBy(steps);
+ if (wrapping())
+ {
+ if (v + steps > maximum()) {
+ emit wrapUp();
+ }
+ if (v + steps < minimum()) {
+ emit wrapDown();
+ }
+ }
+}
+
+// QAbstractSlider just generates SliderMove actions for wheel events, so we can't distinguish between
+// wheel and dial being clicked to a new position - so we set a flag here, before passing up the event
+void WrappingSpinBox::wheelEvent(QWheelEvent *e)
+{
+ m_wheelEvent = true;
+ m_wheelUp = e->angleDelta().y() > 0;
+ QSpinBox::wheelEvent(e);
+ m_wheelEvent = false;
+}
diff --git a/sdrgui/gui/wrappingspinbox.h b/sdrgui/gui/wrappingspinbox.h
new file mode 100644
index 0000000000..e775ecb86e
--- /dev/null
+++ b/sdrgui/gui/wrappingspinbox.h
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2024 Jon Beniston, M7RCE //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see . //
+///////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SDRGUI_GUI_WRAPPINGDSPINBOX_H
+#define SDRGUI_GUI_WRAPPINGDSPINBOX_H
+
+#include
+
+#include "export.h"
+
+// Extends QSpinBox to generate a signal when spinbox wraps
+class SDRGUI_API WrappingSpinBox : public QSpinBox {
+ Q_OBJECT
+
+public:
+ explicit WrappingSpinBox(QWidget *parent = nullptr);
+
+ void stepBy(int steps) override;
+
+protected:
+ void wheelEvent(QWheelEvent *e) override;
+
+private:
+ bool m_wheelEvent;
+ bool m_wheelUp;
+
+signals:
+ void wrapUp();
+ void wrapDown();
+
+};
+
+#endif // SDRGUI_GUI_WRAPPINGDSPINBOX_H
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5e7b45b4c0..0b753bfce5 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -10,7 +10,7 @@
#
# To install sdrangel local snap:
#
-# sudo snap install sdrangel_7.19.0_amd64.snap --dangerous
+# sudo snap install sdrangel_7.22.1_amd64.snap --dangerous
#
# Users appear to need to grant h/w access manually from command line with:
#
@@ -36,11 +36,19 @@
# snapcraft clean uhd
# snapcraft stage uhd --shell-after
#
+#
+# To publish to snap store:
+#
+# snapcraft login
+# snapcraft push sdrangel_7.22.1_amd64.snap --release=stable,edge,candidate,beta
+#
+# Can also manage/promote releases at: https://snapcraft.io/sdrangel/releases
+
name: sdrangel
base: core22
type: app
-version: "7.19.0"
+adopt-info: sdrangel
summary: SDRangel
description: SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. SSE 4.2 required.
confinement: strict
@@ -139,7 +147,9 @@ parts:
plugin: cmake
source: https://github.com/f4exb/sdrangel
source-type: git
- source-tag: v7.19.0
+ override-pull: |
+ snapcraftctl pull
+ snapcraftctl set-version "$(git describe --tags --abbrev=0 | sed 's/v//')"
after: [apt, libdab, mbelib, serialdv, dsdcc, codec2, sgp4, cm265cc, libsigmf, airspy, rtlsdr, pluto, bladerf, hackrf, limesuite, airspyhf, uhd, uhdfpga, soapysdr, soapyremote]
cmake-parameters:
- -DDEBUG_OUTPUT=OFF
@@ -167,6 +177,7 @@ parts:
- -DSGP4_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
- -DLIBSIGMF_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
- -DDAB_DIR=$SNAPCRAFT_STAGE/opt/install/sdrangel
+ - -DARCH_OPT=nehalem
#- -DQt5_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5
build-packages:
- libfftw3-dev
@@ -192,6 +203,7 @@ parts:
- libqt5texttospeech5-dev
- libqt5gamepad5-dev
- libfaad-dev
+ - libflac-dev
- zlib1g-dev
- libboost-all-dev
- libasound2-dev
diff --git a/swagger/sdrangel/api/swagger/include/RemoteTCPInput.yaml b/swagger/sdrangel/api/swagger/include/RemoteTCPInput.yaml
index 09cc073e60..c27b4e712e 100644
--- a/swagger/sdrangel/api/swagger/include/RemoteTCPInput.yaml
+++ b/swagger/sdrangel/api/swagger/include/RemoteTCPInput.yaml
@@ -61,3 +61,12 @@ RemoteTCPInputReport:
properties:
sampleRate:
type: integer
+ latitude:
+ type: number
+ format: float
+ longitude:
+ type: number
+ format: float
+ altitude:
+ type: number
+ format: float
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.cpp
index 74c4c5abf3..eb50dd12a4 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.cpp
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.cpp
@@ -1,6 +1,6 @@
/**
* SDRangel
- * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
@@ -59,7 +59,7 @@ SWGRemoteTCPInputReport::fromJson(QString &json) {
void
SWGRemoteTCPInputReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&sample_rate, pJson["sampleRate"], "qint32", "");
-
+
}
QString
@@ -79,6 +79,9 @@ SWGRemoteTCPInputReport::asJsonObject() {
if(m_sample_rate_isSet){
obj->insert("sampleRate", QJsonValue(sample_rate));
}
+ obj->insert("latitude", QJsonValue(latitude));
+ obj->insert("longitude", QJsonValue(longitude));
+ obj->insert("altitude", QJsonValue(altitude));
return obj;
}
diff --git a/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.h b/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.h
index 1dd6df6a8c..92ea400e01 100644
--- a/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.h
+++ b/swagger/sdrangel/code/qt5/client/SWGRemoteTCPInputReport.h
@@ -1,6 +1,6 @@
/**
* SDRangel
- * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
+ * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 7.0.0
* Contact: f4exb06@gmail.com
@@ -43,13 +43,21 @@ class SWG_API SWGRemoteTCPInputReport: public SWGObject {
qint32 getSampleRate();
void setSampleRate(qint32 sample_rate);
-
+ float getLatitude() { return latitude; }
+ float getLongitude() { return longitude; }
+ float getAltitude() { return altitude; }
+ void setLatitude(float latitude) { this->latitude = latitude; }
+ void setLongitude(float longitude) { this->longitude = longitude; }
+ void setAltitude(float altitude) { this->altitude = altitude; }
virtual bool isSet() override;
private:
qint32 sample_rate;
bool m_sample_rate_isSet;
+ float latitude;
+ float longitude;
+ float altitude;
};