diff --git a/graphics/Qat/QatPlotWidgets/CMakeLists.txt b/graphics/Qat/QatPlotWidgets/CMakeLists.txt index 268031916cff0fda874477046a5dea6da5570d38..1e32919f68fbc04b36c6161f29f5e5a1cbc8fb9c 100644 --- a/graphics/Qat/QatPlotWidgets/CMakeLists.txt +++ b/graphics/Qat/QatPlotWidgets/CMakeLists.txt @@ -11,7 +11,17 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( CLHEP ) -find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui ) +find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui QtSvg ) + +# Generate UI files automatically: +set( CMAKE_AUTOUIC TRUE ) +# Generate MOC files automatically: +set( CMAKE_AUTOMOC TRUE ) +# Generate resource files automatically: +set( CMAKE_AUTORCC TRUE ) +# to let CMake find .h files automatically-generated from .ui files +set(CMAKE_INCLUDE_CURRENT_DIR ON) + include_directories( /usr/X11R6/include ) @@ -19,8 +29,7 @@ include_directories( /usr/X11R6/include ) atlas_disable_as_needed() # Component(s) in the package: -atlas_add_library( QatPlotWidgets - src/*.c* +atlas_add_library( QatPlotWidgets QatPlotWidgets/*.h src/*.h src/*.c* src/*.qrc PUBLIC_HEADERS QatPlotWidgets INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${QT4_INCLUDE_DIRS} DEFINITIONS ${CLHEP_DEFINITIONS} diff --git a/graphics/Qat/QatPlotWidgets/cmt/requirements b/graphics/Qat/QatPlotWidgets/cmt/requirements index 6f160a43183432267f2d450785627f8f34e2af5f..4e47bee3078fcb05a8c1d2c4bad2a69f807178ab 100644 --- a/graphics/Qat/QatPlotWidgets/cmt/requirements +++ b/graphics/Qat/QatPlotWidgets/cmt/requirements @@ -2,6 +2,7 @@ package QatPlotWidgets author Joe Boudreau author Vakho Tsulaia +manager Riccardo Maria Bianchi use AtlasPolicy AtlasPolicy-* use VP1Qt VP1Qt-* graphics/VP1 diff --git a/graphics/Qat/QatPlotWidgets/src/PlotView.cpp b/graphics/Qat/QatPlotWidgets/src/PlotView.cpp index 90895a63928b58824621890996286d132411b68a..df2c8af045641fe9bc38670bf7b179b2ea9b81a1 100644 --- a/graphics/Qat/QatPlotWidgets/src/PlotView.cpp +++ b/graphics/Qat/QatPlotWidgets/src/PlotView.cpp @@ -864,7 +864,7 @@ void PlotView::resizeEvent (QResizeEvent *event) { // This is here to prevent funny sizes appearing during resize: create(); - QSize size=event->size(); + //QSize size=event->size(); // size not used anymore... //int h=size.height(); //int w=size.width(); diff --git a/graphics/Qat/QatPlotWidgets/src/QatPlotWidgets.pro b/graphics/Qat/QatPlotWidgets/src/QatPlotWidgets.pro index bfb1ff424a1d78713c670835d9350ea7a19d8bee..e7e925ab0ecc5392d968de583d97bdb87df48cde 100644 --- a/graphics/Qat/QatPlotWidgets/src/QatPlotWidgets.pro +++ b/graphics/Qat/QatPlotWidgets/src/QatPlotWidgets.pro @@ -11,7 +11,7 @@ DESTDIR=../../../lib FORMS=LabelEditorDialog.ui PVControl.ui PlotDirDialog.ui ParameterDialog.ui CONFIG += qt debug QT += svg - +LIBS = -lQatPlotting -lQatDataModeling -lQatDataAnalysis -lCLHEP # Input HEADERS += ../QatPlotWidgets/CustomRangeDivider.h \ ../QatPlotWidgets/RangeDivision.h \