223 Commits

Author SHA1 Message Date
l_maliakal_d
4e4b8b9beb ang conversion enables positions without having to do refresh
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@73 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 13:05:07 +00:00
l_maliakal_d
4143c648d8 bug fixed: constant scan widget: use red label to indicate wrong to, numsteps neednt be an integer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@72 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 12:52:49 +00:00
l_maliakal_d
d56780d906 bug fixed: must wait to get data for scans
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@71 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 11:44:49 +00:00
l_maliakal_d
e6e991bc64 fixed constant scan widget problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@70 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 11:34:18 +00:00
l_maliakal_d
bf8a1ec0d2 fixed constant scan widget problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@69 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 11:31:15 +00:00
l_maliakal_d
a79c5c6183 fixed advanced tab, optimize settings, threshold and exposure time enabling, histogram plotting crashing
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@68 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-25 07:22:04 +00:00
l_maliakal_d
197de5c995 checked in the change about config file at the very start of gui and gui version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@67 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-21 10:14:03 +00:00
l_msdetect
96c805f7bf Makefile with clean label addded
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@66 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-21 08:37:34 +00:00
l_maliakal_d
1273a3b1a1 added images
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@65 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-21 08:32:47 +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
8c250ed26a modified makefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@63 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-20 10:12:05 +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
ee264e9b56 change filename in plot only when you get to plot
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@59 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-17 12:20:01 +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
38451caa7c should all be done now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@56 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-14 14:55:53 +00:00
l_maliakal_d
62b14f4199 fixed gettrimbits, histogram(still more),start stop,scans,not accessign shared memory duign acquisition
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@55 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-12 15:44:23 +00:00
l_maliakal_d
f7078c3700 updated number of measurements to be taken from the detector class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@54 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-10 17:55:44 +00:00
l_maliakal_d
b85e03adfd included images
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@53 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-07 16:33:24 +00:00
l_maliakal_d
c9db2c4272 included images
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@52 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-07 16:29:32 +00:00
l_maliakal_d
a4a0237711 trim tab works except for graph
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@51 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-07 08:17:16 +00:00
l_maliakal_d
b67f3a83d8 stop signal works, call back works, number of probes to expert mode, angular works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@50 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-05 08:42:03 +00:00
l_maliakal_d
e32c1de0af stop signal works, call back works, number of probes to expert mode, angular works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@49 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-05 07:33:55 +00:00
l_maliakal_d
63fadd3633 added color to collapse in actions, changed angular for number of data to be received, corrected constant size scan widget
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@48 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-04 10:30:18 +00:00
l_maliakal_d
a754e419fe loading and saving trimbits and calibration file works now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@47 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-03 09:35:01 +00:00
l_maliakal_d
f0217ce9b1 loading and saving trimbits and calibration file works now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@46 af1100a4-978c-4157-bff7-07162d2ba061
2012-09-03 09:25: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
4686cb9c0e the angles should work now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@44 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-30 16:45:11 +00:00
l_maliakal_d
c4d478484b deleted some forms not used
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@43 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-30 08:35:45 +00:00
l_maliakal_d
fa5817ab77 constant size scan widget works properly now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@42 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-30 08:28:16 +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
51e7feb605 the scans work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@39 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-27 14:50:59 +00:00
l_maliakal_d
ee3a54601c the scans work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@38 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-27 14:11:58 +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
cc176ea404 updated plot to show index instead of frame number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@36 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-21 12:05:22 +00:00
l_maliakal_d
1ce04ef785 updated plot to show index instead of frame number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@35 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-21 11:53:23 +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
6c19d75359 included high voltage for developer tab in gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@33 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 13:16:02 +00:00
l_maliakal_d
b21b4d066c included high voltage for developer tab in gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@32 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 13:12:08 +00:00
l_maliakal_d
685e236828 energy calibration is not needed anymore
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@31 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 10:37:06 +00:00
l_maliakal_d
92406bf6a8 energy calibration is not needed anymore
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@30 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-17 10:35:39 +00:00
l_maliakal_d
423a47cd9e git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@29 af1100a4-978c-4157-bff7-07162d2ba061 2012-08-17 10:29:46 +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
l_maliakal_d
63bfdb9cb9 dacs and adcs work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@27 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-08 17:10:44 +00:00
l_maliakal_d
a47d0a57f6 finished getting dacs and adcs..need to set it
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@26 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-07 19:11:54 +00:00
l_maliakal_d
72c52de2fe included checkbox for enable file write
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@25 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-07 12:20:50 +00:00
l_maliakal_d
bcb4710477 changed such that getdata returns if not really necessary to copy
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@24 af1100a4-978c-4157-bff7-07162d2ba061
2012-08-07 10:19:15 +00:00