|
|
49ba893d7e
|
zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same
|
2017-11-21 13:38:31 +01:00 |
|
|
|
70e4c6e2a2
|
zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:37:00 +01:00 |
|
|
|
28e2ebf75a
|
merge conflict resolved from 3.0.1
|
2017-11-17 09:40:42 +01:00 |
|
|
|
d7137e0c75
|
fixed segmentation fault issue of xputsn the right way, fixed warnings
|
2017-11-17 09:26:05 +01:00 |
|
|
|
2569ffbf10
|
fixed warnings, back to int warning in debugstream due to 64 bit
|
2017-11-17 08:53:05 +01:00 |
|
|
|
c1e735c1b4
|
fixed a few warnings
|
2017-11-17 08:46:04 +01:00 |
|
|
|
bbcf75bc09
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:00:59 +01:00 |
|
|
|
065b4a8e0f
|
including zmq port change in gui
|
2017-11-16 13:50:30 +01:00 |
|
|
|
0e8d2de253
|
somewhere
|
2017-11-16 09:12:49 +01:00 |
|
|
|
eb4ab306c7
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:37 +01:00 |
|
|
|
8872f86e31
|
Merge branch '3.0.1' into developer
|
2017-11-13 15:32:47 +01:00 |
|
|
|
52a9303a5e
|
removed compression from gui in expert mode
|
2017-11-13 15:32:24 +01:00 |
|
|
|
409519a3db
|
fixed the double plot due to unzooming in gui
|
2017-11-13 15:25:49 +01:00 |
|
|
|
7ba90f98fc
|
including dynamic range in gui call back
|
2017-11-02 11:02:22 +01:00 |
|
|
|
9d4c14b724
|
gap pixels should now work for 4 bit mode and a bug fix in decoding for 4 bit mode
|
2017-10-31 12:38:42 +01:00 |
|
|
|
6812961836
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:09:55 +02:00 |
|
|
|
0fe43c75f2
|
merge branch developer into gappixels, added .project into gitignore
|
2017-10-12 15:08:32 +02:00 |
|
|
|
e814aee300
|
.project added to gitignore
|
2017-10-12 15:07:33 +02:00 |
|
|
|
0d92b11055
|
print out comment, not print if mythen else access to null
|
2017-10-05 15:58:37 +02:00 |
|
|
|
c594870fdd
|
Merge branch 'realgappixels' into gappixels
|
2017-10-03 10:49:47 +02:00 |
|
|
|
34062b6e0b
|
fixed 32 bit gui masking problem in qdrawplot (conversion from char* to double) mythen clause not activated
|
2017-10-03 10:49:26 +02:00 |
|
|
|
7cf7d9eb79
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:01 +02:00 |
|
|
|
5a7800768b
|
double* to char* in detector call back.
|
2017-10-02 13:20:19 +02:00 |
|
|
|
63c0fe863d
|
missing packets 0xffff are also anded with the mask, fixed
|
2017-09-29 18:33:41 +02:00 |
|
|
|
fa79a36089
|
should work, but jungfrau needs debugging
|
2017-09-29 16:43:07 +02:00 |
|
|
|
9bdb361d08
|
works but needs to be verified. the void* in call back
|
2017-09-29 11:39:36 +02:00 |
|
|
|
2bd5386c29
|
Merge branch '3.0.1' into developer
|
2017-09-21 13:35:16 +02:00 |
|
|
|
a250565f44
|
updaterev
|
2017-09-20 19:00:09 +02:00 |
|
|
|
b78dcf869b
|
Merge branch '3.0' into developer
|
2017-09-15 13:27:18 +02:00 |
|
|
|
bcea5a99a1
|
1. bug fix: loading trimbits and gui complains of different trimbits and sets them all to zero. This is fixed. It just loads -1 to gui. 2. Advanced Tab made slightly better aligned
|
2017-09-15 09:36:44 +02:00 |
|
|
|
069d044e17
|
fixed gain plot, aspect ratio, 1/4size of mainplat, keeping limits also for gain plot at start up, removing gain plot titles
|
2017-09-01 15:37:05 +02:00 |
|
|
|
277dc2cfd9
|
gainplot added for jungfrau, aspect ratio check in gui added, npixels-1 as endpixel bug fix
|
2017-09-01 12:03:09 +02:00 |
|
|
|
3fb92aa9dd
|
changes done
|
2017-08-14 13:33:24 +02:00 |
|
|
|
12592c1206
|
updaterev
|
2017-08-09 17:24:43 +02:00 |
|
|
|
c31ee2d76f
|
allowing -1 in gui for spinbox
|
2017-08-04 14:20:51 +02:00 |
|
|
|
77dc4d3d77
|
solved some warnings
|
2017-07-27 12:08:12 +02:00 |
|
|
|
915fd41bf6
|
should be able to compile in pcmoench as l_msdetect
|
2017-07-26 15:09:24 +02:00 |
|
|
|
1a522c6696
|
removed ui include files as they are generated anyway for every make
|
2017-07-26 11:14:17 +02:00 |
|
|
|
91f8987b6c
|
removed ui include files as they are generated anyway for every make
|
2017-07-26 11:12:56 +02:00 |
|
|
|
5771a3c722
|
includes in gui
|
2017-07-25 13:56:27 +02:00 |
|
|
|
68cbb63355
|
adding the form include files back into git
|
2017-07-25 12:15:58 +02:00 |
|
|
|
c25239a398
|
updaterev
|
2017-07-13 14:44:52 +02:00 |
|
|
|
126ad92ed8
|
can set zmqport from receiver
|
2017-07-13 12:18:19 +02:00 |
|
|
|
f1a77c4146
|
resolved issue with source not being looked at for compiling
|
2017-07-11 13:27:27 +02:00 |
|
|
|
e0b886e2cc
|
moved the versioning files back to include
|
2017-07-10 11:22:32 +02:00 |
|
|
|
ef9fd77850
|
some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that
|
2017-07-10 11:20:50 +02:00 |
|
|
|
cf0ef68cda
|
fixed adc and num dacs for jungfrau in gui
|
2017-07-06 18:34:00 +02:00 |
|
|
|
539ab79e99
|
changed jungfrau temperature conversion
|
2017-07-03 14:45:29 +02:00 |
|
|
|
bd9f19f6c7
|
changed the makefile a bit to find libraries
|
2017-06-30 12:20:42 +02:00 |
|
|
|
c01931e5a6
|
makefiles and versioning update complete
|
2017-06-29 17:09:46 +02:00 |
|
