detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 12:57:13 +02:00
Code Issues Actions Packages Releases Activity

client connecting to gui serveR done

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@150 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-03-04 15:27:57 +00:00
parent 863b662c6b
commit 22b51032dd
8 changed files with 269 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -4,8 +4,6 @@
* ********************************************************************/
// Qt Project Class Headers
#include "qDetectorMain.h"
#include "qDrawPlot.h"
#include "qTabMeasurement.h"
#include "qTabDataOutput.h"
#include "qTabPlot.h"
#include "qTabActions.h"
@ -113,7 +111,7 @@ void qDetectorMain::SetUpWidgetWindow(){
tab_debugging = new qTabDebugging (this, myDet); cout<<"Debugging ready"<<endl;
tab_developer = new qTabDeveloper (this, myDet); cout<<"Developer ready"<<endl;
myServer = new qServer(myDet, tab_measurement, myPlot);
myServer = new qServer(myDet, this);
// creating the scroll area widgets for the tabs
for(int i=0;i<NumberOfTabs;i++){
@ -719,4 +717,31 @@ void qDetectorMain::SetZoomToolTip(bool disable){
}
//-------------------------------------------------------------------------------------------------------------------------------------------------
int qDetectorMain::StartStopAcquisitionFromClient(bool start){
#ifdef VERBOSE
cout << "Start/Stop Acquisition From Client:" << start << endl;
#endif
int ret = slsDetectorDefs::FAIL;
if (tab_measurement->GetStartStatus() != start){
if(start){
//refresh all the required tabs
tab_actions->Refresh();
tab_measurement->Refresh();
tab_plot->Refresh();
}
//click start/stop
tab_measurement->ClickStartStop();
}
if (myPlot->isRunning() == start)
ret = slsDetectorDefs::OK;
return ret;
}
//-------------------------------------------------------------------------------------------------------------------------------------------------