511 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	11d3392064	gui uncomments	2016-11-04 13:46:23 +01:00
Dhanya Maliakal	7aae906c62	debugging	2016-11-04 12:02:52 +01:00
Dhanya Maliakal	404323e13a	updaterev	2016-11-03 12:32:37 +01:00
Dhanya Maliakal	d1fd6f0883	check for why gui doesnt show all data	2016-10-25 16:22:31 +02:00
Dhanya Maliakal	a8fb66483d	check for why gui doesnt show all data	2016-10-25 16:22:09 +02:00
Dhanya Maliakal	e6f17ed9d5	check for why gui doesnt show all data	2016-10-25 16:05:34 +02:00
Dhanya Maliakal	d97f1c1677	check for why gui doesnt show all data	2016-10-25 16:02:56 +02:00
Dhanya Maliakal	7a93fd8a58	check for why gui doesnt show all data	2016-10-25 16:00:18 +02:00
Dhanya Maliakal	a7658b2b94	check for why gui doesnt show all data	2016-10-25 15:57:11 +02:00
Dhanya Maliakal	cd6b952d64	check for why gui doesnt show all data	2016-10-25 15:44:24 +02:00
Dhanya Maliakal	81190d29b0	check for why gui doesnt show all data	2016-10-25 15:38:38 +02:00
Dhanya Maliakal	2f749bb91d	Merge branch 'zmqdata' into developer	2016-10-20 08:40:19 +02:00
Dhanya Maliakal	54b78363b0	enabling datastream back to qdrawplot	2016-10-06 14:22:08 +02:00
Dhanya Maliakal	723df0e9fb	somewhere	2016-10-06 08:43:14 +02:00
Dhanya Maliakal	c093da38ae	updaterev	2016-09-29 08:29:39 +02:00
Dhanya Maliakal	acb5e50870	Merge branch 'developer' into zmqdata	2016-09-20 14:42:20 +02:00
Dhanya Maliakal	9f2430cace	enablingdatastream name change	2016-09-20 14:42:01 +02:00
wang_x1	189834bb53	autorcc is not available for cmake 2.8, use manual instead	2016-09-19 11:59:47 +02:00
Dhanya Maliakal	6abb1d2ae9	included json example with dummy values	2016-09-16 17:19:29 +02:00
Dhanya Maliakal	895dae6d68	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_gui into zmqdata	2016-09-16 12:48:57 +02:00
Dhanya Maliakal	e0dc25905b	done	2016-09-16 12:48:32 +02:00
wang_x1	e1604a081f	add missing pthread lib	2016-09-15 13:59:18 +02:00
wang_x1	fdffe8dc1e	compatible with qwt 6.1	2016-09-02 16:22:34 +02:00
wang_x1	b8944a3156	add cmake configuration	2016-08-31 20:51:15 +02:00
Dhanya Maliakal	020e1b43f9	updaterev	2016-08-30 16:12:47 +02:00
Dhanya Maliakal	5d52e41e37	adcs refresh only in developer tab	2016-08-24 17:10:07 +02:00
Dhanya Maliakal	5b5e1e32b3	updaterev	2016-08-12 11:14:57 +02:00
Dhanya Maliakal	4c2d28943f	rate correction fixed for gui, removed auto made it defalt	2016-08-11 13:59:36 +02:00
Dhanya Maliakal	cf74f9b138	fixed rate correction to not include 16 bit dr	2016-08-08 15:50:37 +02:00
Dhanya Maliakal	5d3e925ed4	compatible with gcc 5.3.1 amd 6.1.1	2016-08-03 17:50:54 +02:00
Dhanya Maliakal	9139451127	added 2 gain settings to eigeR	2016-08-03 10:34:10 +02:00
Dhanya Maliakal	180038e485	updaterev	2016-07-22 10:41:54 +02:00
Dhanya Maliakal	86308352cb	added more accurate temperature sensors for eiger, and to gui	2016-07-22 10:41:35 +02:00
Dhanya Maliakal	843dbffcd8	updaterev	2016-07-18 17:19:18 +02:00
Dhanya Maliakal	6e4d4eed0e	updating versions	2016-07-06 10:32:55 +02:00
Dhanya Maliakal	be516e34b2	updating versions	2016-07-05 17:24:43 +02:00
Dhanya Maliakal	cc896bd99c	updating versions	2016-07-05 17:23:00 +02:00
Dhanya Maliakal	6b0814c907	updating versions	2016-07-04 15:49:43 +02:00
Dhanya Maliakal	d4dd7b5d8c	added burst_trigger mode for eiger to replace trigger_readout mode	2016-07-04 15:44:59 +02:00
Dhanya Maliakal	7db1136e65	versions update	2016-06-13 19:10:38 +02:00
Dhanya Maliakal	328139434d	fixed the zooming in plot tab. if x andy axis zoom set, it didnt take it for next measurement	2016-05-11 17:21:27 +02:00
Martin Brückner	14c78dc500	Changed make to $(MAKE) in Makefile for parallel compiling	2016-05-04 14:15:00 +02:00
Dhanya Maliakal	e7dbbf4c1f	undefined enum fixed	2016-03-15 17:33:40 +01:00
Dhanya Maliakal	6ad6c9e8bb	fixed undefined gain enum to a large number	2016-03-15 16:10:10 +01:00
Dhanya Maliakal	1633cc3f01	incorporated rate correction of eiger into gui	2016-02-17 18:04:24 +01:00
Dhanya Maliakal	615909f178	Merge branch 'release' into jungfrauv1.0	2016-02-03 15:00:53 +01:00
Dhanya Maliakal	1230b63b29	Merge branch 'release', remote branch 'origin' into release	2016-02-02 11:21:07 +01:00
Martin Brückner	d489b34824	Test commit, added a space in makefile	2016-02-02 10:49:40 +01:00
Dhanya Maliakal	700346fbbe	some changes for gui for settings for jungfrau	2015-12-01 17:15:41 +01:00
Dhanya Maliakal	b803f3a32a	works for jungfrau	2015-11-27 17:30:45 +01:00