From 90bde36b046505c27cb6dc579810afa56945d41f Mon Sep 17 00:00:00 2001 From: Olivier Langella <olivier.langella@u-psud.fr> Date: Fri, 23 Mar 2018 16:04:36 +0100 Subject: [PATCH] delta MH switched from theoretical - observed to observed - theoretical --- src/core/peptideevidence.h | 4 ++-- src/gui/peptide_list_view/peptidelistwindow.cpp | 1 + src/gui/peptide_list_view/peptidetablemodel.cpp | 6 +++--- src/gui/peptide_list_view/peptidetablemodel.h | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/peptideevidence.h b/src/core/peptideevidence.h index 4e727774..8dc7dfa4 100644 --- a/src/core/peptideevidence.h +++ b/src/core/peptideevidence.h @@ -110,12 +110,12 @@ public : void updateAutomaticFilters(const AutomaticFilterParameters & automatic_filter_parameters); /** @brief get delta between theoretical mhplus mass and mhplus experimental mass - * theoretical mhplus mass - mhplus experimental mass + * mhplus experimental mass - theoretical mhplus mass */ pappso::mz getDeltaMass() const; /** @brief get delta in ppm between theoretical mhplus mass and mhplus experimental mass - * @return theoretical mhplus mass - mhplus experimental mass + * @return mhplus experimental mass - theoretical mhplus mass */ pappso::mz getPpmDeltaMass() const; diff --git a/src/gui/peptide_list_view/peptidelistwindow.cpp b/src/gui/peptide_list_view/peptidelistwindow.cpp index 5f0a4770..f313fe52 100644 --- a/src/gui/peptide_list_view/peptidelistwindow.cpp +++ b/src/gui/peptide_list_view/peptidelistwindow.cpp @@ -27,6 +27,7 @@ #include "ui_peptide_view.h" + PeptideListQactionColumn::PeptideListQactionColumn(PeptideListWindow * parent, PeptideListColumn column):QAction(parent) { this->setText(PeptideTableModel::getTitle(column)); diff --git a/src/gui/peptide_list_view/peptidetablemodel.cpp b/src/gui/peptide_list_view/peptidetablemodel.cpp index 396aac97..3fb37add 100644 --- a/src/gui/peptide_list_view/peptidetablemodel.cpp +++ b/src/gui/peptide_list_view/peptidetablemodel.cpp @@ -189,7 +189,7 @@ QVariant PeptideTableModel::data(const QModelIndex &index, int role ) const { return QVariant((qreal) (_p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->getExperimentalMass()+pappso::MHPLUS)); break; case (std::int8_t)PeptideListColumn::theoretical_mhplus: - return QVariant((qreal) _p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->getPeptideXtpSp().get()->getMz(1)); + return QVariant(_p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->getPeptideXtpSp().get()->getMz(1)); break; case (std::int8_t)PeptideListColumn::delta_mhplus: return QVariant((qreal) _p_protein_match->getPeptideMatchList().at(row).getPeptideEvidence()->getDeltaMass()); @@ -369,10 +369,10 @@ const QString PeptideTableModel::getDescription(std::int8_t column) { return "peptide theoretical MH+"; break; case (std::int8_t) PeptideListColumn::delta_mhplus: - return "peptide mass difference in dalton between theoretical mass and observed mass (theoretical - observed)"; + return "peptide mass difference in dalton between observed mass and theoretical mass (observed - theoretical)"; break; case (std::int8_t) PeptideListColumn::delta_ppm: - return "peptide mass difference in ppm between theoretical mass and observed mass"; + return "peptide mass difference in ppm between observed mass and theoretical mass"; break; case (std::int8_t) PeptideListColumn::hyperscore: return "X!Tandem hyperscore"; diff --git a/src/gui/peptide_list_view/peptidetablemodel.h b/src/gui/peptide_list_view/peptidetablemodel.h index 5aa61a29..cde92b47 100644 --- a/src/gui/peptide_list_view/peptidetablemodel.h +++ b/src/gui/peptide_list_view/peptidetablemodel.h @@ -48,8 +48,8 @@ enum class PeptideListColumn: std::int8_t { used=13, subgroups=14, Evalue=15, - theoretical_mhplus=16, - experimental_mhplus=17, + experimental_mhplus=16, + theoretical_mhplus=17, delta_mhplus=18, delta_ppm=19, hyperscore=20, -- GitLab