From d076be888728a1d1f6e67d3bc6350efcc68d6576 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 4 Jun 2019 10:27:23 +0200 Subject: [PATCH] WIP --- slsDetectorGui/CMakeLists.txt | 16 ++++++++-------- slsDetectorGui/include/qTabAdvanced.h | 3 --- slsDetectorGui/src/qDetectorMain.cpp | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index a13a1b3ff..b68d899b4 100755 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -1,14 +1,14 @@ set(CMAKE_AUTOMOC ON) -#set(ENV{QMAKESPEC} "/afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/Qt-4.8.2/mkspecs/linux-g++") -#set(ENV{PATH} "/afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/Qt-4.8.2/bin:$PATH") +set(ENV{QMAKESPEC} "/afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/Qt-4.8.2/mkspecs/linux-g++") +set(ENV{PATH} "/afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/Qt-4.8.2/bin:$PATH") -#link_directories( -# /afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/Qt-4.8.2/lib -# /afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/qwt-6.0.1/lib -# /afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/qwtplot3d/lib -# /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorPackage/build/bin -#) +link_directories( + /afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/Qt-4.8.2/lib + /afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/qwt-6.0.1/lib + /afs/psi.ch/intranet/Controls/Software/Trolltech/RHEL7-x86_64/qwtplot3d/lib + /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorPackage/build/bin +) set(SOURCES slsDetectorPlotting/src/SlsQt1DPlot.cxx diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index 65a1ac432..47084f057 100755 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -6,9 +6,6 @@ #include "ui_form_tab_advanced.h" class multiSlsDetector; -class slsDetector; - -class qDrawPlot; #include #include diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 6f5fa2d49..8e92408cd 100755 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -293,7 +293,7 @@ void qDetectorMain::Initialization() { connect(tabMeasurement, SIGNAL(StopSignal()), myPlot,SLOT(StopAcquisition())); connect(tabMeasurement, SIGNAL(CheckPlotIntervalSignal()), tabPlot,SLOT(SetFrequency())); // Plot tab - connect(tab_plot, SIGNAL(DisableZoomSignal(bool)), this,SLOT(SetZoomToolTip(bool))); + connect(tabPlot, SIGNAL(DisableZoomSignal(bool)), this,SLOT(SetZoomToolTip(bool))); // Plotting // When the acquisition is finished, must update the meas tab