linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
270 Commits 18 Branches 1 Tag
Commit Graph

40 Commits

Author SHA1 Message Date
Enrico Faulhaber
99f757bf78 fixup: rename *subtype* in client code as well 
Change-Id: I97cc836b2eaa508935113c225de593bbb9ad8821
Reviewed-on: https://forge.frm2.tum.de/review/20245
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-03-27 15:40:49 +01:00
Enrico Faulhaber
a255cfaa55 isort result 
Change-Id: I137d9a6b4e2322f8df0506f9e8f751a4743aafd0
Reviewed-on: https://forge.frm2.tum.de/review/20218
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-03-26 11:05:34 +01:00
Enrico Faulhaber
8efd1df92c fix isort 
Change-Id: I5486e1f9b3143c6bb0804c49c7ca21adb9b84de1
Reviewed-on: https://forge.frm2.tum.de/review/19524
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-12-04 10:18:55 +01:00
Enrico Faulhaber
29a5b5c49e big rework to comply to current spec 
- adapt to release(v2018-11-07)
- remove duplicate errors.py
- adapt tests

Change-Id: I383bb571f9808c72b37c12fbe55042011c4c0084
Reviewed-on: https://forge.frm2.tum.de/review/19397
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-12-04 10:18:40 +01:00
Enrico Faulhaber
7e54cd93b7 minor fixes 
Change-Id: I4be15d264e402be000811dffc1b28a2bc93ab297
Reviewed-on: https://forge.frm2.tum.de/review/18941
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-09-25 12:50:35 +02:00
Markus Zolliker
fb1939d5c8 merge 'parameters' and 'commands' to 'accessibles' 
- for now, the definition also accepts the old syntax
  (to be changed later)
- Commands have datatype CommandType
- do not need keyword for the decription parameter of Override
- issue a Warning when a Parameter is overwritten without Overrride
  (this should be turned into an error message)
-

Change-Id: Ib2c0f520abb5b4d7e6aed4d77a0d2b8bc470a85a
Reviewed-on: https://forge.frm2.tum.de/review/18251
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2018-06-25 17:26:01 +02:00
Enrico Faulhaber
22645b449b rename Param -> Parameter 
Change-Id: Idcbc440b76219282a888172890673a4d74935dfd
Reviewed-on: https://forge.frm2.tum.de/review/18210
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-19 14:25:13 +02:00
Enrico Faulhaber
574a66c65b rework EnumType to use better Enum's 
unfortunately IntEnum can't be bent like we would need it (extensible).
So we had to write our own....

The members of the Enum still behave like ints, but also have
.name and .value attributes, should they be needed.

needed adoptions to correctly use (and test) the EnumType are included.

Change-Id: Ie019d2f449a244c4fab00554b6c6daaac8948b59
Reviewed-on: https://forge.frm2.tum.de/review/17843
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-07 17:57:46 +02:00
Enrico Faulhaber
f0ea4bd9b8 fix internal event handling 
stringify at the latest possible moment, not the earliest

Change-Id: I230138c5787f97a72e8726ddc3546c61092d87c5
Reviewed-on: https://forge.frm2.tum.de/review/17858
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-26 16:36:01 +02:00
Enrico Faulhaber
153b4d79f7 fix equipment_id handling 
Change-Id: Ibeba9f0771dca8e7f9754f8b6431535885d654a0
Reviewed-on: https://forge.frm2.tum.de/review/17857
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-26 16:32:51 +02:00
Enrico Faulhaber
3b802e67c8 improve Py2/3 compat 
Change-Id: I1dfdcb88a492401851d5157c734cd708496bf004
Reviewed-on: https://forge.frm2.tum.de/review/17734
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-17 17:34:24 +02:00
Jens Krüger
851da9696c GUI: clean up callback for enum ComboBoxes 
Change-Id: I17450fb1701aeb252c6ce5a27db5f336ba138bb0
Reviewed-on: https://forge.frm2.tum.de/review/17748
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
Tested-by: Jens Krueger <jens.krueger@frm2.tum.de>
 2018-04-17 14:32:18 +02:00
Enrico Faulhaber
9f9dd9e3a3 GUI: Fix doubled slot on 'set' button click 
Change-Id: I65126fc33a25f9c63fa37d896a0fff6ac13150e8
Reviewed-on: https://forge.frm2.tum.de/review/17746
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@frm2.tum.de>
 2018-04-17 13:52:06 +02:00
Enrico Faulhaber
7653809954 [GUI] fix 'double' click on go-buttons 
Change-Id: I338cb7100a9fdbf8d45110e23bea71538235268d
Reviewed-on: https://forge.frm2.tum.de/review/17743
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 17:38:27 +02:00
Jens Krüger
aba67dde7f NODECTRL: Fix some problems with logging and callbacks 
- The widgets do not have a logger itself, the node logger has to be
  used
- The 'target_go' callback function has to be part of the Driveable
  widget not the Readable widget

Change-Id: Ie045fb02414d768fcf9c5e3f8590267209e23d83
Reviewed-on: https://forge.frm2.tum.de/review/17721
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 11:51:45 +02:00
Jens Krüger
b49dcf0fa8 UI: Add connection from exit button to close the window 
Change-Id: I168b06efa8ae95b09a9be408a25c510f90937c4c
Reviewed-on: https://forge.frm2.tum.de/review/17714
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-16 11:47:06 +02:00
Enrico Faulhaber
e830666315 Support PyQt5 (fallback to PyQt4) 
Change-Id: I7fa1add00d677e626fee5cd1071dee54d0bf8565
Reviewed-on: https://forge.frm2.tum.de/review/17666
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-11 12:43:04 +02:00
Enrico Faulhaber
40e75aefcc minor adoptions 
Change-Id: I8ee3968b46609ffb22f3618b61f6d15f0e5188c1
Reviewed-on: https://forge.frm2.tum.de/review/17281
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 15:36:45 +01:00
Enrico Faulhaber
d0620964fd fix unbound unit access 
Change-Id: I6dfb1a1c3c08fda54283ebbd1c862d99281b4c1e
Reviewed-on: https://forge.frm2.tum.de/review/17280
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 14:53:42 +01:00
Enrico Faulhaber
8117b26363 GUI: Saveguard against missing mandatory parameter status 
Change-Id: I04fa866474a8f2205c1e77f19d3eef4cd100ccf0
Reviewed-on: https://forge.frm2.tum.de/review/17279
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 14:50:39 +01:00
Enrico Faulhaber
b8abcfaf85 remember Widgets for modulectrl and paramctl 
to not recreate them when another module/param got selected

