874092a9d0
gui sub frame index now shows
2020-07-31 17:26:53 +02:00
4702a76235
Merge branch 'developer' into eiger
2020-07-31 17:15:07 +02:00
fd503e84af
m3: gui: when counters change, the npixelsx also changes
2020-07-31 16:50:17 +02:00
d31839e80e
roi constructor added
2020-07-30 14:04:50 +02:00
7dfeb987db
changing command from vhighvoltage to highvoltage
2020-07-30 11:50:03 +02:00
94e9591974
gui: dr enabled for m3
2020-07-17 18:49:05 +02:00
efc247f46f
WIP
2020-06-16 12:32:28 +02:00
Dhanya Thattil
f5160b0978
exposing receiver thread ids to client ( #102 )
...
* exposing receiver thread ids to client
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-06-09 16:18:37 +02:00
37cb0bb1c0
minor PR fixes
2020-05-26 08:57:48 +02:00
f293ba8c56
gui cmake fix
2020-05-26 08:50:09 +02:00
be3f095b56
gui minor fix
2020-05-20 17:27:22 +02:00
174bb32744
gui minor fix
2020-05-20 17:26:57 +02:00
07d90d127f
gui fix
2020-05-20 17:25:39 +02:00
9475e01062
gui done
2020-05-20 12:41:14 +02:00
dc8f67cd7b
gui fix
2020-05-20 12:04:48 +02:00
3ebb1fca02
gui WIP
2020-05-20 11:51:18 +02:00
Erik Frojdh
8ff9b0cdac
format GUI
2020-05-05 10:12:05 +02:00
Dhanya Thattil
fdb6e3f3d4
Removeshm ( #90 )
...
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not updated yet)
* removed dr and deadtiem from shm
* help for rx_status and status to point them to rx_Start, rx_stop, start and stop
* moved progress to receiver
* removed currentsettings from eiger shm
* updated server binaries, and client api
* moench and ctb virtual servers compile fix
* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
Dhanya Thattil
d58eb1dc6e
Gappixels ( #89 )
...
* WIP
* WIP virtual delays, imagetest for saturation
* WIP, vertical and horizontal
* WIP
* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers
* quad works (also in virtual), handling gappixels and quad
* jungfrau gapppixels work
* jungfrau: done
* complete image or missing packets given in json header and gui
* eiger virtual 4 bit mode bug fix
* working version of zmq add json header, except printout
* printout bug
* fix for json para
* to map WIP
* map done
* map print , mapwith result left
* json result works, testing added
* updated server binaries
* compiling on rhels7, variable size char array iniitalization
* zmqsocket parsing didnt need Document
* const to map, json para is strings not map
* json add header: mapping cleaner without insert make_pair
2020-03-30 14:54:35 +02:00
Dhanya Thattil
4813b5567a
Minimal shared memory for receiver
2020-03-19 07:01:32 +01:00
Erik Frojdh
e7e201bd2a
export and include
2020-03-18 10:20:01 +01:00
Erik Frojdh
ec9f8305e9
not export gui
2020-03-18 08:41:25 +01:00
Erik Frojdh
012c66bbbf
minor
2020-03-11 15:57:10 +01:00
Erik Frojdh
0de0d82a1a
replaced old logger
2020-03-11 12:40:12 +01:00
Dhanya Thattil
2acf64b09c
gui changes ( #87 )
2020-03-11 10:08:30 +01:00
Erik Frojdh
53749c3b77
clean
2020-03-10 16:09:59 +01:00
Erik Frojdh
8ba0ef093e
cmap
2020-03-10 15:50:14 +01:00
Erik Frojdh
cb268aa43f
cmap
2020-03-10 15:49:54 +01:00
Erik Frojdh
d818e2570f
clang-tidy nullptr
2020-03-10 15:06:51 +01:00
Erik Frojdh
ee799b540a
removed redundant includes etc.
2020-03-10 11:12:00 +01:00
Erik Frojdh
ae3189d836
changed cxx to cpp
2020-03-10 10:28:27 +01:00
Erik Frojdh
9ede0629ef
clang format on gui
2020-03-10 10:18:52 +01:00
Erik Frojdh
bd47c969dd
WIP
2020-03-09 12:49:24 +01:00
Erik Frojdh
e4a86e544a
WIP
2020-03-09 12:42:57 +01:00
a4fa9ff480
gui: scroll area uniquie pointers to remove mem leak
2020-03-06 19:44:44 +01:00
0a596c689b
sanitizer on, gui:removed qfuture, client: not implemented made specific as to what is not
2020-03-06 15:41:15 +01:00
4e2f685b76
gotthard2: gain plot fix with clones
2020-03-04 14:39:44 +01:00
1b996d1703
revised gain plot; updated version api
2020-03-04 10:25:38 +01:00
032475fc14
gainplot clone revised
2020-03-04 10:17:51 +01:00
8abc32e7f1
moench: default pattern file in server, settings, tests
2020-03-03 16:00:01 +01:00
6bbcf6173d
moench: first version
2020-03-02 18:34:10 +01:00
d7319968a7
gui: always show gain plots, include intensity ticks(2d), channels number and gain ticks(1d)
2020-02-28 17:28:44 +01:00
f38ed8706f
removing gui warnings from qwt section
2020-02-26 16:56:41 +01:00
e66d42a43d
old form fix
2020-02-26 10:28:45 +01:00
2310b5e55d
Merge branch 'developer' into bursts
2020-02-25 20:03:18 +01:00
dca2d098a9
gui: hide gain legend
2020-02-25 20:03:09 +01:00
462bc2e70c
Merge branch 'developer' into bursts
2020-02-25 18:22:58 +01:00
2da3d179ee
gotthard2 gain plot in gui
2020-02-25 18:22:18 +01:00
6a0a931e3e
gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes
2020-02-25 15:45:40 +01:00
f902bb06ad
gui bug fix: trigger timing mode was disconnected
2020-02-24 17:40:00 +01:00
