diff --git a/src/core/tandem_run/tandemparameters.cpp b/src/core/tandem_run/tandemparameters.cpp
index 3a3cc9ebe233a87a9ccdb6e23cc060633143fc89..85919d313a97f421543c54eff99fd2a80cfb06f4 100644
--- a/src/core/tandem_run/tandemparameters.cpp
+++ b/src/core/tandem_run/tandemparameters.cpp
@@ -95,7 +95,7 @@ void TandemParameters::setParamLabelValue(const QString & label, const QString &
throw pappso::ExceptionNotPossible(QObject::tr("%1 value must be Daltons or ppm (not %2)").arg(label).arg(value));
}
}
- if ((label == "spectrum, parent monoisotopic mass isotope error") || (label == "spectrum, use neutral loss window") || (label == "spectrum, use contrast angle") || (label == "protein, cleavage semi") || (label == "protein, quick acetyl") || (label == "protein, quick pyrolidone") || (label == "protein, stP bias") || (label == "scoring, cyclic permutation") || (label == "scoring, include reverse") || (label == "scoring, y ions") || (label == "scoring, b ions") || (label == "scoring, c ions") || (label == "scoring, z ions") || (label == "scoring, a ions") || (label == "scoring, x ions") || (label == "refine") || (label == "refine, use potential modifications for full refinement") || (label == "refine, cleavage semi") ) {
+ if ((label == "spectrum, parent monoisotopic mass isotope error") || (label == "spectrum, use neutral loss window") || (label == "spectrum, use contrast angle") || (label == "protein, cleavage semi") || (label == "protein, quick acetyl") || (label == "protein, quick pyrolidone") || (label == "protein, stP bias") || (label == "scoring, cyclic permutation") || (label == "scoring, include reverse") || (label == "scoring, y ions") || (label == "scoring, b ions") || (label == "scoring, c ions") || (label == "scoring, z ions") || (label == "scoring, a ions") || (label == "scoring, x ions") || (label == "refine") || (label == "refine, use potential modifications for full refinement") || (label == "refine, cleavage semi") || (label == "refine, unanticipated cleavage")|| (label == "refine, spectrum synthesis")|| (label == "refine, point mutations")) {
if ((value != "yes") && (value != "no")) {
throw pappso::ExceptionNotPossible(QObject::tr("%1 value must be yes or no (not %2)").arg(label).arg(value));
}
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 546bd9a2f0f0c877e0a1330b1e7332e31ad077f1..b49af79c325445301d2d0bc1ed164117d0a87072 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
@@ -132,7 +132,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>998</width>
+ <width>658</width>
<height>598</height>
</rect>
</property>
@@ -679,8 +679,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1012</width>
- <height>468</height>
+ <width>551</width>
+ <height>360</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1028,8 +1028,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1012</width>
- <height>468</height>
+ <width>331</width>
+ <height>326</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1224,8 +1224,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1012</width>
- <height>468</height>
+ <width>517</width>
+ <height>360</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1708,14 +1708,31 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-96</y>
+ <y>-164</y>
<width>998</width>
- <height>564</height>
+ <height>632</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<item>
<layout class="QGridLayout" name="gridLayout_5">
+ <item row="5" column="2">
+ <widget class="QPushButton" name="refmm1_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="QLineEdit" name="refpmmotif_edit"/>
+ </item>
+ <item row="7" column="2">
+ <widget class="QPushButton" name="refpmm_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
<item row="12" column="1">
<widget class="QLineEdit" name="refpmmotif2_edit"/>
</item>
@@ -1828,6 +1845,9 @@
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="rmvev_edit"/>
+ </item>
<item row="1" column="2">
<widget class="QPushButton" name="rmvev_push_button">
<property name="text">
@@ -1842,8 +1862,8 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="rmvev_edit"/>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="refpntm_edit"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_29">
@@ -1896,8 +1916,8 @@
</item>
</layout>
</item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="refpntm_edit"/>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="refpctm_edit"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_50">
@@ -1906,8 +1926,8 @@
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="refpctm_edit"/>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="refmm_edit"/>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="refpntm_push_button">
@@ -1923,8 +1943,8 @@
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="refmm_edit"/>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="refpmm_edit"/>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="refpctm_push_button">
@@ -1940,9 +1960,6 @@
</property>
</widget>
</item>
- <item row="7" column="1">
- <widget class="QLineEdit" name="refpmm_edit"/>
- </item>
<item row="5" column="0">
<widget class="QLabel" name="label_52">
<property name="text">
@@ -1950,18 +1967,11 @@
</property>
</widget>
</item>
- <item row="4" column="2">
- <widget class="QPushButton" name="refmm_push_button">
- <property name="text">
- <string>?</string>
- </property>
- </widget>
- </item>
<item row="8" column="1">
<widget class="QLineEdit" name="refpmm1_edit"/>
</item>
- <item row="5" column="2">
- <widget class="QPushButton" name="refmm1_push_button">
+ <item row="4" column="2">
+ <widget class="QPushButton" name="refmm_push_button">
<property name="text">
<string>?</string>
</property>
@@ -1977,13 +1987,6 @@
</property>
</widget>
</item>
- <item row="7" column="2">
- <widget class="QPushButton" name="refpmm_push_button">
- <property name="text">
- <string>?</string>
- </property>
- </widget>
- </item>
<item row="9" column="2">
<widget class="QPushButton" name="refpmm2_push_button">
<property name="text">
@@ -1991,9 +1994,6 @@
</property>
</widget>
</item>
- <item row="10" column="1">
- <widget class="QLineEdit" name="refpmmotif_edit"/>
- </item>
<item row="11" column="0">
<widget class="QLabel" name="label_58">
<property name="text">
@@ -2124,6 +2124,108 @@
</item>
</layout>
</item>
+ <item row="16" column="0">
+ <widget class="QLabel" name="label_63">
+ <property name="text">
+ <string>Spectrum intensity model synthesis</string>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="0">
+ <widget class="QLabel" name="label_64">
+ <property name="text">
+ <string>Point mutations</string>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="2">
+ <widget class="QPushButton" name="rss_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="17" column="2">
+ <widget class="QPushButton" name="rpm_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_25">
+ <item>
+ <widget class="QRadioButton" name="rss_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">rss_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="rss_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">rss_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_23">
+ <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="17" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_26">
+ <item>
+ <widget class="QRadioButton" name="rpm_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">rpm_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="rpm_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">rpm_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_24">
+ <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>
@@ -2160,8 +2262,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1012</width>
- <height>468</height>
+ <width>98</width>
+ <height>46</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
@@ -3126,7 +3228,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>104</y>
+ <y>36</y>
</hint>
<hint type="destinationlabel">
<x>1130</x>
@@ -3142,7 +3244,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>138</y>
+ <y>70</y>
</hint>
<hint type="destinationlabel">
<x>1076</x>
@@ -3158,7 +3260,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>172</y>
+ <y>104</y>
</hint>
<hint type="destinationlabel">
<x>1070</x>
@@ -3174,7 +3276,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>206</y>
+ <y>138</y>
</hint>
<hint type="destinationlabel">
<x>1064</x>
@@ -3190,7 +3292,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>240</y>
+ <y>172</y>
</hint>
<hint type="destinationlabel">
<x>1523</x>
@@ -3206,7 +3308,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>274</y>
+ <y>206</y>
</hint>
<hint type="destinationlabel">
<x>1523</x>
@@ -3222,7 +3324,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>308</y>
+ <y>240</y>
</hint>
<hint type="destinationlabel">
<x>993</x>
@@ -3238,7 +3340,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>342</y>
+ <y>274</y>
</hint>
<hint type="destinationlabel">
<x>1132</x>
@@ -3254,7 +3356,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>376</y>
+ <y>308</y>
</hint>
<hint type="destinationlabel">
<x>1090</x>
@@ -3270,7 +3372,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>410</y>
+ <y>342</y>
</hint>
<hint type="destinationlabel">
<x>1076</x>
@@ -3286,7 +3388,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>444</y>
+ <y>376</y>
</hint>
<hint type="destinationlabel">
<x>1001</x>
@@ -3302,7 +3404,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>478</y>
+ <y>410</y>
</hint>
<hint type="destinationlabel">
<x>933</x>
@@ -3318,7 +3420,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>512</y>
+ <y>444</y>
</hint>
<hint type="destinationlabel">
<x>920</x>
@@ -3334,7 +3436,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>546</y>
+ <y>478</y>
</hint>
<hint type="destinationlabel">
<x>807</x>
@@ -3350,7 +3452,7 @@
<hints>
<hint type="sourcelabel">
<x>1017</x>
- <y>580</y>
+ <y>512</y>
</hint>
<hint type="destinationlabel">
<x>789</x>
@@ -3365,8 +3467,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>965</x>
- <y>597</y>
+ <x>1017</x>
+ <y>546</y>
</hint>
<hint type="destinationlabel">
<x>865</x>
@@ -3374,6 +3476,38 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>rss_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>989</x>
+ <y>576</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>1172</x>
+ <y>950</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>rpm_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>963</x>
+ <y>603</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>1134</x>
+ <y>925</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
<slots>
<slot>doCopy()</slot>
@@ -3386,26 +3520,28 @@
<slot>doSelectDir()</slot>
</slots>
<buttongroups>
+ <buttongroup name="sunlw_button_group"/>
+ <buttongroup name="refine_button_group"/>
+ <buttongroup name="pstpb_button_group"/>
+ <buttongroup name="rupmffr_button_group"/>
+ <buttongroup name="ruc_button_group"/>
+ <buttongroup name="syi_button_group"/>
<buttongroup name="sci_button_group"/>
+ <buttongroup name="sir_button_group"/>
<buttongroup name="sbi_button_group"/>
- <buttongroup name="pqp_button_group"/>
- <buttongroup name="syi_button_group"/>
- <buttongroup name="spmmie_button_group"/>
+ <buttongroup name="pcsemi_button_group"/>
+ <buttongroup name="rcsemi_button_group"/>
+ <buttongroup name="szi_button_group"/>
+ <buttongroup name="spmmeu_button_group"/>
+ <buttongroup name="suca_button_group"/>
<buttongroup name="sfmmeu_button_group"/>
- <buttongroup name="pstpb_button_group"/>
- <buttongroup name="pqa_button_group"/>
<buttongroup name="sxi_button_group"/>
- <buttongroup name="sir_button_group"/>
- <buttongroup name="sunlw_button_group"/>
- <buttongroup name="spmmeu_button_group"/>
+ <buttongroup name="spmmie_button_group"/>
+ <buttongroup name="pqa_button_group"/>
+ <buttongroup name="pqp_button_group"/>
<buttongroup name="sai_button_group"/>
- <buttongroup name="pcsemi_button_group"/>
- <buttongroup name="suca_button_group"/>
- <buttongroup name="refine_button_group"/>
- <buttongroup name="rupmffr_button_group"/>
<buttongroup name="scp_button_group"/>
- <buttongroup name="szi_button_group"/>
- <buttongroup name="ruc_button_group"/>
- <buttongroup name="rcsemi_button_group"/>
+ <buttongroup name="rss_button_group"/>
+ <buttongroup name="rpm_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 cd614096c5f73eb4304daa14beb970873f6cf67b..f7064b2e1f3a1f31c6a33d5d67cad0ac1cd25e18 100644
--- a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+++ b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
@@ -378,6 +378,14 @@ void EditTandemPresetDialog::doHelp() {
{
html_doc.setFileName(":/tandem/resources/html_doc/ruc.html");
}
+ if(senderObjName == "rss_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/rss.html");
+ }
+ if(senderObjName == "rpm_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/rpm.html");
+ }
if (html_doc.open(QFile::ReadOnly | QFile::Text)) {
QTextStream in(&html_doc);
@@ -531,6 +539,16 @@ void EditTandemPresetDialog::readUi() {
if (ui->ruc_yes_radio_button->isChecked()) {
_tandem_params.setParamLabelValue("refine, unanticipated cleavage", "yes");
}
+ _tandem_params.setParamLabelValue("refine, spectrum synthesis", "no");
+ if (ui->rss_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("refine, spectrum synthesis", "yes");
+ }
+ _tandem_params.setParamLabelValue("refine, point mutations", "no");
+ if (ui->rpm_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("refine, point mutations", "yes");
+ }
+
+
}
catch (pappso::PappsoException & error) {
@@ -805,7 +823,19 @@ void EditTandemPresetDialog::populate() {
ui->ruc_no_radio_button->setChecked(true);
}
//<note type="input" label="refine, spectrum synthesis">yes</note>
+ ui->rss_yes_radio_button->setChecked(true);
+ ui->rss_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("refine, spectrum synthesis") == "no" ) { // -1 for not found
+ ui->rss_yes_radio_button->setChecked(false);
+ ui->rss_no_radio_button->setChecked(true);
+ }
//<note type="input" label="refine, point mutations">no</note>
+ ui->rpm_yes_radio_button->setChecked(true);
+ ui->rpm_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("refine, point mutations") == "no" ) { // -1 for not found
+ ui->rpm_yes_radio_button->setChecked(false);
+ ui->rpm_no_radio_button->setChecked(true);
+ }
qDebug() << "EditTandemPresetDialog::populate end";
}