diff --git a/src/core/tandem_run/tandemparameters.cpp b/src/core/tandem_run/tandemparameters.cpp
index 1886ac2bde1285d3944289402b30ab54dbde8b7b..429b09e907ed27ad31f4f8608b74147723fc9d21 100644
--- a/src/core/tandem_run/tandemparameters.cpp
+++ b/src/core/tandem_run/tandemparameters.cpp
@@ -95,14 +95,13 @@ 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")) {
+ 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")) {
if ((value != "yes") && (value != "no")) {
throw pappso::ExceptionNotPossible(QObject::tr("%1 value must be yes or no (not %2)").arg(label).arg(value));
}
}
-
if ((label == "spectrum, parent monoisotopic mass error minus") || (label == "spectrum, parent monoisotopic mass error plus")|| (label == "spectrum, dynamic range") || (label == "spectrum, minimum parent m+h") || (label == "protein, cleavage C-terminal mass change")|| (label == "protein, cleavage N-terminal mass change") || (label == "protein, C-terminal residue modification mass") || (label == "protein, N-terminal residue modification mass")) {
bool ok;
value.toDouble(&ok);
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 bd53a96f1b21da739c61c2f20bf7b1ae6720e84c..6b95bb51a39d413ff24436854dc51066edbb8164 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>658</width>
+ <width>998</width>
<height>598</height>
</rect>
</property>
@@ -679,8 +679,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>551</width>
- <height>360</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -1028,8 +1028,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>331</width>
- <height>326</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1231,6 +1231,27 @@
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<layout class="QGridLayout" name="gridLayout_4">
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_42">
+ <property name="text">
+ <string>Use Y ions </string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QPushButton" name="sir_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="label_45">
+ <property name="text">
+ <string>Use Z ions</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
@@ -1316,6 +1337,342 @@
</item>
</layout>
</item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_43">
+ <property name="text">
+ <string>Use B ions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_41">
+ <property name="text">
+ <string>Automatically perform reverse database search</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_11">
+ <item>
+ <widget class="QRadioButton" name="sir_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sir_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sir_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sir_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_12">
+ <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="0">
+ <widget class="QLabel" name="label_46">
+ <property name="text">
+ <string>Use A ions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_44">
+ <property name="text">
+ <string>Use C ions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="label_47">
+ <property name="text">
+ <string>Use X ions</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QPushButton" name="syi_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="2">
+ <widget class="QPushButton" name="sbi_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
+ <widget class="QPushButton" name="sci_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="2">
+ <widget class="QPushButton" name="szi_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="2">
+ <widget class="QPushButton" name="sai_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="2">
+ <widget class="QPushButton" name="sxi_push_button">
+ <property name="text">
+ <string>?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_15">
+ <item>
+ <widget class="QRadioButton" name="syi_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">syi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="syi_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">syi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_13">
+ <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="5" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_16">
+ <item>
+ <widget class="QRadioButton" name="sbi_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sbi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sbi_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sbi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_14">
+ <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="6" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_17">
+ <item>
+ <widget class="QRadioButton" name="sci_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sci_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sci_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sci_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_15">
+ <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="7" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_18">
+ <item>
+ <widget class="QRadioButton" name="szi_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">szi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="szi_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">szi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_16">
+ <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_19">
+ <item>
+ <widget class="QRadioButton" name="sai_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sai_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sai_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sai_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_17">
+ <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="9" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_20">
+ <item>
+ <widget class="QRadioButton" name="sxi_yes_radio_button">
+ <property name="text">
+ <string>yes</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sxi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="sxi_no_radio_button">
+ <property name="text">
+ <string>no</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">sxi_button_group</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_18">
+ <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>
@@ -1352,8 +1709,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>98</width>
- <height>46</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
@@ -1402,8 +1759,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>98</width>
- <height>46</height>
+ <width>1012</width>
+ <height>468</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
@@ -1535,8 +1892,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>200</y>
</hint>
<hint type="destinationlabel">
<x>1728</x>
@@ -1567,8 +1924,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>234</y>
</hint>
<hint type="destinationlabel">
<x>720</x>
@@ -1583,8 +1940,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>268</y>
</hint>
<hint type="destinationlabel">
<x>1181</x>
@@ -1599,8 +1956,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>302</y>
</hint>
<hint type="destinationlabel">
<x>1037</x>
@@ -1631,8 +1988,8 @@
<slot>doEdit(QString)</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>568</x>
+ <y>234</y>
</hint>
<hint type="destinationlabel">
<x>464</x>
@@ -1647,8 +2004,8 @@
<slot>doEdit(QString)</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>568</x>
+ <y>268</y>
</hint>
<hint type="destinationlabel">
<x>798</x>
@@ -1695,8 +2052,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>336</y>
</hint>
<hint type="destinationlabel">
<x>1209</x>
@@ -1711,8 +2068,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>370</y>
</hint>
<hint type="destinationlabel">
<x>1247</x>
@@ -1727,8 +2084,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>404</y>
</hint>
<hint type="destinationlabel">
<x>1142</x>
@@ -1743,8 +2100,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>438</y>
</hint>
<hint type="destinationlabel">
<x>1322</x>
@@ -1759,8 +2116,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>472</y>
</hint>
<hint type="destinationlabel">
<x>1259</x>
@@ -1775,8 +2132,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>506</y>
</hint>
<hint type="destinationlabel">
<x>1588</x>
@@ -1791,8 +2148,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>540</y>
</hint>
<hint type="destinationlabel">
<x>1674</x>
@@ -1807,8 +2164,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>574</y>
</hint>
<hint type="destinationlabel">
<x>1611</x>
@@ -1823,8 +2180,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>608</y>
</hint>
<hint type="destinationlabel">
<x>1711</x>
@@ -1839,8 +2196,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>642</y>
</hint>
<hint type="destinationlabel">
<x>1642</x>
@@ -1855,8 +2212,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>676</y>
</hint>
<hint type="destinationlabel">
<x>1579</x>
@@ -1871,8 +2228,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>710</y>
</hint>
<hint type="destinationlabel">
<x>1734</x>
@@ -1887,8 +2244,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1017</x>
+ <y>744</y>
</hint>
<hint type="destinationlabel">
<x>1734</x>
@@ -1903,8 +2260,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>200</y>
</hint>
<hint type="destinationlabel">
<x>1735</x>
@@ -1919,8 +2276,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>234</y>
</hint>
<hint type="destinationlabel">
<x>1678</x>
@@ -1935,8 +2292,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>268</y>
</hint>
<hint type="destinationlabel">
<x>1454</x>
@@ -1951,8 +2308,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>302</y>
</hint>
<hint type="destinationlabel">
<x>1486</x>
@@ -1967,8 +2324,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>336</y>
</hint>
<hint type="destinationlabel">
<x>1511</x>
@@ -1983,8 +2340,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>370</y>
</hint>
<hint type="destinationlabel">
<x>1577</x>
@@ -1999,8 +2356,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>404</y>
</hint>
<hint type="destinationlabel">
<x>1521</x>
@@ -2015,8 +2372,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>438</y>
</hint>
<hint type="destinationlabel">
<x>1521</x>
@@ -2031,8 +2388,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>472</y>
</hint>
<hint type="destinationlabel">
<x>1521</x>
@@ -2047,8 +2404,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>506</y>
</hint>
<hint type="destinationlabel">
<x>1521</x>
@@ -2063,8 +2420,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>200</y>
</hint>
<hint type="destinationlabel">
<x>1605</x>
@@ -2079,8 +2436,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>234</y>
</hint>
<hint type="destinationlabel">
<x>1616</x>
@@ -2095,8 +2452,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>268</y>
</hint>
<hint type="destinationlabel">
<x>1684</x>
@@ -2111,8 +2468,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>302</y>
</hint>
<hint type="destinationlabel">
<x>1691</x>
@@ -2127,8 +2484,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>336</y>
</hint>
<hint type="destinationlabel">
<x>1690</x>
@@ -2143,8 +2500,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>370</y>
</hint>
<hint type="destinationlabel">
<x>1691</x>
@@ -2159,8 +2516,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>404</y>
</hint>
<hint type="destinationlabel">
<x>1637</x>
@@ -2175,8 +2532,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>438</y>
</hint>
<hint type="destinationlabel">
<x>1637</x>
@@ -2191,8 +2548,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>138</x>
- <y>201</y>
+ <x>1031</x>
+ <y>472</y>
</hint>
<hint type="destinationlabel">
<x>1637</x>
@@ -2248,6 +2605,118 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>sir_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>977</x>
+ <y>290</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>921</x>
+ <y>-89</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>syi_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>1009</x>
+ <y>320</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>1006</x>
+ <y>-66</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>sbi_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>972</x>
+ <y>361</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>1013</x>
+ <y>-132</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>sci_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>1000</x>
+ <y>387</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>1042</x>
+ <y>-88</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>szi_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>960</x>
+ <y>432</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>896</x>
+ <y>-56</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>sai_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>1010</x>
+ <y>458</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>919</x>
+ <y>-44</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>sxi_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>975</x>
+ <y>493</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>921</x>
+ <y>-18</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
<slots>
<slot>doCopy()</slot>
@@ -2260,15 +2729,22 @@
<slot>doSelectDir()</slot>
</slots>
<buttongroups>
+ <buttongroup name="spmmie_button_group"/>
+ <buttongroup name="scp_button_group"/>
<buttongroup name="spmmeu_button_group"/>
<buttongroup name="suca_button_group"/>
- <buttongroup name="spmmie_button_group"/>
- <buttongroup name="pstpb_button_group"/>
<buttongroup name="sfmmeu_button_group"/>
- <buttongroup name="sunlw_button_group"/>
- <buttongroup name="pqa_button_group"/>
<buttongroup name="pcsemi_button_group"/>
+ <buttongroup name="pqa_button_group"/>
<buttongroup name="pqp_button_group"/>
- <buttongroup name="scp_button_group"/>
+ <buttongroup name="pstpb_button_group"/>
+ <buttongroup name="sunlw_button_group"/>
+ <buttongroup name="sir_button_group"/>
+ <buttongroup name="syi_button_group"/>
+ <buttongroup name="sbi_button_group"/>
+ <buttongroup name="sci_button_group"/>
+ <buttongroup name="szi_button_group"/>
+ <buttongroup name="sai_button_group"/>
+ <buttongroup name="sxi_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 a8c1d551e851e1b642c5895673225652015d2969..743f036302232c27ed5695451f0bb092cdc6db91 100644
--- a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+++ b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
@@ -310,6 +310,35 @@ void EditTandemPresetDialog::doHelp() {
{
html_doc.setFileName(":/tandem/resources/html_doc/scp.html");
}
+ if(senderObjName == "sir_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/sir.html");
+ }
+ if(senderObjName == "syi_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/syi.html");
+ }
+ if(senderObjName == "sbi_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/sbi.html");
+ }
+ if(senderObjName == "sci_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/sci.html");
+ }
+ if(senderObjName == "szi_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/szi.html");
+ }
+ if(senderObjName == "sai_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/sai.html");
+ }
+ if(senderObjName == "sxi_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/sxi.html");
+ }
+
_tandem_params.setParamLabelValue("residue, potential modification mass", ui->rpmm_edit->text());
@@ -409,9 +438,36 @@ void EditTandemPresetDialog::readUi() {
if (ui->scp_yes_radio_button->isChecked()) {
_tandem_params.setParamLabelValue("scoring, cyclic permutation", "yes");
}
-
+ _tandem_params.setParamLabelValue("scoring, include reverse", "no");
+ if (ui->sir_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, include reverse", "yes");
+ }
_tandem_params.setParamLabelValue("scoring, minimum ion count", ui->smic_edit->text());
+ _tandem_params.setParamLabelValue("scoring, y ions", "no");
+ if (ui->syi_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, y ions", "yes");
+ }
+ _tandem_params.setParamLabelValue("scoring, b ions", "no");
+ if (ui->sbi_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, b ions", "yes");
+ }
+ _tandem_params.setParamLabelValue("scoring, c ions", "no");
+ if (ui->sci_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, c ions", "yes");
+ }
+ _tandem_params.setParamLabelValue("scoring, z ions", "no");
+ if (ui->szi_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, z ions", "yes");
+ }
+ _tandem_params.setParamLabelValue("scoring, a ions", "no");
+ if (ui->sai_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, a ions", "yes");
+ }
+ _tandem_params.setParamLabelValue("scoring, x ions", "no");
+ if (ui->sxi_yes_radio_button->isChecked()) {
+ _tandem_params.setParamLabelValue("scoring, x ions", "yes");
+ }
}
catch (pappso::PappsoException & error) {
QMessageBox::warning(this,tr("Error in parameters :"), error.qwhat());
@@ -581,12 +637,54 @@ void EditTandemPresetDialog::populate() {
ui->scp_no_radio_button->setChecked(true);
}
//<note type="input" label="scoring, include reverse">yes</note>
+ ui->sir_yes_radio_button->setChecked(true);
+ ui->sir_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, include reverse") == "no" ) { // -1 for not found
+ ui->sir_yes_radio_button->setChecked(false);
+ ui->sir_no_radio_button->setChecked(true);
+ }
//<note type="input" label="scoring, y ions">yes</note>
+ ui->syi_yes_radio_button->setChecked(true);
+ ui->syi_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, y ions") == "no" ) { // -1 for not found
+ ui->syi_yes_radio_button->setChecked(false);
+ ui->syi_no_radio_button->setChecked(true);
+ }
//<note type="input" label="scoring, b ions">yes</note>
+ ui->sbi_yes_radio_button->setChecked(true);
+ ui->sbi_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, b ions") == "no" ) { // -1 for not found
+ ui->sbi_yes_radio_button->setChecked(false);
+ ui->sbi_no_radio_button->setChecked(true);
+ }
//<note type="input" label="scoring, c ions">no</note>
+ ui->sci_yes_radio_button->setChecked(true);
+ ui->sci_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, c ions") == "no" ) { // -1 for not found
+ ui->sci_yes_radio_button->setChecked(false);
+ ui->sci_no_radio_button->setChecked(true);
+ }
//<note type="input" label="scoring, z ions">no</note>
+ ui->szi_yes_radio_button->setChecked(true);
+ ui->szi_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, z ions") == "no" ) { // -1 for not found
+ ui->szi_yes_radio_button->setChecked(false);
+ ui->szi_no_radio_button->setChecked(true);
+ }
//<note type="input" label="scoring, a ions">no</note>
+ ui->sai_yes_radio_button->setChecked(true);
+ ui->sai_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, a ions") == "no" ) { // -1 for not found
+ ui->sai_yes_radio_button->setChecked(false);
+ ui->sai_no_radio_button->setChecked(true);
+ }
//<note type="input" label="scoring, x ions">no</note>
+ ui->sxi_yes_radio_button->setChecked(true);
+ ui->sxi_no_radio_button->setChecked(false);
+ if ( _tandem_params.getValue("scoring, x ions") == "no" ) { // -1 for not found
+ ui->sxi_yes_radio_button->setChecked(false);
+ ui->sxi_no_radio_button->setChecked(true);
+ }
qDebug() << "EditTandemPresetDialog::populate end";
}