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

Callback rxheader (#502)

Browse Source 
* gui message doesnt show if it has a '>' symbol in error msg

* minor refactoring for readability (size_t calc fifo size)

* refactoring listening udp socket code: activated and datastream dont create udp sockets anyway, rc<=- should be discarded in any case

* wip

* refactoring memory structure access

* wip: bugfix write header + data to binary

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* portRoi no roi effecto on progress

* fail at receiver progress, wip

* segfaults for char pointer in struct

* reference to header to get header and data

* refactoring

* use const defined for size of header of fifo

* updated release notes

* remove pointer in callback for sls_receiver_header pointer

* passing reference header for callback instead of copying it
This commit is contained in:
Dhanya Thattil
2022-07-22 16:15:21 +02:00
committed by GitHub
parent 4117cda79b
commit d132ad8d02
9 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -349,12 +349,12 @@ void DataProcessor::ProcessAnImage(sls_receiver_header & header, size_t &size, s
try {
// normal call back
if (rawDataReadyCallBack != nullptr) {
rawDataReadyCallBack(&header, data, size, pRawDataReady);
rawDataReadyCallBack(header, data, size, pRawDataReady);
}
// call back with modified size
else if (rawDataModifyReadyCallBack != nullptr) {
rawDataModifyReadyCallBack(&header, data, size, pRawDataReady);
rawDataModifyReadyCallBack(header, data, size, pRawDataReady);
}
} catch (const std::exception &e) {
throw RuntimeError("Get Data Callback Error: " +
@ -414,13 +414,13 @@ bool DataProcessor::CheckCount() {
}
void DataProcessor::registerCallBackRawDataReady(
void (*func)(sls_receiver_header *, char *, size_t, void *), void *arg) {
void (*func)(sls_receiver_header&, char *, size_t, void *), void *arg) {
rawDataReadyCallBack = func;
pRawDataReady = arg;
}
void DataProcessor::registerCallBackRawDataModifyReady(
void (*func)(sls_receiver_header *, char *, size_t &, void *), void *arg) {
void (*func)(sls_receiver_header&, char *, size_t &, void *), void *arg) {
rawDataModifyReadyCallBack = func;
pRawDataReady = arg;
}