502 Commits

Author SHA1 Message Date
864db79a13 WIP 2019-07-02 17:11:03 +02:00
455252f2f3 WIP 2019-07-02 13:51:31 +02:00
5e6eb45f56 Merge branch 'gui' of github.com:slsdetectorgroup/slsDetectorPackage into gui 2019-07-02 13:51:03 +02:00
975076043f WIP 2019-07-02 13:50:20 +02:00
Erik Frojdh
cbe979b4b9 fixed merge 2019-07-02 12:16:05 +02:00
Erik Frojdh
44aa3f655b cmath + cleaning 2019-07-02 12:11:45 +02:00
fc2cc7e00c WIP 2019-07-02 12:09:37 +02:00
e22d03a744 WIP 2019-07-02 09:13:47 +02:00
a373609b08 WIP 2019-06-28 18:16:32 +02:00
039a725c5c WIP. removed qServer 2019-06-28 11:57:37 +02:00
9f61104f0d WIP 2019-06-27 16:39:53 +02:00
06834617de WIP 2019-06-27 11:54:17 +02:00
61b937e2e0 WIP. catching exceptions using macros to ignore socket and shm error 2019-06-25 17:27:30 +02:00
33f5253831 QIP 2019-06-21 18:19:39 +02:00
f4bc255f2c WIP 2019-06-19 15:01:57 +02:00
d2280b4414 WIP 2019-06-19 15:01:18 +02:00
332e83d43c WIP, except qdrawplot 2019-06-18 18:06:27 +02:00
3f4dda9d33 WIP 2019-06-18 17:53:07 +02:00
e4190285be WIP 2019-06-18 17:51:28 +02:00
0acf97cc9a WIP 2019-06-18 16:24:59 +02:00
976b460e70 WIP 2019-06-17 17:54:12 +02:00
326b14737f WIP 2019-06-17 15:51:17 +02:00
4213a161fe WIP 2019-06-14 16:38:42 +02:00
5d2567005d WIP 2019-06-12 14:40:04 +02:00
afb6d6bf3a WIP 2019-06-12 10:40:56 +02:00
b922b79232 WIP 2019-06-11 16:36:02 +02:00
d3467432a9 WIP 2019-06-11 15:43:24 +02:00
cb2c39c62f WIP 2019-06-11 15:38:04 +02:00
111c48e3fa WIP 2019-06-11 11:29:45 +02:00
d2d25cdd69 WIP 2019-06-11 11:19:07 +02:00
1bab010d0b WIP 2019-06-11 10:15:40 +02:00
f0872174cf WIP 2019-06-07 18:53:57 +02:00
ca5a0b4cc8 WIP Settings 2019-06-07 10:58:47 +02:00
48dd0fb084 WIP 2019-06-06 18:41:31 +02:00
bb760f3210 WIP datatoutput 2019-06-06 15:04:05 +02:00
e4546c6121 WIP 2019-06-05 17:54:56 +02:00
862dc824ba WIP 2019-06-05 11:27:19 +02:00
d076be8887 WIP 2019-06-04 10:27:23 +02:00
c30485a65b advanced down 2019-05-08 16:44:08 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
235002cdd4 gui: fixed title height 2018-09-20 14:48:36 +02:00
4e446f1f39 eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server 2018-08-17 13:45:09 +02:00
1102153d2b Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically) 2018-08-09 15:43:56 +02:00
52b1e98726 merge 2018-08-08 12:06:14 +02:00
44fdc46c11 some changes in the moench executables 2018-08-08 10:23:35 +02:00
a970bacbe5 slsDetectorGui: JCTB does not kill itself for wrong settings anymore 2018-05-28 11:29:35 +02:00
Erik Frojdh
f45e2b4ab9 changed type of getCalDir to std::string 2018-05-25 10:30:02 +02:00
Erik Frojdh
abdf4b1ada converting to Qstring 2018-05-25 10:19:09 +02:00
563b1bb8b7 slsDetectorGui:added subexptime and subperiod to gui 2018-05-17 15:34:35 +02:00
501d2478a5 Merge branch 'jungfraunew' into esrfchanges 2018-04-26 16:37:33 +02:00