Compare commits

...

31 Commits

Author SHA1 Message Date
dforsi c9ed071b5b
Merge a4f1cc9e28 into 5e321e3ead 2024-04-26 00:17:10 -04:00
Edouard Griffiths 5e321e3ead
Merge pull request #2068 from dforsi/feature/map-feature
Feature/map feature
2024-04-25 00:23:12 +02:00
Daniele Forsi 991ccddb66 Close any open dialog when sdrangel quits 2024-04-23 20:23:07 +02:00
Daniele Forsi b4ec43e4aa Raise the Beacon, IBP Beacons an Radio Time dialogs
Make the dialogs visible again if they are open but are hidden behind
the main window or another application's window.
2024-04-22 23:05:04 +02:00
Daniele Forsi f4b2dfc0a9 Revert "Prevent the dialogs to be hidden behind the main window"
This reverts commit f72574d1ad.
2024-04-22 22:42:00 +02:00
Daniele Forsi f72574d1ad Prevent the dialogs to be hidden behind the main window
This also menas that when the main window is closed, the dialogs get
closed automatically, and not only when the map window is closed.
2024-04-22 22:39:19 +02:00
Daniele Forsi 230c461204 Update the IPB beacons table only when the dialog is visible 2024-04-22 22:39:19 +02:00
Edouard Griffiths dac9b9a5b3
Merge pull request #2080 from dforsi/fix/cmakefiles
Fix typos in CMakeLists
2024-04-22 19:30:24 +02:00
Daniele Forsi 90e917f666 Fix typos in CMakeLists
s/FFMEG/FFMPEG/
2024-04-21 21:41:42 +02:00
Edouard Griffiths 4d43e53272
Merge pull request #2076 from dforsi/fix/includes
Fix/includes
2024-04-21 11:15:46 +02:00
Daniele Forsi fd830a0153 Fix build of DAB demodulation plugin 2024-04-20 22:00:16 +02:00
Edouard Griffiths ba4c8a42fc
Merge pull request #2075 from dforsi/fix/warnings
Fix "More '%' conversions than data arguments"
2024-04-20 20:28:34 +02:00
Daniele Forsi 004811d83d Make all include directives identical
Fixes the 5 includes that are different from the majority:
grep -Ehr "#include .+export" --include=*.h | sort | uniq -c
    769 #include "export.h"
      5 #include "../../exports/export.h"
2024-04-20 19:19:21 +02:00
Daniele Forsi fe84c20aff Make all include directives identical
Fixes the 5 includes that are different from the majority:
grep -Ehr "#include .+dsptypes" --include=*.h | sort | uniq -c
    110 #include "dsp/dsptypes.h"
      1 #include <dsp/dsptypes.h>
      4 #include "dsptypes.h"
2024-04-20 19:19:11 +02:00
Daniele Forsi 613d9e4005 Fix "More '%' conversions than data arguments"
Fixes a compiler warning:
.../sdrangel/sdrbase/audio/audioinputdevice.cpp:106: warning: format ‘%d’ expects a matching ‘int’ argument [-Wformat=]
2024-04-20 19:11:16 +02:00
Daniele Forsi 570c1f6877 Remove unused includes and use more direct includes 2024-04-20 19:10:18 +02:00
Edouard Griffiths acc06658ec
Merge pull request #2074 from godsic/bugfix/chanalyzer-settings-typo
Fix typos in ChannelAnalyzer settings
2024-04-19 15:56:45 +02:00
Mykola Dvornik f55adc481d Fix typos in ChannelAnalyzer settings
With this fix, corresponding settings updates are now properly
communicated via reverse API.
2024-04-18 22:46:21 +02:00
Edouard Griffiths 6b41a77e31
Merge pull request #2073 from dforsi/fix/skymap
Fix build failure when Qt Location is not available
2024-04-18 13:32:15 +02:00
Daniele Forsi db4d07e59a Fix build failure when Qt Location is not available
Adds parenthesis to fix the precedence in the existing test and adds
another condition that makes the presence of Qt Location actually
optional like in the top level CMakeLists.txt
2024-04-17 23:50:36 +02:00
Edouard Griffiths 3795b72855
Merge pull request #2072 from srcejon/freq_scanner
ADS-B: Fix map centering and station icon on Qt6
2024-04-16 18:15:57 +02:00
srcejon 0dcc4755ef Merge branch 'freq_scanner' of https://github.com/srcejon/sdrangel into freq_scanner 2024-04-16 13:39:00 +01:00
srcejon 002c824dd9 ADS-B: Fix map centering and station icon for Qt6. 2024-04-16 13:28:50 +01:00
Daniele Forsi a4f1cc9e28 Fix memleaks found with AddressSanitizer/LeakSanitizer
Found with:
ASAN_OPTIONS="detect_odr_violation=1,strip_path_prefix=$(pwd)/" build/sdrangel

