WIP : qwt6 transition

modules/FindQwt6.cmake

+# Find the Qwt 6.x includes and library, either the version linked to Qt3 or 
+# the version linked to Qt4
+#
+# On Windows it makes these assumptions:
+#    - the Qwt DLL is where the other DLLs for Qt are (QT_DIR\bin) or in the path
+#    - the Qwt .h files are in QT_DIR\include\Qwt or in the path
+#    - the Qwt .lib is where the other LIBs for Qt are (QT_DIR\lib) or in the path
+#
+# Qwt6_INCLUDE_DIR - where to find qwt.h if Qwt
+# Qwt6_Qt4_LIBRARY - The Qwt6 library linked against Qt4 (if it exists)
+# Qwt6_Qt3_LIBRARY - The Qwt6 library linked against Qt4 (if it exists)
+# Qwt6_Qt4_FOUND   - Qwt6 was found and uses Qt4
+# Qwt6_Qt3_FOUND   - Qwt6 was found and uses Qt3
+# Qwt6_FOUND - Set to TRUE if Qwt6 was found (linked either to Qt3 or Qt4)
+
+# Copyright (c) 2007, Pau Garcia i Quiles, <pgquiles@elpauer.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# Condition is "(A OR B) AND C", CMake does not support parentheses but it
+# evaluates left to right
+IF(Qwt6_Qt4_LIBRARY OR Qwt6_Qt3_LIBRARY AND Qwt6_INCLUDE_DIR)
+    SET(Qwt6_FIND_QUIETLY TRUE)
+ENDIF(Qwt6_Qt4_LIBRARY OR Qwt6_Qt3_LIBRARY AND Qwt6_INCLUDE_DIR)
+
+#IF(NOT QT4_FOUND)
+	#FIND_PACKAGE( Qt4 REQUIRED QUIET )
+#ENDIF(NOT QT4_FOUND)
+
+# keep QWT_ROOT variable
+if ("$ENV{QWT_ROOT}" STREQUAL "")
+    if (NOT "${QWT_DIR}" STREQUAL "")
+        set(ENV{QWT_ROOT} ${QWT_DIR})
+    endif()
+else()
+    set(QWT_DIR $ENV{QWT_ROOT} CACHE STRING "QWT directory")
+endif()
+
+#IF( QT4_FOUND )
+	# Is Qwt6 installed? Look for header files
+	FIND_PATH( Qwt6_INCLUDE_DIR qwt.h 
+               PATHS ${QT_INCLUDE_DIR}
+               $ENV{QWT_ROOT}/include
+               /usr/local/qwt/include
+               /usr/include/qwt
+               /usr/local/qwt-6.0.2-svn/include/
+               /usr/local/qwt-6.0.1-svn/include/
+               /usr/local/qwt-6.0.0-rc1/include
+               /usr/local/qwt-6.0.0-rc3/include
+               PATH_SUFFIXES
+               qwt
+               qwt6
+               qwt-qt4
+               qwt6-qt4
+               qwt-qt3
+               qwt6-qt3
+               include
+               qwt/include
+               qwt6/include
+               qwt-qt4/include
+               qwt6-qt4/include
+               qwt-qt3/include
+               qwt6-qt3/include
+               ENV PATH)
+	
+	# Find Qwt version
+	IF( Qwt6_INCLUDE_DIR )
+		FILE( READ ${Qwt6_INCLUDE_DIR}/qwt_global.h QWT_GLOBAL_H )
+		STRING( REGEX MATCH "#define *QWT_VERSION *(0x06*)" QWT_IS_VERSION_6 ${QWT_GLOBAL_H})
+		
+		IF( QWT_IS_VERSION_6 )
+		STRING(REGEX REPLACE ".*#define[\\t\\ ]+QWT_VERSION_STR[\\t\\ ]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" "\\1" Qwt_VERSION "${QWT_GLOBAL_H}")
+
+		# Find Qwt6 library linked to Qt4
+		FIND_LIBRARY( Qwt6_Qt4_TENTATIVE_LIBRARY 
+		      NAMES qwt6-qt4 qwt-qt4 qwt6 qwt
+		      PATHS
+		      /usr/local/qwt/lib
+		      /usr/local/lib
+		      /usr/local/qwt-6.0.1-svn/lib
+		      /usr/local/qwt-6.0.2-svn/lib
+		      /usr/local/qwt-6.0.0-rc1/lib
+		      /usr/local/qwt-6.0.0-rc3/lib
+               $ENV{HOME}/local/qwt-6.0.2-svn/lib
+		      /usr/lib
+		      ${QT_LIBRARY_DIR})
+		      
+		IF( UNIX AND NOT CYGWIN)
+			IF( Qwt6_Qt4_TENTATIVE_LIBRARY )
+        #MESSAGE("Qwt6_Qt4_TENTATIVE_LIBRARY = ${Qwt6_Qt4_TENTATIVE_LIBRARY}")
+				EXECUTE_PROCESS( COMMAND "ldd" ${Qwt6_Qt4_TENTATIVE_LIBRARY} OUTPUT_VARIABLE Qwt_Qt4_LIBRARIES_LINKED_TO )
+				STRING( REGEX MATCH ".*QtCore.*" Qwt6_IS_LINKED_TO_Qt4 ${Qwt_Qt4_LIBRARIES_LINKED_TO})
+				IF( Qwt6_IS_LINKED_TO_Qt4 )
+					SET( Qwt6_Qt4_LIBRARY ${Qwt6_Qt4_TENTATIVE_LIBRARY} )
+					SET( Qwt6_Qt4_FOUND TRUE )
+					IF (NOT Qwt6_FIND_QUIETLY)
+						MESSAGE( STATUS "Found Qwt: ${Qwt6_Qt4_LIBRARY}" )
+					ENDIF (NOT Qwt6_FIND_QUIETLY)
+				ENDIF( Qwt6_IS_LINKED_TO_Qt4 )
+			ENDIF( Qwt6_Qt4_TENTATIVE_LIBRARY )
+		ELSE( UNIX AND NOT CYGWIN)
+		# Assumes qwt.dll is in the Qt dir
+			SET( Qwt6_Qt4_LIBRARY ${Qwt6_Qt4_TENTATIVE_LIBRARY} )
+			SET( Qwt6_Qt4_FOUND TRUE )
+			IF (NOT Qwt6_FIND_QUIETLY)
+				MESSAGE( STATUS "Found Qwt version ${Qwt_VERSION} linked to Qt4" )
+			ENDIF (NOT Qwt6_FIND_QUIETLY)
+		ENDIF( UNIX AND NOT CYGWIN)
+		
+		
+		# Find Qwt6 library linked to Qt3
+		FIND_LIBRARY( Qwt6_Qt3_TENTATIVE_LIBRARY NAMES qwt-qt3 qwt qwt6-qt3 qwt6 )
+		IF( UNIX AND NOT CYGWIN)
+			IF( Qwt6_Qt3_TENTATIVE_LIBRARY )
+				#MESSAGE("Qwt6_Qt3_TENTATIVE_LIBRARY = ${Qwt6_Qt3_TENTATIVE_LIBRARY}")
+				EXECUTE_PROCESS( COMMAND "ldd" ${Qwt6_Qt3_TENTATIVE_LIBRARY} OUTPUT_VARIABLE Qwt-Qt3_LIBRARIES_LINKED_TO )
+				STRING( REGEX MATCH "qt-mt" Qwt6_IS_LINKED_TO_Qt3 ${Qwt-Qt3_LIBRARIES_LINKED_TO})
+				IF( Qwt6_IS_LINKED_TO_Qt3 )
+					SET( Qwt6_Qt3_LIBRARY ${Qwt6_Qt3_TENTATIVE_LIBRARY} )
+					SET( Qwt6_Qt3_FOUND TRUE )
+					IF (NOT Qwt6_FIND_QUIETLY)
+						MESSAGE( STATUS "Found Qwt version ${Qwt_VERSION} linked to Qt3" )
+					ENDIF (NOT Qwt6_FIND_QUIETLY)
+				ENDIF( Qwt6_IS_LINKED_TO_Qt3 )
+			ENDIF( Qwt6_Qt3_TENTATIVE_LIBRARY )
+		ELSE( UNIX AND NOT CYGWIN)
+			SET( Qwt6_Qt3_LIBRARY ${Qwt6_Qt3_TENTATIVE_LIBRARY} )
+			SET( Qwt6_Qt3_FOUND TRUE )
+			IF (NOT Qwt6_FIND_QUIETLY)
+				MESSAGE( STATUS "Found Qwt: ${Qwt6_Qt3_LIBRARY}" )
+			ENDIF (NOT Qwt6_FIND_QUIETLY)
+		ENDIF( UNIX AND NOT CYGWIN)
+		
+		ENDIF( QWT_IS_VERSION_6 )
+		
+		IF( Qwt6_Qt4_FOUND OR Qwt6_Qt3_FOUND )
+			SET( Qwt6_FOUND TRUE )
+		ENDIF( Qwt6_Qt4_FOUND OR Qwt6_Qt3_FOUND )
+		
+		MARK_AS_ADVANCED( Qwt6_INCLUDE_DIR Qwt6_Qt4_LIBRARY Qwt6_Qt3_LIBRARY )
+	ENDIF( Qwt6_INCLUDE_DIR )
+
+   	IF (NOT Qwt6_FOUND AND Qwt6_FIND_REQUIRED)
+      		MESSAGE(FATAL_ERROR "Could not find Qwt 6.x")
+   	ENDIF (NOT Qwt6_FOUND AND Qwt6_FIND_REQUIRED)
+
+#ENDIF( QT4_FOUND )

