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

Merge branch 'zmqdata' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-20 08:40:19 +02:00
commit 2f749bb91d
4 changed files with 21 additions and 2 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

7
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -333,6 +333,9 @@ void qDrawPlot::SetupWidgetWindow(){
myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this); myDet->registerMeasurementFinishedCallback(&(GetMeasurementFinishedCallBack),this);
//Setting the callback function to get progress from detector class(using receivers) //Setting the callback function to get progress from detector class(using receivers)
myDet->registerProgressCallback(&(GetProgressCallBack),this); myDet->registerProgressCallback(&(GetProgressCallBack),this);
//stream data to the gui
myDet->enableDataStreamingFromReceiver(1);
qDefs::checkErrorMessage(myDet,"qDrawPlot::SetupWidgetWindow"); 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){ 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;
} }
@ -1946,7 +1951,7 @@ void qDrawPlot::SetFrameFactor(int frame){
frameFactor = frame; frameFactor = frame;
if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){ if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
frame = myDet->setReadReceiverFrequency(1,frame); frame = myDet->setReadReceiverFrequency(1,frame);
if(frame > 0) frameFactor = 1; /*if(frame > 0) frameFactor = 1;*//**what is this*/
#ifdef VERBOSE #ifdef VERBOSE
cout << "Receiver read frequency set to : " << frame << endl; cout << "Receiver read frequency set to : " << frame << endl;
#endif #endif

1
slsDetectorGui/src/qTabActions.cpp
View File

@ -529,6 +529,7 @@ void qTabActions::Refresh(){
#ifdef VERBOSE #ifdef VERBOSE
cout << "**Updated all action widgets: " << endl << endl; cout << "**Updated all action widgets: " << endl << endl;
#endif #endif
qDefs::checkErrorMessage(myDet,"qTabActions::Refresh"); qDefs::checkErrorMessage(myDet,"qTabActions::Refresh");
} }

2
slsDetectorGui/src/qTabPlot.cpp
View File

@ -1007,7 +1007,7 @@ void qTabPlot::SetScanArgument(){
} }
cout <<"min:"<<min<<" max:"<<max<<" size:"<<size<<endl; //cout <<"min:"<<min<<" max:"<<max<<" size:"<<size<<endl;
myPlot->SetHistogram(radioHistogram->isChecked(),histArg,min,max,size); myPlot->SetHistogram(radioHistogram->isChecked(),histArg,min,max,size);