60 Commits

Author SHA1 Message Date
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
c01931e5a6 makefiles and versioning update complete 2017-06-29 17:09:46 +02:00
Dhanya Maliakal
b6eb4cbb61 testing changes 2017-06-29 10:18:51 +02:00
Dhanya Maliakal
21e1fcf693 trying with gui makefile changes 2017-06-29 09:27:26 +02:00
Dhanya Maliakal
3515951bb8 added updateversion into makefile while compiling 2017-06-28 11:18:55 +02:00
Dhanya Maliakal
9ee9fdea96 fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards 2016-11-10 16:13:42 +01:00
Dhanya Maliakal
cec2e5c6b4 reverting to previous 2016-11-10 16:08:38 +01:00
Dhanya Maliakal
fd666605aa some changes for qwt7 and for higher gcc 2016-11-10 14:56:52 +01:00
Dhanya Maliakal
d4dd7b5d8c added burst_trigger mode for eiger to replace trigger_readout mode 2016-07-04 15:44:59 +02:00
Maliakal Dhanya
0eaecc0e12 git version history 2014-06-03 13:56:39 +02:00
Maliakal Dhanya
ea1878f848 changes in makefile to make a separate receiver 2014-05-20 17:17:20 +02:00
bergamaschi
3731bfd51e removed checkinfinity flags
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@249 af1100a4-978c-4157-bff7-07162d2ba061
2013-12-17 10:31:54 +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
4c662270cd fixed zooming problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@241 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-02 16:41:50 +00:00
l_maliakal_d
113ee269d4 added trimming checks
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@222 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 13:39:36 +00:00
l_maliakal_d
6aeacf7b13 ordered the makefile a bit, needs more revising
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@189 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-23 12:26:08 +00:00
l_maliakal_d
675ab8ceca bad channel not read on refresh or start up, makefile reverted to compile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@175 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-30 15:05:21 +00:00
x04sa
35f151775e some debugging at the beamline, still crashing sl6 64bit, angular conversion etc.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@174 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-30 11:26:22 +00:00
l_maliakal_d
d56b2b480b edited the gui makefile to be able to compile withot errors from this directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@170 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-04 07:23:19 +00:00
l_maliakal_d
b7629f6c67 included a flag to print log or not
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@167 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-15 08:11:52 +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
bergamaschi
5bb8bc4574 svn version headers generated, but not yet implemented in the code
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@124 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-17 15:51:44 +00:00
l_maliakal_d
adc52782f8 gui svninfo added to script
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@123 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-14 13:45:38 +00:00
bergamaschi
1e705df5dc docs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@120 af1100a4-978c-4157-bff7-07162d2ba061
2012-12-04 15:46:18 +00:00
bergamaschi
95741a1c33 project file finally ok
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@116 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-22 10:11:54 +00:00
bergamaschi
29a9678d3b makefile changed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@114 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-21 09:01:33 +00:00
l_maliakal_d
832287af9e fixed filedir for gotthard receiver problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@113 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-15 13:53:08 +00:00
bergamaschi
6e529f1c06 warings suppressed (directly with flag in .pro)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@110 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-14 11:37:40 +00:00
l_maliakal_d
ba923b55b7 updated gui to work with receiver, start and stop receiver, show progress using callback
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@108 af1100a4-978c-4157-bff7-07162d2ba061
2012-11-07 17:01:24 +00:00
l_maliakal_d
80e0cd7fa1 qwtsrc was commented out in pro file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@106 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 11:52:55 +00:00
l_maliakal_d
d083d80a29 got rid of sample plot for 2d again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@105 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-24 11:47:20 +00:00
bergamaschi
8715a416a0 Changes for Qwt6, but 2D plot still does not work...and should be checked if Qwt5 still works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@100 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-22 15:34:14 +00:00
bergamaschi
ce110a79c8 some small changes to comly with qt4.7 version..but it still does not work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@97 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-18 15:28:57 +00:00
l_maliakal_d
7eb48a300d bug fix: time interval disabled when angular conversion disabled.solved
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@82 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-01 09:36:39 +00:00
l_maliakal_d
887303c820 bug fix: time interval disabled when angular conversion disabled.solved
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@81 af1100a4-978c-4157-bff7-07162d2ba061
2012-10-01 09:36:25 +00:00
l_maliakal_d
87f79a9327 without very verbose
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@80 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 17:05:38 +00:00
l_maliakal_d
1eb07b31f6 bug fix: plot tab refresh doesnt change plot
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@79 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 16:55:33 +00:00
l_maliakal_d
cd0d1976bc changed qw dir
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@64 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-20 10:19:27 +00:00
l_maliakal_d
12eeebb439 done
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@62 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-20 09:25:44 +00:00
l_maliakal_d
4f1c03c879 removed possible chances of a shared memory access during acquisition, start button to entable tabs, to refresh plot tab and startstoptoggle
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@61 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-19 15:10:28 +00:00
l_maliakal_d
d01852892b done
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@60 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-19 14:40:27 +00:00
l_maliakal_d
34d20aa712 change filename in plot only when you get to plot
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@58 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-17 12:12:25 +00:00
l_maliakal_d
4527e9f61b should be completely done except for mods in mythen for debuggin
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@57 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-14 15:19:09 +00:00
l_maliakal_d
a25b74c9ab angle done, more of trimming...save, load, yet to fix number of probes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@45 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-31 15:09:13 +00:00
l_maliakal_d
86ccd014ab included position scan
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@41 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-29 09:07:05 +00:00
l_maliakal_d
c9ecec183f included position scan
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@40 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-29 09:06:49 +00:00
l_maliakal_d
73152572a5 a rough idea of a scan is implemented with all frames
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@37 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-21 16:52:41 +00:00
l_maliakal_d
40af9384b5 fixed the losing focus too often problem in rangeSizeWidget for scanwidget
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@34 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 14:31:47 +00:00
l_maliakal_d
30c11d7589 fixed the dac problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@28 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-15 17:21:05 +00:00