VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-23 08:28:36 -05:00
Code Issues Projects Releases Wiki Activity

Fixed preset import

Browse Source
This commit is contained in:
f4exb 2016-03-29 14:51:52 +02:00
parent bb9900e699
commit b70fa3f191
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
plugins/samplesource/sdrdaemon/sdrdaemongui.ui
View File

@ -6,13 +6,13 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>363</width> <width>350</width>
<height>365</height> <height>366</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>340</width> <width>350</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -270,7 +270,7 @@
<widget class="QLabel" name="frameSizeText"> <widget class="QLabel" name="frameSizeText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>40</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -296,7 +296,7 @@
<widget class="QLabel" name="sampleRateStreamText"> <widget class="QLabel" name="sampleRateStreamText">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>65</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
@ -304,7 +304,7 @@
<string>Nominal sample rate from stream meta data (kS/s)</string> <string>Nominal sample rate from stream meta data (kS/s)</string>
</property> </property>
<property name="text"> <property name="text">
<string>0000.00</string> <string>00000.00</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -330,7 +330,7 @@
<string>Actual sample rate (kS/s)</string> <string>Actual sample rate (kS/s)</string>
</property> </property>
<property name="text"> <property name="text">
<string>0000.000</string> <string>00000.000</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -726,7 +726,7 @@
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>90</width> <width>100</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@ -741,18 +741,44 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="freqUnitLabel">
<property name="text">
<string>kHz</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="decimLabel"> <widget class="QLabel" name="decimLabel">
<property name="text"> <property name="text">
<string>k Dec:</string> <string>Dec:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="decim"> <widget class="QComboBox" name="decim">
<property name="minimumSize">
<size>
<width>45</width>
<height>0</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>40</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
@ -837,19 +863,6 @@
</item> </item>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QPushButton" name="sendButton"> <widget class="QPushButton" name="sendButton">
<property name="maximumSize"> <property name="maximumSize">

7
sdrbase/mainwindow.cpp
View File

@ -601,12 +601,13 @@ void MainWindow::on_presetImport_clicked()
instream >> base64Str; instream >> base64Str;
exportFile.close(); exportFile.close();
Preset* preset = new Preset(); Preset* preset = m_settings.newPreset("", "");
preset->deserialize(QByteArray::fromBase64(base64Str)); preset->deserialize(QByteArray::fromBase64(base64Str));
preset->setGroup(group); preset->setGroup(group); // override with current group
savePresetSettings(preset);
ui->presetTree->setCurrentItem(addPresetToTree(preset)); ui->presetTree->setCurrentItem(addPresetToTree(preset));
// loadPresetSettings(preset);
// applySettings();
} }
else else
{ {