VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-06 16:05:13 -04:00
Code Issues Projects Releases Wiki Activity

Implemented multiple sample sources for one preset

Browse Source
This commit is contained in:
Edouard Griffiths
2015-10-01 16:57:33 +02:00
parent c85813b577
commit fa79c55f41
6 changed files with 241 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/mainwindow.cpp
+29 -9
View File
@@ -115,13 +115,27 @@ MainWindow::MainWindow(QWidget* parent) :
qDebug() << "MainWindow::MainWindow: select SampleSource from settings...";
int sampleSourceIndex = m_pluginManager->selectFirstSampleSource(m_settings.getCurrent()->getSourceId()); // select SampleSource from settings
Preset *currentPreset = m_settings.getCurrent();
if(sampleSourceIndex >= 0)
if (currentPreset != 0)
{
bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);
ui->sampleSource->setCurrentIndex(sampleSourceIndex);
ui->sampleSource->blockSignals(sampleSourceSignalsBlocked);
QString sourceId, sourceSerial;
int sourceSequence;
const QByteArray *sourceConfig;
sourceConfig = currentPreset->findCurrentSourceConfig(sourceId, sourceSerial, sourceSequence);
if (sourceConfig != 0)
{
int sampleSourceIndex = m_pluginManager->selectSampleSourceBySerialOrSequence(sourceId, sourceSerial, sourceSequence); // select SampleSource from settings
if(sampleSourceIndex >= 0)
{
bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);
ui->sampleSource->setCurrentIndex(sampleSourceIndex);
ui->sampleSource->blockSignals(sampleSourceSignalsBlocked);
}
}
}
qDebug() << "MainWindow::MainWindow: load current preset settings...";
@@ -206,9 +220,12 @@ void MainWindow::loadSettings()
}
}
void MainWindow::loadPresetSettings(const Preset* preset)
void MainWindow::loadPresetSettings(Preset* preset)
{
qDebug() << "MainWindow::loadPresetSettings: preset: " << preset->getSourceId().toStdString().c_str();
qDebug("MainWindow::loadPresetSettings: group: %s desc: %s Fcenter: %llu Hz",
qPrintable(preset->getGroup()),
qPrintable(preset->getDescription()),
preset->getCenterFrequency());
ui->glSpectrumGUI->deserialize(preset->getSpectrumConfig());
@@ -229,7 +246,10 @@ void MainWindow::saveSettings()
void MainWindow::savePresetSettings(Preset* preset)
{
qDebug() << "MainWindow::savePresetSettings: preset: " << preset->getSourceId().toStdString().c_str();
qDebug("MainWindow::savePresetSettings: group: %s desc: %s Fcenter: %llu Hz",
qPrintable(preset->getGroup()),
qPrintable(preset->getDescription()),
preset->getCenterFrequency());
preset->setSpectrumConfig(ui->glSpectrumGUI->serialize());
preset->clearChannels();
@@ -497,7 +517,7 @@ void MainWindow::on_presetLoad_clicked()
return;
}
const Preset* preset = qvariant_cast<const Preset*>(item->data(0, Qt::UserRole));
Preset* preset = qvariant_cast<Preset*>(item->data(0, Qt::UserRole));
if(preset == 0)
{