[sardana] 05/06: Merge tag 'upstream/2.1.0'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Sep 30 08:55:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository sardana.
commit f3acd8cc77084acf0a702e98747c66f8810e80c4
Merge: 7ca673b 523f1ff
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Tue Sep 13 19:57:12 2016 +0200
Merge tag 'upstream/2.1.0'
Upstream version 2.1.0
PKG-INFO | 4 +-
doc/man/MacroServer.1 | 4 +-
doc/man/Pool.1 | 4 +-
doc/man/Sardana.1 | 4 +-
doc/man/diffractometeralignment.1 | 4 +-
doc/man/hklscan.1 | 4 +-
doc/man/macroexecutor.1 | 4 +-
doc/man/sequencer.1 | 4 +-
doc/man/spock.1 | 4 +-
doc/man/ubmatrix.1 | 4 +-
doc/source/_static/macros/favouriteeditor01.png | Bin 0 -> 12205 bytes
doc/source/_static/macros/macroexecutor01.odg | Bin 0 -> 42236 bytes
doc/source/_static/macros/macroexecutor01.png | Bin 0 -> 1111166 bytes
doc/source/_static/macros/macroexecutor01_raw.png | Bin 0 -> 21869 bytes
.../_static/macros/macroparameterseditor01.png | Bin 0 -> 8124 bytes
.../_static/macros/macroparameterseditor02.png | Bin 0 -> 7635 bytes
.../_static/macros/macroparameterseditor03.odg | Bin 0 -> 20268 bytes
.../_static/macros/macroparameterseditor03.png | Bin 0 -> 604944 bytes
.../_static/macros/macroparameterseditor03_raw.png | Bin 0 -> 7773 bytes
.../_static/macros/macroparameterseditor04.odg | Bin 0 -> 23179 bytes
.../_static/macros/macroparameterseditor04.png | Bin 0 -> 604944 bytes
.../_static/macros/macroparameterseditor04_raw.png | Bin 0 -> 10110 bytes
.../_static/macros/macroparameterseditor05.odg | Bin 0 -> 22524 bytes
.../_static/macros/macroparameterseditor05.png | Bin 0 -> 604944 bytes
doc/source/_static/macros/sequenceeditor01.png | Bin 0 -> 13687 bytes
doc/source/_static/macros/sequenceeditor02.odg | Bin 0 -> 27793 bytes
doc/source/_static/macros/sequenceeditor02.png | Bin 0 -> 672669 bytes
doc/source/_static/macros/sequenceeditor02_raw.png | Bin 0 -> 13687 bytes
doc/source/_static/macros/sequenceeditor03.odg | Bin 0 -> 30108 bytes
doc/source/_static/macros/sequenceeditor03.png | Bin 0 -> 628299 bytes
doc/source/_static/macros/sequenceeditor03_raw.png | Bin 0 -> 15806 bytes
doc/source/_static/macros/sequenceeditor04.odg | Bin 0 -> 29610 bytes
doc/source/_static/macros/sequenceeditor04.png | Bin 0 -> 628299 bytes
doc/source/_static/macros/sequenceeditor05_raw.png | Bin 0 -> 19830 bytes
doc/source/_static/macros/sequencer01.odg | Bin 0 -> 47998 bytes
doc/source/_static/macros/sequencer01.png | Bin 0 -> 1233154 bytes
doc/source/_static/macros/sequencer01_raw.png | Bin 0 -> 29047 bytes
.../devel/howto_controllers/howto_0dcontroller.rst | 35 ++++-
.../howto_controllers/howto_motorcontroller.rst | 4 -
doc/source/devel/howto_macros/macros_general.rst | 30 ++--
doc/source/devel/overview/overview_0D.rst | 18 ++-
doc/source/users/index.rst | 1 +
.../users/taurus/experimentconfiguration.rst | 15 ++
doc/source/users/taurus/index.rst | 15 ++
doc/source/users/taurus/macroexecutor.rst | 152 +++++++++++++++++++
doc/source/users/taurus/sardanaeditor.rst | 15 ++
doc/source/users/taurus/sequencer.rst | 123 +++++++++++++++
setup.py | 2 +-
src/sardana/macroserver/macro.py | 48 +++++-
src/sardana/macroserver/macros/demo.py | 30 ++--
src/sardana/macroserver/macros/examples/motion.py | 56 +++++++
.../macroserver/macros/examples/parameters.py | 4 +-
src/sardana/macroserver/macros/hkl.py | 72 ++++-----
src/sardana/macroserver/macros/standard.py | 3 +-
.../macroserver/macros/test/macroexecutor.py | 6 +-
src/sardana/macroserver/msmacromanager.py | 52 ++++++-
src/sardana/macroserver/msoptions.py | 1 +
src/sardana/macroserver/msparameter.py | 165 ++++++++++++++++++++-
src/sardana/macroserver/recorders/output.py | 9 +-
src/sardana/macroserver/scan/gscan.py | 19 ++-
src/sardana/pool/pool.py | 9 +-
src/sardana/pool/poolacquisition.py | 8 +-
src/sardana/pool/poolbasegroup.py | 9 +-
.../poolcontrollers/HklPseudoMotorController.py | 28 +++-
src/sardana/pool/poolmeasurementgroup.py | 21 +--
src/sardana/pool/poolzerodexpchannel.py | 15 +-
src/sardana/release.py | 2 +-
src/sardana/requirements.py | 3 +
src/sardana/spock/ipython_00_10/genutils.py | 23 ++-
src/sardana/spock/ipython_00_11/genutils.py | 92 ++++++++----
src/sardana/spock/ipython_01_00/genutils.py | 100 +++++++++----
src/sardana/spock/magic.py | 56 ++++---
src/sardana/spock/release.py | 2 +-
src/sardana/spock/spockms.py | 14 +-
.../taurus/core/tango/sardana/macroserver.py | 28 +++-
src/sardana/taurus/core/tango/sardana/motion.py | 2 +-
src/sardana/taurus/core/tango/sardana/pool.py | 91 ++++++++++--
.../taurus/qt/qtcore/tango/sardana/macroserver.py | 31 +++-
.../taurus/qt/qtgui/extra_macroexecutor/common.py | 10 +-
.../qt/qtgui/extra_macroexecutor/macrobutton.py | 18 +--
.../qt/qtgui/extra_macroexecutor/macroexecutor.py | 31 +++-
.../extra_macroexecutor/sequenceeditor/model.py | 2 +-
.../sequenceeditor/sequenceeditor.py | 31 +++-
.../taurus/qt/qtgui/extra_pool/poolchannel.py | 2 +-
.../taurus/qt/qtgui/extra_pool/poolioregister.py | 6 +-
.../taurus/qt/qtgui/extra_pool/poolmotor.py | 52 ++++---
.../taurus/qt/qtgui/extra_pool/ui/PoolMotorSlim.ui | 148 ++++++++----------
.../qt/qtgui/extra_sardana/expdescription.py | 19 ++-
.../qt/qtgui/extra_sardana/measurementgroup.py | 62 +++++++-
89 files changed, 1421 insertions(+), 409 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sardana.git
More information about the debian-science-commits
mailing list