3406 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	e819ed26e1	proper update of progressfile bug	2016-10-20 08:24:54 +02:00
Dhanya Maliakal	7eafce87f9	fixed the print file packet loss progress bug	2016-10-20 08:13:42 +02:00
Dhanya Maliakal	8d5259d653	Merge branch '2.1.1-rc' into developer	2016-10-20 07:56:07 +02:00
Dhanya Maliakal	09c853ae26	fixed the print file packet loss progress bug	2016-10-20 07:55:56 +02:00
Dhanya Maliakal	fa7536e1d1	merge with 2.1.1-rc to be latest	2016-10-20 07:38:08 +02:00
Dhanya Maliakal	81d96a047d	slsDetector/slsDetectorCommand.cpp	2016-10-20 07:31:53 +02:00
Dhanya Maliakal	44a69e2aee	improved locking a bit	2016-10-19 10:46:03 +02:00
Dhanya Maliakal	121e9faf56	trying with the actual 1 getframescaught	2016-10-19 10:32:11 +02:00
Dhanya Maliakal	673e7c8f20	removed asking only 1 for framescaugh	2016-10-19 10:22:35 +02:00
Dhanya Maliakal	749c64204e	done showing error when detectors not added in sharedmemory due to connect failure	2016-10-19 08:15:52 +02:00
Dhanya Maliakal	e49f97a03c	done showing error when detectors not added in sharedmemory due to connect failure	2016-10-19 08:10:42 +02:00
Dhanya Maliakal	f535e11bba	check not done	2016-10-18 15:31:48 +02:00
Dhanya Maliakal	028ba57876	check for giving an error in gui if cannot connect to hostname	2016-10-18 15:06:01 +02:00
Dhanya Maliakal	ca89835035	check for giving an error in gui if cannot connect to hostname	2016-10-18 15:03:44 +02:00
Dhanya Maliakal	1e9ebc6f37	check for giving an error in gui if cannot connect to hostname	2016-10-18 14:50:25 +02:00
Dhanya Maliakal	4bfbd24144	check for giving an error in gui if cannot connect to hostname	2016-10-18 14:47:52 +02:00
Dhanya Maliakal	18046379ab	bugfix:seg fault for giving an error in gui if cannot connect to hostname	2016-10-18 14:44:13 +02:00
Dhanya Maliakal	8502a7b79f	giving	2016-10-18 14:36:04 +02:00
Dhanya Maliakal	0f8a33d71f	overwriting	2016-10-18 14:31:05 +02:00
Dhanya Maliakal	a7e8ff1c42	back	2016-10-18 14:05:05 +02:00
Dhanya Maliakal	82884370b5	back	2016-10-18 14:05:05 +02:00
Dhanya Maliakal	eec812f92c	switched	2016-10-18 12:33:47 +02:00
Dhanya Maliakal	cdaeff76d5	switched	2016-10-18 12:19:20 +02:00
Dhanya Maliakal	de5037ae2b	switched	2016-10-18 12:19:20 +02:00
Dhanya Maliakal	208c12b72c	trying	2016-10-18 12:12:08 +02:00
Dhanya Maliakal	e00ad76e55	trying	2016-10-18 12:08:11 +02:00
Dhanya Maliakal	3a6d97b4f3	trying	2016-10-18 12:08:11 +02:00
Dhanya Maliakal	01366b7273	done	2016-10-18 11:10:42 +02:00
Dhanya Maliakal	9f28cc686c	done	2016-10-18 11:10:42 +02:00
Dhanya Maliakal	37c0ea7453	almost there	2016-10-18 08:43:21 +02:00
Dhanya Maliakal	1bade91254	almost there	2016-10-18 08:43:16 +02:00
Dhanya Maliakal	b0bedc516d	works for missing packets and image reconstruction	2016-10-14 16:08:43 +02:00
Dhanya Maliakal	a6d9f681d8	works for missing packets and image reconstruction	2016-10-14 16:07:51 +02:00
Dhanya Maliakal	5c4d55af6b	random read, the current fnum shoud be sent, not the padded frame	2016-10-12 08:53:13 +02:00
Dhanya Maliakal	e45b89695b	somewhere	2016-10-11 12:35:49 +02:00
Dhanya Maliakal	55c352a9cd	somewhere	2016-10-11 12:35:48 +02:00
Dhanya Maliakal	03cdda99ae	fixed bug in temp front fpga	2016-10-07 15:54:46 +02:00
Dhanya Maliakal	28f96f4b51	included a febl and febr temp read	2016-10-07 15:44:13 +02:00
Dhanya Maliakal	f751e060b9	fixed bug that it does not display image 2	2016-10-07 15:13:20 +02:00
Dhanya Maliakal	47516cafde	works	2016-10-07 14:26:53 +02:00
Dhanya Maliakal	6751132466	works	2016-10-07 14:26:41 +02:00
Dhanya Maliakal	dce9911164	ask only 1 for frames caught for 9m	2016-10-07 13:48:45 +02:00
Dhanya Maliakal	4d1c6a1940	ask only 1 for frames caught for 9m	2016-10-07 13:48:19 +02:00
Dhanya Maliakal	d4122726ec	ask only 1 for frames caught for 9m	2016-10-07 13:16:12 +02:00
Dhanya Maliakal	16adb444b9	changed back the delay between framescaught	2016-10-07 13:12:57 +02:00
Dhanya Maliakal	d54392c6eb	increased delay to get framescaught from receiver for acquire form command line	2016-10-07 12:45:34 +02:00
Dhanya Maliakal	51e45baeff	removing check for read out	2016-10-07 12:14:08 +02:00
Dhanya Maliakal	125c3a789a	locking improved	2016-10-07 11:56:04 +02:00
Dhanya Maliakal	831bd8e160	some changes for quitting gui and continuing with acquire from command line	2016-10-07 11:40:56 +02:00
Dhanya Maliakal	1545d37f36	some changes for quitting gui and continuing with acquire from command line	2016-10-07 11:40:51 +02:00