24 Commits

Author SHA1 Message Date
Dhanya Maliakal
db2fef5d69 conflict resolved in merge from 3.0.1 to include file index in zmq streaming 2017-11-14 12:14:26 +01:00
Dhanya Maliakal
0ae706d9a5 file index sent along with zmq stream 2017-11-14 12:13:06 +01:00
Dhanya Maliakal
6fa4e4cef8 Merge branch '3.0.1' into gappixels 2017-11-10 16:37:28 +01:00
Dhanya Maliakal
53caebe0f3 replaced gethostbyname with getaddrinfo as it is not thread safe 2017-11-10 16:30:48 +01:00
Dhanya Maliakal
d0b379a2d5 double* changed to char* in gui data call back, effect in receiver is change in zmqsocket.h from int* to char* 2017-10-02 13:21:49 +02:00
Dhanya Maliakal
5ff574b33f made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now 2017-09-12 15:04:56 +02:00
Dhanya Maliakal
c086e9c19f allow for slow joiner in zmq 2017-09-01 13:58:00 +02:00
Dhanya Maliakal
05c5ad711b solving the issue of deleting context by setting linger to 0 so that all open sockets are closed 2017-08-28 12:03:15 +02:00
Dhanya Maliakal
2d52058a55 Printing thread Ids created and exited, others (if others) are zmqs internal threading, moved all zmq socket type to publish subscriber type: (non blocking in send if no client) as per Aldos gui and probably faster, as only clients to receiver standard impl is aldos gui/slsDetectorGui/xiaoqiangs call back via detector class 2017-08-24 16:06:00 +02:00
Dhanya Maliakal
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
Dhanya Maliakal
1c7ff1dd8c adding printouts , resetting an image size for each listen image, if last image is not complete, it should be checked with rc==0 and not if itis transmitting, else it doesnt send last incomplete image 2017-06-21 17:07:45 +02:00
Dhanya Maliakal
cbd1570a8c fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector receiver updated 2017-06-20 12:43:28 +02:00
Dhanya Maliakal
3007694b77 bug (from eiger_newheader) with imagesize of fifo different from actual image size 2017-06-16 13:53:27 +02:00
Dhanya Maliakal
0e2d0f07e8 getting hostname from ip (for all, cuz hostname can have dots too 2017-05-19 10:21:33 +02:00
Dhanya Maliakal
a276b6b7f5 fixed bug rx_hostname being hostname or ip in zmqsockt, and num packets correctly reflects num good frames 2017-05-18 10:53:29 +02:00
Dhanya Maliakal
ea875a14f9 fixed bug when rx_hostname was an ip and using zmqsocket 2017-05-17 15:58:12 +02:00
Dhanya Maliakal
6d7fb07a4c fixing the standard header pointers for it to work 2017-05-08 12:33:31 +02:00
Dhanya Maliakal
a1fc93b398 changes including warnings and zmq 2017-05-04 17:52:58 +02:00
Dhanya Maliakal
49b4ae2f56 changed zmq method, and resolved warnings and from esrf 2017-05-03 17:57:56 +02:00
Dhanya Maliakal
b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
Dhanya Maliakal
50f8366bc2 small changes for jungfrau, but also for the gui 2017-03-03 15:57:48 +01:00
Dhanya Maliakal
829ba49c1c moving subframenumber into a 32 bit number, also in stremer, changing json header to mention 4 bit and version number 2017-02-28 15:30:53 +01:00
Dhanya Maliakal
447c5bb8fe gui works 2017-02-28 13:42:56 +01:00
Dhanya Maliakal
3aac30b8ee added zmqasocket 2017-02-27 16:06:58 +01:00