mirror of https://github.com/f4exb/sdrangel.git
Merge a4f1cc9e28
into 5e321e3ead
This commit is contained in:
commit
c9ed071b5b
|
@ -25,7 +25,8 @@ set(sdrangel_VERSION_SUFFIX "")
|
||||||
|
|
||||||
# SDRAngel cmake options
|
# SDRAngel cmake options
|
||||||
option(DEBUG_OUTPUT "Print debug messages" OFF)
|
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(RX_SAMPLE_24BIT "Internal 24 bit Rx DSP" ON)
|
||||||
option(BUILD_SERVER "Build Server" ON)
|
option(BUILD_SERVER "Build Server" ON)
|
||||||
option(BUILD_GUI "Build GUI" ON)
|
option(BUILD_GUI "Build GUI" ON)
|
||||||
|
|
|
@ -215,6 +215,14 @@ RadiosondeGUI::~RadiosondeGUI()
|
||||||
disconnect(&MainCore::instance()->getSettings(), &MainSettings::preferenceChanged, this, &RadiosondeGUI::preferenceChanged);
|
disconnect(&MainCore::instance()->getSettings(), &MainSettings::preferenceChanged, this, &RadiosondeGUI::preferenceChanged);
|
||||||
// Remove from map and free memory
|
// Remove from map and free memory
|
||||||
on_deleteAll_clicked();
|
on_deleteAll_clicked();
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_LATITUDE);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_LONGITUDE);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_ALTITUDE);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_SPEED);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_VERTICAL_RATE);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_HEADING);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_ALT_MAX);
|
||||||
|
delete ui->radiosondes->itemDelegateForColumn(RADIOSONDE_COL_LAST_UPDATE);
|
||||||
delete ui;
|
delete ui;
|
||||||
delete m_sondeHub;
|
delete m_sondeHub;
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,8 @@ QByteArray DeviceUserArgs::serialize() const
|
||||||
{
|
{
|
||||||
SimpleSerializer s(1);
|
SimpleSerializer s(1);
|
||||||
QByteArray data;
|
QByteArray data;
|
||||||
QDataStream *stream = new QDataStream(&data, QIODevice::WriteOnly);
|
QDataStream stream(&data, QIODevice::WriteOnly);
|
||||||
*stream << m_argsByDevice;
|
stream << m_argsByDevice;
|
||||||
s.writeBlob(1, data);
|
s.writeBlob(1, data);
|
||||||
return s.final();
|
return s.final();
|
||||||
}
|
}
|
||||||
|
|
|
@ -209,6 +209,7 @@ void MainCore::removeLastFeatureSet()
|
||||||
FeatureSet *featureSet = m_featureSets.back();
|
FeatureSet *featureSet = m_featureSets.back();
|
||||||
m_featureSetsMap.remove(featureSet);
|
m_featureSetsMap.remove(featureSet);
|
||||||
m_featureSets.pop_back();
|
m_featureSets.pop_back();
|
||||||
|
delete featureSet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -227,6 +228,7 @@ void MainCore::removeLastDeviceSet()
|
||||||
DeviceSet *deviceSet = m_deviceSets.back();
|
DeviceSet *deviceSet = m_deviceSets.back();
|
||||||
m_deviceSetsMap.remove(deviceSet);
|
m_deviceSetsMap.remove(deviceSet);
|
||||||
m_deviceSets.pop_back();
|
m_deviceSets.pop_back();
|
||||||
|
delete deviceSet;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,11 @@ MainSettings::~MainSettings()
|
||||||
{
|
{
|
||||||
delete m_pluginPresets[i];
|
delete m_pluginPresets[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < m_configurations.count(); ++i)
|
||||||
|
{
|
||||||
|
delete m_configurations[i];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString MainSettings::getFileLocation() const
|
QString MainSettings::getFileLocation() const
|
||||||
|
|
|
@ -5560,3 +5560,10 @@ Airline::Init::Init()
|
||||||
s += 4;
|
s += 4;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Airline::Init::~Init()
|
||||||
|
{
|
||||||
|
foreach(const QString s, m_icaoHash.keys()) {
|
||||||
|
delete m_icaoHash[s];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -55,6 +55,7 @@ private:
|
||||||
friend struct Init;
|
friend struct Init;
|
||||||
struct Init {
|
struct Init {
|
||||||
Init();
|
Init();
|
||||||
|
~Init();
|
||||||
static const char *m_airlines[];
|
static const char *m_airlines[];
|
||||||
};
|
};
|
||||||
static Init m_init;
|
static Init m_init;
|
||||||
|
|
|
@ -514,6 +514,8 @@ void GLShaderSpectrogram::drawSurface(SpectrumSettings::SpectrogramStyle style,
|
||||||
|
|
||||||
void GLShaderSpectrogram::cleanup()
|
void GLShaderSpectrogram::cleanup()
|
||||||
{
|
{
|
||||||
|
delete m_vao;
|
||||||
|
m_vao = nullptr;
|
||||||
delete m_programShaded;
|
delete m_programShaded;
|
||||||
m_programShaded = nullptr;
|
m_programShaded = nullptr;
|
||||||
delete m_programSimple;
|
delete m_programSimple;
|
||||||
|
|
Loading…
Reference in New Issue