srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
6,754 Commits 63 Branches 34 Tags 19 MiB
Commit Graph

375 Commits

Author SHA1 Message Date
Robert Jördens 11bfe33dd4 scanwidget: painting (3237d2b) 2016-03-16 21:13:14 +01:00
Robert Jördens 67db5f77cd scanwidget: lmb axis drag (9e6203c) 2016-03-16 21:11:40 +01:00
Robert Jördens d858ad4180 scanwidget: rewrite, pending drawing area (3de1505) 2016-03-16 21:11:40 +01:00
Sebastien Bourdeauducq a142d403ea gui: handle better changing MDI area background colors 2016-03-15 18:36:34 +08:00
Sebastien Bourdeauducq a172d8b837 logo: use Unix EOLs 2016-03-15 18:35:30 +08:00
Robert Jördens fc60f3504c scanwidget: wheel event handling cleanup (380634e) 2016-03-14 18:06:18 +01:00
Robert Jördens 2e73d6c89c scanwidget: changes as of 1f9ab9b (resize) 2016-03-14 16:53:06 +01:00
Robert Jördens 1dc72635a0 scanwidget: changes as of 19a1d40 (closes #330) 2016-03-14 16:50:58 +01:00
Robert Jördens 5714ffe758 scanwidget: draw based on font metrics (closes #328) 2016-03-12 13:09:31 +01:00
Robert Jördens 5e7eff6c4d scanwidget: changes as of edaba53 2016-03-12 12:42:33 +01:00
Robert Jördens 78f2706aa8 scanwidget: apply changes as of 579bf5e 2016-03-11 21:37:55 +01:00
Robert Jördens d34d83f35c Merge branch 'scanwidget' (closes #128) 
* scanwidget:
  gui: fix scanwidget usage
  scanwidget: apply changes as of 10439cb
  scanwidget: apply changes as of 98f0a56
  missing parts of 59ac567
  scanwidget: disable unmodified wheel on axis and slider
  scanwidget: wire up signals better, set values late, take scanwidget from 7aa6397
  gui: use scanwidget
  scanwidget: add from current git
 2016-03-11 18:31:25 +01:00
Robert Jördens 22b072699f gui: fix scanwidget usage 2016-03-11 18:30:27 +01:00
Robert Jördens 7f3e1c989d scanwidget: apply changes as of 10439cb 2016-03-11 18:29:21 +01:00
Robert Jördens e4b854b8bf scanwidget: apply changes as of 98f0a56 2016-03-11 15:38:22 +01:00
Sebastien Bourdeauducq 065cbfbb8a gui/moninj: fix datagram offset computation (#325) 2016-03-10 22:34:22 +08:00
Robert Jördens bc9203457e Merge branch 'master' into scanwidget 
* master: (38 commits)
  hardware_testbench: better message when skipping
  test_spi: drain errors and be more strict on where we expect errors
  monkey-patch asyncio.proactor_events to handle ConnectionAbortedError on Windows. Closes #247
  test/rtio/Loopback: ensure loop_out is low before starting test
  test/rtio: raise exception when pulse is not received
  rtio: fix different address collision detection
  frontend/coreanalyzer: do not attempt to print obsolete decoded_dump attribute. Closes #324
  coredevice: put cache into separate file/device
  gui: delete log/applet docks instead of hiding them
  gui/moninj: make DDS widgets look less like buttons
  rtio: remove NOP suppression capability
  rtio/wishbone: make replace configurable
  exceptions: clarify RTIOBusy
  gateware/rtio: factor _BlindTransfer
  test_spi: break_realtime
  test_spi: simplify test, add collision vs busy test
  hardware_testbench: clean up artiq_core_exeption printing
  coredevice: fix _DDSGeneric __init__ args
  hardware_testbench: also print artiq_core_exeption
  rtio/core: fix syntax
  ...
 2016-03-10 12:46:07 +01:00
Sebastien Bourdeauducq 7f501820de gui: delete log/applet docks instead of hiding them 2016-03-10 10:35:44 +08:00
Sebastien Bourdeauducq c5552f9009 gui/moninj: make DDS widgets look less like buttons 2016-03-10 10:20:26 +08:00
Sebastien Bourdeauducq f0b0b1bac7 support for multiple DDS buses (untested) 2016-03-09 17:12:50 +08:00
Robert Jördens 81bc99905c missing parts of 59ac567 2016-03-08 16:49:23 +01:00
Robert Jördens 59ac567048 scanwidget: disable unmodified wheel on axis and slider 2016-03-08 16:43:04 +01:00
Robert Jördens 285979cab6 Merge branch 'master' into scanwidget 
* master:
  pipistrello: grow fifos a bit (may make ise happier)
  gui: don't scroll experiment editor on modified wheel (closes #303)
  gui: ignore only unmodified wheelevents
  pipistrello: shrink fifos a bit (may make ise happier)
  pipistrello: use ttl_simple for pmod[4:8]
  pipistrello: move the spi channel like kc705
  doc: kc705.clock: add spi bus mappings (closes #321)
  doc: add pipistrello spi bus
  doc: add pipistrello pmod ttl channels
  pipistrello: make pmod[4:8] available as ttls
  pipistrello: adhere to pmod interface type 2 layout
 2016-03-08 16:18:50 +01:00
Robert Jördens c08881de5d gui: don't scroll experiment editor on modified wheel (closes #303) 
If you try to target e.g. spinbox with a ctrl- or shift-wheel to change the value
and you don't aim well, the tree widget will scroll. We already have tree
scroll on unmodified wheel. Let's have the modified wheel events exclusively
target the smaller widgets.
 2016-03-08 16:12:38 +01:00
Robert Jördens 41ca223c45 gui: ignore only unmodified wheelevents 2016-03-08 15:53:27 +01:00
Robert Jördens 7e99780891 scanwidget: wire up signals better, set values late, take scanwidget from 7aa6397 2016-03-08 12:35:13 +01:00
Robert Jördens ef217f7fe2 Merge branch 'master' into scanwidget 
* master: (125 commits)
  rtio: when rtlink addresses are different, issue collision not replace (fixes #320)
  rtio: collision_error -> collision
  test/coredevice/time_keeps_running: start new session to prevent now_mu save/restore
  runtime: fix sloppy memory management in cache_put.
  test_loopback: bump RTT limit to 60ns.
  soc: use add_extra_software_packages, factor builder code
  doc/PCA9548: clarify channel selection
  doc: I2C/QC2
  test: I2C/PCA9548 unittest
  examples/device_db: add PCA9548
  runtime/i2c_read: fix MSB
  ad5360: add documentation and an example
  ad5360: t16 is a max
  ad5360: un-factor write_channels
  ad5360: add busy and update timings
  ad5360: style
  ad5360: add batched zero-length multi-channel set()
  spi/ad5360: refactor, small fixes
  coredevice/i2c: fix exception message
  coredevice/PCA9548: fix I2C address
  ...
 2016-03-08 11:14:57 +01:00
Sebastien Bourdeauducq b83b113f3c gui/moninj: make widgets look less like buttons 2016-03-03 10:48:17 +08:00
Robert Jördens 485fc3bd27 gui: use scanwidget 2016-02-25 20:34:18 +01:00
Robert Jördens 3ed8288601 scanwidget: add from current git 2016-02-25 20:34:04 +01:00
Sebastien Bourdeauducq 95dbafd662 gui: add logo to MDI area 2016-02-21 08:06:52 +08:00
Sebastien Bourdeauducq 804592a3f7 gui/log: fix dock close tracking 2016-02-21 05:33:24 +08:00
Robert Jördens fef72506e4 ctlmgr/gui/master: start subprocesses in new pgroup 
This only makes a difference on POSIX. It prevents subprocesses
from receiving the signals that the parent receives. For ctlmgr
and master is cuts down on spam on the console (KeyboardInterrupt
tracebacks from all controllers) and enforces that proper
termination is followed.

This does not help if the parent gets SIGKILL (subprocesses
may linger).
 2016-02-18 23:51:12 +01:00
Sebastien Bourdeauducq 6973a9471b gui/explorer: fix 'parent folder' on Windows 2016-02-18 13:47:03 +01:00
Sebastien Bourdeauducq 4940e48d85 gui/log: scroll to bottom on startup 2016-02-18 01:09:51 +01:00
Sebastien Bourdeauducq 2ce3c08697 gui/applets: escape backslashes in {python} and {ipc_address} 2016-02-16 12:52:11 +01:00
Sebastien Bourdeauducq f0e25991fe gui/experiments: set icon of MDI subwindows 2016-02-16 00:28:51 +01:00
Sebastien Bourdeauducq 53076615f8 gui: save/restore geometry of MDI subwindows 2016-02-16 00:19:38 +01:00
Sebastien Bourdeauducq aa5f6a5aba gui: basic MDI area 2016-02-15 23:58:44 +01:00
Sebastien Bourdeauducq b9bce92bbb Revert "gui: Qt wants a central widget in the main window, use explorer" 
This reverts commit d81ce15869.
 2016-02-15 23:20:06 +01:00
Sebastien Bourdeauducq c63afae875 gui/moninj: add scrollbars 2016-02-15 00:57:15 +01:00
Sebastien Bourdeauducq d30fe60edd gui: remove pyqtgraph 2016-02-15 00:23:47 +01:00
Sebastien Bourdeauducq 3ab35f7f8d gui: get rid of pyqtgraph.LayoutWidget 2016-02-15 00:05:30 +01:00
Sebastien Bourdeauducq 9797acc964 gui/applets: prevent size from shrinking to zero when docked 2016-02-14 23:27:59 +01:00
Sebastien Bourdeauducq d81ce15869 gui: Qt wants a central widget in the main window, use explorer 2016-02-14 23:04:14 +01:00
Sebastien Bourdeauducq 579e789ad7 tools/QDockWidgetCloseDetect: simplify 2016-02-14 22:42:25 +01:00
Sebastien Bourdeauducq 489f69f991 gui: reliable detection of dock close 2016-02-14 22:22:07 +01:00
Sebastien Bourdeauducq 3c12c13a67 gui: dock state save/restore 2016-02-14 13:46:15 +01:00
Sebastien Bourdeauducq daf49efa04 gui: rough conversion to the Qt docking system 2016-02-14 12:15:57 +01:00
Sebastien Bourdeauducq e68d0d1ec7 gui: do not crash when deleting selected hierarchical dataset and its parents 2016-02-13 23:22:59 +01:00
Sebastien Bourdeauducq 6b6393ff56 gui: remove console 2016-02-13 22:48:38 +01:00
Sebastien Bourdeauducq fb2f53ea9b gui/datasets: support deleting datasets without console 2016-02-13 22:46:29 +01:00
Sebastien Bourdeauducq 29d4755567 gui/applets: prevent concurrent process start/stop 2016-02-11 16:25:44 +01:00
Sebastien Bourdeauducq 92c0ede689 applets: workaround for Qt window embedding initial size bug 2016-02-11 16:19:34 +01:00
Sebastien Bourdeauducq cd9467a8df gui/applets: properly destroy container widget when process is terminated 2016-02-11 16:02:10 +01:00
Sebastien Bourdeauducq 97ba77f4b5 gui/log: top cell alignment 2016-02-10 06:34:11 +01:00
Sebastien Bourdeauducq d1e54c86b1 gui/applets: log warning if IPC address not in command 2016-02-08 22:39:47 +01:00
Sebastien Bourdeauducq 67327b1e61 applets: avoid argparse subparser mess 2016-02-08 22:25:02 +01:00
Sebastien Bourdeauducq 4733c4ba1e gui/applets: save dock UID in state 2016-02-08 21:57:07 +01:00
Sebastien Bourdeauducq 7584b02d66 applets: fix error message text 2016-02-08 19:23:50 +01:00
Sebastien Bourdeauducq de99e7f830 applets: handle dataset mutations 2016-02-08 19:20:07 +01:00
Sebastien Bourdeauducq f25b5442e7 applets: properly name docks to support state save/restore 2016-02-08 16:26:02 +01:00
Sebastien Bourdeauducq 8844fba4c9 applets: clean shutdown 2016-02-08 14:35:37 +01:00
Sebastien Bourdeauducq 741b11c26d applets: basic embedding OK 2016-02-08 09:59:15 +01:00
Sebastien Bourdeauducq 70a67a0e38 Merge branch 'applets' into applets_pipeipc 2016-02-05 13:29:20 +01:00
Sebastien Bourdeauducq 1d92c0874e gui/log: use QFontDatabase for fixed font 2016-01-29 23:21:22 +01:00
Sebastien Bourdeauducq 022a1ffd09 gui/experiments: float/bring into focus already open docks when opening experiments 2016-01-27 21:58:27 +01:00
Sebastien Bourdeauducq ebb959cd50 gui: reduce size of console dock 2016-01-27 21:25:42 +01:00
Sebastien Bourdeauducq 7aaeb636e4 gui: reduce size of schedule dock 2016-01-27 21:18:47 +01:00
Sebastien Bourdeauducq cfa4f791e8 gui: reduce size of log dock 2016-01-27 20:51:34 +01:00
Sebastien Bourdeauducq dca44ef501 gui: reduce size of experiment dock 2016-01-27 20:46:25 +01:00
Sebastien Bourdeauducq 56cbf261b0 gui/log: display level and date information in tooltips 2016-01-23 22:17:08 -05:00
Sebastien Bourdeauducq f9a6ba1884 gui/applets: add shortcuts 2016-01-16 13:12:16 -07:00
Sebastien Bourdeauducq ed6a53db00 gui/log: add scroll to bottom button 2016-01-16 13:06:45 -07:00
Sebastien Bourdeauducq 16f6d00e35 gui: fix shortcut contexts. Closes #225 2016-01-16 12:53:53 -07:00
whitequark 95470a59e5 gui.log: work around a Qt layout bug. 2016-01-16 01:26:05 +00:00
Sebastien Bourdeauducq 9acf8b7c1a gui/applets: templates 2016-01-15 10:15:06 -07:00
Sebastien Bourdeauducq cc3a45d4e4 gui/applets: fix applet removal 2016-01-15 10:11:13 -07:00
whitequark 00b688cab0 gui: wrap very long words too (fixes #187). 2016-01-14 18:57:32 +00:00
Sebastien Bourdeauducq e2c7578e48 gui: reorganize experiment/entry code 2016-01-10 21:48:47 +08:00
Sebastien Bourdeauducq 6a972eb591 gui: remove pyqt4 support code 2016-01-10 18:38:24 +08:00
Sebastien Bourdeauducq e6e6b27ba9 gui: remove displays (use applets instead) 2016-01-10 18:32:46 +08:00
Sebastien Bourdeauducq 2199eadb99 gui/applets: save/restore state 2016-01-09 19:32:50 +08:00
Sebastien Bourdeauducq 1ea73be56d gui/applets: all basic functionality, no state save/restore 2016-01-08 20:07:02 +08:00
Sebastien Bourdeauducq 597c2e4b17 gui/applets: startup and embedding working 2016-01-08 13:04:36 +08:00
Sebastien Bourdeauducq e106ee3f90 gui: basic applet dock editing 2016-01-07 20:23:17 +08:00
Sebastien Bourdeauducq 8778aef6a1 gui/schedule: hide vertical header 2016-01-07 16:56:48 +08:00
Sebastien Bourdeauducq eac2e2ad0b gui/experiments: fix Qt compatibility issue with QHeaderView.setResizeMode 2015-12-13 19:32:17 +08:00
Sebastien Bourdeauducq 0eb8079b45 gui: fix some dock sizing issues 2015-12-11 00:20:20 +08:00
Sebastien Bourdeauducq 93317d48c9 gui/explorer: file selector for experiments outside repos 2015-12-09 19:13:57 +08:00
Sebastien Bourdeauducq ed08352f67 gui: improve error handling 2015-12-08 18:58:20 +08:00
Sebastien Bourdeauducq 0da89557da gui: basic support for opening files outside repository 2015-12-08 17:52:38 +08:00
Sebastien Bourdeauducq 238ee9adb4 gui/experiments: support recomputing all arguments of an experiment 2015-12-07 00:55:32 +08:00
Sebastien Bourdeauducq 5e14afde3e scheduler: use current (last scanned) repo revision instead of HEAD 2015-12-06 19:00:41 +08:00
Sebastien Bourdeauducq ea6dcb2743 master: repository -> experiment_db 2015-12-06 18:39:27 +08:00
Sebastien Bourdeauducq 8467013160 master,gui: support recomputation+reset of arguments 2015-12-06 17:27:15 +08:00
Sebastien Bourdeauducq 1cba685326 gui/experiments: fix StringEntry update 2015-12-06 17:21:53 +08:00
Sebastien Bourdeauducq e8bd24d539 gui/experiments: add argument recompute buttons. Closes #171 2015-12-05 17:51:12 +08:00
Sebastien Bourdeauducq 2871b5e078 gui: typos 2015-12-05 14:47:20 +08:00
Sebastien Bourdeauducq 3bc119f3f0 gui/shortcuts: default state is no shortcuts, hide clear/open/submit widgets 2015-12-03 16:30:37 +08:00
Sebastien Bourdeauducq b6260615a6 gui/log: better-looking new dock feature 2015-12-01 22:51:15 +08:00
Sebastien Bourdeauducq 08abc2e00a gui/shortcuts: make global shortcuts really global 2015-12-01 18:49:23 +08:00
Sebastien Bourdeauducq de54f57fbe gui/experiments: fix vertical resizing of experiment dock 2015-12-01 18:33:43 +08:00
Sebastien Bourdeauducq 9baf54d25e gui/experiments: fix text entry update problem with shortcuts 2015-12-01 18:31:56 +08:00
Sebastien Bourdeauducq 03f92f2de2 gui/experiments: in experiment dock, fix submit button, add reqterm button 2015-12-01 18:26:46 +08:00
Sebastien Bourdeauducq d39126d69e gui/experiments: show status bar message on mass termination 2015-12-01 18:26:01 +08:00
Sebastien Bourdeauducq f73c967b3e gui/shortcuts: fix status bar usage 2015-12-01 18:22:12 +08:00
Sebastien Bourdeauducq bbabc7bb8d gui/shortcuts: make shrinkable, add open button 2015-12-01 18:04:43 +08:00
Sebastien Bourdeauducq ff4c03014c gui/shortcuts: integrate with experiment manager 2015-12-01 17:10:44 +08:00
Sebastien Bourdeauducq 741dfce38c gui/scan: enforce valid sequence input 2015-11-30 23:10:12 +08:00
Sebastien Bourdeauducq a6f3055cd3 scan: enforce max >= min 2015-11-30 20:01:25 +08:00
Sebastien Bourdeauducq 277e26434f gui/experiments: prevent comboboxes and spinboxes from stealing focus via mouse wheel 2015-11-30 19:53:40 +08:00
Sebastien Bourdeauducq cabcdb3784 gui/experiments: support setting repository revision 2015-11-30 18:25:46 +08:00
Sebastien Bourdeauducq 24a33be9df gui/experiments: support setting submission scheduling/options 2015-11-30 17:18:31 +08:00
Sebastien Bourdeauducq afa8148b2b gui/experiments: save/restore state 2015-11-30 11:40:50 +08:00
Sebastien Bourdeauducq 23a84500a3 gui/experiments: support scan widgets 2015-11-30 00:21:27 +08:00
Sebastien Bourdeauducq 3825428dbf gui/experiments: support setting values for simple entries 2015-11-28 00:19:47 +08:00
Sebastien Bourdeauducq c382fac8f2 gui: experiment docks (WIP) 2015-11-27 19:30:05 +08:00
Sebastien Bourdeauducq 6671bb33a4 gui/log: improve vertical scrolling 2015-11-27 19:18:20 +08:00
Sebastien Bourdeauducq 3c0efb3ad5 gui/log: fix layout problems 2015-11-24 23:04:01 +08:00
Sebastien Bourdeauducq 9826b19c9a gui/scan: adapt layout to show more decimals 2015-11-20 11:20:15 +08:00
Sebastien Bourdeauducq 108aed569e gui/models/DictSyncTreeSepModel: add getitem 2015-11-17 22:53:11 +08:00
Sebastien Bourdeauducq 537fa2287b gui/models/DictSyncTreeSepModel: fix item row update 2015-11-17 22:39:46 +08:00
Sebastien Bourdeauducq 7bebc52959 gui/explorer: reduce impact of Qt selection display bug 2015-11-17 22:38:01 +08:00
Sebastien Bourdeauducq 250ab6b489 gui/explorer: tree view 2015-11-17 19:46:26 +08:00
Sebastien Bourdeauducq 9c5db288a5 gui/datasets: tree view 2015-11-17 19:46:17 +08:00
Sebastien Bourdeauducq 107d8f0ffa gui/models: add DictSyncTreeSepModel 2015-11-17 19:45:28 +08:00
Sebastien Bourdeauducq 3cbd7c4c13 gui: support multiple log docks 2015-11-12 01:13:57 +08:00
Sebastien Bourdeauducq fa89e165b2 gui/datasets: fix display update 2015-11-11 17:09:35 +08:00
Sebastien Bourdeauducq 62c0eb85b1 gui/console: use network clients directly 2015-11-11 17:02:51 +08:00
Sebastien Bourdeauducq 77330c7c68 gui/moninj: suppress spurious core device address warnings 2015-11-11 12:43:25 +08:00
Sebastien Bourdeauducq c3f99eda8f gui: centralize subscribers 2015-11-11 12:13:19 +08:00
Sebastien Bourdeauducq a7c9c95085 gui/explorer: support requesting termination of all instances 2015-11-05 19:04:10 +08:00
Sebastien Bourdeauducq 8e24a018ea gui/log: fix filter initialization race condition 2015-11-01 00:01:45 +08:00
Sebastien Bourdeauducq f57145c4f3 gui: support triggering repository rescan 2015-10-31 23:58:39 +08:00
Sebastien Bourdeauducq 0a36b03a12 gui/log: work around Qt scrolling bug. Closes #151 2015-10-31 10:25:01 +08:00
Sebastien Bourdeauducq d8b98ae5d4 gui/log: fix performance problems 2015-10-31 00:34:14 +08:00
Sebastien Bourdeauducq b61eb866b6 gui: log freetext filter 2015-10-30 19:58:33 +08:00
Sebastien Bourdeauducq f3ee97a4ff fix typo 2015-10-30 19:58:15 +08:00
Sebastien Bourdeauducq 0e375e4980 gui: fix shortcut pipeline 2015-10-30 00:50:18 +08:00
Sebastien Bourdeauducq 179416dac7 gui: delete shortcuts 2015-10-27 18:20:25 +08:00
Sebastien Bourdeauducq f872d92d22 gui/schedule: improve delete status bar message 2015-10-27 18:20:11 +08:00
Sebastien Bourdeauducq 138ba7e2fa gui: add addItems to populate log level comboboxes 2015-10-27 18:10:31 +08:00
Sebastien Bourdeauducq 967d4eda63 gui: shortcut support 2015-10-27 17:59:34 +08:00
Sebastien Bourdeauducq a6d38b8a97 gui/datasets: fix source decoding 2015-10-26 00:32:49 +08:00
Sebastien Bourdeauducq 62bcadfa44 gui/explorer: change submit shortcut to CTRL+ENTER 2015-10-25 23:21:27 +08:00
Sebastien Bourdeauducq 5ae9bbc0ca gui/explorer: add CTRL+S shortcut to submit 2015-10-24 19:19:12 +08:00
Sebastien Bourdeauducq 53a9d7eb9a gui/explorer: more compact layout 2015-10-24 16:00:20 +08:00
Sebastien Bourdeauducq b0ef0d205a gui/datasets: do not crash when a display data is unavailable 2015-10-24 09:57:42 +08:00
Sebastien Bourdeauducq e4165aecf2 gui/displays: do not test for empty list using bool conversion (breaks for numpy arrays). Closes #153 2015-10-22 11:00:11 +08:00