src/CMakeLists.txt

@@ -28,9 +28,9 @@ if (NOT PAPPSOMSPP_DIR)
 #	FIND_PACKAGE( Pappsomspp REQUIRED )
 endif (NOT PAPPSOMSPP_DIR)
 #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}/build/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}/build/src/libpappsomspp-qt4.so")
 
 INCLUDE_DIRECTORIES( ${PAPPSOMSPP_INCLUDE_DIR})
 
@@ -234,12 +234,12 @@ ELSE (NOGUI)
 		INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR})
   	ELSE (NOQWT)
  		set(Qwt5_DIR ${masschroq_SOURCE_DIR}/Modules)
- 		#FIND_PACKAGE(Qwt5 REQUIRED)
+ 		FIND_PACKAGE(Qwt6 REQUIRED)
  		# and finally this will run moc:
  		QT4_WRAP_CPP( STUDIO_MOC_SRCS ${STUDIO_MOC_HDRS} )
 		# we need this to be able to include headers produced by uic in our code
 		# (CMAKE_BINARY_DIR holds a path to the build directory, while INCLUDE_DIRECTORIES() works just like INCLUDEPATH from qmake)
-		INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${QWT_INCLUDE_DIR})
+		INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${Qwt6_INCLUDE_DIR})
   	ENDIF (NOQWT)
 
   # this command will generate rules that will run rcc on all files from SAMPLE_RCS
