|
|
e024774323
|
added storage cells
|
2018-04-13 15:05:43 +02:00 |
|
|
|
2bd8e6c166
|
zmq fixed to have additional json headers using rx_zmqjsonheader
|
2018-04-09 16:33:14 +02:00 |
|
|
|
fe2ba8621b
|
updating versioning to only have date
|
2018-03-27 11:00:15 +02:00 |
|
|
|
14546247e4
|
adding a receiver callback to be able to give modified size from the callback
|
2018-03-22 14:34:03 +01:00 |
|
|
|
a74e8f68f7
|
size change in receiver call back API now streamed, gui allows smaller packet size than expected to be caught and replaced the rest with 0xFF
|
2018-03-21 17:08:38 +01:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
7859df6aa3
|
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
|
2018-02-26 12:44:32 +01:00 |
|
|
|
65a91c519e
|
Merge branch '3.0.1' into developer
|
2017-12-14 14:29:16 +01:00 |
|
|
|
0649626842
|
made the color fix for black/white backgrounds
|
2017-12-14 14:29:07 +01:00 |
|
|
|
24c305ec59
|
solved conflicts from merge of version being used to binary
|
2017-12-06 19:07:06 +01:00 |
|
|
|
c4a242e10a
|
changed all variables from svn to git, included --version for receiver binary
|
2017-12-06 10:29:57 +01:00 |
|
|
|
0ef52138e1
|
merge conflict sorted, removing rest
|
2017-12-05 11:25:10 +01:00 |
|
|
|
65b4c69847
|
REST implementation removed from slsReceiver
|
2017-12-05 11:03:52 +01:00 |
|
|
|
9f152ce1f3
|
merge conflict resolved
|
2017-12-01 12:44:34 +01:00 |
|
|
|
d1e3d50a87
|
cosmetic print outs
|
2017-12-01 12:43:14 +01:00 |
|
|
|
0e26734023
|
restreaming stop fix
|
2017-11-30 19:13:55 +01:00 |
|
|
|
6f3898441e
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:47 +01:00 |
|
|
|
70bf6eb4cb
|
restream stop from receiver
|
2017-11-30 18:39:08 +01:00 |
|
|
|
a89847538d
|
merge ocnflict for white background
|
2017-11-28 11:29:15 +01:00 |
|
|
|
a351fa8f28
|
switching from black to white background for receiver
|
2017-11-28 11:18:30 +01:00 |
|
|
|
a0c9018455
|
Merge branch '3.0.1' into developer
|
2017-11-23 18:24:34 +01:00 |
|
|
|
59b5fe9424
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:22:03 +01:00 |
|
|
|
97260510f2
|
gap pixels should be allowed to set to 0 for other detectors
|
2017-11-20 09:43:41 +01:00 |
|
|
|
662f502d4c
|
zmq always needs an ip in header
|
2017-11-17 17:40:57 +01:00 |
|
|
|
2e234f1bbd
|
Merge branch '3.0.1' into developer
|
2017-11-17 11:36:02 +01:00 |
|
|
|
a79864a5ae
|
bugfix enabledata streaming send int for update
|
2017-11-17 11:35:54 +01:00 |
|
|
|
1dee950870
|
merge conflict from 3.0.1
|
2017-11-17 11:35:15 +01:00 |
|
|
|
c69ae52e76
|
somewhere
|
2017-11-16 09:12:57 +01:00 |
|
|
|
32d32dbcdc
|
in between separating datastreaming in client and receiver
|
2017-11-15 16:16:59 +01:00 |
|
|
|
3da8bca462
|
allowing receiver to know of gap pixels enable even in 4 bit mode, but not doing anything useful
|
2017-10-31 12:39:36 +01:00 |
|
|
|
003239cddd
|
gap pixels for 4 bit mode restrictions, not completed
|
2017-10-24 14:16:08 +02:00 |
|
|
|
e54767b69d
|
conflict resolution with developer
|
2017-10-03 15:12:56 +02:00 |
|
|
|
0b82aabd2b
|
merge with 3.0.1 conflicts resolved
|
2017-10-03 14:52:53 +02:00 |
|
|
|
7cde5dbe38
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:08 +02:00 |
|
|
|
6a8aad4c2b
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:11:31 +02:00 |
|
|
|
e8bb186ff8
|
removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.
|
2017-09-22 12:25:08 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e8217b0867
|
do not complain when setting timers
|
2017-08-16 16:26:57 +02:00 |
|
|
|
ad3e3ce255
|
sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa
|
2017-08-10 17:25:28 +02:00 |
|
|
|
0cd18a3b7a
|
more comments
|
2017-08-07 10:39:29 +02:00 |
|
|
|
88b6fabb0d
|
bug did not give error when switching to hdf5
|
2017-07-28 11:54:22 +02:00 |
|
|
|
39560969f4
|
can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it
|
2017-07-13 12:17:49 +02:00 |
|
|
|
460a44a9b1
|
made updatereceiver to actually update client in parameters that it can
|
2017-07-03 17:37:31 +02:00 |
|
|
|
26f9b1ccbd
|
Somewhere
|
2017-07-03 13:45:45 +02:00 |
|
|
|
b03e35a8d6
|
sorted receiver client interface, more consistent
|
2017-07-03 13:31:17 +02:00 |
|
|
|
f8c04a6a51
|
sorted the receiver client interface, more manageable
|
2017-06-30 18:17:33 +02:00 |
|
|
|
a4c07ba9a0
|
added black background for reciever to see gray font better
|
2017-06-30 12:19:27 +02:00 |
|
|
|
f516d24089
|
solved many bugs, but cannot get data in eiger
|
2017-06-09 16:05:22 +02:00 |
|
|
|
bb52676f50
|
merged from 2.3 without udpstandard
|
2017-03-24 10:34:31 +01:00 |
|
