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

minor cleaning of ZmqSocket

Browse Source
This commit is contained in:
Erik Frojdh 2018-08-10 14:34:59 +02:00
parent d74a8368b8
commit 3cab1bc0fe
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -4962,7 +4962,6 @@ void multiSlsDetector::readFrameFromReceiver() {
rapidjson::Document doc; rapidjson::Document doc;
if (!zmqSocket[isocket]->ReceiveHeader(isocket, doc, if (!zmqSocket[isocket]->ReceiveHeader(isocket, doc,
SLS_DETECTOR_JSON_HEADER_VERSION)) { SLS_DETECTOR_JSON_HEADER_VERSION)) {
// zmqSocket[isocket]->CloseHeaderMessage();
// parse error, version error or end of acquisition for socket // parse error, version error or end of acquisition for socket
runningList[isocket] = false; runningList[isocket] = false;
--numRunning; --numRunning;
@ -5023,7 +5022,6 @@ void multiSlsDetector::readFrameFromReceiver() {
coordX, coordY, coordX, coordY,
flippedDataX); flippedDataX);
#endif #endif
// zmqSocket[isocket]->CloseHeaderMessage();
} }
// DATA // DATA

7
slsReceiverSoftware/include/ZmqSocket.h
View File

@ -365,10 +365,6 @@ public:
*/ */
int ReceiveHeader(const int index, Document& document, uint32_t version) int ReceiveHeader(const int index, Document& document, uint32_t version)
{ {
// zmq_msg_t message;
// headerMessage= &message;
// zmq_msg_init (&message);
// int len = ReceiveMessage(index, message);
std::vector<char>buffer(MAX_STR_LENGTH); std::vector<char>buffer(MAX_STR_LENGTH);
int len = zmq_recv(sockfd.socketDescriptor, buffer.data(), buffer.size(),0); int len = zmq_recv(sockfd.socketDescriptor, buffer.data(), buffer.size(),0);
if ( len > 0 ) { if ( len > 0 ) {
@ -593,7 +589,4 @@ private:
/** Socket descriptor */ /** Socket descriptor */
mySocketDescriptors sockfd; mySocketDescriptors sockfd;
/** Header Message pointer */
//zmq_msg_t* headerMessage;
}; };