Skip to content
Snippets Groups Projects
Commit 862002dd authored by Langella Olivier's avatar Langella Olivier
Browse files

spectrum total peaks

parent 27fd1e9a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/core/tandem_run/tandemparameters.cpp
+ 2
− 2
View file @ 862002dd
......@@ -100,14 +100,14 @@ void TandemParameters::setParamLabelValue(const QString & label, const QString &
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")) {
if ((label == "spectrum, parent monoisotopic mass error minus") || (label == "spectrum, parent monoisotopic mass error plus")|| (label == "spectrum, dynamic range")) {
bool ok;
value.toDouble(&ok);
if (!ok) {// not an integer
throw pappso::ExceptionNotPossible(QObject::tr("%1 value must be a number (not %2)").arg(label).arg(value));
}
}
if ((label == "spectrum, maximum parent charge")) {
if ((label == "spectrum, maximum parent charge") || (label == "spectrum, total peaks")) {
bool ok;
value.toInt(&ok);
if (!ok) {// not an integer
......
src/gui/edit_tandem_preset_dialog/edit_tandem_preset_dialog.ui
+ 138
− 72
View file @ 862002dd
......@@ -133,7 +133,7 @@
<x>0</x>
<y>0</y>
<width>990</width>
<height>334</height>
<height>402</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
......@@ -200,6 +200,20 @@
</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">
......@@ -233,20 +247,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="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
......@@ -267,6 +267,9 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="parent_ion_upper_window_edit"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="parent_ion_lower_window_edit"/>
</item>
......@@ -277,16 +280,6 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Anticipate carbon isotope parent ion assignments errors</string>
</property>
</widget>
</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>
......@@ -301,6 +294,19 @@
</item>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="smpc_edit"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Anticipate carbon isotope parent ion assignments errors</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="sfmme_edit"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
......@@ -315,9 +321,6 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="smpc_edit"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
......@@ -325,9 +328,6 @@
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="sfmme_edit"/>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="smpc_push_button">
<property name="text">
......@@ -342,20 +342,6 @@
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Fragment ion mass tolerance (monoisotopic)</string>
</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>
......@@ -370,6 +356,20 @@
</item>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Fragment ion mass tolerance (monoisotopic)</string>
</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="0">
<widget class="QLabel" name="label_10">
<property name="text">
......@@ -377,6 +377,40 @@
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QPushButton" name="sdr_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="sdr_edit"/>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Set the dynamic range to score spectra</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Maximum number of peaks to use in a spectrum</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLineEdit" name="stp_edit"/>
</item>
<item row="10" column="2">
<widget class="QPushButton" name="stp_push_button">
<property name="text">
<string>?</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
......@@ -413,8 +447,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>990</width>
<height>334</height>
<width>98</width>
<height>72</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
......@@ -553,8 +587,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>976</x>
<y>242</y>
<x>1009</x>
<y>234</y>
</hint>
<hint type="destinationlabel">
<x>1728</x>
......@@ -570,7 +604,7 @@
<hints>
<hint type="sourcelabel">
<x>1030</x>
<y>181</y>
<y>147</y>
</hint>
<hint type="destinationlabel">
<x>1542</x>
......@@ -585,8 +619,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>976</x>
<y>276</y>
<x>1009</x>
<y>268</y>
</hint>
<hint type="destinationlabel">
<x>720</x>
......@@ -601,8 +635,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>976</x>
<y>310</y>
<x>1009</x>
<y>302</y>
</hint>
<hint type="destinationlabel">
<x>1181</x>
......@@ -617,8 +651,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>976</x>
<y>344</y>
<x>1009</x>
<y>336</y>
</hint>
<hint type="destinationlabel">
<x>1037</x>
......@@ -634,7 +668,7 @@
<hints>
<hint type="sourcelabel">
<x>944</x>
<y>181</y>
<y>147</y>
</hint>
<hint type="destinationlabel">
<x>707</x>
......@@ -649,8 +683,8 @@
<slot>doEdit(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>890</x>
<y>242</y>
<x>923</x>
<y>234</y>
</hint>
<hint type="destinationlabel">
<x>400</x>
......@@ -666,7 +700,7 @@
<hints>
<hint type="sourcelabel">
<x>923</x>
<y>302</y>
<y>268</y>
</hint>
<hint type="destinationlabel">
<x>464</x>
......@@ -681,8 +715,8 @@
<slot>doEdit(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>890</x>
<y>310</y>
<x>923</x>
<y>302</y>
</hint>
<hint type="destinationlabel">
<x>798</x>
......@@ -697,8 +731,8 @@
<slot>doEdit(QString)</slot>
<hints>
<hint type="sourcelabel">
<x>890</x>
<y>344</y>
<x>923</x>
<y>336</y>
</hint>
<hint type="destinationlabel">
<x>970</x>
......@@ -714,7 +748,7 @@
<hints>
<hint type="sourcelabel">
<x>1313</x>
<y>102</y>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>1737</x>
......@@ -730,7 +764,7 @@
<hints>
<hint type="sourcelabel">
<x>1430</x>
<y>102</y>
<y>85</y>
</hint>
<hint type="destinationlabel">
<x>1796</x>
......@@ -746,7 +780,7 @@
<hints>
<hint type="sourcelabel">
<x>1009</x>
<y>404</y>
<y>370</y>
</hint>
<hint type="destinationlabel">
<x>1209</x>
......@@ -762,7 +796,7 @@
<hints>
<hint type="sourcelabel">
<x>1009</x>
<y>438</y>
<y>404</y>
</hint>
<hint type="destinationlabel">
<x>1247</x>
......@@ -778,7 +812,7 @@
<hints>
<hint type="sourcelabel">
<x>1009</x>
<y>472</y>
<y>438</y>
</hint>
<hint type="destinationlabel">
<x>1142</x>
......@@ -794,7 +828,7 @@
<hints>
<hint type="sourcelabel">
<x>1009</x>
<y>506</y>
<y>472</y>
</hint>
<hint type="destinationlabel">
<x>1322</x>
......@@ -809,8 +843,8 @@
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>951</x>
<y>529</y>
<x>1009</x>
<y>506</y>
</hint>
<hint type="destinationlabel">
<x>1259</x>
......@@ -818,6 +852,38 @@
</hint>
</hints>
</connection>
<connection>
<sender>sdr_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>980</x>
<y>532</y>
</hint>
<hint type="destinationlabel">
<x>1588</x>
<y>672</y>
</hint>
</hints>
</connection>
<connection>
<sender>stp_push_button</sender>
<signal>clicked()</signal>
<receiver>EditTandemPresetView</receiver>
<slot>doHelp()</slot>
<hints>
<hint type="sourcelabel">
<x>957</x>
<y>568</y>
</hint>
<hint type="destinationlabel">
<x>1674</x>
<y>619</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>doCopy()</slot>
......
src/gui/edit_tandem_preset_dialog/edittandempresetdialog.cpp
+ 20
− 4
View file @ 862002dd
......@@ -213,7 +213,14 @@ void EditTandemPresetDialog::doHelp() {
{
html_doc.setFileName(":/tandem/resources/html_doc/sunlw.html");
}
if(senderObjName == "sdr_push_button")
{
html_doc.setFileName(":/tandem/resources/html_doc/sdr.html");
}
if(senderObjName == "stp_push_button")
{
html_doc.setFileName(":/tandem/resources/html_doc/stp.html");
}
if (html_doc.open(QFile::ReadOnly | QFile::Text)) {
QTextStream in(&html_doc);
......@@ -244,7 +251,11 @@ 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());
_tandem_params.setParamLabelValue("spectrum, dynamic range", ui->sdr_edit->text());
_tandem_params.setParamLabelValue("spectrum, total peaks", ui->stp_edit->text());
}
catch (pappso::PappsoException & error) {
QMessageBox::warning(this,tr("Error in parameters :"), error.qwhat());
......@@ -289,12 +300,17 @@ 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>
//<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);
}
//<note type="input" label="spectrum, dynamic range">100.0</note>
ui->sdr_edit->setText(_tandem_params.getValue("spectrum, dynamic range"));
//<note type="input" label="spectrum, total peaks">100</note>
ui->stp_edit->setText(_tandem_params.getValue("spectrum, total peaks"));
qDebug() << "EditTandemPresetDialog::populate end";
}
......
src/gui/main.ui
+ 1
− 1
View file @ 862002dd
......@@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../xtpcpp.qrc">
<normaloff>:/xtpcpp_icon/resources/xtandempipeline_icon.svg</normaloff>:/xtpcpp_icon/resources/xtandempipeline_icon.svg</iconset>
<normaloff>:/tandem/resources/xtandempipeline_icon.svg</normaloff>:/tandem/resources/xtandempipeline_icon.svg</iconset>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment