diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index e22ebe043..0178b9536 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 67f3ed720..c5b884215 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -333,6 +333,9 @@ void qDrawPlot::SetupWidgetWindow(){ myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this); //Setting the callback function to get progress from detector class(using receivers) myDet->registerProgressCallback(&(GetProgressCallBack),this); + //stream data to the gui + myDet->enableDataStreamingFromReceiver(1); + qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); } @@ -1162,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; } @@ -1946,7 +1951,7 @@ void qDrawPlot::SetFrameFactor(int frame){ frameFactor = frame; if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){ frame = myDet->setReadReceiverFrequency(1,frame); - if(frame > 0) frameFactor = 1; + /*if(frame > 0) frameFactor = 1;*//**what is this*/ #ifdef VERBOSE cout << "Receiver read frequency set to : " << frame << endl; #endif diff --git a/slsDetectorGui/src/qTabActions.cpp b/slsDetectorGui/src/qTabActions.cpp index bbaf462fa..ebc0ee140 100644 --- a/slsDetectorGui/src/qTabActions.cpp +++ b/slsDetectorGui/src/qTabActions.cpp @@ -529,6 +529,7 @@ void qTabActions::Refresh(){ #ifdef VERBOSE cout << "**Updated all action widgets: " << endl << endl; #endif + qDefs::checkErrorMessage(myDet,"qTabActions::Refresh"); } diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 2c46f07f1..9cd16607b 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -1007,7 +1007,7 @@ void qTabPlot::SetScanArgument(){ } - cout <<"min:"<SetHistogram(radioHistogram->isChecked(),histArg,min,max,size);