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
|
1d1e5e1202
|
included shortframe in gui for time being its just adc selection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@142 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-31 15:42:04 +00:00 |
|
l_maliakal_d
|
6b311f931b
|
included shortframe in gui for time being its just adc selection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@141 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-31 15:34:31 +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
|
64208d5edd
|
dataoutput browse button disabled help in red
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@139 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-22 09:45:24 +00:00 |
|
l_maliakal_d
|
0c529e09fb
|
with all the svn revisions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@138 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-16 13:59:41 +00:00 |
|
l_maliakal_d
|
b10fedb8f3
|
cleared data in gui at beginning
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@137 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-16 10:19:14 +00:00 |
|
l_maliakal_d
|
b94e9475a0
|
also catches cerr now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@136 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-15 17:36:04 +00:00 |
|
l_maliakal_d
|
bb46b9afce
|
also catches cerr now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@135 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-15 17:28:59 +00:00 |
|
l_maliakal_d
|
6a3747638d
|
also catches cerr now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@134 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-15 17:11:54 +00:00 |
|
l_maliakal_d
|
ac79bb86fb
|
initialized everything in gui to get rid of the initialization error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@133 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-11 17:21:37 +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
|
6560a325ce
|
no change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@130 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-08 14:05:49 +00:00 |
|
l_maliakal_d
|
c21d674e89
|
changed uint in qDebugStream so that qtabmessages work on 64bit machine
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@129 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-12-18 16:33:30 +00:00 |
|
l_mozzanica
|
dbad2a41d8
|
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@128 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-12-18 15:21:09 +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 |
|
l_maliakal_d
|
46a4fee083
|
included the revision change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@125 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-12-17 16:39:25 +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
|
4ccb47203e
|
manual removed from makefiile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@122 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-12-13 11:36:50 +00:00 |
|
l_maliakal_d
|
27ef53da4a
|
made some change in static member used as index to avoid compile time error with new gcc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@121 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-12-05 08:48:57 +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 |
|
l_maliakal_d
|
bbb6e21607
|
included pedestal and also moved the frame index out of graph so it doesnt keep moving
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@119 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-30 17:05:06 +00:00 |
|
l_maliakal_d
|
382554afe9
|
included spacebar as a shortcut to start and stop acq
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@118 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-30 09:51:52 +00:00 |
|
l_maliakal_d
|
0b8f6cc925
|
changed the check for is a file using stat and not looking for a dot in file name
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@117 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-26 15:54:22 +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
|
90e219d402
|
makefile again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@115 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-22 08:29:47 +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 |
|
l_maliakal_d
|
f201a6a32b
|
for receiver, display frame number since not in filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@112 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-15 11:18:56 +00:00 |
|
l_maliakal_d
|
7a6bba3c77
|
fixed the problem with multiple frame scan, frame index and file index included in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@111 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-14 13:39:04 +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
|
854015532e
|
gotthard works with receiver without tcp lock
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@109 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-11-12 15:47:55 +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 |
|
bergamaschi
|
716b3530e8
|
zero value in 2D plot set to BG, logZ does not crash any longer (?)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@107 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-25 08:37:18 +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 |
|
l_maliakal_d
|
3759b48c6e
|
editted QDrawPlot to include sample plot just before they do a 2d scan
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@104 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-24 11:35:16 +00:00 |
|
bergamaschi
|
07ff5ce42d
|
Some problems with LogZ solved, but stil crashing when unsetting logZ
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@103 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-24 10:39:05 +00:00 |
|
bergamaschi
|
3e979fdece
|
finally works also with qwt6 - 2D plot color scales changed to root's
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@102 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-24 09:44:31 +00:00 |
|
bergamaschi
|
1d03067bd5
|
works with qwt5, but qwt6 except for 2D plots
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@101 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-23 10:30:32 +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 |
|
l_maliakal_d
|
6cec748335
|
added the buttons
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@99 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-22 14:10:32 +00:00 |
|
l_maliakal_d
|
04e04db2ad
|
problem with segmentation fault when trying to capture config loading logs at start:fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@98 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-19 10:21:56 +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
|
34b3a8b01b
|
bugfix: catching config count at the beginning caused it to crash. now it works without crashing. still to catch cerr output
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@96 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-16 09:44:09 +00:00 |
|
l_maliakal_d
|
e104b1d529
|
messages capture config output, still to find a way to capture all cerr output
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@95 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-16 08:29:44 +00:00 |
|
l_maliakal_d
|
863662a5eb
|
enhancement: logy with arrow buttons
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@94 af1100a4-978c-4157-bff7-07162d2ba061
|
2012-10-12 14:12:20 +00:00 |
|