occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
2,774 Commits 14 Branches 35 Tags 23 MiB
Commit Graph

2774 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq e4918a6e19 Merge branch 'master' of github.com:m-labs/artiq 2016-02-14 23:29:24 +01:00
Sebastien Bourdeauducq b24146e680 Merge branch 'qtdocks' 2016-02-14 23:28:44 +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 15515f33ef gui: better default placement of docks 2016-02-14 23:15:18 +01:00
Sebastien Bourdeauducq cd732718ad gui: save/restore main window geometry 2016-02-14 23:08:14 +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
Robert Jördens 055573a4af Merge branch 'subprocess-termination' 
* subprocess-termination:
  test_ctlmgr: fix
  Client: add note about timeout sideeffects
  hardware_testbench: full shutdown sequence for controllers
  worker: flake8 style cleanup
  ctlmgr: fix import
  pc_rpc.Client: support socket timeouts
  subprocesses: unify termination logic
 2016-02-14 22:28:11 +01:00
Sebastien Bourdeauducq 489f69f991 gui: reliable detection of dock close 2016-02-14 22:22:07 +01:00
Sebastien Bourdeauducq 6ee86d994f Merge branch 'master' of github.com:m-labs/artiq 2016-02-14 21:30:55 +01:00
Sebastien Bourdeauducq b97be9c08d Merge branch 'newtesting' 2016-02-14 21:30:19 +01:00
whitequark 1cfca74fcb conda: remove spurious artiq dep from gateware packages. 2016-02-14 13:35:40 +00:00
Robert Jördens 734fa593e4 conda bitstreams: depend on artiq 0.1 2016-02-14 14:21:31 +01:00
Sebastien Bourdeauducq ab1d85be53 gui: remove PyQt5 assertion (break mock modules) 2016-02-14 14:03:57 +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
Robert Jördens ed36a96f8f conda/artiq: pyqt (not 5, to be revisited) 2016-02-14 02:24:46 +01:00
Robert Jördens 801b256d67 conda: use git_url 
needed for conda-build >= 0.19.0
 2016-02-14 02:21:07 +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 4a03335850 protocols/pipe_ipc: fix read transport resource leak 
This caused the "Exception ignored in:" message on exit.
 2016-02-11 17:12:05 +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 c9a9d19182 test/serialization: fix syntax 2016-02-11 09:37:27 +01:00
Robert Jördens 6434a9cd5f Merge branch 'master' into subprocess-termination 
* master: (44 commits)
  Revert "conda: restrict binutils-or1k-linux dependency to linux."
  manual/installing: refresh
  use https for m-labs.hk
  gui/log: top cell alignment
  master/log: do not break lines
  conda: fix pyqt package name
  gui/applets: log warning if IPC address not in command
  applets: make sure pyqtgraph imports qt5
  applets: avoid argparse subparser mess
  examples/histogram: artiq -> artiq.experiment
  gui/applets: save dock UID in state
  setup.py: give up trying to check for PyQt
  setup.py: fix PyQt5 package name
  Use Qt5
  applets: fix error message text
  applets: handle dataset mutations
  applets: properly name docks to support state save/restore
  applets: clean shutdown
  protocols/pyon: set support
  protocols/pyon: remove FlatFileDB
  ...
 2016-02-11 09:24:45 +01:00
Sebastien Bourdeauducq fcf7a6be2e Revert "conda: restrict binutils-or1k-linux dependency to linux." 
This reverts commit 5bead8b83f.
 2016-02-10 23:42:24 +01:00
Sebastien Bourdeauducq b68035d162 manual/installing: refresh 2016-02-10 23:37:21 +01:00
Sebastien Bourdeauducq 64263b75d0 use https for m-labs.hk 2016-02-10 17:20:29 +01:00
Sebastien Bourdeauducq 97ba77f4b5 gui/log: top cell alignment 2016-02-10 06:34:11 +01:00
Sebastien Bourdeauducq 2ce1e6a1e9 master/log: do not break lines 2016-02-10 06:33:41 +01:00
Sebastien Bourdeauducq f3f667be5b conda: fix pyqt package name 2016-02-09 10:47:38 +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 338e5fe3fc Merge branch 'applets_pipeipc' 2016-02-08 22:25:36 +01:00
Sebastien Bourdeauducq 44a1efa601 applets: make sure pyqtgraph imports qt5 2016-02-08 22:25:20 +01:00
Sebastien Bourdeauducq 67327b1e61 applets: avoid argparse subparser mess 2016-02-08 22:25:02 +01:00
Sebastien Bourdeauducq 1a2596de8e examples/histogram: artiq -> artiq.experiment 2016-02-08 22:24:23 +01:00
Sebastien Bourdeauducq 4733c4ba1e gui/applets: save dock UID in state 2016-02-08 21:57:07 +01:00
Sebastien Bourdeauducq 13a8f9c7ca setup.py: give up trying to check for PyQt 2016-02-08 19:42:08 +01:00
Sebastien Bourdeauducq 1830d6a62e setup.py: fix PyQt5 package name 2016-02-08 19:33:35 +01:00
Sebastien Bourdeauducq d873c25b8b Use Qt5 2016-02-08 19:32:40 +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 dc955d46c9 Merge branch 'applets' 2016-02-08 14:55:53 +01:00
Sebastien Bourdeauducq 8844fba4c9 applets: clean shutdown 2016-02-08 14:35:37 +01:00
Sebastien Bourdeauducq 8be0696b39 protocols/pyon: set support 2016-02-08 14:08:14 +01:00
Sebastien Bourdeauducq 8a912105cb protocols/pyon: remove FlatFileDB 2016-02-08 14:05:00 +01:00
Sebastien Bourdeauducq 741b11c26d applets: basic embedding OK 2016-02-08 09:59:15 +01:00