VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed presets not loading correctly

This commit is contained in:
f4exb 2015-10-09 01:50:09 +02:00
parent c4be82a40b
commit 7a798f7dbf
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ sdrangelove.supp
.cproject
.project
.settings/
*.cs

12
sdrbase/mainwindow.cpp
View File

@ -330,13 +330,18 @@ void MainWindow::updatePresetControls()
QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
{
QTreeWidgetItem* group = 0;
for(int i = 0; i < ui->presetTree->topLevelItemCount(); i++) {
if(ui->presetTree->topLevelItem(i)->text(0) == preset->getGroup()) {
for(int i = 0; i < ui->presetTree->topLevelItemCount(); i++)
{
if(ui->presetTree->topLevelItem(i)->text(0) == preset->getGroup())
{
group = ui->presetTree->topLevelItem(i);
break;
}
}
if(group == 0) {
if(group == 0)
{
QStringList sl;
sl.append(preset->getGroup());
group = new QTreeWidgetItem(ui->presetTree, sl, PGroup);
@ -344,6 +349,7 @@ QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
group->setExpanded(true);
ui->presetTree->sortByColumn(0, Qt::AscendingOrder);
}
QStringList sl;
sl.append(QString("%1 kHz").arg(preset->getCenterFrequency() / 1000));
sl.append(preset->getDescription());

4
sdrbase/settings/preset.cpp
View File

@ -115,7 +115,7 @@ bool Preset::deserialize(const QByteArray& data)
if (!sourceId.isEmpty())
{
qDebug("Preset::deserialize: source: id: %ss, ser: %s, seq: %d",
qDebug("Preset::deserialize: source: id: %s, ser: %s, seq: %d",
qPrintable(sourceId),
qPrintable(sourceSerial),
sourceSequence);
@ -140,6 +140,8 @@ bool Preset::deserialize(const QByteArray& data)
qDebug("Preset::deserialize: channel: id: %s", qPrintable(channel));
m_channelConfigs.append(ChannelConfig(channel, config));
}
return true;
}
else
{