Commit Graph

33 Commits

Author SHA1 Message Date
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
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
b0a5a76065 adding LTO to tests 2021-11-24 17:40:14 +01:00
519b09fcad permission 2021-10-18 15:01:10 +02:00
ca08cd9ec1 updated cmakelists.txt for licesnse 2021-10-18 11:44:47 +02:00
2f2fe4dd47 Release of 5.1.0 (#237)
* Setting pattern from memory (#218)

* ToString accepts c-style arrays

* fixed patwait time bug in validation

* Introduced pattern class

* compile for servers too

* Python binding for Pattern

* added scanParameters in Python

* slsReceiver: avoid potential memory leak around Implementation::generalData

* additional constructors for scanPrameters in python

* bugfix: avoid potentital memory leak in receiver if called outside constructor context

* added scanParameters in Python

* additional constructors for scanPrameters in python

* M3defaultpattern (#227)

* default pattern for m3 and moench including Python bindings

* M3settings (#228)

* some changes to compile on RH7 and in the server to load the default chip status register at startup

* Updated mythen3DeectorServer_developer executable with correct initialization at startup

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>

* Pattern.h as a public header files (#229)

* fixed buffer overflow but caused by using global instead of local enum

* replacing out of range trimbits with edge values

* replacing dac values that are out of range after interpolation

* updated pybind11 to 2.6.2

* Mythen3 improved synchronization (#231)

Disabling scans for multi module Mythen3, since there is no feedback of the detectors being ready
startDetector first starts the slaves then the master
acquire firs calls startDetector for the slaves then acquire on the master
getMaster to read back from hardware which one is master

* New server for JF to go with the new FW (#232)

* Modified Jungfrau speed settings for HW1.0 - FW fix version 1.1.1, compilation date 210218

* Corrected bug. DBIT clk phase is implemented in both HW version 1.0 and 2.0. Previous version did not update the DBIT phase shift on the configuration of a speed.

* fix for m3 scan with single module

* m3 fw version

* m3 server

* bugfix for bottom when setting quad

* new strategy for finding zmq based on cppzmq



Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
Co-authored-by: Dhanya Thattil <33750417+thattil@users.noreply.github.com>
Co-authored-by: Alejandro Homs Puron <ahoms@esrf.fr>
Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
Co-authored-by: Xiaoqiang Wang <xiaoqiangwang@gmail.com>
Co-authored-by: lopez_c <carlos.lopez-cuenca@psi.ch>
2021-03-22 14:43:11 +01:00
56be47669f more cmake cleaning 2020-11-18 09:43:07 +01:00
121a3ad733 Static libraries (#213) 2020-11-03 18:54:11 +01:00
fb8842e048 build and libname 2020-09-07 09:14:47 +02:00
f293ba8c56 gui cmake fix 2020-05-26 08:50:09 +02:00
3ebb1fca02 gui WIP 2020-05-20 11:51:18 +02:00
ec9f8305e9 not export gui 2020-03-18 08:41:25 +01:00
ae3189d836 changed cxx to cpp 2020-03-10 10:28:27 +01:00
f1bce15a57 replaced udp socket 2020-02-17 17:43:14 +01:00
8cdfe4194f gui works, including clone plots 2019-07-17 16:58:04 +02:00
cc769c5a96 WIP 2019-07-10 09:23:11 +02:00
4b10991429 WIP 2019-07-05 19:12:46 +02:00
00eaad3416 cmake 2019-07-02 12:42:58 +02:00
44aa3f655b cmath + cleaning 2019-07-02 12:11:45 +02:00
e22d03a744 WIP 2019-07-02 09:13:47 +02:00
7b456cb9c6 WIP 2019-06-18 16:27:44 +02:00
afb6d6bf3a WIP 2019-06-12 10:40:56 +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
16428f3828 esrf changes: CMake: support to be added and installed as a sub-project:
* Configure zmq as global imported library in slsReceiverSoftware
* Install zmq, necessary if linking to slsReceiver library
2018-04-25 18:24:08 +02:00
a536f8ac9b added png and Qt in CMakesList for gui 2018-02-19 17:44:57 +01:00
eb57e3a1d3 gui install 2018-01-24 10:17:24 +01:00
acb5e50870 Merge branch 'developer' into zmqdata 2016-09-20 14:42:20 +02:00
189834bb53 autorcc is not available for cmake 2.8, use manual instead 2016-09-19 11:59:47 +02:00
6abb1d2ae9 included json example with dummy values 2016-09-16 17:19:29 +02:00
e1604a081f add missing pthread lib 2016-09-15 13:59:18 +02:00
b8944a3156 add cmake configuration 2016-08-31 20:51:15 +02:00