Dhanya Maliakal
|
baee38802b
|
wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it
|
2017-11-30 16:20:26 +01:00 |
|
Dhanya Maliakal
|
1c606df752
|
using file index from zmq
|
2017-11-28 14:45:01 +01:00 |
|
Dhanya Maliakal
|
addf964901
|
Merge branch '3.0.1' into developer
|
2017-11-28 09:37:09 +01:00 |
|
Dhanya Maliakal
|
d5c310a2db
|
only call register call back which already enables streaming in client and receiveR
|
2017-11-28 09:36:14 +01:00 |
|
Dhanya Maliakal
|
e29371ca8d
|
makng the zmq work without external flag
|
2017-11-27 17:06:11 +01:00 |
|
Dhanya Maliakal
|
375b1c9485
|
not required to restart client datastreaming due to connect everytime for acquire
|
2017-11-27 15:40:36 +01:00 |
|
Dhanya Maliakal
|
f0431bd873
|
Merge branch '3.0.1' into developer
|
2017-11-23 18:24:33 +01:00 |
|
Dhanya Maliakal
|
9f733c1dfb
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 18:22:26 +01:00 |
|
Dhanya Maliakal
|
d40a2e0efa
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:29 +01:00 |
|
Dhanya Maliakal
|
d23c9d52ed
|
somewhere
|
2017-11-23 14:53:33 +01:00 |
|
Dhanya Maliakal
|
39a20e1616
|
comment
|
2017-11-22 11:34:55 +01:00 |
|
Dhanya Maliakal
|
4159e83fd6
|
making gui work temporarily for jctb
|
2017-11-22 09:27:01 +01:00 |
|
Dhanya Maliakal
|
7f58b77dfb
|
Merge branch '3.0.1' into developer
|
2017-11-21 15:12:32 +01:00 |
|
Dhanya Maliakal
|
fd4dd5b1e9
|
removed printout
|
2017-11-21 15:12:05 +01:00 |
|
Dhanya Maliakal
|
9c55cb4974
|
removed merge conflicts from bug fix of zmq buffering while acquire from command line
|
2017-11-21 14:57:52 +01:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
70e4c6e2a2
|
zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:37:00 +01:00 |
|
Dhanya Maliakal
|
28e2ebf75a
|
merge conflict resolved from 3.0.1
|
2017-11-17 09:40:42 +01:00 |
|
Dhanya Maliakal
|
d7137e0c75
|
fixed segmentation fault issue of xputsn the right way, fixed warnings
|
2017-11-17 09:26:05 +01:00 |
|
Dhanya Maliakal
|
2569ffbf10
|
fixed warnings, back to int warning in debugstream due to 64 bit
|
2017-11-17 08:53:05 +01:00 |
|
Dhanya Maliakal
|
c1e735c1b4
|
fixed a few warnings
|
2017-11-17 08:46:04 +01:00 |
|
Dhanya Maliakal
|
bbcf75bc09
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:00:59 +01:00 |
|
Dhanya Maliakal
|
eb4ab306c7
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:37 +01:00 |
|
Dhanya Maliakal
|
8872f86e31
|
Merge branch '3.0.1' into developer
|
2017-11-13 15:32:47 +01:00 |
|
Dhanya Maliakal
|
52a9303a5e
|
removed compression from gui in expert mode
|
2017-11-13 15:32:24 +01:00 |
|
Dhanya Maliakal
|
409519a3db
|
fixed the double plot due to unzooming in gui
|
2017-11-13 15:25:49 +01:00 |
|
Dhanya Maliakal
|
7ba90f98fc
|
including dynamic range in gui call back
|
2017-11-02 11:02:22 +01:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
6812961836
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:09:55 +02:00 |
|
Dhanya Maliakal
|
0d92b11055
|
print out comment, not print if mythen else access to null
|
2017-10-05 15:58:37 +02:00 |
|
Dhanya Maliakal
|
c594870fdd
|
Merge branch 'realgappixels' into gappixels
|
2017-10-03 10:49:47 +02:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
7cf7d9eb79
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:01 +02:00 |
|
Dhanya Maliakal
|
63c0fe863d
|
missing packets 0xffff are also anded with the mask, fixed
|
2017-09-29 18:33:41 +02:00 |
|
Dhanya Maliakal
|
fa79a36089
|
should work, but jungfrau needs debugging
|
2017-09-29 16:43:07 +02:00 |
|
Dhanya Maliakal
|
9bdb361d08
|
works but needs to be verified. the void* in call back
|
2017-09-29 11:39:36 +02:00 |
|
Dhanya Maliakal
|
b78dcf869b
|
Merge branch '3.0' into developer
|
2017-09-15 13:27:18 +02:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
3fb92aa9dd
|
changes done
|
2017-08-14 13:33:24 +02:00 |
|
Dhanya Maliakal
|
126ad92ed8
|
can set zmqport from receiver
|
2017-07-13 12:18:19 +02:00 |
|
Dhanya Maliakal
|
f1a77c4146
|
resolved issue with source not being looked at for compiling
|
2017-07-11 13:27:27 +02:00 |
|
Dhanya Maliakal
|
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 |
|
Dhanya Maliakal
|
cf0ef68cda
|
fixed adc and num dacs for jungfrau in gui
|
2017-07-06 18:34:00 +02:00 |
|
Dhanya Maliakal
|
539ab79e99
|
changed jungfrau temperature conversion
|
2017-07-03 14:45:29 +02:00 |
|
Dhanya Maliakal
|
f7e4dbc99e
|
getadc must specify -1 for imod, as imod in multi might be default 0
|
2017-06-23 17:26:33 +02:00 |
|
Dhanya Maliakal
|
5d75d8371b
|
unnecessary printout
|
2017-06-22 16:59:18 +02:00 |
|
Dhanya Maliakal
|
df01ca7e4b
|
ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring
|
2017-06-22 16:44:13 +02:00 |
|
Dhanya Maliakal
|
931e750d65
|
fixed gui starting up without the config file
|
2017-06-22 15:26:00 +02:00 |
|