@@ -272,7 +272,7 @@ IF (MINGW32)
 	IF (NOQWT)
   	ELSE (NOQWT)
   	    ADD_EXECUTABLE(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS} ${MASSCHROQ_LIB_SRCS}  ${MASSCHROQ_LIB_MOC_SRCS} ${SAXLIB_SRCS} ${OBIWARP_SRCS})
-    	TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${QWT_LIBRARY}  ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
+    	TARGET_LINK_LIBRARIES(masschroq_studio ${QT_LIBRARIES} ${Qwt6_Qt4_LIBRARY}  ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
     	SET_TARGET_PROPERTIES(masschroq_studio PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import  -Wl,--subsystem,windows ${ADD_MINGW_EXE_LINKER_FLAGS}")
   	ENDIF (NOQWT)
 
@@ -302,12 +302,12 @@ ELSE (MINGW32)
 
 
     ADD_EXECUTABLE(masschroq_gui gui/launcherGui.cpp ${GUI_SRCS} ${GUI_MOC_SRCS} ${GUI_UI_HDRS})
-    TARGET_LINK_LIBRARIES(masschroq_gui ${MASSCHROQ_LIB_NAME} ${QT_LIBRARIES} ${Qwt5_Qt4_LIBRARY}  ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
+    TARGET_LINK_LIBRARIES(masschroq_gui ${MASSCHROQ_LIB_NAME} ${QT_LIBRARIES}  ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
 
     IF (NOQWT)
   	ELSE (NOQWT)
 		ADD_EXECUTABLE(masschroq_studio gui/parameterGui.cpp ${STUDIO_SRCS} ${STUDIO_MOC_SRCS})
-		TARGET_LINK_LIBRARIES(masschroq_studio ${MASSCHROQ_LIB_NAME} ${QT_LIBRARIES} ${Qwt5_Qt4_LIBRARY}  ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
+		TARGET_LINK_LIBRARIES(masschroq_studio ${MASSCHROQ_LIB_NAME} ${QT_LIBRARIES} ${Qwt6_Qt4_LIBRARY}  ${PAPPSOMSPP_QT4_LIBRARY} ${ODSSTREAM_QT4_LIBRARY})
  	ENDIF (NOQWT)
 
   ENDIF (NOGUI)

src/gui/alignementwidget/alignment_widget.cpp

@@ -97,8 +97,10 @@ void AlignmentWidget::completDataToMsrun(Msrun * msrun){
 }
 
 void AlignmentWidget::doneAlignment() {
+    qDebug()<< "AlignmentWidget::doneAlignment begin";
 	_runningQLabel->stopLoading("");
 	this->emitSignalDoneAlignement();
+     qDebug()<< "AlignmentWidget::doneAlignment end";
 }
 
 void AlignmentWidget::startAlignment() {

src/gui/alignementwidget/ms2_alignment_widget.cpp

@@ -266,10 +266,12 @@ void Ms2AlignmentWidget::completDataToMsrun(Msrun * msrun) {
 }
 
 void Ms2AlignmentWidget::emitSignalDoneAlignement() {
+    qDebug() << "Ms2AlignmentWidget::emitSignalDoneAlignement begin" ;
 	emit newAlignmentCurve();
 	MonitorAlignmentPlot * monitor = (MonitorAlignmentPlot *) _monitor;
 	emit finishMonitorAlignment(monitor);
 	emit finishAlignment(_msunToAligned);
+    qDebug() << "Ms2AlignmentWidget::emitSignalDoneAlignement end" ;
 }
 
 void Ms2AlignmentWidget::deleteData() {

src/gui/alignementwidget/plot_aligned.cpp

@@ -37,7 +37,7 @@ PlotAligned::~PlotAligned() {
 }
 
 void PlotAligned::viewAlignedMsRun(const Msrun * msrun) {
-	qDebug() << "View MsRun aligned";
+	qDebug() << "PlotAligned::viewAlignedMsRun begin";
 	const std::vector<mcq_double> originalRt =
 			msrun->getOriginalRetentionTimes();
 	const std::vector<mcq_double> alignedRt = msrun->getAlignedRetentionTimes();
@@ -68,9 +68,12 @@ void PlotAligned::viewAlignedMsRun(const Msrun * msrun) {
 		this->replot();
 		initZoomer();
 	}
+	
+	qDebug() << "PlotAligned::viewAlignedMsRun end";
 }
 
 void PlotAligned::viewAlignedMS2Peaks(const MonitorAlignmentPlot * monitorAlignment) {
+    qDebug() << "PlotAligned::viewAlignedMS2Peaks begin";
 	if(monitorAlignment==0)
 		return;
 
@@ -106,6 +109,7 @@ void PlotAligned::viewAlignedMS2Peaks(const MonitorAlignmentPlot * monitorAlignm
 	_p_curve_ms2->attach(this);
 	this->replot();
 	initZoomer();
+    qDebug() << "PlotAligned::viewAlignedMS2Peaks end";
 }
 
 void PlotAligned::clear() {

src/gui/parameterMainWindow.cpp

@@ -409,7 +409,7 @@ void ParameterMainWindow::obiwarpAlignmentWidget() {
 }
 
 void ParameterMainWindow::ms2AlignmentWidget() {
-	qDebug() << "New MS2 widget" << endl;
+	qDebug() << "ParameterMainWindow::ms2AlignmentWidget begin" << endl;
 	this->resetDockTools();
 	Ms2AlignmentWidget * ms2 = new Ms2AlignmentWidget(dockwidget);
 	connect(ms2, SIGNAL(newAlignmentCurve()), _plot_area_aligned,
@@ -421,6 +421,7 @@ void ParameterMainWindow::ms2AlignmentWidget() {
 			SLOT(viewAlignedMS2Peaks(const MonitorAlignmentPlot *)));
 	vbox->addWidget(ms2);
 	vbox->addStretch(1);
+    qDebug() << "ParameterMainWindow::ms2AlignmentWidget end" << endl;
 }
 
 void ParameterMainWindow::about() {
@@ -490,4 +491,4 @@ void ParameterMainWindow::appendLogString(QString log)
 {
     _logQTextEdit->moveCursor(QTextCursor::End);
     _logQTextEdit->insertPlainText(log);
-}
\ No newline at end of file
+}