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 5dcc61b0b20ab846619415c809f8d341fb93369a..713b7567b067cfdd5c8bddfa033e1a114a485636 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
@@ -100,7 +100,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="spectrum_tab">
<property name="sizePolicy">
@@ -131,7 +131,7 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>0</y>
+ <y>-1</y>
<width>976</width>
<height>598</height>
</rect>
@@ -212,22 +212,8 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QComboBox" name="parent_ion_window_unit_combo_box">
- <item>
- <property name="text">
- <string>Daltons</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>ppm</string>
- </property>
- </item>
- </widget>
- </item>
<item row="0" column="2">
- <widget class="QPushButton" name="parent_ion_window_unit_push_button">
+ <widget class="QPushButton" name="spmmeu_push_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -242,20 +228,6 @@
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QComboBox" name="anticipate_carbon_combo_box">
- <item>
- <property name="text">
- <string>yes</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>no</string>
- </property>
- </item>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
@@ -528,6 +500,80 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QRadioButton" name="spmmeu_daltons_radio_button">
+ <property name="text">
+ <string>Daltons</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">spmmeu_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="spmmeu_ppm_radio_button">
+ <property name="text">
+ <string>ppm</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">spmmeu_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <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="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QRadioButton" name="spmmie_yes_radio_button">
+ <property name="text">
+ <string>&yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">spmmie_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="spmmie_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">spmmie_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <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>
@@ -1250,7 +1296,7 @@
</hints>
</connection>
<connection>
- <sender>parent_ion_window_unit_push_button</sender>
+ <sender>spmmeu_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
@@ -1345,22 +1391,6 @@
</hint>
</hints>
</connection>
- <connection>
- <sender>parent_ion_window_unit_combo_box</sender>
- <signal>activated(QString)</signal>
- <receiver>EditTandemPresetView</receiver>
- <slot>doEdit(QString)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>909</x>
- <y>200</y>
- </hint>
- <hint type="destinationlabel">
- <x>400</x>
- <y>897</y>
- </hint>
- </hints>
- </connection>
<connection>
<sender>parent_ion_lower_window_edit</sender>
<signal>textChanged(QString)</signal>
@@ -1393,22 +1423,6 @@
</hint>
</hints>
</connection>
- <connection>
- <sender>anticipate_carbon_combo_box</sender>
- <signal>activated(QString)</signal>
- <receiver>EditTandemPresetView</receiver>
- <slot>doEdit(QString)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>909</x>
- <y>302</y>
- </hint>
- <hint type="destinationlabel">
- <x>970</x>
- <y>797</y>
- </hint>
- </hints>
- </connection>
<connection>
<sender>pushButton_5</sender>
<signal>clicked()</signal>
@@ -1964,4 +1978,8 @@
<slot>accept()</slot>
<slot>doSelectDir()</slot>
</slots>
+ <buttongroups>
+ <buttongroup name="spmmie_button_group"/>
+ <buttongroup name="spmmeu_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 6a939bcd1d8c85dec808314ac0fc00b0b9fe18d4..ab759f32b9c76e6380b5ac2684b8e7766a86964a 100644
--- a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+++ b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
@@ -175,7 +175,7 @@ void EditTandemPresetDialog::doHelp() {
QString senderObjName = senderObj->objectName();
qDebug() << "EditTandemPresetDialog::doHelp begin " << senderObjName;
QFile html_doc;
- if(senderObjName == "parent_ion_window_unit_push_button")
+ if(senderObjName == "spmmeu_push_button")
{
//spmmeu.html
html_doc.setFileName(":/tandem/resources/html_doc/spmmeu.html");
@@ -317,13 +317,19 @@ void EditTandemPresetDialog::doHelp() {
void EditTandemPresetDialog::readUi() {
try {
_tandem_params.setMethodName(ui->method_name_line_edit->text());
- _tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass error units", ui->parent_ion_window_unit_combo_box->currentText());
+ _tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass error units", "Daltons");
+ if (ui->spmmeu_ppm_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass error units", "ppm");
+ }
_tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass error minus", ui->parent_ion_lower_window_edit->text());
_tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass error plus", ui->parent_ion_upper_window_edit->text());
- _tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass isotope error", ui->anticipate_carbon_combo_box->currentText());
+ _tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass isotope error", "no");
+ if (ui->spmmie_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("spectrum, parent monoisotopic mass isotope error", "yes");
+ }
_tandem_params.setParamLabelValue("spectrum, maximum parent charge", ui->smpc_edit->text());
@@ -376,27 +382,28 @@ void EditTandemPresetDialog::populate() {
/*
* <note type="input" label="spectrum, parent monoisotopic mass error units">ppm</note>
* */
- int index = ui->parent_ion_window_unit_combo_box->findText(_tandem_params.getValue("spectrum, parent monoisotopic mass error units"));
- if ( index != -1 ) { // -1 for not found
- ui->parent_ion_window_unit_combo_box->setCurrentIndex(index);
- }
- else {
- qDebug() << "EditTandemPresetDialog::populate " << index;
+ ui->spmmeu_daltons_radio_button->setChecked(true);
+ ui->spmmeu_ppm_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("spectrum, parent monoisotopic mass error units") == "ppm" ) { // -1 for not found
+ ui->spmmeu_daltons_radio_button->setChecked(false);
+ ui->spmmeu_ppm_radio_button->setChecked(true);
}
//<note type="input" label="spectrum, parent monoisotopic mass error minus">10</note>
ui->parent_ion_lower_window_edit->setText(_tandem_params.getValue("spectrum, parent monoisotopic mass error minus"));
//<note type="input" label="spectrum, parent monoisotopic mass error plus">10</note>
ui->parent_ion_upper_window_edit->setText(_tandem_params.getValue("spectrum, parent monoisotopic mass error plus"));
//<note type="input" label="spectrum, parent monoisotopic mass isotope error">yes</note>
- index = ui->anticipate_carbon_combo_box->findText(_tandem_params.getValue("spectrum, parent monoisotopic mass isotope error"));
- if ( index != -1 ) { // -1 for not found
- ui->anticipate_carbon_combo_box->setCurrentIndex(index);
+ ui->spmmie_yes_radio_button->setChecked(true);
+ ui->spmmie_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("spectrum, parent monoisotopic mass isotope error") == "no" ) { // -1 for not found
+ ui->spmmie_yes_radio_button->setChecked(false);
+ ui->spmmie_no_radio_button->setChecked(true);
}
//<note type="input" label="spectrum, maximum parent charge">4</note>
ui->smpc_edit->setText(_tandem_params.getValue("spectrum, maximum parent charge"));
//<note type="input" label="spectrum, fragment mass type">monoisotopic</note>
- index = ui->sfmt_combo_box->findText("monoisotopic");
+ auto index = ui->sfmt_combo_box->findText("monoisotopic");
if ( index != -1 ) { // -1 for not found
ui->sfmt_combo_box->setCurrentIndex(index);
}