mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-22 03:40:04 +02:00
included json example with dummy values
This commit is contained in:
parent
895dae6d68
commit
6abb1d2ae9
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user