From 876788849ffbced45fb24504d9809ab7a35d8715 Mon Sep 17 00:00:00 2001 From: Olivier Langella <olivier.langella@u-psud.fr> Date: Thu, 6 Jun 2019 21:14:29 +0200 Subject: [PATCH] new pappso ms ++ API updates --- .../identification_sources/identificationdatasource.cpp | 7 ++++--- src/gui/peptide_list_view/peptidetableproxymodel.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/identification_sources/identificationdatasource.cpp b/src/core/identification_sources/identificationdatasource.cpp index cabdf57e8..26bc4ca1f 100644 --- a/src/core/identification_sources/identificationdatasource.cpp +++ b/src/core/identification_sources/identificationdatasource.cpp @@ -201,7 +201,8 @@ IdentificationDataSource::getMassSpectrumCstSPtr(unsigned int scan_number) const { scan_number = scan_number - 1; } - pappso::MsRunReaderSp msrun_reader_sp = _ms_run_sp.get()->getMsRunReaderSp(); + pappso::MsRunReaderSPtr msrun_reader_sp = + _ms_run_sp.get()->getMsRunReaderSPtr(); if(msrun_reader_sp == nullptr) { @@ -212,7 +213,7 @@ IdentificationDataSource::getMassSpectrumCstSPtr(unsigned int scan_number) const .arg(_ms_run_sp.get()->getFileName())); } } - msrun_reader_sp = _ms_run_sp.get()->getMsRunReaderSp(); + msrun_reader_sp = _ms_run_sp.get()->getMsRunReaderSPtr(); if(msrun_reader_sp == nullptr) { throw pappso::ExceptionNotFound( @@ -224,7 +225,7 @@ IdentificationDataSource::getMassSpectrumCstSPtr(unsigned int scan_number) const // qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__ << // _ms_run_sp.get()->getMsRunReaderSp().get()->getSpectrumListSize(); - qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__ ; + qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__; std::size_t spectrum_index = msrun_reader_sp.get()->scanNumber2SpectrumIndex(scan_number); qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__ << " " diff --git a/src/gui/peptide_list_view/peptidetableproxymodel.cpp b/src/gui/peptide_list_view/peptidetableproxymodel.cpp index 9eb0a037a..b7685c087 100644 --- a/src/gui/peptide_list_view/peptidetableproxymodel.cpp +++ b/src/gui/peptide_list_view/peptidetableproxymodel.cpp @@ -146,7 +146,7 @@ PeptideTableProxyModel::filterAcceptsRow(int source_row, { msrun_ok = false; if(peptide_evidence->getMsRunP() - ->getFilename() + ->getFileName() .toLower() .contains(file_search_string)) { -- GitLab