Dhanya Maliakal
|
65b4c69847
|
REST implementation removed from slsReceiver
|
2017-12-05 11:03:52 +01:00 |
|
Dhanya Maliakal
|
61791c078c
|
Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1
|
2017-12-04 16:48:17 +01:00 |
|
Dhanya Maliakal
|
36802cdb14
|
Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1
|
2017-12-04 16:48:17 +01:00 |
|
Dhanya Maliakal
|
e26cf3b673
|
Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1
|
2017-12-04 16:48:15 +01:00 |
|
Dhanya Maliakal
|
aab62fccc1
|
Merge remote branch 'slsDetectorGui/3.0' into 3.0
|
2017-12-04 16:48:09 +01:00 |
|
Dhanya Maliakal
|
73ce4abd58
|
Merge remote branch 'slsReceiverSoftware/3.0' into 3.0
|
2017-12-04 16:48:08 +01:00 |
|
Dhanya Maliakal
|
c12b137b79
|
Merge remote branch 'slsDetectorSoftware/3.0' into 3.0
|
2017-12-04 16:48:07 +01:00 |
|
Dhanya Maliakal
|
befdcf7f36
|
Merge remote branch 'slsDetectorGui/2.3.4' into 2.3.4
|
2017-12-04 16:48:01 +01:00 |
|
Dhanya Maliakal
|
02f5c472a8
|
Merge remote branch 'slsReceiverSoftware/2.3.4' into 2.3.4
|
2017-12-04 16:48:00 +01:00 |
|
Dhanya Maliakal
|
75ed2cd2e4
|
Merge remote branch 'slsDetectorSoftware/2.3.4' into 2.3.4
|
2017-12-04 16:47:59 +01:00 |
|
Dhanya Maliakal
|
3be045f9b6
|
Merge remote branch 'slsDetectorGui/2.3.3' into 2.3.3
|
2017-12-04 16:47:54 +01:00 |
|
Dhanya Maliakal
|
8fae982802
|
Merge remote branch 'slsReceiverSoftware/2.3.3' into 2.3.3
|
2017-12-04 16:47:54 +01:00 |
|
Dhanya Maliakal
|
128ec88b5f
|
Merge remote branch 'slsDetectorSoftware/2.3.3' into 2.3.3
|
2017-12-04 16:47:52 +01:00 |
|
Dhanya Maliakal
|
d5fc158330
|
Merge remote branch 'slsDetectorGui/2.3.2' into 2.3.2
|
2017-12-04 16:47:47 +01:00 |
|
Dhanya Maliakal
|
864e6e4c81
|
Merge remote branch 'slsReceiverSoftware/2.3.2' into 2.3.2
|
2017-12-04 16:47:47 +01:00 |
|
Dhanya Maliakal
|
343d96ff16
|
Merge remote branch 'slsDetectorSoftware/2.3.2' into 2.3.2
|
2017-12-04 16:47:46 +01:00 |
|
Dhanya Maliakal
|
4142328437
|
Merge remote branch 'slsDetectorGui/2.3.1' into 2.3.1
|
2017-12-04 16:47:41 +01:00 |
|
Dhanya Maliakal
|
6c797988c7
|
Merge remote branch 'slsReceiverSoftware/2.3.1' into 2.3.1
|
2017-12-04 16:47:41 +01:00 |
|
Dhanya Maliakal
|
215c262981
|
Merge remote branch 'slsDetectorSoftware/2.3.1' into 2.3.1
|
2017-12-04 16:47:39 +01:00 |
|
Dhanya Maliakal
|
081b809078
|
Merge remote branch 'slsDetectorGui/2.3' into 2.3
|
2017-12-04 16:47:35 +01:00 |
|
Dhanya Maliakal
|
9263567cd8
|
Merge remote branch 'slsReceiverSoftware/2.3' into 2.3
|
2017-12-04 16:47:34 +01:00 |
|
Dhanya Maliakal
|
58e90a85be
|
Merge remote branch 'slsDetectorSoftware/2.3' into 2.3
|
2017-12-04 16:47:33 +01:00 |
|
Dhanya Maliakal
|
025c836e25
|
Merge remote branch 'slsDetectorGui/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
Dhanya Maliakal
|
5d5abae3f4
|
Merge remote branch 'slsReceiverSoftware/2.2' into 2.2
|
2017-12-04 16:47:28 +01:00 |
|
Dhanya Maliakal
|
e2ad46386e
|
Merge remote branch 'slsDetectorSoftware/2.2' into 2.2
|
2017-12-04 16:47:26 +01:00 |
|
Dhanya Maliakal
|
308d44e452
|
Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
Dhanya Maliakal
|
69da61b1fb
|
Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
Dhanya Maliakal
|
460168ce04
|
Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:21 +01:00 |
|
Dhanya Maliakal
|
4e429c0d77
|
Merge remote branch 'slsDetectorGui/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
Dhanya Maliakal
|
bf4fab549d
|
Merge remote branch 'slsReceiverSoftware/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
Dhanya Maliakal
|
f7705eb1da
|
Merge remote branch 'slsDetectorSoftware/2.1' into 2.1
|
2017-12-04 16:45:32 +01:00 |
|
Dhanya Maliakal
|
a2217e2066
|
Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:33:33 +01:00 |
|
Dhanya Maliakal
|
aaa02706fc
|
Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:31:52 +01:00 |
|
Dhanya Maliakal
|
d1e3d50a87
|
cosmetic print outs
|
2017-12-01 12:43:14 +01:00 |
|
Dhanya Maliakal
|
a06f29f473
|
minor cosmetics
|
2017-12-01 11:23:17 +01:00 |
|
Dhanya Maliakal
|
18422ce215
|
setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked
|
2017-12-01 09:18:42 +01:00 |
|
Dhanya Maliakal
|
e9343a5bd0
|
remove warning
|
2017-11-30 19:07:05 +01:00 |
|
Dhanya Maliakal
|
70bf6eb4cb
|
restream stop from receiver
|
2017-11-30 18:39:08 +01:00 |
|
Dhanya Maliakal
|
ca855e6d39
|
restream stop from receiver
|
2017-11-30 18:37:11 +01:00 |
|
Dhanya Maliakal
|
2227265357
|
removed external gui flag, acquiring flag is now not reset in stop acquisition, slsdet does not have acquiring flag anymore, busy accomodating acquiringflag, acquire cleanup, in acquire made lock for receiver more local, moved setacquiringflag false to bottom of acquire
|
2017-11-30 16:25:23 +01:00 |
|
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
|
712c9a4524
|
zmq connect earlier in gui to prevent losing first messages
|
2017-11-29 12:13:02 +01:00 |
|
Dhanya Maliakal
|
b75985088d
|
twice connect bug fix in zmq
|
2017-11-28 18:50:18 +01:00 |
|
Dhanya Maliakal
|
a351fa8f28
|
switching from black to white background for receiver
|
2017-11-28 11:18:30 +01:00 |
|
Dhanya Maliakal
|
4825ace129
|
switching from black to white background for receiver
|
2017-11-28 11:18:22 +01:00 |
|
Dhanya Maliakal
|
ba71529ff2
|
comment in users
|
2017-11-28 10:50:35 +01:00 |
|
Dhanya Maliakal
|
1fce54ec4b
|
zmqport in users fixed
|
2017-11-28 10:35:06 +01:00 |
|
Dhanya Maliakal
|
1dd300f713
|
only call register call back which already enables streaming in client and receiver, added to postprocessing
|
2017-11-28 09:36:54 +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
|
9f91b78696
|
update comments
|
2017-11-28 09:26:12 +01:00 |
|