From 7dabcd4a20c6ca3602b61179db4b4f6c0604f256 Mon Sep 17 00:00:00 2001 From: Olivier Langella <Olivier.Langella@moulon.inra.fr> Date: Fri, 7 Apr 2017 21:58:21 +0200 Subject: [PATCH] sequence Li count --- src/core/proteinmatch.cpp | 4 ++-- src/core/proteinmatch.h | 2 +- src/grouping/groupinggroup.cpp | 6 +++--- src/gui/protein_list_view/proteintablemodel.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/proteinmatch.cpp b/src/core/proteinmatch.cpp index 339b3a6cb..af186f98c 100644 --- a/src/core/proteinmatch.cpp +++ b/src/core/proteinmatch.cpp @@ -187,11 +187,11 @@ unsigned int ProteinMatch::countPeptideMatch(ValidationState state) const { }); } -size_t ProteinMatch::countUniqueSequence(ValidationState state)const { +size_t ProteinMatch::countUniqueSequenceLi(ValidationState state)const { std::set<QString> sequence_list; for (auto & p_peptide_match : _peptide_match_list) { if (p_peptide_match->getValidationState() >= state) { - sequence_list.insert(p_peptide_match->getPeptideXtpSp().get()->getSequence()); + sequence_list.insert(p_peptide_match->getPeptideXtpSp().get()->getSequenceLi()); } } return sequence_list.size(); diff --git a/src/core/proteinmatch.h b/src/core/proteinmatch.h index 76c495033..a2039e62b 100644 --- a/src/core/proteinmatch.h +++ b/src/core/proteinmatch.h @@ -80,7 +80,7 @@ public: /** @brief count unique identified sequences (from valid and cheked spectrums) * */ - size_t countUniqueSequence(ValidationState state)const; + size_t countUniqueSequenceLi(ValidationState state)const; const pappso::GrpProteinSp & getGrpProteinSp() const; diff --git a/src/grouping/groupinggroup.cpp b/src/grouping/groupinggroup.cpp index b27c25706..f5da520f6 100644 --- a/src/grouping/groupinggroup.cpp +++ b/src/grouping/groupinggroup.cpp @@ -111,19 +111,19 @@ std::size_t GroupingGroup::countSpecificSpectrum(const ProteinMatch * p_protein_ std::size_t GroupingGroup::countSpecificSequence(const ProteinMatch * p_protein_match) const { if (_number_of_subgroup == 1) { - return p_protein_match->countUniqueSequence(ValidationState::validAndChecked); + return p_protein_match->countUniqueSequenceLi(ValidationState::validAndChecked); } std::set<QString> sequence_list_in; for (auto && p_peptide_match :p_protein_match->getPeptideMatchList()) { if (p_peptide_match->isValidAndChecked()) { - sequence_list_in.insert(p_peptide_match->getPeptideXtpSp().get()->getSequence()); + sequence_list_in.insert(p_peptide_match->getPeptideXtpSp().get()->getSequenceLi()); } } std::set<QString> sequence_list_out; unsigned int sg_number = p_protein_match->getGrpProteinSp().get()->getSubGroupNumber(); for (auto && pair_peptide_match :_pair_sg_number_peptide_match_list) { if (pair_peptide_match.first != sg_number) { - sequence_list_out.insert(pair_peptide_match.second->getPeptideXtpSp().get()->getSequence()); + sequence_list_out.insert(pair_peptide_match.second->getPeptideXtpSp().get()->getSequenceLi()); } } diff --git a/src/gui/protein_list_view/proteintablemodel.cpp b/src/gui/protein_list_view/proteintablemodel.cpp index 904fa910d..9302b550e 100644 --- a/src/gui/protein_list_view/proteintablemodel.cpp +++ b/src/gui/protein_list_view/proteintablemodel.cpp @@ -181,7 +181,7 @@ QVariant ProteinTableModel::data(const QModelIndex &index, int role ) const { } if (_column_assignment[col] == (std::int8_t) ProteinListColumn::sequence ) { - return QVariant ((qreal) _p_identification_group->getProteinMatchList().at(row)->countUniqueSequence(ValidationState::validAndChecked)); + return QVariant ((qreal) _p_identification_group->getProteinMatchList().at(row)->countUniqueSequenceLi(ValidationState::validAndChecked)); } if (_column_assignment[col] == (std::int8_t) ProteinListColumn::specific_sequence ) { GroupingGroup * p_groupin_group = _p_identification_group->getProteinMatchList().at(row)->getGroupingGroupSp().get(); -- GitLab