mirror of https://github.com/f4exb/sdrangel.git
Fixed presets not loading correctly
This commit is contained in:
parent
c4be82a40b
commit
7a798f7dbf
|
@ -7,3 +7,4 @@ sdrangelove.supp
|
||||||
.cproject
|
.cproject
|
||||||
.project
|
.project
|
||||||
.settings/
|
.settings/
|
||||||
|
*.cs
|
||||||
|
|
|
@ -330,13 +330,18 @@ void MainWindow::updatePresetControls()
|
||||||
QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
|
QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
|
||||||
{
|
{
|
||||||
QTreeWidgetItem* group = 0;
|
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);
|
group = ui->presetTree->topLevelItem(i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(group == 0) {
|
|
||||||
|
if(group == 0)
|
||||||
|
{
|
||||||
QStringList sl;
|
QStringList sl;
|
||||||
sl.append(preset->getGroup());
|
sl.append(preset->getGroup());
|
||||||
group = new QTreeWidgetItem(ui->presetTree, sl, PGroup);
|
group = new QTreeWidgetItem(ui->presetTree, sl, PGroup);
|
||||||
|
@ -344,6 +349,7 @@ QTreeWidgetItem* MainWindow::addPresetToTree(const Preset* preset)
|
||||||
group->setExpanded(true);
|
group->setExpanded(true);
|
||||||
ui->presetTree->sortByColumn(0, Qt::AscendingOrder);
|
ui->presetTree->sortByColumn(0, Qt::AscendingOrder);
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList sl;
|
QStringList sl;
|
||||||
sl.append(QString("%1 kHz").arg(preset->getCenterFrequency() / 1000));
|
sl.append(QString("%1 kHz").arg(preset->getCenterFrequency() / 1000));
|
||||||
sl.append(preset->getDescription());
|
sl.append(preset->getDescription());
|
||||||
|
|
|
@ -115,7 +115,7 @@ bool Preset::deserialize(const QByteArray& data)
|
||||||
|
|
||||||
if (!sourceId.isEmpty())
|
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(sourceId),
|
||||||
qPrintable(sourceSerial),
|
qPrintable(sourceSerial),
|
||||||
sourceSequence);
|
sourceSequence);
|
||||||
|
@ -140,6 +140,8 @@ bool Preset::deserialize(const QByteArray& data)
|
||||||
qDebug("Preset::deserialize: channel: id: %s", qPrintable(channel));
|
qDebug("Preset::deserialize: channel: id: %s", qPrintable(channel));
|
||||||
m_channelConfigs.append(ChannelConfig(channel, config));
|
m_channelConfigs.append(ChannelConfig(channel, config));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue