412 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Dhanya Maliakal	73c97f1381	solved many bugs, but cannot get data in eiger	2017-06-09 16:05:40 +02:00
Dhanya Maliakal	1e8c7bd637	not necessary to check file name	2017-05-08 12:33:00 +02:00
Dhanya Maliakal	3525bb3f9f	changed all -lpthread to -pthread	2017-05-01 09:44:33 +02:00
Dhanya Maliakal	8ebbfbb84b	incl. prev commit: Included file overwrite, format and changed the functonality of filewrite enable and file path	2017-03-10 12:21:19 +01:00
Dhanya Maliakal	2ef44ec70b	somewhere	2017-03-10 10:51:47 +01:00
Dhanya Maliakal	3e9476cca2	updaterev	2017-02-10 11:49:58 +01:00
Dhanya Maliakal	f464be38a3	xyrangechanged not checked for histogram	2016-12-16 14:46:02 +01:00
Dhanya Maliakal	37ea7d425f	updaterev	2016-11-30 11:17:38 +01:00
Dhanya Maliakal	b131f268e0	added the check for detector and receiver online in refreshing tabs	2016-11-22 14:11:11 +01:00
Dhanya Maliakal	96d8478b46	gui ensuring receiver offline caught, also at progress	2016-11-22 13:59:27 +01:00
Dhanya Maliakal	9031b3998b	removed warnings and zmq only when not mythen	2016-11-22 11:06:05 +01:00
Dhanya Maliakal	4292bf1ce8	updaterev	2016-11-11 14:15:08 +01:00
Dhanya Maliakal	9ee9fdea96	fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards	2016-11-10 16:13:42 +01:00
Dhanya Maliakal	7d860cc7cd	fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards	2016-11-10 16:13:22 +01:00
Dhanya Maliakal	cec2e5c6b4	reverting to previous	2016-11-10 16:08:38 +01:00
Dhanya Maliakal	5189640cd7	debugging for eriks pc	2016-11-10 16:02:31 +01:00
Dhanya Maliakal	8298486f27	debugging for eriks pc	2016-11-10 15:57:04 +01:00
Dhanya Maliakal	fd666605aa	some changes for qwt7 and for higher gcc	2016-11-10 14:56:52 +01:00
Dhanya Maliakal	b55414cd38	fixed time interval in receiveR	2016-11-10 14:37:08 +01:00
Dhanya Maliakal	3c48065b5a	removed the normal timer on the updateplot, it shold now plot as soon as it gets the data	2016-11-10 12:23:01 +01:00
Dhanya Maliakal	a0b28503d0	updaterev	2016-11-08 15:23:48 +01:00
Dhanya Maliakal	c2c7365566	works for jungfrau	2016-11-08 15:23:05 +01:00
Dhanya Maliakal	d335dfaae4	some print	2016-11-08 15:21:00 +01:00