Fixes:
Direct leak of 176096 byte(s) in 5503 object(s) allocated from:
    #0 0x7f3a464f46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7f3a44009219 in Airline::Init::Init() sdrbase/util/airlines.cpp:5559
    #2 0x7f3a43dc797d in _sub_I_65535_0.0 (build/lib/libsdrbase.so+0x3c797d) (BuildId: fb568b705538a6e506ee23027626f4366b25aa50)
    #3 0x7f3a46c6ce3d in call_init elf/dl-init.c:74
    #4 0x7f3a46c6ce3d in call_init elf/dl-init.c:26

Indirect leak of 989274 byte(s) in 22012 object(s) allocated from:
    #0 0x7f3a464f3bd7 in malloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:69
    #1 0x7f3a410e63f1 in QArrayData::allocate(unsigned long, unsigned long, unsigned long, QFlags<QArrayData::AllocationOption>) (/lib/x86_64-linux-gnu/libQt5Core.so.5+0xe63f1) (BuildId: eaf989d675ab5f0e8e9033fa527c9ed018f70370)
2024-04-07 19:10:38 +02:00
Daniele Forsi 945a2fc91c Fix memleaks found with AddressSanitizer/LeakSanitizer
Found with:
ASAN_OPTIONS="detect_odr_violation=1,strip_path_prefix=$(pwd)/" build/sdrangel

Fixes:
Indirect leak of 40 byte(s) in 1 object(s) allocated from:
    #0 0x7faba78f46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7fab69d3817f in RadiosondeGUI::RadiosondeGUI(PluginAPI*, FeatureUISet*, Feature*, QWidget*) plugins/feature/radiosonde/radiosondegui.cpp:189
    #2 0x7fab69d39814 in RadiosondeGUI::create(PluginAPI*, FeatureUISet*, Feature*) plugins/feature/radiosonde/radiosondegui.cpp:43
    #3 0x7faba752c578 in FeatureUISet::loadFeatureSetSettings(FeatureSetPreset const*, PluginAPI*, WebAPIAdapterInterface*, QList<Workspace*>*, Workspace*) sdrgui/feature/featureuiset.cpp:185
    #4 0x7faba717dbe8 in MainWindow::loadConfiguration(Configuration const*, bool) sdrgui/mainwindow.cpp:1507
    #5 0x7faba715a610 in MainWindow::MainWindow(qtwebapp::LoggerWithFile*, MainParser const&, QWidget*) sdrgui/mainwindow.cpp:261
    #6 0x5630df43f175 in runQtApplication app/main.cpp:196
    #7 0x5630df43cab7 in main app/main.cpp:248
    #8 0x7faba1e456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58

and 7 others that I'm not copying here.
2024-04-07 19:10:38 +02:00
Daniele Forsi 0077b0af7e Fix memleak found with AddressSanitizer/LeakSanitizer
Found with:
ASAN_OPTIONS="detect_odr_violation=1,strip_path_prefix=$(pwd)/" build/sdrangel

Fixes:
Indirect leak of 16 byte(s) in 1 object(s) allocated from:
    #0 0x7faba78f46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7faba73281e1 in GLShaderSpectrogram::initializeGL(int, int) sdrgui/gui/glshaderspectrogram.cpp:118
    #2 0x7faba7369b54 in GLSpectrumView::initializeGL() sdrgui/gui/glspectrumview.cpp:937
    #3 0x7faba33c4f45 in QOpenGLWidget::resizeEvent(QResizeEvent*) (/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x1c4f45) (BuildId: 983eca66d9695a1892aa796da4160d8d6f9b9ac4)
2024-04-07 19:10:38 +02:00
Daniele Forsi 086eff2e60 Fix memleaks found with AddressSanitizer/LeakSanitizer
Found with:
ASAN_OPTIONS="detect_odr_violation=1,strip_path_prefix=$(pwd)/" build/sdrangel

Fixes:
Direct leak of 56 byte(s) in 1 object(s) allocated from:
    #0 0x7f9d7d0f46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7f9d7af247aa in MainCore::appendDeviceSet(int) sdrbase/maincore.cpp:219
    #2 0x7f9d7c95c8a5 in MainWindow::sampleSourceAdd(Workspace*, Workspace*, int) sdrgui/mainwindow.cpp:359
    #3 0x7f9d7c97ce3c in MainWindow::loadConfiguration(Configuration const*, bool) sdrgui/mainwindow.cpp:1439
    #4 0x7f9d7c95a610 in MainWindow::MainWindow(qtwebapp::LoggerWithFile*, MainParser const&, QWidget*) sdrgui/mainwindow.cpp:261
    #5 0x562f7c492175 in runQtApplication app/main.cpp:196
    #6 0x562f7c48fab7 in main app/main.cpp:248
    #7 0x7f9d776456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58

and 34 others that I'm not copying here.
2024-04-07 19:10:38 +02:00
Daniele Forsi 0dd3f6a353 Fix memleak found with AddressSanitizer/LeakSanitizer
Found with:
ASAN_OPTIONS="detect_odr_violation=1,strip_path_prefix=$(pwd)/" build/sdrangel

