detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 14:38:14 +02:00
Code Issues Actions Packages Releases Activity
3,400 Commits 44 Branches 100 Tags
Commit Graph

103 Commits

Author SHA1 Message Date
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
Martin Brückner
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
l_maliakal_d
d49a5cd7b4 bug fix: after cloning, signals still ocnnected 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@195 af1100a4-978c-4157-bff7-07162d2ba061
 2013-06-07 11:16:53 +00:00
l_maliakal_d
c605c77037 adjusted gui for moench and proper 2d plots, which are not scans for 1ds 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@172 af1100a4-978c-4157-bff7-07162d2ba061
 2013-04-16 13:43:28 +00:00
l_maliakal_d
050bec703d defining everything to reduce null pointer errors, fixed zooming problem for scans 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@171 af1100a4-978c-4157-bff7-07162d2ba061
 2013-04-10 13:34:52 +00:00
l_maliakal_d
10e47581e0 gui_client more stable with 2 servers for stop and acquire 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@169 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-21 09:27:16 +00:00
l_maliakal_d
303d84b24a reduced gui_client crashes 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@168 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-19 16:00:38 +00:00
l_maliakal_d
7675b47474 check error message in between implemented in gui 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@156 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-13 15:38:33 +00:00
l_maliakal_d
ab41ffb6bf there was a gap between start and get status 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@154 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-06 10:16:48 +00:00
l_maliakal_d
22b51032dd client connecting to gui serveR done 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@150 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-04 15:27:57 +00:00
l_maliakal_d
863b662c6b gui client works for just getting status 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@149 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-01 13:21:07 +00:00
l_maliakal_d
642d7d8c74 previous checkin is not a working version 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@146 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-22 09:54:06 +00:00
l_maliakal_d
4814962347 included setroi for multidet 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@145 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-21 16:00:44 +00:00
l_maliakal_d
f3eb9c924f included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@144 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-07 17:34:16 +00:00
l_maliakal_d
aec136cf21 added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@143 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-06 15:23:35 +00:00
l_maliakal_d
2ead554b7b fixed browse to show in red when disabled browse button for receiver, got rid of error message showing, 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@140 af1100a4-978c-4157-bff7-07162d2ba061
 2013-01-31 11:15:38 +00:00
l_maliakal_d
0b05f67f9d included sls defs in every file so that int is 32 bit 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@132 af1100a4-978c-4157-bff7-07162d2ba061
 2013-01-11 09:59:29 +00:00
l_maliakal_d
74654b1ebc got rid of the weird ui look, which was due to windows style from afs 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@131 af1100a4-978c-4157-bff7-07162d2ba061
 2013-01-08 16:28:32 +00:00
l_maliakal_d
dd7385cd88 included -f in config file 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@127 af1100a4-978c-4157-bff7-07162d2ba061
 2012-12-18 14:34:48 +00:00
l_maliakal_d
b59b54e004 got rid of segmentation fault while loading settings file which didnt refresh actions tab etc 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@126 af1100a4-978c-4157-bff7-07162d2ba061
 2012-12-18 12:07:45 +00:00