diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index 343cabdc0..b3e57434a 100644 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -88,6 +88,11 @@ include_directories( ${QWT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) + +add_definitions( + -DDACS_INT -DVERBOSE -DPRINT_LOG +) + add_executable(slsDetectorGui ${SOURCES} ${HEADERS} @@ -100,12 +105,20 @@ set_target_properties(slsDetectorGui PROPERTIES 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 slsDetectorShared ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QWT_LIBRARIES} pthread + zmq + rt ) add_executable(gui_client diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 8e308071d..b35ceb470 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -1165,7 +1165,9 @@ int qDrawPlot::GetData(detectorData *data,int fIndex, int subIndex){ int qDrawPlot::GetAcquisitionFinishedCallBack(double currentProgress,int detectorStatus, void *this_pointer){ ((qDrawPlot*)this_pointer)->AcquisitionFinished(currentProgress,detectorStatus); +#ifdef VERYVERBOSE cout << "acquisition finished callback worked ok" << endl; +#endif return 0; }