447 Commits

Author	SHA1	Message	Date
Dhanya Thattil	bacc4073f7	png compile fails in gui, removing it from cmakelists.txt in gui	2018-02-23 14:10:53 +01:00
Erik Frojdh	bc6fc51f6a	linking cmake	2018-02-12 19:15:12 +01:00
Erik Frojdh	f8c90b6da6	gui cmake	2018-02-09 15:27:25 +01:00
Erik Frojdh	23c5a73285	Merge branch '3.0.1' into condatest	2018-02-08 10:36:06 +01:00
Dhanya Thattil	ecf1e9fac1	bugfix: returning pointer to local variable, char* to string in function definition	2018-02-07 10:14:52 +01:00
Erik Frojdh	eb57e3a1d3	gui install	2018-01-24 10:17:24 +01:00
Dhanya Maliakal	bb3e5351b4	solving warnings from latest linux	2017-12-11 13:51:11 +01:00
Dhanya Maliakal	bf9905ad2a	possible to use binary --version or -v to get the branch and versionid	2017-12-06 19:05:35 +01:00
Dhanya Maliakal	c4a242e10a	changed all variables from svn to git, included --version for receiver binary	2017-12-06 10:29:57 +01:00
Dhanya Maliakal	7436d6c8d3	updaterev	2017-12-06 08:44:07 +01:00
Dhanya Maliakal	b498043ea6	remember old read freq if not 0 in gui	2017-12-05 16:04:10 +01:00
Dhanya Maliakal	7aaf95a565	-1 in getadc fixed in gui as well	2017-12-05 15:37:34 +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	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