311 Commits

Author SHA1 Message Date
Dhanya Maliakal
bb3e5351b4 solving warnings from latest linux 2017-12-11 13:51:11 +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
b498043ea6 remember old read freq if not 0 in gui 2017-12-05 16:04:10 +01:00
Dhanya Maliakal
7aaf95a565 -1 in getadc fixed in gui as well 2017-12-05 15:37:34 +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
d5c310a2db only call register call back which already enables streaming in client and receiveR 2017-11-28 09:36:14 +01:00
Dhanya Maliakal
375b1c9485 not required to restart client datastreaming due to connect everytime for acquire 2017-11-27 15:40:36 +01:00
Dhanya Maliakal
9f733c1dfb Merge branch '3.0.1' into zmqchange 2017-11-23 18:22:26 +01:00
Dhanya Maliakal
d40a2e0efa receiver read freq should save value in shm even if no receiver present 2017-11-23 18:21:29 +01:00
Dhanya Maliakal
d23c9d52ed somewhere 2017-11-23 14:53:33 +01:00
Dhanya Maliakal
fd4dd5b1e9 removed printout 2017-11-21 15:12:05 +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
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
eb4ab306c7 in between separating datastreaming in client and receiver 2017-11-15 17:16:37 +01:00
Dhanya Maliakal
52a9303a5e removed compression from gui in expert mode 2017-11-13 15:32:24 +01:00
Dhanya Maliakal
409519a3db fixed the double plot due to unzooming in gui 2017-11-13 15:25:49 +01:00
Dhanya Maliakal
bcea5a99a1 1. bug fix: loading trimbits and gui complains of different trimbits and sets them all to zero. This is fixed. It just loads -1 to gui. 2. Advanced Tab made slightly better aligned 2017-09-15 09:36:44 +02:00
Dhanya Maliakal
3fb92aa9dd changes done 2017-08-14 13:33:24 +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
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
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
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
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
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
f464be38a3 xyrangechanged not checked for histogram 2016-12-16 14:46:02 +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
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
Dhanya Maliakal
8298486f27 debugging for eriks pc 2016-11-10 15:57:04 +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
d335dfaae4 some print 2016-11-08 15:21:00 +01:00
Dhanya Maliakal
a337feba7f showing old plot and firstimagE 2016-11-07 15:34:14 +01:00
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