743 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	65a91c519e	Merge branch '3.0.1' into developer	2017-12-14 14:29:16 +01:00
Dhanya Maliakal	0649626842	made the color fix for black/white backgrounds	2017-12-14 14:29:07 +01:00
Dhanya Maliakal	d6bdbf8524	Merge branch '3.0.1' into developer	2017-12-11 13:51:20 +01:00
Dhanya Maliakal	bb3e5351b4	solving warnings from latest linux	2017-12-11 13:51:11 +01:00
Dhanya Maliakal	24c305ec59	solved conflicts from merge of version being used to binary	2017-12-06 19:07:06 +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	2f3dc8d109	Merge branch '3.0.1' into developer	2017-12-06 08:44:21 +01:00
Dhanya Maliakal	7436d6c8d3	updaterev	2017-12-06 08:44:07 +01:00
Dhanya Maliakal	0ef52138e1	merge conflict sorted, removing rest	2017-12-05 11:25:10 +01:00
Dhanya Maliakal	28211af5af	Makefile for Receiver merged incorrectly sometime back, also in archived project	2017-12-05 11:23:35 +01:00
Dhanya Maliakal	65b4c69847	REST implementation removed from slsReceiver	2017-12-05 11:03:52 +01:00
Dhanya Maliakal	2ae5a959fe	fix in receiver merge conflict (before the respos merge)	2017-12-04 18:35:57 +01:00
Dhanya Maliakal	9f152ce1f3	merge conflict resolved	2017-12-01 12:44:34 +01:00
Dhanya Maliakal	d1e3d50a87	cosmetic print outs	2017-12-01 12:43:14 +01:00
Dhanya Maliakal	a06f29f473	minor cosmetics	2017-12-01 11:23:17 +01:00
Dhanya Maliakal	0e26734023	restreaming stop fix	2017-11-30 19:13:55 +01:00
Dhanya Maliakal	fd64ba289e	Merge branch '3.0.1' into developer	2017-11-30 19:07:21 +01:00
Dhanya Maliakal	e9343a5bd0	remove warning	2017-11-30 19:07:05 +01:00
Dhanya Maliakal	6f3898441e	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:47 +01:00
Dhanya Maliakal	70bf6eb4cb	restream stop from receiver	2017-11-30 18:39:08 +01:00
Dhanya Maliakal	e17e4c3171	Merge branch '3.0.1' into developer	2017-11-28 18:50:27 +01:00
Dhanya Maliakal	b75985088d	twice connect bug fix in zmq	2017-11-28 18:50:18 +01:00
Dhanya Maliakal	8bba57e77d	fix to not have sls_receiver_defs in zmqSocket.h incldue	2017-11-28 16:32:15 +01:00
Dhanya Maliakal	8388d1f503	using file index from zmq	2017-11-28 14:45:48 +01:00
Dhanya Maliakal	a89847538d	merge ocnflict for white background	2017-11-28 11:29:15 +01:00
Dhanya Maliakal	a351fa8f28	switching from black to white background for receiver	2017-11-28 11:18:30 +01:00
Dhanya Maliakal	4466213882	makng the zmq work without external flag	2017-11-27 17:06:27 +01:00
Dhanya Maliakal	a0c9018455	Merge branch '3.0.1' into developer	2017-11-23 18:24:34 +01:00
Dhanya Maliakal	eb89e9bf96	Merge branch '3.0.1' into zmqchange	2017-11-23 18:22:27 +01:00
Dhanya Maliakal	59b5fe9424	receiver read freq should save value in shm even if no receiver present	2017-11-23 18:22:03 +01:00
Dhanya Maliakal	2c276db579	solved merge conflict in changes to use ZmqSocket.h externally	2017-11-23 16:35:31 +01:00
Dhanya Maliakal	b14ea217ee	Merge branch '3.0.1' into zmqchange	2017-11-23 16:34:14 +01:00
Dhanya Maliakal	da3ca9f306	changes to use ZmqSocket.h externally without further changes	2017-11-23 16:28:02 +01:00
Dhanya Maliakal	ad64df01c7	somewhere	2017-11-23 14:53:40 +01:00
Dhanya Maliakal	114c45c04a	making gui work temporarily for jctb	2017-11-22 09:27:42 +01:00
Dhanya Maliakal	3a26c95c0d	Merge branch '3.0.1' into developer	2017-11-21 15:46:21 +01:00
Dhanya Maliakal	8c45f94496	updated npixelsy for jungfrau effecting hdf5 mapping	2017-11-21 15:46:10 +01:00
Dhanya Maliakal	5d34358f44	changin zmqip in rxr should also restart streaming	2017-11-21 15:11:29 +01:00
Dhanya Maliakal	a0ad1fb3a3	Merge branch '3.0.1' into developer	2017-11-21 14:15:59 +01:00
Dhanya Maliakal	d00df32e49	changing zmq rxr port should restart data streaming	2017-11-21 13:39:49 +01:00
Dhanya Maliakal	46aeee00f1	somewhere	2017-11-21 12:30:58 +01:00
Dhanya Maliakal	97260510f2	gap pixels should be allowed to set to 0 for other detectors	2017-11-20 09:43:41 +01:00
Dhanya Maliakal	662f502d4c	zmq always needs an ip in header	2017-11-17 17:40:57 +01:00
Dhanya Maliakal	2e234f1bbd	Merge branch '3.0.1' into developer	2017-11-17 11:36:02 +01:00
Dhanya Maliakal	a79864a5ae	bugfix enabledata streaming send int for update	2017-11-17 11:35:54 +01:00
Dhanya Maliakal	1dee950870	merge conflict from 3.0.1	2017-11-17 11:35:15 +01:00
Dhanya Maliakal	823d537825	fixed warnings	2017-11-17 09:26:20 +01:00
Dhanya Maliakal	c69ae52e76	somewhere	2017-11-16 09:12:57 +01:00
Dhanya Maliakal	32d32dbcdc	in between separating datastreaming in client and receiver	2017-11-15 16:16:59 +01:00