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

included json example with dummy values

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-16 17:19:29 +02:00
parent 895dae6d68
commit 6abb1d2ae9
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorGui/CMakeLists.txt
View File

@ -88,6 +88,11 @@ include_directories(
${QWT_INCLUDE_DIR} ${QWT_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
add_definitions(
-DDACS_INT -DVERBOSE -DPRINT_LOG
)
add_executable(slsDetectorGui add_executable(slsDetectorGui
${SOURCES} ${SOURCES}
${HEADERS} ${HEADERS}
@ -100,12 +105,20 @@ set_target_properties(slsDetectorGui PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
) )
add_library(zmq STATIC IMPORTED )
set_target_properties(zmq PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../slsReceiverSoftware/include/libzmq.a
)
target_link_libraries(slsDetectorGui target_link_libraries(slsDetectorGui
slsDetectorShared slsDetectorShared
${QT_QTCORE_LIBRARIES} ${QT_QTCORE_LIBRARIES}
${QT_QTGUI_LIBRARIES} ${QT_QTGUI_LIBRARIES}
${QWT_LIBRARIES} ${QWT_LIBRARIES}
pthread pthread
zmq
rt
) )
add_executable(gui_client add_executable(gui_client

2
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -1165,7 +1165,9 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){
int qDrawPlot::GetAcquisitionFinishedCallBack(double currentProgress,int detectorStatus, void *this_pointer){ int qDrawPlot::GetAcquisitionFinishedCallBack(double currentProgress,int detectorStatus, void *this_pointer){
((qDrawPlot*)this_pointer)->AcquisitionFinished(currentProgress,detectorStatus); ((qDrawPlot*)this_pointer)->AcquisitionFinished(currentProgress,detectorStatus);
#ifdef VERYVERBOSE
cout << "acquisition finished callback worked ok" << endl; cout << "acquisition finished callback worked ok" << endl;
#endif
return 0; return 0;
} }