Skip to content
Snippets Groups Projects
Commit 4acff869 authored by Olivier Langella's avatar Olivier Langella
Browse files

replace modification is OK

parent 435e4ed9
No related branches found
No related tags found
No related merge requests found
...@@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5 ...@@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5
#sudo apt-get install libpappsomspp-dev #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/olivier/eclipse/git/pappsomspp")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp") SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
......
...@@ -78,10 +78,10 @@ const pappso::Peptide * PeptideXtp::getNativePeptideP() const { ...@@ -78,10 +78,10 @@ const pappso::Peptide * PeptideXtp::getNativePeptideP() const {
} }
bool PeptideXtp::replaceModification(pappso::AaModificationP oldmod, pappso::AaModificationP newmod) { bool PeptideXtp::replaceModification(pappso::AaModificationP oldmod, pappso::AaModificationP newmod) {
/*
pappso::Peptide::replaceModification(oldmod, newmod); pappso::Peptide::replaceAaModification(oldmod, newmod);
if (_sp_native_peptide.get() != nullptr) { if (_sp_native_peptide.get() != nullptr) {
_sp_native_peptide.get()->replaceModification(oldmod, newmod); //_sp_native_peptide.get()->replaceAaModification(oldmod, newmod);
} }
*/
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>PSI MOD selection</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
......
...@@ -70,7 +70,7 @@ ChooseModificationDialog::~ChooseModificationDialog() ...@@ -70,7 +70,7 @@ ChooseModificationDialog::~ChooseModificationDialog()
void ChooseModificationDialog::setMassRange(const pappso::MassRange & massrange) { void ChooseModificationDialog::setMassRange(const pappso::MassRange & massrange) {
qDebug() << "ChooseModificationDialog::setMassRange " << massrange.toString(); qDebug() << "ChooseModificationDialog::setMassRange " << massrange.toString();
_selected_modification = nullptr;
_p_modification_str_li->removeRows(0,_p_modification_str_li->rowCount()); _p_modification_str_li->removeRows(0,_p_modification_str_li->rowCount());
pappso::FilterOboPsiModSink term_list; pappso::FilterOboPsiModSink term_list;
......
...@@ -142,12 +142,17 @@ void EditModifications::doActionReplace() { ...@@ -142,12 +142,17 @@ void EditModifications::doActionReplace() {
if (_selected_modification != nullptr) { if (_selected_modification != nullptr) {
if (_replace_modification != nullptr) { if (_replace_modification != nullptr) {
_project_sp.get()->getPeptideStore().replaceModification(_selected_modification, _replace_modification); _project_sp.get()->getPeptideStore().replaceModification(_selected_modification, _replace_modification);
_project_window->doAutomaticFilterParametersChanged(_project_sp.get()->getAutomaticFilterParameters());
setProjectSp(_project_sp);
} }
} }
qDebug() << "EditModifications::doActionReplace end"; qDebug() << "EditModifications::doActionReplace end";
} }
void EditModifications::doAcceptedBrowseDialog() { void EditModifications::doAcceptedBrowseDialog() {
setReplaceModification(_p_browse_modification_dialog->getSelectedModification()); setReplaceModification(_p_browse_modification_dialog->getSelectedModification());
} }
...@@ -63,8 +63,11 @@ PeptideXtpSp & PeptideStore::getInstance(PeptideXtpSp & peptide_in) { ...@@ -63,8 +63,11 @@ PeptideXtpSp & PeptideStore::getInstance(PeptideXtpSp & peptide_in) {
bool PeptideStore::replaceModification(pappso::AaModificationP oldmod, pappso::AaModificationP newmod) { bool PeptideStore::replaceModification(pappso::AaModificationP oldmod, pappso::AaModificationP newmod) {
for (std::pair<std::size_t, PeptideXtpSp> pair_peptide:_map_crc_peptide_list) { for (std::pair<std::size_t, PeptideXtpSp> pair_peptide:_map_crc_peptide_list) {
PeptideXtpSp peptide_xtp = pair_peptide.second; PeptideXtpSp peptide_xtp = pair_peptide.second;
peptide_xtp.get()->replaceModification(oldmod, newmod); peptide_xtp.get()->replaceAaModification(oldmod, newmod);
} }
_modification_collection.erase(oldmod);
_modification_collection.insert(newmod);
} }
const std::set<pappso::AaModificationP> & PeptideStore::getModificationCollection() const { const std::set<pappso::AaModificationP> & PeptideStore::getModificationCollection() const {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment