75 Commits

Author SHA1 Message Date
928d778fb1 formatting 2022-11-24 11:25:47 +01:00
Erik Fröjdh
8dbcfc2ca8
Static internal build of qwt (#583)
* static linking of qwt
* suppressed warning in qwt + added reason
2022-11-23 11:59:22 +01:00
Dhanya Thattil
38cd10d4e6
Qt5 built in qwt (#570)
- qt4->qt5
- in built qt5 6.1.5 because rhel7 is not upto date with qt5, removed findqwt.cmake
- made a fix in qwt lib (qwt_plot_layout.h) to work with 5.15 and lower versions for qrect constr.
- qt5 forms fixed, qt4 many hard coding forms switched to forms including qtabwidget, scrolls etc, fonts moved to forms
 - docking option enabled by default, removed option to disable docking feature from "Mode"
- added qVersionResolve utility functions to handle compatibility before and after qt5.12
- qtplots (ian's code) takes in gain mode enable to set some settings within the class, with proper gain plot ticks
- ensure gain plots have no zooming of z axis in 2d and y axis in 1d
- removed placeholder text in qpalette in main window form as its not supportd until 5.12 (so using qt5.9 designer insted of qt5.15 to cope)
- tab order
Servers:
- fixed some error messages that were empty for fail in funcs (mostly minor as if this error, major issues)
2022-11-11 15:15:10 +01:00
Dhanya Thattil
4a7cd051c1
Gainzoom (#556)
* gain plot: dont allow zoom, only zoom on main plot

* fixed gain plot zooming

* fixing panning for gainplots
2022-10-18 15:27:44 +02:00
Dhanya Thattil
e385618d09
gui crash qtimer (#551)
* locks when qtimer runs out same time as acquisitionfinished

* fix for newer gcc
2022-09-16 17:02:03 +02:00
Dhanya Thattil
6bf9dbf6d3
Format (#506)
Formatted package
2022-08-05 15:39:34 +02:00
Dhanya Thattil
4259363169
rxr sls namespace (#457)
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
2022-05-18 11:48:38 +02:00
Dhanya Thattil
fcc7f7aef8
Rx roi (#428)
* roi structure expanded to have ymin and ymax

* compile with 'detector roi'

* wip

* wip, rx_roi, rx_clearroi

* wip rxroi

* rxroi wip

* wip rxroi

* merge fix

* wip

* rx_roi works, impl wip, test

* tests in, impl left

* wip, rxroi impl

* wip, rxroi impl

* wip

* setrx_Roi works, getrx_roi, wip

* rx_roi impl done

* wip, rxroi

* wip, getrx_roi rxr ports

* fix ports

* wip

* wip

* fix positions on server side

* wip

* numports wip

* wip

* jungfrau top inner interface row increment

* x, y detpos, wip

* removed eiger row indices flipping in gui (bottom flipping maintained)

* wip

* wip, jungfrau numinterfaces2

* jungfrau virtual works

* eiger, jungfrau, g2 virtual server works

* eiger positions fix, wip

* binaries in

* minor printout

* binaries in

* merge fix

* merge fix

* removing getposition

* setrxroi wip

* set upto port

* get messed, wip

* roi multi to module works, wip

* wip

* roi dont return -1

* added rxroi metadata in master file

* added rxroifromshm, not yet in detector

* rx roi in gui with box, also for gap pixels (gappixels for jungfrau mess)

* fix for segfault in gui with detaching roi box in gui

* wip

* m3 gui: slave timing modes should be discarded when squashing

* fixed m3 virtual data, and fixed counters in gui asthetics

* m3 roi works

* wip, g2

* wip

* handling g225um boards, and showing roi for gainplot as well

* udpate python functions

* fix for 1d and a2d roi written

* fixed actual roi written to file

* no virtual hdf5 when handling rx roi

* test

* minor

* binarie in
2022-05-16 12:35:06 +02:00
b39c64032d clang format 2021-10-19 14:49:43 +02:00
dac60ad76d added .cpp licenses 2021-10-15 15:47:04 +02:00
4de7bb51ed updated all .h files with license notice and copyright notice 2021-10-14 18:10:56 +02:00
Erik Fröjdh
a15d8dd30a
Moving headers into include/sls (#212) 2020-11-02 16:05:28 +01:00
Erik Frojdh
8ff9b0cdac format GUI 2020-05-05 10:12:05 +02:00
Erik Frojdh
e7e201bd2a export and include 2020-03-18 10:20:01 +01:00
Erik Frojdh
012c66bbbf minor 2020-03-11 15:57:10 +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
0a596c689b sanitizer on, gui:removed qfuture, client: not implemented made specific as to what is not 2020-03-06 15:41:15 +01:00
f38ed8706f removing gui warnings from qwt section 2020-02-26 16:56:41 +01:00
2da3d179ee gotthard2 gain plot in gui 2020-02-25 18:22:18 +01:00
8cdfe4194f gui works, including clone plots 2019-07-17 16:58:04 +02:00
4f5b8c17b2 WIP 2019-07-15 15:46:38 +02:00
0e0e5db7c5 WIP 2019-07-05 18:17:55 +02:00
8ac7d96ef3 WIP 2019-07-05 08:54:50 +02:00
c582ba15d5 WIP 2019-07-04 16:40:25 +02:00
e22d03a744 WIP 2019-07-02 09:13:47 +02:00
9f61104f0d WIP 2019-06-27 16:39:53 +02:00
06834617de WIP 2019-06-27 11:54:17 +02:00
e4190285be WIP 2019-06-18 17:51:28 +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
48dd0fb084 WIP 2019-06-06 18:41:31 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Erik Frojdh
a1831c38ed replace lostFocus with editingFinished for QT 2018-05-18 17:05:35 +02:00
Dhanya Maliakal
409519a3db fixed the double plot due to unzooming in gui 2017-11-13 15:25:49 +01:00
Dhanya Maliakal
77dc4d3d77 solved some warnings 2017-07-27 12:08:12 +02:00
Dhanya Maliakal
f464be38a3 xyrangechanged not checked for histogram 2016-12-16 14:46:02 +01:00
Dhanya Maliakal
9031b3998b removed warnings and zmq only when not mythen 2016-11-22 11:06:05 +01:00
fdffe8dc1e compatible with qwt 6.1 2016-09-02 16:22:34 +02:00
Dhanya Maliakal
5d3e925ed4 compatible with gcc 5.3.1 amd 6.1.1 2016-08-03 17:50:54 +02:00
Dhanya Maliakal
5c5e9d349a zmin zmax change finish 2015-07-27 19:18:32 +02:00
Dhanya Maliakal
b1a9689caf solved some zmax zmin problems with gui 2015-07-27 18:53:16 +02:00