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

compiles, but doesnt run

Browse Source
This commit is contained in:
maliakal_d
2018-10-29 15:23:52 +01:00
parent 33ac63d14a
commit 92fc837eb4
11 changed files with 1034 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -144,9 +144,9 @@ int slsReceiverImplementation::getDetectorPositionId() const{
return detID;
}
char *slsReceiverImplementation::getDetectorHostname() const{
std::string slsReceiverImplementation::getDetectorHostname() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return detHostname;
return std::string(detHostname);
}
int slsReceiverImplementation::getFlippedData(int axis) const{
@ -167,14 +167,14 @@ slsDetectorDefs::fileFormat slsReceiverImplementation::getFileFormat() const{
}
char *slsReceiverImplementation::getFileName() const{
std::string slsReceiverImplementation::getFileName() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return fileName;
return std::string(fileName);
}
char *slsReceiverImplementation::getFilePath() const{
std::string slsReceiverImplementation::getFilePath() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return filePath;
return std::string(filePath);
}
uint64_t slsReceiverImplementation::getFileIndex() const{
@ -270,9 +270,9 @@ uint32_t slsReceiverImplementation::getUDPPortNumber2() const{
return udpPortNum[1];
}
char *slsReceiverImplementation::getEthernetInterface() const{
std::string slsReceiverImplementation::getEthernetInterface() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return eth;
return std::string(eth);
}
@ -367,14 +367,14 @@ uint32_t slsReceiverImplementation::getStreamingPort() const{
return streamingPort;
}
char *slsReceiverImplementation::getStreamingSourceIP() const{
std::string slsReceiverImplementation::getStreamingSourceIP() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return streamingSrcIP;
return std::string(streamingSrcIP);
}
char *slsReceiverImplementation::getAdditionalJsonHeader() const{
std::string slsReceiverImplementation::getAdditionalJsonHeader() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
return additionalJsonHeader;
return std::string(additionalJsonHeader);
}
uint32_t slsReceiverImplementation::getUDPSocketBufferSize() const {

580
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

File diff suppressed because it is too large Load Diff