From c72868064e74ba32cf7d5e324b2ff1ef7782bdc6 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Tue, 16 Jan 2018 21:55:18 +0100
Subject: [PATCH] clear before plotting xics
---
src/CMakeLists.txt | 4 ++--
src/gui/xic_view/xic_box/xicbox.cpp | 3 +--
src/gui/xic_view/xicwindow.cpp | 6 +-----
src/gui/xic_view/xicwindow.h | 1 -
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 159b03b3..71bd578d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,8 +28,8 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5
#sudo apt-get install libpappsomspp-dev
#FIND_PACKAGE( Pappsomspp REQUIRED )
-# SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
- SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
+ 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_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so")
SET (PAPPSOMSPP_WIDGET_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so")
diff --git a/src/gui/xic_view/xic_box/xicbox.cpp b/src/gui/xic_view/xic_box/xicbox.cpp
index 92ba8acd..1bed097c 100644
--- a/src/gui/xic_view/xic_box/xicbox.cpp
+++ b/src/gui/xic_view/xic_box/xicbox.cpp
@@ -101,7 +101,7 @@ void XicBox::setPeptideEvidence(const PeptideEvidence * p_peptide_evidence) {
void XicBox::setXic(std::vector< pappso::XicSp> xic_sp_list) {
qDebug() << "XicBox::setXic begin " << xic_sp_list.size();
-
+ ui->xic_widget->clear();
//pappso::XicWidget * xic_widget = new pappso::XicWidget(this);
//ui->xic_list_widget->layout()->addWidget(xic_widget);
for (int i=0; i < xic_sp_list.size(); i++) {
@@ -157,7 +157,6 @@ void XicBox::setIsotopeMassList(std::vector<pappso::PeptideNaturalIsotopeAverage
void XicBox::reExtractXic() {
qDebug() << "XicBox::reExtractXic begin";
ui->xic_widget->clear();
- ui->xic_widget->plot();
std::vector<pappso::mz> mass_list;
for (pappso::PeptideNaturalIsotopeAverageSp & natural_isotope_average: _isotope_mass_list) {
diff --git a/src/gui/xic_view/xicwindow.cpp b/src/gui/xic_view/xicwindow.cpp
index 0a296194..703195a7 100644
--- a/src/gui/xic_view/xicwindow.cpp
+++ b/src/gui/xic_view/xicwindow.cpp
@@ -43,8 +43,7 @@ XicWindow::XicWindow(ProjectWindow *parent):
QSettings settings;
QString precision_str = settings.value("xic/precision", "10 ppm").toString();
- _old_xic_extract_precision = pappso::Precision::fromString(precision_str);
- ui->xic_precision->setPrecision(_old_xic_extract_precision);
+ ui->xic_precision->setPrecision(pappso::Precision::fromString(precision_str));
#if QT_VERSION >= 0x050000
// Qt5 code
@@ -92,10 +91,7 @@ pappso::PrecisionP XicWindow::getXicExtractPrecision() const {
void XicWindow::xicPrecisionChanged(pappso::PrecisionP precision) {
qDebug() << "XicWindow::xicPrecisionChanged begin";
- if (precision != _old_xic_extract_precision) {
- _old_xic_extract_precision = precision;
qDebug() << "XicWindow::xicPrecisionChanged emit";
emit reExtractXicNeeded();
- }
qDebug() << "XicWindow::xicPrecisionChanged end";
}
diff --git a/src/gui/xic_view/xicwindow.h b/src/gui/xic_view/xicwindow.h
index fdc0e2f9..e04745b6 100644
--- a/src/gui/xic_view/xicwindow.h
+++ b/src/gui/xic_view/xicwindow.h
@@ -69,7 +69,6 @@ protected:
private:
ProjectWindow * _project_window;
Ui::XicWindow *ui;
- pappso::PrecisionP _old_xic_extract_precision;
};
#endif // XICWINDOW_H
--
GitLab