diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d92200278ae7f15b098c94539b5cf97ce8ab3cd..d32cfddebe078fc826e589865d93667faf657bc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11") SET(PAPPSOMSPP_VERSION_MAJOR "0") SET(PAPPSOMSPP_VERSION_MINOR "2") -SET(PAPPSOMSPP_VERSION_PATCH "10") +SET(PAPPSOMSPP_VERSION_PATCH "11") SET(PAPPSOMSPP_VERSION "${PAPPSOMSPP_VERSION_MAJOR}.${PAPPSOMSPP_VERSION_MINOR}.${PAPPSOMSPP_VERSION_PATCH}") # Set the CMAKE_PREFIX_PATH for the find_library fonction when using non diff --git a/debian/changelog b/debian/changelog index 9f8831d2b93fa2c7c060668d231dc1a17ec280ba..3150a45e5d53e020706d4450f1d724f3137d14d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libpappsomspp (0.2.11-1) jessie; urgency=medium + + * get highest and lowest mass of MassRange + + -- Olivier Langella <Olivier.Langella@moulon.inra.fr> Thu, 28 Apr 2016 15:14:20 +0200 + libpappsomspp (0.2.10-1) jessie; urgency=medium * peptide modification API modified, new Xic MS point distance diff --git a/src/pappsomspp/mass_range.cpp b/src/pappsomspp/mass_range.cpp index dcbb5125a5ac75ae73221559e2493511467a8f82..af38df2019c89401165c60a669d38c9a93b75ee9 100644 --- a/src/pappsomspp/mass_range.cpp +++ b/src/pappsomspp/mass_range.cpp @@ -96,5 +96,5 @@ bool MassRange::contains(mz mz) const { const QString MassRange::toString() const { //QString s = "mz=" + QString::number(_mz) + " delta=" + QString::number(_delta); - return QString("mz=%1 delta=%2 : %3 < %4 < %5").arg(_mz).arg(_delta).arg(_mz-_delta).arg(_mz).arg(_mz+_delta); + return QString("mz=%1 delta=%2 : %3 < %4 < %5").arg(_mz).arg(_delta).arg(getLowest()).arg(_mz).arg(getHighest()); }