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

first code using new msrunretentiontime API

parent 7fb24ede
No related branches found
No related tags found
No related merge requests found
...@@ -48,7 +48,7 @@ else () ...@@ -48,7 +48,7 @@ else ()
endif () endif ()
#depending on libpappsomspp version : #depending on libpappsomspp version :
SET(LIBPAPPSOMSPP_VERSION "0.6.0-1") SET(LIBPAPPSOMSPP_VERSION "0.6.1-1")
configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY) configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY)
...@@ -58,7 +58,7 @@ SET(BUILD_SYSTEM_NAME "${CMAKE_SYSTEM}") ...@@ -58,7 +58,7 @@ SET(BUILD_SYSTEM_NAME "${CMAKE_SYSTEM}")
SET(XTPCPP_VERSION_MAJOR "0") SET(XTPCPP_VERSION_MAJOR "0")
SET(XTPCPP_VERSION_MINOR "2") SET(XTPCPP_VERSION_MINOR "2")
SET(XTPCPP_VERSION_PATCH "37") SET(XTPCPP_VERSION_PATCH "38")
SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}") SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}")
# Set the CMAKE_PREFIX_PATH for the find_library fonction when using non # Set the CMAKE_PREFIX_PATH for the find_library fonction when using non
......
...@@ -56,6 +56,7 @@ ELSE (PAPPSOMSPP_WIDGET_QT5_FOUND) ...@@ -56,6 +56,7 @@ ELSE (PAPPSOMSPP_WIDGET_QT5_FOUND)
MESSAGE("did you apt-get install libpappsomspp-widget-dev ?") MESSAGE("did you apt-get install libpappsomspp-widget-dev ?")
ENDIF (PAPPSOMSPP_WIDGET_QT5_FOUND) ENDIF (PAPPSOMSPP_WIDGET_QT5_FOUND)
MESSAGE("PAPPSOms++ library : ${PAPPSOMSPP_QT5_LIBRARY}")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
......
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
#include <QSettings> #include <QSettings>
#include <QMessageBox> #include <QMessageBox>
#include <QFileDialog> #include <QFileDialog>
#include <pappsomspp/msrun/alignment/msrunretentiontime.h>
#include <pappsomspp/msfile/msfileaccessor.h>
ExportMasschroqDialog::ExportMasschroqDialog(QWidget *parent) ExportMasschroqDialog::ExportMasschroqDialog(QWidget *parent)
: QDialog(parent), ui(new Ui::ExportMasschroqDialog) : QDialog(parent), ui(new Ui::ExportMasschroqDialog)
...@@ -261,3 +263,31 @@ ExportMasschroqDialog::doBrowseMsrunDirectory() ...@@ -261,3 +263,31 @@ ExportMasschroqDialog::doBrowseMsrunDirectory()
<< parent.absolutePath(); << parent.absolutePath();
} }
} }
void
ExportMasschroqDialog::doFindBestMsrunForAlignment()
{
for(IdentificationDataSourceSp p_ident_data_source :
mp_project->getIdentificationDataSourceStore()
.getIdentificationDataSourceList())
{
MsRunSp msrun_sp = p_ident_data_source->getMsRunSp();
if(msrun_sp->findMsRunFile())
{
// msrun_sp->checkMsRunStatistics();
pappso::MsRunReaderSPtr reader = msrun_sp->getMsRunReaderSPtr();
pappso::MsRunRetentionTime<QString> msrun_retention_time(reader);
}
else
{
ui->warningDirectoryLabel->setText(
tr("%1 not found : Please choose the directory to look for this MS "
"run file.")
.arg(msrun_sp.get()->getFileName()));
ui->directorySelectWidget->setHidden(false);
break;
}
}
}
...@@ -50,6 +50,7 @@ class ExportMasschroqDialog : public QDialog ...@@ -50,6 +50,7 @@ class ExportMasschroqDialog : public QDialog
protected slots: protected slots:
void doCheckMsrunFilepath(); void doCheckMsrunFilepath();
void doBrowseMsrunDirectory(); void doBrowseMsrunDirectory();
void doFindBestMsrunForAlignment();
public: public:
explicit ExportMasschroqDialog(QWidget *parent); explicit ExportMasschroqDialog(QWidget *parent);
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
*implementation *implementation
******************************************************************************/ ******************************************************************************/
#ifndef PEPTIDEEVIDENCESTORE_H #pragma once
#define PEPTIDEEVIDENCESTORE_H
#include <memory> #include <memory>
#include <vector> #include <vector>
...@@ -70,7 +69,8 @@ class PeptideEvidenceStore ...@@ -70,7 +69,8 @@ class PeptideEvidenceStore
*/ */
void getSameXicPeptideEvidenceList( void getSameXicPeptideEvidenceList(
std::vector<const PeptideEvidence *> &peptide_evidence_list, std::vector<const PeptideEvidence *> &peptide_evidence_list,
const MsRun *p_msrun, const PeptideXtp *p_peptide, const MsRun *p_msrun,
const PeptideXtp *p_peptide,
unsigned int charge) const; unsigned int charge) const;
private: private:
...@@ -79,5 +79,3 @@ class PeptideEvidenceStore ...@@ -79,5 +79,3 @@ class PeptideEvidenceStore
std::multimap<unsigned int, std::shared_ptr<PeptideEvidence>> std::multimap<unsigned int, std::shared_ptr<PeptideEvidence>>
_multimap_scan_evidence; _multimap_scan_evidence;
}; };
#endif // PEPTIDEEVIDENCESTORE_H
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