7675 Commits

Author SHA1 Message Date
bergamaschi
5f74a469eb svn version from svn works for text client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@411 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 15:47:36 +00:00
bergamaschi
c9a9d0103f versioning scripts now work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@41 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 15:40:30 +00:00
bergamaschi
587c03b246 Added scripts to update version headers
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@40 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 14:56:01 +00:00
l_maliakal_d
b573014a02 changed makefile since gui has a different fodlername
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@39 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 14:49:59 +00:00
l_maliakal_d
67d3e34c08 changed makefile since its directory has changed relatively
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@38 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 14:35:34 +00:00
l_maliakal_d
2f058c89a6 changed client makefile since its directory has changed relatively
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@410 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 14:35:16 +00:00
l_maliakal_d
3d6530f043 deleted a few unnecessary c files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@409 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 14:12:26 +00:00
l_maliakal_d
499be37d0c deleted all the detector classes since they are all combined now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@408 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 14:04:53 +00:00
l_maliakal_d
4a47657b9e using force to overwrite when exporting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@37 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-17 08:21:17 +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
l_maliakal_d
b4127fa31c gui svninfo added to script
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@36 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-14 13:45:23 +00:00
l_maliakal_d
df144d90f1 added exportsoftware script which exports software and creates the svninfo.txt file for slsdetectorsoftware. others to be implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@35 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-14 12:56:49 +00:00
bergamaschi
824e4458ec removed docs from Makefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@34 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-13 11:38:08 +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
bergamaschi
7392497b52 manual added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@407 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 11:34:44 +00:00
bergamaschi
101c3b17ef examples directory with config files and scripts added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@33 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-13 11:23:05 +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
3acf9bd469 docs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@32 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-04 15:54:52 +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
c841c1111c test2
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@31 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-04 15:41:23 +00:00
bergamaschi
2405c70805 some docs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@30 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-12-04 15:36:02 +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
411b38d716 makefile again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@406 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-22 08:29:39 +00:00
bergamaschi
b32937f541 makefile again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@29 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-22 08:29:19 +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
bergamaschi
2ba3823c69 makefile changed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@28 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-21 09:00:59 +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
bergamaschi
82f672299b makefile fixed for asm includes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@405 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-14 11:36:30 +00:00
bergamaschi
bc1c3522d8 standard ch0 trimbit OK again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@27 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-13 09:20:42 +00:00
bergamaschi
4a8f89cea8 high gain trimbit OK again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@26 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-13 09:20:24 +00:00
l_maliakal_d
4f016db0c9 include gui in makefile,was commented out
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@25 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-11-13 08:38:42 +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
l_maliakal_d
11e2fafac3 separated slsReceiverInterface from slsDetector and edited Makefile to have nonstatic
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@404 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-26 08:59:46 +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
4d47efb847 changed slsDetectorReceiver to slsReceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@24 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-10-24 13:11:31 +00:00
l_maliakal_d
98945dce88 including receiver in makefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@23 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-10-24 12:34:14 +00:00
l_maliakal_d
de6836493c Makefile adjusted for nonstatic
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@22 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2012-10-24 11:56:51 +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