435 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	d5c310a2db	only call register call back which already enables streaming in client and receiveR	2017-11-28 09:36:14 +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	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	fd4dd5b1e9	removed printout	2017-11-21 15:12:05 +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	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	065b4a8e0f	including zmq port change in gui	2017-11-16 13:50:30 +01:00
Dhanya Maliakal	0e8d2de253	somewhere	2017-11-16 09:12:49 +01:00
Dhanya Maliakal	eb4ab306c7	in between separating datastreaming in client and receiver	2017-11-15 17:16:37 +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	a250565f44	updaterev	2017-09-20 19:00:09 +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	3fb92aa9dd	changes done	2017-08-14 13:33:24 +02:00
Dhanya Maliakal	12592c1206	updaterev	2017-08-09 17:24:43 +02:00
Dhanya Maliakal	c31ee2d76f	allowing -1 in gui for spinbox	2017-08-04 14:20:51 +02:00
Dhanya Maliakal	77dc4d3d77	solved some warnings	2017-07-27 12:08:12 +02:00
Dhanya Maliakal	915fd41bf6	should be able to compile in pcmoench as l_msdetect	2017-07-26 15:09:24 +02:00
Dhanya Maliakal	1a522c6696	removed ui include files as they are generated anyway for every make	2017-07-26 11:14:17 +02:00
Dhanya Maliakal	91f8987b6c	removed ui include files as they are generated anyway for every make	2017-07-26 11:12:56 +02:00
Dhanya Maliakal	5771a3c722	includes in gui	2017-07-25 13:56:27 +02:00
Dhanya Maliakal	68cbb63355	adding the form include files back into git	2017-07-25 12:15:58 +02:00
Dhanya Maliakal	c25239a398	updaterev	2017-07-13 14:44:52 +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	e0b886e2cc	moved the versioning files back to include	2017-07-10 11:22:32 +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	bd9f19f6c7	changed the makefile a bit to find libraries	2017-06-30 12:20:42 +02:00
Dhanya Maliakal	c01931e5a6	makefiles and versioning update complete	2017-06-29 17:09:46 +02:00
Dhanya Maliakal	b6eb4cbb61	testing changes	2017-06-29 10:18:51 +02:00
Dhanya Maliakal	21e1fcf693	trying with gui makefile changes	2017-06-29 09:27:26 +02:00
Dhanya Maliakal	cfff7969e3	changes for Makefile dependencies	2017-06-28 18:52:43 +02:00
Dhanya Maliakal	3515951bb8	added updateversion into makefile while compiling	2017-06-28 11:18:55 +02:00
Dhanya Maliakal	22796d0d27	updaterev	2017-06-27 17:43:19 +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
Dhanya Maliakal	cffdf7fede	updaterev	2017-06-22 14:33:24 +02:00
Dhanya Maliakal	b2caec384f	removing receiver print config from gui	2017-06-21 17:03:41 +02:00
Dhanya Maliakal	2ec1e08081	changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui	2017-06-19 14:19:30 +02:00
Dhanya Maliakal	47e5504203	updaterev	2017-06-12 18:50:55 +02:00