From 063eef40b3da6191b11cddc012da9b7b7f75072d Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Sat, 31 Mar 2018 07:36:46 +0200
Subject: [PATCH] catch mouse click on Xic
---
src/CMakeLists.txt | 10 +++++-----
src/gui/xic_view/xic_box/xicbox.cpp | 5 +++++
src/gui/xic_view/xic_box/xicbox.h | 1 +
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f59c289..d4345f46 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,12 +27,12 @@ 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")
+#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_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so")
-# SET (PAPPSOMSPP_WIDGET_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/pappsomspp/widget/libpappsomspp-widget-qt5.so")
+ 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")
# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
IF (PAPPSOMSPP_QT5_FOUND)
ELSE (PAPPSOMSPP_QT5_FOUND)
diff --git a/src/gui/xic_view/xic_box/xicbox.cpp b/src/gui/xic_view/xic_box/xicbox.cpp
index 978362ce..48cce61a 100644
--- a/src/gui/xic_view/xic_box/xicbox.cpp
+++ b/src/gui/xic_view/xic_box/xicbox.cpp
@@ -113,6 +113,7 @@ XicBox::XicBox(XicWindow *parent):
connect(_p_xic_window, &XicWindow::reExtractXicNeeded,this, &XicBox::reExtractXic);
connect(ui->xic_widget, &pappso::XicWidget::xicPeakListChanged,this, &XicBox::setXicPeakList);
+ connect(ui->xic_widget, &pappso::XicWidget::clicked,this, &XicBox::onXicWidgetClick);
connect(_p_xic_window, &XicWindow::rtUnitChangeNeeded,this, &XicBox::onRtUnitChanged);
#else
@@ -142,6 +143,10 @@ XicBox::~XicBox()
_xic_thread.wait();
}
+void XicBox::onXicWidgetClick(double rt, double intensity) {
+ qDebug() << __FILE__ << " " <<__FUNCTION__ << " " << __LINE__;
+}
+
void XicBox::remove() {
_p_xic_window->removeXicBox(this);
}
diff --git a/src/gui/xic_view/xic_box/xicbox.h b/src/gui/xic_view/xic_box/xicbox.h
index 4e43a6b2..949d174d 100644
--- a/src/gui/xic_view/xic_box/xicbox.h
+++ b/src/gui/xic_view/xic_box/xicbox.h
@@ -66,6 +66,7 @@ private slots:
void setRetentionTime(double rt);
void setXicPeakList(std::vector<std::pair<pappso::XicSp, pappso::XicPeakSp>> xic_peak_list);
void onRtUnitChanged();
+ void onXicWidgetClick(double rt, double intensity);
private:
Ui::XicBox *ui;
--
GitLab