Change-Id: Ic81bd8e3105f666d3a03dffb3de4e15603d99c39
Reviewed-on: https://forge.frm2.tum.de/review/17276
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 12:13:23 +01:00
Enrico Faulhaber
99f763647f Avoid race condition upon gui start with autoconnect 
Change-Id: I9f886dd858d50584403da5adf0c995e73fe67267
Reviewed-on: https://forge.frm2.tum.de/review/17277
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 12:05:12 +01:00
Enrico Faulhaber
66503e8975 Add value parser + use it for the gui 
replaces eval which is used so far

Change-Id: Ie5ff8c82175786e233d52bc0faac4e72e3bc27e9
Reviewed-on: https://forge.frm2.tum.de/review/17271
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-02-08 09:54:04 +01:00
Enrico Faulhaber
3c3eaa166b provide an mean to use commands in the gui 
Change-Id: Ia6a3fa03b50496abcab47026637a8f292c761d0c
 2017-09-13 17:09:41 +02:00
Enrico Faulhaber
b9b2db1763 fixups 
Change-Id: Ibbae99d1c51edcbf251f43cd75f21e448825139c
 2017-09-12 18:25:06 +02:00
Enrico Faulhaber
96ac437fd3 fix transport and display of node-properties 
Change-Id: I35a3021768e386a5ce922c8e24128d0bc3a039be
 2017-09-12 16:10:22 +02:00
Enrico Faulhaber
7a50ff2603 adopt to new jsonify of string/blob/arrayof datatyes 
+ further fixes

Change-Id: I6411a689436ba246bcf572b420ca2a0385b033a2
 2017-09-12 11:08:09 +02:00
Enrico Faulhaber
ba59448442 fixups 
Change-Id: If1377ef41f8d500ccab0e2a0979343b4c090c036
 2017-09-11 17:50:20 +02:00
Enrico Faulhaber
357056d478 fixups 
Change-Id: I72abe9b4c2deb08e58ce69786f853ccc4b385a5d
 2017-09-11 15:22:33 +02:00
Enrico Faulhaber
b26b64032e fixups 
Change-Id: Ib0c6fddd38f594d735feadce31e4809e7a4c5d44
 2017-09-11 11:27:52 +02:00
Enrico Faulhaber
123d0fb504 [GUI]: create buttons for commands 
very basic!

Change-Id: Iee528a307be41e2da1f6f54d8442b7d24634bebe
 2017-09-07 15:03:36 +02:00
Enrico Faulhaber
2e492269b8 fix typo 
Change-Id: Ic7125870f209dd9b12e597e43a4874c30da3ca05
 2017-07-27 11:38:04 +02:00
Enrico Faulhaber
2bb96bea70 provide setup for MLZ_Amagnet to be used @PSI soon 
Also implement lots of fixes and improvements.

fixes: #3381

Change-Id: Ibe6664da00756ae5813b90f190295045808b2ff0
 2017-07-27 11:21:05 +02:00
Enrico Faulhaber
29ee07c5b3 several improvements and bugfixes 
+ rework GUI
  - include a combobox for selection of visibility
  - include a checkbox wether validation should be done in the client
  - remove unused lineEdit
+ improve datatypes
+ improve tests for new descriptive data
+ metaclasse: fix overlooked read_* or write_* func's
+ improve polling
+ Introduce new ErrorClasses
+ dispatcher: use new features of datatypes + PARAMS
+ improve lib
+ autopep8
+ first working version of MLZ_entangle integration
+ split specific stuff into it's own package (MLZ,demo,ess)

Change-Id: I8ac3ce871b28f44afecbba6332ca741095426712
 2017-07-19 11:03:29 +02:00
Enrico Faulhaber
bc3253a01a replace validators with datatypes 
Change-Id: I446c4e14e24afa3f65e79c8b6e07eec3271532b0
 2017-07-03 18:13:09 +02:00
Enrico Faulhaber
f984129986 GUI: show grouping of parameters 
still todo: grouping of modules

Change-Id: I67e8582004f16061dda96e455f424f5a12e6a163
 2017-05-24 17:15:22 +02:00
Enrico Faulhaber
462b6a0a7e autopep8 
Change-Id: I4e40e0ef8e80999832846eac3a415fdd767c6d98
 2017-05-24 17:15:20 +02:00
Enrico Faulhaber
6ec30e38e8 polishing for a demo 
+ adopting additional requests

Change-Id: If5ca29b5d247f1bc429ca101b0081b1d14f6e6f1
 2017-01-26 10:13:12 +01:00
Enrico Faulhaber
d5e935788f Bug hunting and polishing 
Change-Id: I0f05730dd4e01e926ab0c4870c27ed5754f3ccfd
 2017-01-23 17:48:50 +01:00
Alexander Lenz
d442da0789 Stub debug client gui. 
Change-Id: Ib422c66bc36245e1fc3c450765d7555da5c8dda0
 2017-01-19 10:04:16 +01:00