Fixes:
Direct leak of 16 byte(s) in 1 object(s) allocated from:
    #0 0x7ff2588f46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7ff256723dd0 in MainCore::appendFeatureSet() sdrbase/maincore.cpp:190
    #2 0x7ff25817fb89 in MainWindow::addFeatureSet() sdrgui/mainwindow.cpp:1191
    #3 0x7ff25815a4d0 in MainWindow::MainWindow(qtwebapp::LoggerWithFile*, MainParser const&, QWidget*) sdrgui/mainwindow.cpp:250
    #4 0x559632289175 in runQtApplication app/main.cpp:196
    #5 0x559632286ab7 in main app/main.cpp:248
    #6 0x7ff252e456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
2024-04-07 19:10:38 +02:00
Daniele Forsi cde8f74435 Fix memleaks found with AddressSanitizer/LeakSanitizer
Fixes:
Direct leak of 32 byte(s) in 1 object(s) allocated from:
    #0 0x7eff8bcf46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7eff897b484d in DeviceUserArgs::serialize() const sdrbase/device/deviceuserargs.cpp:43
    #2 0x7eff897f4904 in MainSettings::save() const sdrbase/settings/mainsettings.cpp:237
    #3 0x7eff8b578654 in MainWindow::closeEvent(QCloseEvent*) sdrgui/mainwindow.cpp:1749
    #4 0x7eff877a5dc7 in QWidget::event(QEvent*) (/lib/x86_64-linux-gnu/libQt5Widgets.so.5+0x1a5dc7) (BuildId: 983eca66d9695a1892aa796da4160d8d6f9b9ac4)

Direct leak of 32 byte(s) in 1 object(s) allocated from:
    #0 0x7eff8bcf46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7eff897b484d in DeviceUserArgs::serialize() const sdrbase/device/deviceuserargs.cpp:43
    #2 0x7eff897f4904 in MainSettings::save() const sdrbase/settings/mainsettings.cpp:237
    #3 0x7eff8b552c9a in MainWindow::~MainWindow() sdrgui/mainwindow.cpp:326
    #4 0x564e8b36e1e5 in runQtApplication app/main.cpp:212
    #5 0x564e8b36bab7 in main app/main.cpp:248
    #6 0x7eff862456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
2024-04-07 19:10:38 +02:00
Daniele Forsi fe84aa11f6 Fix memleaks found with AddressSanitizer/LeakSanitizer
Found with:
ASAN_OPTIONS="detect_odr_violation=1,strip_path_prefix=$(pwd)/" build/sdrangel

Fixes:
Direct leak of 72 byte(s) in 1 object(s) allocated from:
    #0 0x7f7b94ef46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7f7b929ff74c in MainSettings::load() sdrbase/settings/mainsettings.cpp:153
    #2 0x7f7b947614f6 in MainWindow::loadSettings() sdrgui/mainwindow.cpp:1230
    #3 0x7f7b94759e11 in MainWindow::MainWindow(qtwebapp::LoggerWithFile*, MainParser const&, QWidget*) sdrgui/mainwindow.cpp:211
    #4 0x55b694e0a175 in runQtApplication app/main.cpp:196
    #5 0x55b694e07ab7 in main app/main.cpp:248
    #6 0x7f7b8f4456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58

Indirect leak of 136 byte(s) in 1 object(s) allocated from:
    #0 0x7f7b94ef46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7f7b929e734d in QList<Preset>::node_construct(QList<Preset>::Node*, Preset const&) /usr/include/x86_64-linux-gnu/qt5/QtCore/qlist.h:465
    #2 0x7f7b929e734d in QList<Preset>::append(Preset const&) /usr/include/x86_64-linux-gnu/qt5/QtCore/qlist.h:625
    #3 0x7f7b929e734d in QList<Preset>::push_back(Preset const&) /usr/include/x86_64-linux-gnu/qt5/QtCore/qlist.h:377
    #4 0x7f7b929e734d in Configuration::deserialize(QByteArray const&) sdrbase/settings/configuration.cpp:112
    #5 0x7f7b929ff934 in MainSettings::load() sdrbase/settings/mainsettings.cpp:155
    #6 0x7f7b947614f6 in MainWindow::loadSettings() sdrgui/mainwindow.cpp:1230
    #7 0x7f7b94759e11 in MainWindow::MainWindow(qtwebapp::LoggerWithFile*, MainParser const&, QWidget*) sdrgui/mainwindow.cpp:211
    #8 0x55b694e0a175 in runQtApplication app/main.cpp:196
    #9 0x55b694e07ab7 in main app/main.cpp:248
    #10 0x7f7b8f4456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58

