295 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	98e09b29d5	merge conflict solved -1 in adc in gui	2017-12-05 15:39:02 +01:00
Dhanya Maliakal	7aaf95a565	-1 in getadc fixed in gui as well	2017-12-05 15:37:34 +01:00
Dhanya Maliakal	385e6714cc	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:19 +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	e29371ca8d	makng the zmq work without external flag	2017-11-27 17:06:11 +01:00
Dhanya Maliakal	d23c9d52ed	somewhere	2017-11-23 14:53:33 +01:00
Dhanya Maliakal	4159e83fd6	making gui work temporarily for jctb	2017-11-22 09:27:01 +01:00
Dhanya Maliakal	9c55cb4974	removed merge conflicts from bug fix of zmq buffering while acquire from command line	2017-11-21 14:57:52 +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	70e4c6e2a2	zmq separated for client and rx, ports and ip included in expert advanced mode	2017-11-17 17:37:00 +01:00
Dhanya Maliakal	28e2ebf75a	merge conflict resolved from 3.0.1	2017-11-17 09:40:42 +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	8872f86e31	Merge branch '3.0.1' into developer	2017-11-13 15:32:47 +01:00
Dhanya Maliakal	52a9303a5e	removed compression from gui in expert mode	2017-11-13 15:32:24 +01:00
Dhanya Maliakal	7ba90f98fc	including dynamic range in gui call back	2017-11-02 11:02:22 +01:00
Dhanya Maliakal	5a7800768b	double* to char* in detector call back.	2017-10-02 13:20:19 +02:00
Dhanya Maliakal	fa79a36089	should work, but jungfrau needs debugging	2017-09-29 16:43:07 +02:00
Dhanya Maliakal	9bdb361d08	works but needs to be verified. the void* in call back	2017-09-29 11:39:36 +02:00
Dhanya Maliakal	2bd5386c29	Merge branch '3.0.1' into developer	2017-09-21 13:35:16 +02:00
Dhanya Maliakal	a250565f44	updaterev	2017-09-20 19:00:09 +02:00
Dhanya Maliakal	277dc2cfd9	gainplot added for jungfrau, aspect ratio check in gui added, npixels-1 as endpixel bug fix	2017-09-01 12:03:09 +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	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	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	c01931e5a6	makefiles and versioning update complete	2017-06-29 17:09:46 +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	22796d0d27	updaterev	2017-06-27 17:43:19 +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	cffdf7fede	updaterev	2017-06-22 14:33:24 +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	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	4292bf1ce8	updaterev	2016-11-11 14:15:08 +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	5189640cd7	debugging for eriks pc	2016-11-10 16:02:31 +01:00