diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a16ae686e980e6c988e538b86a716e1881b44c41..c08b83a5b2def798f5ddd036ae85b125b688a79b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5 #sudo apt-get install libpappsomspp-dev -#FIND_PACKAGE( Pappsomspp REQUIRED ) +FIND_PACKAGE( Pappsomspp REQUIRED ) # SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp") - SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp") - SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") - SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") +# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp") +# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") +# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) diff --git a/src/gui/protein_list_view/protein_view.ui b/src/gui/protein_list_view/protein_view.ui index 13cf419ce5de6d8a4cdf24a705091762fbf2fe9a..91273797907bdebf177f23df05523dca38f69ac3 100644 --- a/src/gui/protein_list_view/protein_view.ui +++ b/src/gui/protein_list_view/protein_view.ui @@ -86,6 +86,16 @@ <string>group</string> </property> </item> + <item> + <property name="text"> + <string>sequence</string> + </property> + </item> + <item> + <property name="text"> + <string>peptide</string> + </property> + </item> </widget> </item> <item> diff --git a/src/gui/protein_list_view/proteintableproxymodel.cpp b/src/gui/protein_list_view/proteintableproxymodel.cpp index 234bf5e1ec6ed7eef4c124e609379a21562c95ef..a0631e18d7b61b2a052e499b293c3866d6e97f17 100644 --- a/src/gui/protein_list_view/proteintableproxymodel.cpp +++ b/src/gui/protein_list_view/proteintableproxymodel.cpp @@ -57,6 +57,20 @@ bool ProteinTableProxyModel::filterAcceptsRow(int source_row, } } } + else if (_search_on == "sequence") { + if (!protein_match->getProteinXtpSp().get()->getSequence().contains(_protein_search_string)) { + return false; + } + } + else if (_search_on == "peptide") { + QString peptide_search_string = QString(_protein_search_string).replace("L","I"); + for (PeptideMatch * p_peptide_match: protein_match->getPeptideMatchList()) { + if (p_peptide_match->getPeptideXtpSp().get()->getSequenceLi().contains(peptide_search_string)) { + return true; + } + } + return false; + } else { if (!protein_match->getProteinXtpSp().get()->getDescription().contains(_protein_search_string)) { return false;