Indirect leak of 32 byte(s) in 1 object(s) allocated from:
    #0 0x7f7b94ef46c8 in operator new(unsigned long) ../../../../src/libsanitizer/asan/asan_new_delete.cpp:95
    #1 0x7f7b929e9706 in QList<Preset::DeviceConfig>::node_construct(QList<Preset::DeviceConfig>::Node*, Preset::DeviceConfig const&) /usr/include/x86_64-linux-gnu/qt5/QtCore/qlist.h:465
    #2 0x7f7b929e9706 in QList<Preset::DeviceConfig>::append(Preset::DeviceConfig const&) /usr/include/x86_64-linux-gnu/qt5/QtCore/qlist.h:625
    #3 0x7f7b929f627c in Preset::deserialize(QByteArray const&) sdrbase/settings/preset.cpp:193
    #4 0x7f7b929e74ca in Configuration::deserialize(QByteArray const&) sdrbase/settings/configuration.cpp:113
    #5 0x7f7b929ff934 in MainSettings::load() sdrbase/settings/mainsettings.cpp:155
    #6 0x7f7b947614f6 in MainWindow::loadSettings() sdrgui/mainwindow.cpp:1230
    #7 0x7f7b94759e11 in MainWindow::MainWindow(qtwebapp::LoggerWithFile*, MainParser const&, QWidget*) sdrgui/mainwindow.cpp:211
    #8 0x55b694e0a175 in runQtApplication app/main.cpp:196
    #9 0x55b694e07ab7 in main app/main.cpp:248
    #10 0x7f7b8f4456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
2024-04-07 19:10:38 +02:00
Daniele Forsi eecf1a822b Add cmake option to optionally compile with LeakSanitizer
Alse change the description of the existing option SANITIZE_ADDRESS to avoid ambiguity.
2024-04-07 19:10:38 +02:00
226 changed files with 167 additions and 258 deletions

View File

