diff --git a/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui b/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
index 713b7567b067cfdd5c8bddfa033e1a114a485636..9221b2d105d1f1a60aaaefba509c0fbdf691ea59 100644
--- a/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
+++ b/src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
@@ -131,8 +131,8 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-1</y>
- <width>976</width>
+ <y>0</y>
+ <width>998</width>
<height>598</height>
</rect>
</property>
@@ -290,20 +290,6 @@
<item row="4" column="1">
<widget class="QLineEdit" name="smpc_edit"/>
</item>
- <item row="6" column="1">
- <widget class="QComboBox" name="sfmmeu_combo_box">
- <item>
- <property name="text">
- <string>Daltons</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>ppm</string>
- </property>
- </item>
- </widget>
- </item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -342,20 +328,6 @@
</property>
</widget>
</item>
- <item row="8" column="1">
- <widget class="QComboBox" name="sunlw_combo_box">
- <item>
- <property name="text">
- <string>yes</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>no</string>
- </property>
- </item>
- </widget>
- </item>
<item row="4" column="2">
<widget class="QPushButton" name="smpc_push_button">
<property name="text">
@@ -469,20 +441,6 @@
</property>
</widget>
</item>
- <item row="15" column="1">
- <widget class="QComboBox" name="suca_combo_box">
- <item>
- <property name="text">
- <string>yes</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>no</string>
- </property>
- </item>
- </widget>
- </item>
<item row="16" column="1">
<widget class="QLineEdit" name="st_edit"/>
</item>
@@ -574,6 +532,117 @@
</item>
</layout>
</item>
+ <item row="6" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QRadioButton" name="sfmmeu_daltons_radio_button">
+ <property name="text">
+ <string>Daltons</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sfmmeu_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sfmmeu_ppm_radio_button">
+ <property name="text">
+ <string>ppm</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sfmmeu_button_group</string>
+ </attribute>
+ </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>
+ </layout>
+ </item>
+ <item row="8" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QRadioButton" name="sunlw_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sunlw_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sunlw_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sunlw_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="15" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QRadioButton" name="suca_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">suca_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="suca_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">suca_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
</layout>
</item>
<item>
@@ -610,8 +679,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>990</width>
- <height>468</height>
+ <width>500</width>
+ <height>360</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -873,8 +942,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>990</width>
- <height>468</height>
+ <width>331</width>
+ <height>326</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1069,8 +1138,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>990</width>
- <height>468</height>
+ <width>98</width>
+ <height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1119,8 +1188,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>990</width>
- <height>468</height>
+ <width>98</width>
+ <height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
@@ -1169,8 +1238,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>990</width>
- <height>468</height>
+ <width>98</width>
+ <height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
@@ -1981,5 +2050,8 @@
<buttongroups>
<buttongroup name="spmmie_button_group"/>
<buttongroup name="spmmeu_button_group"/>
+ <buttongroup name="sunlw_button_group"/>
+ <buttongroup name="sfmmeu_button_group"/>
+ <buttongroup name="suca_button_group"/>
</buttongroups>
</ui>
diff --git a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
index ab759f32b9c76e6380b5ac2684b8e7766a86964a..1fa6c49a99f7d3d553904a09ea729fa406aa531e 100644
--- a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+++ b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
@@ -335,17 +335,27 @@ void EditTandemPresetDialog::readUi() {
_tandem_params.setParamLabelValue("spectrum, fragment mass type", ui->sfmt_combo_box->currentText());
- _tandem_params.setParamLabelValue("spectrum, fragment monoisotopic mass error units", ui->sfmmeu_combo_box->currentText());
+ _tandem_params.setParamLabelValue("spectrum, fragment monoisotopic mass error units", "Daltons");
+ if (ui->sfmmeu_ppm_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("spectrum, fragment monoisotopic mass error units", "ppm");
+ }
+
_tandem_params.setParamLabelValue("spectrum, fragment monoisotopic mass error", ui->sfmme_edit->text());
- _tandem_params.setParamLabelValue("spectrum, use neutral loss window", ui->sunlw_combo_box->currentText());
+ _tandem_params.setParamLabelValue("spectrum, use neutral loss window", "no");
+ if (ui->sunlw_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("spectrum, use neutral loss window", "yes");
+ }
_tandem_params.setParamLabelValue("spectrum, dynamic range", ui->sdr_edit->text());
_tandem_params.setParamLabelValue("spectrum, total peaks", ui->stp_edit->text());
_tandem_params.setParamLabelValue("spectrum, minimum peaks", ui->smp_edit->text());
_tandem_params.setParamLabelValue("spectrum, minimum fragment mz", ui->smfmz_edit->text());
_tandem_params.setParamLabelValue("spectrum, minimum parent m+h", ui->smpmh_edit->text());
- _tandem_params.setParamLabelValue("spectrum, sequence batch size", ui->spsbs_edit->text());
- _tandem_params.setParamLabelValue("spectrum, use contrast angle", ui->suca_combo_box->currentText());
+ _tandem_params.setParamLabelValue("spectrum, sequence batch size", ui->spsbs_edit->text());
+ _tandem_params.setParamLabelValue("spectrum, use contrast angle", "no");
+ if (ui->suca_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("spectrum, use contrast angle", "yes");
+ }
_tandem_params.setParamLabelValue("spectrum, threads", ui->st_edit->text());
@@ -408,19 +418,25 @@ void EditTandemPresetDialog::populate() {
ui->sfmt_combo_box->setCurrentIndex(index);
}
//<note type="input" label="spectrum, fragment monoisotopic mass error units">Daltons</note>
- index = ui->sfmmeu_combo_box->findText(_tandem_params.getValue("spectrum, fragment monoisotopic mass error units"));
- if ( index != -1 ) { // -1 for not found
- ui->sfmmeu_combo_box->setCurrentIndex(index);
+ ui->sfmmeu_daltons_radio_button->setChecked(true);
+ ui->sfmmeu_ppm_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("spectrum, fragment monoisotopic mass error units") == "ppm" ) { // -1 for not found
+ ui->sfmmeu_daltons_radio_button->setChecked(false);
+ ui->sfmmeu_ppm_radio_button->setChecked(true);
}
+
//<note type="input" label="spectrum, fragment monoisotopic mass error">0.02</note>
ui->sfmme_edit->setText(_tandem_params.getValue("spectrum, fragment monoisotopic mass error"));
//<note type="input" label="spectrum, use neutral loss window">yes</note>
- index = ui->sunlw_combo_box->findText(_tandem_params.getValue("spectrum, use neutral loss window"));
- if ( index != -1 ) { // -1 for not found
- ui->sunlw_combo_box->setCurrentIndex(index);
+ ui->sunlw_yes_radio_button->setChecked(true);
+ ui->sunlw_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("spectrum, use neutral loss window") == "no" ) { // -1 for not found
+ ui->sunlw_yes_radio_button->setChecked(false);
+ ui->sunlw_no_radio_button->setChecked(true);
}
+
//<note type="input" label="spectrum, dynamic range">100.0</note>
ui->sdr_edit->setText(_tandem_params.getValue("spectrum, dynamic range"));
@@ -438,10 +454,14 @@ void EditTandemPresetDialog::populate() {
//<note type="input" label="spectrum, sequence batch size">1000</note>
ui->spsbs_edit->setText(_tandem_params.getValue("spectrum, sequence batch size"));
//<note type="input" label="spectrum, use contrast angle">no</note>
- index = ui->suca_combo_box->findText(_tandem_params.getValue("spectrum, use contrast angle"));
- if ( index != -1 ) { // -1 for not found
- ui->suca_combo_box->setCurrentIndex(index);
- }
+ ui->suca_yes_radio_button->setChecked(true);
+ ui->suca_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("spectrum, use contrast angle") == "no" ) { // -1 for not found
+ ui->suca_yes_radio_button->setChecked(false);
+ ui->suca_no_radio_button->setChecked(true);
+ }
+
+
//<note type="input" label="spectrum, threads">1</note>
ui->st_edit->setText(_tandem_params.getValue("spectrum, threads"));