detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity
9,190 Commits 43 Branches 100 Tags
Commit Graph

62 Commits

Author SHA1 Message Date
Dhanya Thattil
e92578f89d formatting 2025-01-31 12:27:35 +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
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
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
Dhanya Thattil
6c1035aa99 zmq hwm are specified to 2 for gui and restreaming of receiver if all zmq not closed at end of acquiistion 2020-10-08 13:01:01 +02:00
Dhanya Thattil
9592d1760f gui fix 2020-05-25 11:09:26 +02:00
Erik Frojdh
8ff9b0cdac format GUI 2020-05-05 10:12:05 +02:00
Erik Frojdh
ee799b540a removed redundant includes etc. 2020-03-10 11:12:00 +01:00
Erik Frojdh
9ede0629ef clang format on gui 2020-03-10 10:18:52 +01:00
Dhanya Thattil
4e2f685b76 gotthard2: gain plot fix with clones 2020-03-04 14:39:44 +01:00
Dhanya Thattil
fe467cdf70 jungfrau dacs named 2019-10-29 18:11:16 +01:00
Dhanya Thattil
aafe049a9b
Guidetector (#54) 
* WIP

* dacWidget

* main WIP

* advanced WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* works

* updated gui to chrono

* review fixes

* unitque ptrs in gui
 2019-08-26 19:14:22 +02:00
Dhanya Thattil
058e16b872 gui: fixed gain plot size 2019-07-18 10:20:33 +02:00
Dhanya Thattil
8cdfe4194f gui works, including clone plots 2019-07-17 16:58:04 +02:00
Dhanya Thattil
c582ba15d5 WIP 2019-07-04 16:40:25 +02:00
Dhanya Thattil
fc2cc7e00c WIP 2019-07-02 12:09:37 +02:00
Dhanya Thattil
9f61104f0d WIP 2019-06-27 16:39:53 +02:00
Dhanya Thattil
61b937e2e0 WIP. catching exceptions using macros to ignore socket and shm error 2019-06-25 17:27:30 +02:00
Dhanya Thattil
e4190285be WIP 2019-06-18 17:51:28 +02:00
Dhanya Thattil
0acf97cc9a WIP 2019-06-18 16:24:59 +02:00
Dhanya Thattil
afb6d6bf3a WIP 2019-06-12 10:40:56 +02:00
Dhanya Thattil
48dd0fb084 WIP 2019-06-06 18:41:31 +02:00
Dhanya Thattil
bb760f3210 WIP datatoutput 2019-06-06 15:04:05 +02:00
Dhanya Thattil
e4546c6121 WIP 2019-06-05 17:54:56 +02:00
Dhanya Thattil
c30485a65b advanced down 2019-05-08 16:44:08 +02:00
Dhanya Thattil
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Dhanya Maliakal
c01931e5a6 makefiles and versioning update complete 2017-06-29 17:09:46 +02:00
Dhanya Maliakal
21e1fcf693 trying with gui makefile changes 2017-06-29 09:27:26 +02:00
Dhanya Maliakal
f464be38a3 xyrangechanged not checked for histogram 2016-12-16 14:46:02 +01:00
Maliakal Dhanya
c33657f04d histogram for 2d and s curves 2014-08-05 11:30:36 +02:00
l_maliakal_d
9c5e2aa5b7 compiling with and without root defined in makefile.include 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@269 af1100a4-978c-4157-bff7-07162d2ba061
 2014-04-09 10:29:11 +00:00
l_maliakal_d
ef983c151f small variation 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@266 af1100a4-978c-4157-bff7-07162d2ba061
 2014-03-26 10:07:27 +00:00
l_maliakal_d
c32acebc35 fixed problem of period beign recalculated for each refresh 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@244 af1100a4-978c-4157-bff7-07162d2ba061
 2013-10-10 09:09:55 +00:00
l_maliakal_d
35d7359403 qdefs message changed everything from \n to <br>, helps for gray source as html 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@217 af1100a4-978c-4157-bff7-07162d2ba061
 2013-08-06 07:22:50 +00:00
l_maliakal_d
2c8df98bf8 included the error message source to debug errors because of too many slots and signals 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@215 af1100a4-978c-4157-bff7-07162d2ba061
 2013-08-05 14:57:40 +00:00
l_maliakal_d
4f2f7639af changed the start and stop receiver error messages to be displayed to the client and not jsus recever 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@214 af1100a4-978c-4157-bff7-07162d2ba061
 2013-07-30 14:55:17 +00:00
l_maliakal_d
9cdbd74471 changed the start and stop receiver error messages to be displayed to the client and not jsus recever 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@213 af1100a4-978c-4157-bff7-07162d2ba061
 2013-07-30 14:50:01 +00:00
l_maliakal_d
68f360e395 change outdir for all receivers in gui 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@208 af1100a4-978c-4157-bff7-07162d2ba061
 2013-07-24 09:38:55 +00:00
l_maliakal_d
c605c77037 adjusted gui for moench and proper 2d plots, which are not scans for 1ds 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@172 af1100a4-978c-4157-bff7-07162d2ba061
 2013-04-16 13:43:28 +00:00
l_maliakal_d
3e4f76ed07 slsdet clear errormask fixed, qmessage not printing and displog fixed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@155 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-13 15:36:37 +00:00
l_maliakal_d
863b662c6b gui client works for just getting status 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@149 af1100a4-978c-4157-bff7-07162d2ba061
 2013-03-01 13:21:07 +00:00
l_maliakal_d
0682d23abd made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@147 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-26 08:34:47 +00:00
l_maliakal_d
f3eb9c924f included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@144 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-07 17:34:16 +00:00
l_maliakal_d
aec136cf21 added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@143 af1100a4-978c-4157-bff7-07162d2ba061
 2013-02-06 15:23:35 +00:00
l_maliakal_d
2ead554b7b fixed browse to show in red when disabled browse button for receiver, got rid of error message showing, 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@140 af1100a4-978c-4157-bff7-07162d2ba061
 2013-01-31 11:15:38 +00:00
l_maliakal_d
0b05f67f9d included sls defs in every file so that int is 32 bit 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@132 af1100a4-978c-4157-bff7-07162d2ba061
 2013-01-11 09:59:29 +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
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
87410f09de check if outdir exists,indent Actions,degreeC,cascode,thresholdscan(ev),not saving data secondary title,got rid of 2d sampledata 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@86 af1100a4-978c-4157-bff7-07162d2ba061
 2012-10-10 10:25:31 +00:00