detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 19:43:41 +01:00
Code Issues Actions Packages Releases Activity

get progress when acquisition is over to show 100 percent

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@363 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-30 09:51:05 +00:00
parent 6b935f3bd2
commit e490f437a2
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@@ -20,6 +20,8 @@ slsDetectorUtils::slsDetectorUtils() {
acqFinished_p=NULL;
measurement_finished=NULL;
measFinished_p=NULL;
progress_call=0;
pProgressCallArg=0;
registerGetPositionCallback(&defaultGetPosition, NULL);
registerConnectChannelsCallback(&defaultConnectChannels,NULL);
registerDisconnectChannelsCallback(&defaultDisconnectChannels,NULL);
@@ -431,6 +433,10 @@ void slsDetectorUtils::acquire(int delflag){
}
if(progress_call)
progress_call(getCurrentProgress(),pProgressCallArg);
if (connectChannels) {
if (disconnect_channels)
disconnect_channels(DCarg);

4
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@@ -545,7 +545,7 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
void registerAcquisitionFinishedCallback(int( *func)(double,int, void*), void *pArg){acquisition_finished=func; acqFinished_p=pArg;};
void registerMeasurementFinishedCallback(int( *func)(int,int, void*), void *pArg){measurement_finished=func; measFinished_p=pArg;};
void registerProgressCallback(int( *func)(double,void*), void *pArg){progress_call=func; pProgressCallArg=pArg;};
/**
@@ -671,6 +671,8 @@ virtual int exitReceiver()=0;
int (*measurement_finished)(int,int,void*);
void *acqFinished_p, *measFinished_p;
int (*progress_call)(double,void*);
void *pProgressCallArg;
};