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

double* changed to char* in gui data call back, decoding to be done by caller. enablegappixels skeleton created

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-09-29 16:43:19 +02:00
parent 1a8b0692fe
commit afc08f8c30
4 changed files with 17 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1477,13 +1477,6 @@ class multiSlsDetector : public slsDetectorUtils {
*/
bool getExternalGuiFlag();
/**
* Set Gain Data enable for gain plot
* in data call back
* @param e enable
*/
void setGainDataEnableinDataCallback(bool e);
private:
@ -1498,7 +1491,7 @@ private:
* @param subframeIndex address of subframe index
* @param filename address of file name
*/
int getData(const int isocket, int* image, const int size, uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename);
int getData(const int isocket, char* image, const int size, uint64_t &acqIndex, uint64_t &frameIndex, uint32_t &subframeIndex, string &filename);
/** Ensures if sockets created successfully */
@ -1522,9 +1515,6 @@ private:
private:
ThreadPool* threadpool;
/** Gain Data enabled in data call back */
bool gainDataEnable;
};