121 Commits

Author SHA1 Message Date
9f61104f0d WIP 2019-06-27 16:39:53 +02:00
06834617de WIP 2019-06-27 11:54:17 +02:00
61b937e2e0 WIP. catching exceptions using macros to ignore socket and shm error 2019-06-25 17:27:30 +02:00
0acf97cc9a WIP 2019-06-18 16:24:59 +02:00
5d2567005d WIP 2019-06-12 14:40:04 +02:00
d2d25cdd69 WIP 2019-06-11 11:19:07 +02:00
f0872174cf WIP 2019-06-07 18:53:57 +02:00
862dc824ba WIP 2019-06-05 11:27:19 +02:00
d076be8887 WIP 2019-06-04 10:27:23 +02:00
c30485a65b advanced down 2019-05-08 16:44:08 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Erik Frojdh
f45e2b4ab9 changed type of getCalDir to std::string 2018-05-25 10:30:02 +02:00
Erik Frojdh
abdf4b1ada converting to Qstring 2018-05-25 10:19:09 +02:00
252e924f92 separated start gui button into start and stop to prevent multiple click syndrome 2018-03-27 17:49:01 +02:00
fe2ba8621b updating versioning to only have date 2018-03-27 11:00:15 +02:00
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
ac9d9f6a93 removing --f from the gui options help, bugfix gotthard auto to trigger to auto mode and changing tabs will result in num gates and delay being enabled 2018-02-26 16:58:45 +01:00
7859df6aa3 bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui 2018-02-26 12:44:32 +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
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
4159e83fd6 making gui work temporarily for jctb 2017-11-22 09:27:01 +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
52a9303a5e removed compression from gui in expert mode 2017-11-13 15:32:24 +01: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
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
5d52e41e37 adcs refresh only in developer tab 2016-08-24 17:10:07 +02:00
Dhanya Maliakal
b803f3a32a works for jungfrau 2015-11-27 17:30:45 +01:00
73ebb2750c Better commandline parsing 2015-10-23 12:03:19 +02:00
Dhanya Maliakal
2d8ee637dc adc update not stopped between acquisition 2015-07-22 10:35:26 +02:00
Dhanya Maliakal
db5412e599 propix integrated into gui 2015-07-22 10:06:38 +02:00
Dhanya Maliakal
848569b216 print receiver configurations and some error messages upon exit 2015-03-02 14:04:27 +01:00
Maliakal Dhanya
8dc41efad2 changed to linux argument type with -- 2014-12-01 10:54:31 +01:00
Maliakal Dhanya
0eaecc0e12 git version history 2014-06-03 13:56:39 +02:00
l_maliakal_d
e7d22b1b39 compression enabled in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@262 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-27 10:53:27 +00:00
l_maliakal_d
d0b12f4197 fixed a bug in measurement tab
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@261 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-12 09:23:56 +00:00
l_maliakal_d
69524e61f4 does not refresh measurement tab upon clicking start
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@260 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-10 17:01:34 +00:00
l_maliakal_d
f768886308 tried to reduce the time to refresh measurement and settings tab
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@258 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-07 12:33:07 +00:00
l_maliakal_d
534be9f942 file dialogs now show option to show all files, trimbits is possible to open non existing file, copying clones does not get rid of the old plot
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@257 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-05 16:37:05 +00:00
l_maliakal_d
a1c58f152f got rid of unncessary printouts and MyApplication inqDetectorMain does not work.so bak to original
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@251 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-30 17:50:41 +00:00
x04sa
635a33ea85 fixed bug when trimming
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@250 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-28 12:20:43 +00:00
l_maliakal_d
9f92f5cffa getting back to basics in zooming, using a flag to check for angle error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@246 af1100a4-978c-4157-bff7-07162d2ba061
2013-11-25 15:59:30 +00:00
l_maliakal_d
eb48b1c492 checking if probes or threshold ..shouldnt check if its the wrong detector unnecessary err printouts
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@225 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-12 12:21:49 +00:00
l_maliakal_d
2c8df98bf8 included the error message source to debug errors because of too many slots and signals
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@215 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-05 14:57:40 +00:00
l_maliakal_d
9cdbd74471 changed the start and stop receiver error messages to be displayed to the client and not jsus recever
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@213 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-30 14:50:01 +00:00
l_maliakal_d
390ca76130 small change in config file err msg
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@199 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-25 11:30:54 +00:00