@ -25,7 +25,8 @@ set(sdrangel_VERSION_SUFFIX "")
# SDRAngel cmake options
option(DEBUG_OUTPUT "Print debug messages" OFF)
option(SANITIZE_ADDRESS "Activate memory address sanitization" OFF)
option(SANITIZE_ADDRESS "Activate detection of uninitialized memory (AddressSanitizer)" OFF)
option(SANITIZE_MEMORY "Activate detection of leaked memory (LeakSanitizer)" OFF)
option(RX_SAMPLE_24BIT "Internal 24 bit Rx DSP" ON)
option(BUILD_SERVER "Build Server" ON)
option(BUILD_GUI "Build GUI" ON)
@ -456,7 +457,7 @@ elseif(ANDROID)
set(LIBDSDCC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so" CACHE INTERNAL "")
set(FFMPEG_FOUND ON CACHE INTERNAL "")
set(FFMEG_SKIP_CHECK ON CACHE INTERNAL "")
set(FFMPEG_SKIP_CHECK ON CACHE INTERNAL "")
set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/bin" CACHE INTERNAL "")
set(AVCODEC_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")

View File

@ -20,7 +20,6 @@
#ifndef DEVICES_BLADERF_DEVICEHACKRFSHARED_H_
#define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_
#include "util/message.h"
#include "export.h"
class DEVICES_API DeviceBladeRF1Shared

View File

@ -4,9 +4,6 @@
#pragma once
#include "Util.h"
#include "Convolution.h"
#include <array>
#include <cstdlib>
#include <cstdint>

View File

@ -2,7 +2,6 @@
#pragma once
#include "Trellis.h"
#include "Convolution.h"
#include "Util.h"

View File

@ -25,6 +25,7 @@
#include <QRecursiveMutex>
#include "dsp/samplemififo.h"
#include "util/message.h"
#include "util/messagequeue.h"
#include "doa2streamsink.h"
#include "doa2corr.h"

View File

@ -23,7 +23,6 @@
#include "dsp/dsptypes.h"
#include "dsp/fftwindow.h"
#include "util/message.h"
#include "doa2settings.h"

View File

@ -20,7 +20,6 @@
#include "channel/channelwebapiadapter.h"
#include "dsp/glscopesettings.h"
#include "dsp/spectrumsettings.h"
#include "doa2settings.h"
/**

View File

@ -25,6 +25,7 @@
#include <QRecursiveMutex>
#include "dsp/samplemififo.h"
#include "util/message.h"
#include "util/messagequeue.h"
#include "interferometerstreamsink.h"
#include "interferometercorr.h"

View File

@ -23,7 +23,6 @@
#include "dsp/dsptypes.h"
#include "dsp/fftwindow.h"
#include "util/message.h"
#include "interferometersettings.h"

View File

@ -234,7 +234,7 @@ if(NOT SERVER_MODE)
if(WIN32)
add_subdirectory(demoddatv)
else()
if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMEG_SKIP_CHECK)
if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMPEG_SKIP_CHECK)
message(STATUS "Include demoddatv")
add_subdirectory(demoddatv)
else()

View File

@ -380,13 +380,13 @@ void ChannelAnalyzer::webapiUpdateChannelSettings(
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response)
{
if (channelSettingsKeys.contains("frequency")) {
if (channelSettingsKeys.contains("inputFrequencyOffset")) {
settings.m_inputFrequencyOffset = response.getChannelAnalyzerSettings()->getFrequency();
}
if (channelSettingsKeys.contains("downSample")) {
if (channelSettingsKeys.contains("rationalDownSample ")) {
settings.m_rationalDownSample = response.getChannelAnalyzerSettings()->getDownSample() != 0;
}
if (channelSettingsKeys.contains("downSampleRate")) {
if (channelSettingsKeys.contains("rationalDownSamplerRate")) {
settings.m_rationalDownSamplerRate = response.getChannelAnalyzerSettings()->getDownSampleRate();
}
if (channelSettingsKeys.contains("bandwidth")) {
@ -639,13 +639,13 @@ void ChannelAnalyzer::webapiFormatChannelSettings(
// transfer data that has been modified. When force is on transfer all data except reverse API data
if (channelSettingsKeys.contains("frequency") || force) {
if (channelSettingsKeys.contains("inputFrequencyOffset") || force) {
swgChannelAnalyzerSettings->setFrequency(settings.m_inputFrequencyOffset);
}
if (channelSettingsKeys.contains("downSample")) {
if (channelSettingsKeys.contains("rationalDownSample")) {
swgChannelAnalyzerSettings->setDownSample(settings.m_rationalDownSample ? 1 : 0);
}
if (channelSettingsKeys.contains("downSampleRate")) {
if (channelSettingsKeys.contains("rationalDownSamplerRate")) {
swgChannelAnalyzerSettings->setDownSampleRate(settings.m_rationalDownSamplerRate);
}
if (channelSettingsKeys.contains("bandwidth")) {

View File

@ -33,7 +33,6 @@
#include "dsp/scopevis.h"
#include "channel/channelapi.h"
#include "util/message.h"
#include "util/movingaverage.h"
#include "chanalyzerbaseband.h"

View File

@ -23,7 +23,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/dsptypes.h"
#include "util/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"

View File

@ -19,8 +19,6 @@
#define INCLUDE_CHANALYZER_WEBAPIADAPTER_H
#include "channel/channelwebapiadapter.h"
#include "dsp/glscopesettings.h"
#include "dsp/spectrumsettings.h"
#include "chanalyzersettings.h"
/**

View File

@ -4802,6 +4802,25 @@ void ADSBDemodGUI::applyMapSettings()
// Restore position of map
if (newMap != nullptr)
{
// Move antenna icon to My Position
QObject *stationObject = newMap->findChild<QObject*>("station");
if(stationObject != NULL)
{
QGeoCoordinate coords = stationObject->property("coordinate").value<QGeoCoordinate>();
coords.setLatitude(stationLatitude);
coords.setLongitude(stationLongitude);
coords.setAltitude(stationAltitude);
stationObject->setProperty("coordinate", QVariant::fromValue(coords));
stationObject->setProperty("stationName", QVariant::fromValue(MainCore::instance()->getSettings().getStationName()));
}
else
{
qDebug() << "ADSBDemodGUI::applyMapSettings - Couldn't find station";
}
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
newMap = newMap->findChild<QObject*>("map");
#endif
if (coords.isValid())
{
newMap->setProperty("zoomLevel", QVariant::fromValue(zoom));
@ -4812,22 +4831,6 @@ void ADSBDemodGUI::applyMapSettings()
{
qDebug() << "ADSBDemodGUI::applyMapSettings - createMap returned a nullptr";
}
// Move antenna icon to My Position
QObject *stationObject = newMap->findChild<QObject*>("station");
if(stationObject != NULL)
{
QGeoCoordinate coords = stationObject->property("coordinate").value<QGeoCoordinate>();
coords.setLatitude(stationLatitude);
coords.setLongitude(stationLongitude);
coords.setAltitude(stationAltitude);
stationObject->setProperty("coordinate", QVariant::fromValue(coords));
stationObject->setProperty("stationName", QVariant::fromValue(MainCore::instance()->getSettings().getStationName()));
}
else
{
qDebug() << "ADSBDemodGUI::applyMapSettings - Couldn't find station";
}
}
// Called from QML when empty space clicked
@ -6000,7 +6003,11 @@ void ADSBDemodGUI::preferenceChanged(int elementType)
// Update icon position on Map
QQuickItem *item = ui->map->rootObject();
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QObject *map = item->findChild<QObject*>("map");
#else
QObject *map = item->findChild<QObject*>("mapView");
#endif
if (map != nullptr)
{
QObject *stationObject = map->findChild<QObject*>("station");
@ -6019,7 +6026,11 @@ void ADSBDemodGUI::preferenceChanged(int elementType)
{
// Update icon label on Map
QQuickItem *item = ui->map->rootObject();
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QObject *map = item->findChild<QObject*>("map");
#else
QObject *map = item->findChild<QObject*>("mapView");
#endif
if (map != nullptr)
{
QObject *stationObject = map->findChild<QObject*>("station");

View File

@ -32,7 +32,6 @@
#include "channel/channelgui.h"
#include "dsp/dsptypes.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/aviationweather.h"
#include "util/messagequeue.h"
#include "util/azel.h"
@ -48,7 +47,6 @@
#include "adsbdemodsettings.h"
#include "util/ourairportsdb.h"
#include "util/osndb.h"
#include "util/airlines.h"
class PluginAPI;
class DeviceUISet;

View File

@ -23,7 +23,6 @@
#include <QByteArray>
#include <QDateTime>
#include "dsp/dsptypes.h"
#include "util/message.h"
#include "adsbdemodstats.h"

View File

@ -74,6 +74,7 @@ Item {
id: station
objectName: "station"
stationName: "Home"
parent: mapView.map
}
MapItemView {

View File

@ -26,10 +26,8 @@
#include "dsp/phasediscri.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/gaussian.h"
#include "util/movingaverage.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"
#include "util/crc.h"

View File

@ -24,7 +24,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "amdemodsettings.h"

View File

@ -21,6 +21,7 @@
#ifndef PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_
#define PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_
#include "dsp/dsptypes.h"
#include <QByteArray>
class Serializable;

View File

@ -26,6 +26,7 @@
#include "device/deviceapi.h"
#include "atvdemod.h"
#include "dsp/dspcommands.h"
MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message)

View File

@ -27,8 +27,6 @@
#include "dsp/basebandsamplesink.h"
#include "channel/channelapi.h"
#include "dsp/devicesamplesource.h"
#include "dsp/dspcommands.h"
#include "util/message.h"
#include "atvdemodbaseband.h"

View File

@ -24,6 +24,7 @@
#include "atvdemodgui.h"
#include "device/deviceuiset.h"
#include "dsp/dspcommands.h"
#include "dsp/scopevis.h"
#include "dsp/glscopesettings.h"
#include "gui/basicchannelsettingsdialog.h"

View File

@ -25,9 +25,7 @@
#include "dsp/channelsamplesink.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/agc.h"
#include "dsp/phaselock.h"
#include "dsp/recursivefilters.h"
#include "dsp/phasediscri.h"

View File

@ -27,7 +27,6 @@
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/movingaverage.h"
#include "dsp/fftfilt.h"
#include "dsp/phaselock.h"
#include "dsp/filterrc.h"

View File

@ -25,7 +25,6 @@
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftwindow.h"
#include "util/message.h"
#include "util/movingaverage.h"
#include "chirpchatdemodsettings.h"

View File

@ -40,7 +40,6 @@
#include "maincore.h"
#include "dabdemod.h"
#include "dabdemodsink.h"
// Table column indexes
#define PROGRAMS_COL_NAME 0

View File

@ -25,7 +25,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "dabdemodsettings.h"

View File

@ -22,6 +22,9 @@
#define INCLUDE_DABDEMODSETTINGS_H
#include <QByteArray>
#include <QString>
#include "dsp/dsptypes.h"
class Serializable;

View File

@ -23,6 +23,7 @@
#include <vector>
#include "leansdr/dvb.h"
#include "leansdr/framework.h"
#include "gui/tvscreen.h"

View File

@ -30,6 +30,7 @@
#include "SWGChannelReport.h"
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
#include "settings/serializable.h"
#include "datvdemod.h"

View File

@ -29,8 +29,6 @@ class DeviceAPI;
#include "channel/channelapi.h"
#include "dsp/basebandsamplesink.h"
#include "dsp/devicesamplesource.h"
#include "dsp/dspcommands.h"
#include "util/message.h"
#include "datvdemodbaseband.h"

View File

@ -25,7 +25,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "settings/rollupstate.h"
#include "datvdemod.h"

View File

@ -43,8 +43,6 @@
#include "dsp/fftfilt.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/movingaverage.h"
#include "dsp/agc.h"
#include "dsp/interpolator.h"
#include "audio/audiofifo.h"
#include "util/messagequeue.h"

View File

@ -24,6 +24,7 @@
#include <vector>
#include "leansdr/framework.h"
#include "leansdr/sdr.h"
#include "gui/tvscreen.h"
namespace leansdr {

View File

@ -36,7 +36,6 @@
#include "dsp/basebandsamplesink.h"
#include "channel/channelapi.h"
#include "util/message.h"
#include "util/navtex.h"
#include "dscdemodbaseband.h"
#include "dscdemodsettings.h"

View File

@ -21,7 +21,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/aprsfi.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"

View File

@ -30,7 +30,6 @@
#include "dsp/spectrumvis.h"
#include "channel/channelapi.h"
#include "util/message.h"
#include "util/doublebufferfifo.h"
#include "freedvdemodbaseband.h"

View File

@ -25,7 +25,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "freedvdemodsettings.h"

View File

@ -25,6 +25,8 @@
#include <QString>
#include <stdint.h>
#include "dsp/dsptypes.h"
class Serializable;
struct FreeDVDemodSettings

View File

@ -24,7 +24,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "util/ft8message.h"
#include "settings/rollupstate.h"

View File

@ -25,7 +25,6 @@
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"
#include "dsp/agc.h"
#include "util/doublebufferfifo.h"
#include "ft8demodsettings.h"

View File

@ -20,7 +20,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "ilsdemod.h"

View File

@ -23,6 +23,7 @@
#include <QByteArray>
#include "dsp/dsptypes.h"
#include "util/baudot.h"
class Serializable;

View File

@ -32,7 +32,6 @@
#include "dsp/morsedemod.h"
#include "audio/audiofifo.h"
#include "util/movingaverage.h"
#include "util/movingmaximum.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"

View File

@ -24,7 +24,6 @@
#define NXZEROS 134
#include "dsp/iirfilter.h"
#include "export.h"
/**
* This is a 2 pole lowpass Chebyshev (recursive) filter at fc=0.075 using coefficients found in table 20-1 of

View File

@ -26,9 +26,7 @@
#include <QDateTime>
#include "channel/channelgui.h"
#include "dsp/dsptypes.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"

View File

@ -24,7 +24,7 @@
#include <QByteArray>
#include <QString>
#include <dsp/dsptypes.h>
#include "dsp/dsptypes.h"
class Serializable;

View File

@ -24,9 +24,6 @@
#include "dsp/phasediscri.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/afsquelch.h"
#include "dsp/afsquelch.h"
#include "audio/audiofifo.h"
#include "util/movingaverage.h"
#include "util/doublebufferfifo.h"

View File

@ -21,7 +21,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "navtexdemod.h"

View File

@ -23,6 +23,8 @@
#include <QByteArray>
#include "dsp/dsptypes.h"
class Serializable;
// Number of columns in the table

View File

@ -23,7 +23,6 @@
#include "channel/channelgui.h"
#include "dsp/dsptypes.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"

View File

@ -23,6 +23,8 @@
#include <stdint.h>
#include "dsp/dsptypes.h"
class Serializable;
struct NFMDemodSettings

View File

@ -28,7 +28,6 @@
#include "dsp/fftfilt.h"
#include "dsp/firfilter.h"
#include "dsp/afsquelch.h"
#include "dsp/agc.h"
#include "dsp/ctcssdetector.h"
#include "dsp/dcscodes.h"
#include "util/movingaverage.h"

View File

@ -31,7 +31,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "packetdemodsettings.h"

View File

@ -24,6 +24,8 @@
#include <QByteArray>
#include <QHash>
#include "dsp/dsptypes.h"
class Serializable;
// Number of columns in the table

View File

@ -28,7 +28,6 @@
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "util/movingaverage.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"
#include "util/crc.h"

View File

@ -29,7 +29,6 @@
#include "dsp/firfilter.h"
#include "dsp/gaussian.h"
#include "util/movingaverage.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"
#include "util/crc.h"

View File

@ -21,7 +21,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "rttydemod.h"

View File

@ -23,6 +23,7 @@
#include <QByteArray>
#include "dsp/dsptypes.h"
#include "util/baudot.h"
class Serializable;

View File

@ -21,6 +21,7 @@
#include <complex.h>
#include "dsp/dspengine.h"
#include "dsp/fftfactory.h"
#include "dsp/scopevis.h"
#include "util/db.h"

View File

@ -25,11 +25,9 @@
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/raisedcosine.h"
#include "dsp/fftfactory.h"
#include "dsp/fftengine.h"
#include "util/movingaverage.h"
#include "util/movingmaximum.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"
#include "rttydemodsettings.h"

View File

@ -24,7 +24,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "gui/fftnrdialog.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"

View File

@ -21,7 +21,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"
#include "vordemodsettings.h"

View File

@ -24,6 +24,8 @@
#include <QByteArray>
#include <QHash>
#include "dsp/dsptypes.h"
class Serializable;
struct VORDemodSettings

View File

@ -23,6 +23,8 @@
#include "dsp/dsptypes.h"
#include "dsp/dsptypes.h"
class Serializable;
struct WFMDemodSettings

View File

@ -23,12 +23,10 @@
#include "dsp/channelsamplesink.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "util/movingaverage.h"
#include "dsp/fftfilt.h"
#include "dsp/phasediscri.h"
#include "audio/audiofifo.h"
#include "util/message.h"
#include "wfmdemodsettings.h"

View File

@ -20,6 +20,7 @@
#include <complex.h>
#include "dsp/dspengine.h"
#include "dsp/fftfactory.h"
#include "util/db.h"
#include "freqscanner.h"

View File

@ -25,7 +25,6 @@
#include "dsp/channelsamplesink.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/fftfactory.h"
#include "dsp/fftengine.h"
#include "dsp/fftwindow.h"
#include "util/fixedaverage2d.h"

View File

@ -25,7 +25,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "dsp/movingaverage.h"
#include "util/messagequeue.h"
#include "settings/rollupstate.h"

View File

@ -26,12 +26,8 @@
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "util/movingaverage.h"
#include "dsp/agc.h"
#include "dsp/firfilter.h"
#include "dsp/phaselockcomplex.h"
#include "dsp/freqlockcomplex.h"
#include "util/message.h"
#include "util/doublebufferfifo.h"
#include "freqtrackersettings.h"

View File

@ -36,6 +36,7 @@
#include "plugin/pluginapi.h"
#include "util/astronomy.h"
#include "util/csv.h"
#include "util/colormap.h"
#include "util/db.h"
#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"

View File

@ -30,7 +30,6 @@
#include "channel/channelgui.h"
#include "dsp/channelmarker.h"
#include "util/messagequeue.h"
#include "util/colormap.h"
#include "settings/rollupstate.h"
#include "heatmapsettings.h"

View File

@ -24,15 +24,10 @@
#include <QMutex>
#include "dsp/channelsamplesink.h"
#include "dsp/phasediscri.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/gaussian.h"
#include "util/movingaverage.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"
#include "util/crc.h"
#include "heatmapsettings.h"

View File

@ -26,7 +26,6 @@
#include <QMutex>
#include <QWaitCondition>
#include "dsp/dsptypes.h"
#include "util/message.h"
#include "util/messagequeue.h"

View File

@ -35,6 +35,7 @@
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "settings/serializable.h"
#include "util/interpolation.h"
#include "channel/channelwebapiutils.h"

View File

@ -24,7 +24,6 @@
#include <QRecursiveMutex>
#include "dsp/samplesinkfifo.h"
#include "dsp/scopevis.h"
#include "util/message.h"
#include "util/messagequeue.h"

View File

@ -21,6 +21,7 @@
#include "dsp/dspengine.h"
#include "dsp/fftfactory.h"
#include "noisefigure.h"
#include "noisefiguresink.h"

View File

@ -23,7 +23,6 @@
#include <QVector>
#include "dsp/channelsamplesink.h"
#include "dsp/fftfactory.h"
#include "dsp/fftengine.h"
#include "util/movingaverage.h"
#include "util/messagequeue.h"

View File

@ -37,6 +37,7 @@
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "channel/channelwebapiutils.h"
#include "settings/serializable.h"
#include "util/astronomy.h"
#include "maincore.h"

View File

@ -23,7 +23,6 @@
#include <QRecursiveMutex>
#include "dsp/samplesinkfifo.h"
#include "dsp/scopevis.h"
#include "util/message.h"
#include "util/messagequeue.h"

View File

@ -23,8 +23,6 @@
#include <QString>
#include <QDateTime>
#include "dsp/dsptypes.h"
class Serializable;
// Number of columns in the tables

View File

@ -27,12 +27,7 @@
#include "dsp/phasediscri.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/fftfactory.h"
#include "dsp/fftengine.h"
#include "dsp/fftwindow.h"
#include "util/movingaverage.h"
#include "util/doublebufferfifo.h"
#include "util/messagequeue.h"
#include "radioclocksettings.h"

View File

@ -28,7 +28,6 @@
#include "dsp/channelsamplesink.h"
#include "dsp/nco.h"
#include "dsp/interpolator.h"
#include "channel/remotedatablock.h"
#include "util/messagequeue.h"
#include "remotetcpsinksettings.h"

View File

@ -39,6 +39,7 @@
#include "maincore.h"
#include "filesourcebaseband.h"
#include "filesourcereport.h"
MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSource, Message)
MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceWork, Message)

View File

@ -36,9 +36,7 @@
#include "dsp/basebandsamplesource.h"
#include "channel/channelapi.h"
#include "util/message.h"
#include "util/movingaverage.h"
#include "filesourcesettings.h"
#include "filesourcereport.h"
class QNetworkAccessManager;
class QNetworkReply;

View File

@ -27,11 +27,9 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/raisedcosine.h"
#include "dsp/fmpreemphasis.h"
#include "util/lfsr.h"
#include "util/movingaverage.h"
#include "util/message.h"

View File

@ -28,9 +28,7 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/gaussian.h"
#include "util/movingaverage.h"

View File

@ -32,8 +32,6 @@
#include "dsp/interpolator.h"
#include "dsp/rootraisedcosine.h"
#include "util/movingaverage.h"
#include "dsp/fftfilt.h"
#include "util/message.h"
#include "datvmodsettings.h"

View File

@ -28,7 +28,6 @@
#include <QNetworkRequest>
#include "dsp/basebandsamplesource.h"
#include "dsp/basebandsamplesink.h"
#include "dsp/spectrumvis.h"
#include "channel/channelapi.h"
#include "util/message.h"

View File

@ -26,7 +26,6 @@
#include <fstream>
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/fftfilt.h"

View File

@ -26,7 +26,6 @@
#include <QByteArray>
#include "M17Modulator.h"
#include "dsp/dsptypes.h"
#include "util/message.h"
#include "util/messagequeue.h"
#include "m17modfifo.h"

View File

@ -24,6 +24,7 @@
#include <QByteArray>
#include "dsp/cwkeyersettings.h"
#include "dsp/dsptypes.h"
class Serializable;

View File

@ -19,6 +19,7 @@
#include <QDebug>
#include "dsp/datafifo.h"
#include "dsp/misc.h"
#include "util/messagequeue.h"
#include "maincore.h"

View File

@ -28,7 +28,6 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/raisedcosine.h"

View File

@ -25,7 +25,6 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/raisedcosine.h"

View File

@ -25,7 +25,6 @@
#include "dsp/channelsamplesource.h"
#include "dsp/nco.h"
#include "dsp/ncof.h"
#include "dsp/interpolator.h"
#include "dsp/firfilter.h"
#include "dsp/raisedcosine.h"

View File

@ -30,7 +30,6 @@
#include "dsp/basebandsamplesource.h"
#include "dsp/spectrumvis.h"
#include "channel/channelapi.h"
#include "dsp/basebandsamplesink.h"
#include "util/message.h"
#include "ssbmodsettings.h"

View File

@ -26,6 +26,7 @@
#include <stdint.h>
#include "dsp/cwkeyersettings.h"
#include "dsp/dsptypes.h"
class Serializable;

Some files were not shown because too many files have changed in this diff Show More