Browse Source

Fixed presets not loading correctly

chirpmodem-v8.0.0
f4exb 11 years ago
parent
commit
7a798f7dbf
  1. 1
      .gitignore
  2. 12
      sdrbase/mainwindow.cpp
  3. 4
      sdrbase/settings/preset.cpp

1
.gitignore vendored

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

12
sdrbase/mainwindow.cpp

@ -330,13 +330,18 @@ void MainWindow::updatePresetControls() @@ -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) @@ -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

@ -115,7 +115,7 @@ bool Preset::deserialize(const QByteArray& data) @@ -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) @@ -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
{

Loading…
Cancel
Save