diff --git a/src/core/tandem_run/tandemparameters.cpp b/src/core/tandem_run/tandemparameters.cpp
index 2c4fec7ae36a144c8acb8b29e515637eeabd8980..bf20fc2fab53e6704131a49ed38352f5724c5a32 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") {
+ if ((label == "spectrum, parent monoisotopic mass isotope error") || (label == "spectrum, use neutral loss window")) {
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 65f878f3019c111be5973e532551d5434ad26490..7fa19cbc7628748d28b0a9b115ddbfe616e99c0c 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,9 +131,9 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-94</y>
- <width>957</width>
- <height>292</height>
+ <y>0</y>
+ <width>990</width>
+ <height>334</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -267,6 +267,9 @@
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="parent_ion_lower_window_edit"/>
+ </item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -281,12 +284,23 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="parent_ion_lower_window_edit"/>
- </item>
<item row="2" column="1">
<widget class="QLineEdit" name="parent_ion_upper_window_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="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
@@ -301,19 +315,8 @@
</property>
</widget>
</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 row="4" column="1">
+ <widget class="QLineEdit" name="smpc_edit"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_9">
@@ -322,8 +325,8 @@
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="smpc_edit"/>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="sfmme_edit"/>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="smpc_push_button">
@@ -339,9 +342,6 @@
</property>
</widget>
</item>
- <item row="7" column="1">
- <widget class="QLineEdit" name="sfmme_edit"/>
- </item>
<item row="7" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
@@ -349,6 +349,34 @@
</property>
</widget>
</item>
+ <item row="8" column="2">
+ <widget class="QPushButton" name="sunlw_push_button">
+ <property name="text">
+ <string>?</string>
+ </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="8" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Control the use of the neutral loss window</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -385,8 +413,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>971</width>
- <height>198</height>
+ <width>990</width>
+ <height>334</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -494,7 +522,7 @@
<hints>
<hint type="sourcelabel">
<x>1343</x>
- <y>620</y>
+ <y>654</y>
</hint>
<hint type="destinationlabel">
<x>881</x>
@@ -510,7 +538,7 @@
<hints>
<hint type="sourcelabel">
<x>1429</x>
- <y>620</y>
+ <y>654</y>
</hint>
<hint type="destinationlabel">
<x>879</x>
@@ -541,8 +569,8 @@
<slot>doSave()</slot>
<hints>
<hint type="sourcelabel">
- <x>1011</x>
- <y>249</y>
+ <x>1030</x>
+ <y>181</y>
</hint>
<hint type="destinationlabel">
<x>1542</x>
@@ -605,8 +633,8 @@
<slot>doCopy()</slot>
<hints>
<hint type="sourcelabel">
- <x>925</x>
- <y>249</y>
+ <x>944</x>
+ <y>181</y>
</hint>
<hint type="destinationlabel">
<x>707</x>
@@ -637,8 +665,8 @@
<slot>doEdit(QString)</slot>
<hints>
<hint type="sourcelabel">
- <x>889</x>
- <y>269</y>
+ <x>923</x>
+ <y>302</y>
</hint>
<hint type="destinationlabel">
<x>464</x>
@@ -686,7 +714,7 @@
<hints>
<hint type="sourcelabel">
<x>1313</x>
- <y>136</y>
+ <y>102</y>
</hint>
<hint type="destinationlabel">
<x>1737</x>
@@ -702,7 +730,7 @@
<hints>
<hint type="sourcelabel">
<x>1430</x>
- <y>136</y>
+ <y>102</y>
</hint>
<hint type="destinationlabel">
<x>1796</x>
@@ -717,8 +745,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>940</x>
- <y>366</y>
+ <x>1009</x>
+ <y>404</y>
</hint>
<hint type="destinationlabel">
<x>1209</x>
@@ -733,8 +761,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>917</x>
- <y>400</y>
+ <x>1009</x>
+ <y>438</y>
</hint>
<hint type="destinationlabel">
<x>1247</x>
@@ -749,8 +777,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>909</x>
- <y>432</y>
+ <x>1009</x>
+ <y>472</y>
</hint>
<hint type="destinationlabel">
<x>1142</x>
@@ -765,8 +793,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
- <x>944</x>
- <y>469</y>
+ <x>1009</x>
+ <y>506</y>
</hint>
<hint type="destinationlabel">
<x>1322</x>
@@ -774,6 +802,22 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>sunlw_push_button</sender>
+ <signal>clicked()</signal>
+ <receiver>EditTandemPresetView</receiver>
+ <slot>doHelp()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>951</x>
+ <y>529</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>1259</x>
+ <y>628</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
<slots>
<slot>doCopy()</slot>
diff --git a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
index f3219f9cea4f39e6df9c6f5159dac40bb24a0a5a..9b43b6a30b714eb01b7804010506ba95fc0b96d7 100644
--- a/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+++ b/src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
@@ -209,6 +209,10 @@ void EditTandemPresetDialog::doHelp() {
{
html_doc.setFileName(":/tandem/resources/html_doc/sfmme.html");
}
+ if(senderObjName == "sunlw_push_button")
+ {
+ html_doc.setFileName(":/tandem/resources/html_doc/sunlw.html");
+ }
if (html_doc.open(QFile::ReadOnly | QFile::Text)) {
@@ -239,6 +243,8 @@ void EditTandemPresetDialog::readUi() {
_tandem_params.setParamLabelValue("spectrum, fragment monoisotopic mass error units", ui->sfmmeu_combo_box->currentText());
_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());
+
}
catch (pappso::PappsoException & error) {
QMessageBox::warning(this,tr("Error in parameters :"), error.qwhat());
@@ -283,6 +289,12 @@ void EditTandemPresetDialog::populate() {
//<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);
+ }
qDebug() << "EditTandemPresetDialog::populate end";
}