detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40:02 +02:00
Code Issues Actions Packages Releases Activity

cmath + cleaning

Browse Source
This commit is contained in:
Erik Frojdh 2019-07-02 12:11:45 +02:00
parent 547ab8a749
commit 44aa3f655b
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorGui/CMakeLists.txt
View File

@ -51,26 +51,12 @@ set(HEADERS
include/qTabDebugging.h
include/qTabDeveloper.h
include/qTabMessages.h
../slsDetectorSoftware/include
../slsSupportLib/include/versionAPI.h
../slsSupportLib/include/ServerSocket.h
../slsSupportLib/include/ServerInterface2.h
)
set(RESOURCES
include/icons.qrc
)
qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
include_directories(
include
slsDetectorPlotting/include
../slsSupportLib/include
${QT_INCLUDE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
${QWT_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
add_definitions(
-DPRINT_LOG #-DVERBOSE
@ -83,17 +69,22 @@ add_executable(slsDetectorGui
${RESOURCES_SRCS}
)
target_include_directories(slsDetectorGui PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/slsDetectorPlotting/include>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
"$<BUILD_INTERFACE:${QT_INCLUDE_DIR}>"
"$<BUILD_INTERFACE:${QT_QTCORE_INCLUDE_DIR}>"
"$<BUILD_INTERFACE:${QT_QTGUI_INCLUDE_DIR}>"
"$<BUILD_INTERFACE:${QWT_INCLUDE_DIR}>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
)
target_link_libraries(slsDetectorGui PUBLIC
slsProjectOptions
slsProjectWarnings
slsSupportLib
slsDetectorShared
${QT_QTCORE_LIBRARIES}
${QT_QTGUI_LIBRARIES}
${QWT_LIBRARIES}
pthread
${ZeroMQ_LIBRARIES}
rt
png
z
Qt4::QtOpenGL

2
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -3,7 +3,7 @@
#include "qDrawPlot.h"
#include "string_utils.h"
#include <cmath>
#include <QStandardItemModel>
#include <QTimer>