199 Commits

Author SHA1 Message Date
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
c0e735c0b9 updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@198 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-21 14:28:45 +00:00
l_maliakal_d
019b231a8c update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@197 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-19 09:34:58 +00:00
l_maliakal_d
6dfa75430c svn info
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@196 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-12 10:24:55 +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
378f7715b9 update svn number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@194 af1100a4-978c-4157-bff7-07162d2ba061
2013-06-03 08:18:34 +00:00
l_maliakal_d
b915844822 2d pedestal implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@193 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-28 07:04:53 +00:00
l_maliakal_d
4f1dfe8b87 2d pedestal implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@192 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-28 06:45:56 +00:00
l_maliakal_d
1129702738 changed the receiver to be te one deicing frame factor, not gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@191 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-27 09:34:39 +00:00
l_maliakal_d
141a982878 update svn rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@190 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-27 09:11:45 +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
014dfd7eed receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@188 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-21 13:43:30 +00:00
l_maliakal_d
b0d8739439 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@187 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-17 10:20:45 +00:00
l_maliakal_d
bf77cc10b2 small change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@186 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-17 10:20:19 +00:00
l_maliakal_d
7624d301a4 changed dac names for monech
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@185 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-16 12:12:51 +00:00
l_maliakal_d
0e22e9c03c updated version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@184 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 15:09:02 +00:00
l_maliakal_d
acbb4774fc updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@183 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 13:28:01 +00:00
l_maliakal_d
a843661d1b updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@182 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 13:27:00 +00:00
l_maliakal_d
4214ef6be0 changed the tab order for the forms
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@181 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 13:07:07 +00:00
l_maliakal_d
287a451904 optimized the plot a bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@180 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-15 12:50:11 +00:00
l_maliakal_d
4fdacefdbe getting rid of undefined state in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@179 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-13 13:47:05 +00:00
l_maliakal_d
e153c6fd58 fixed zmin zmax bug, automatically online when refreshing advanced tab bug, outdir not checking properly
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@178 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-08 17:32:38 +00:00
l_maliakal_d
7701531ff3 fixed the undefined state of gui when acquisition stopped
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@177 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-07 14:20:43 +00:00
l_maliakal_d
8e19beb410 changed to trackertextF for qwt6 to show z value for 2d plots
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@176 af1100a4-978c-4157-bff7-07162d2ba061
2013-05-06 15:04:24 +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
4719fff09a sample 2d plot
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@173 af1100a4-978c-4157-bff7-07162d2ba061
2013-04-16 14:52:27 +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
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
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
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
ebd6a9131b check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@166 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:53:24 +00:00
l_maliakal_d
b0534f194a check error message in between implemented in gui, uncommented the displaying messages part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@165 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:51:10 +00:00
l_maliakal_d
7352407968 check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@164 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:50:49 +00:00
l_maliakal_d
3e81c16f38 check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@163 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:50:41 +00:00
l_maliakal_d
9e1029185f check error message in between implemented in gui, also fixed wrong ports being set:control:stop
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@162 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:48:30 +00:00
l_maliakal_d
db1aaf041a check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@161 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:47:19 +00:00
l_maliakal_d
4ac8439202 check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@160 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:46:35 +00:00
l_maliakal_d
f809657ec4 check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@159 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:45:49 +00:00
l_maliakal_d
bef3745693 check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@158 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:39:21 +00:00
l_maliakal_d
5c78f148b6 check error message in between implemented in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@157 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:38:57 +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
3e4f76ed07 slsdet clear errormask fixed, qmessage not printing and displog fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@155 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-13 15:36:37 +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
448f333b1e changed the makefiles a bit to be included in slsDetectorsPAckage make
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@153 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 09:41:21 +00:00
l_maliakal_d
499cf4db56 forgot client makefile for gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@152 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 09:21:15 +00:00
l_maliakal_d
8a87f17811 included makefile changes for gui client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@151 af1100a4-978c-4157-bff7-07162d2ba061
2013-03-06 09:18:46 +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