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

gui works

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-02-28 13:42:56 +01:00
parent 3aac30b8ee
commit 447c5bb8fe
10 changed files with 254 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsReceiverSoftware/include/DataStreamer.h
View File

@ -84,11 +84,6 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
*/
void ResetParametersforNewMeasurement();
/**
* Create Part1 of Json Header which includes common attributes in an acquisition
*/
void CreateHeaderPart1();
/**
* Set GeneralData pointer to the one given
* @param g address of GeneralData (Detector Data) pointer
@ -129,6 +124,11 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
*/
bool IsRunning();
/**
* Create Part1 of Json Header which includes common attributes in an acquisition
*/
void CreateHeaderPart1();
/**
* Record First Indices (firstAcquisitionIndex, firstMeasurementIndex)
* @param fnum frame index to record
@ -172,9 +172,10 @@ class DataStreamer : private virtual slsReceiverDefs, public ThreadObject {
/**
* Create and send Json Header
* @param fnum frame number
* @param dummy true if its a dummy header
* @returns 0 if error, else 1
*/
int SendHeader(uint64_t fnum);
int SendHeader(uint64_t fnum, bool dummy = false);
/** type of thread */
static const std::string TypeName;