[sardana] 01/02: Merge tag 'upstream/1.4.0'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Wed Aug 6 12:46:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository sardana.
commit a25949283c65419af2953818b6de404848806a0e
Merge: a8531c6 4ed106f
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Wed Aug 6 11:59:31 2014 +0200
Merge tag 'upstream/1.4.0'
Upstream version 1.4.0
PKG-INFO | 12 +-
doc/man/MacroServer.1 | 6 +-
doc/man/Pool.1 | 6 +-
doc/man/Sardana.1 | 6 +-
doc/man/macroexecutor.1 | 36 +
doc/man/sequencer.1 | 36 +
doc/man/spock.1 | 73 +-
doc/source/_static/gap_offset.png | Bin
doc/source/_static/gap_read.png | Bin
doc/source/_static/gap_write.png | Bin
doc/source/_static/pm_pipeline.png | Bin
doc/source/_templates/index.html | 3 +-
doc/source/_templates/indexsidebar.html | 3 +-
doc/source/conf.py | 2 +-
doc/source/devel/api/api_sardana.rst | 1 +
doc/source/devel/api/api_test.rst | 102 ++
doc/source/devel/api/sardana/macroserver.rst | 1 +
doc/source/devel/api/sardana/sardana.rst | 3 +-
doc/source/devel/api/sardana/tango.rst | 1 +
doc/source/devel/api/sardana/tango/macroserver.rst | 13 +
.../tango/macroserver/test/macroexecutor.rst | 75 +
doc/source/devel/howto_macros/macros_general.rst | 5 +-
doc/source/devel/howto_test/index.rst | 17 +
doc/source/devel/howto_test/test_example.rst | 323 ++++
doc/source/devel/howto_test/test_general.rst | 109 ++
doc/source/devel/howto_test/test_run_commands.rst | 35 +
doc/source/devel/howto_test/tests/index.rst | 19 +
doc/source/devel/howto_test/tests/test_ct.rst | 26 +
doc/source/devel/howto_test/tests/test_list.rst | 114 ++
.../devel/howto_test/tests/test_parameter.rst | 25 +
.../devel/howto_test/tests/test_sardanavalue.rst | 25 +
doc/source/devel/howto_test/tests/test_scan.rst | 96 ++
doc/source/devel/howto_test/tests/test_wm.rst | 37 +
doc/source/devel/index.rst | 1 +
doc/source/users/spock.rst | 14 +-
.../mscontainer.py => scripts/macroexecutor | 19 +-
.../mscontainer.py => scripts/sequencer | 19 +-
setup.py | 50 +-
src/sardana/macroserver/macro.py | 60 +-
.../{mscontainer.py => macros/examples/debug.py} | 24 +-
.../macroserver/macros/examples/parameters.py | 8 +-
src/sardana/macroserver/macros/expert.py | 44 +-
.../{mscontainer.py => macros/test/__init__.py} | 21 +-
src/sardana/macroserver/macros/test/base.py | 322 ++++
.../macroserver/macros/test/macroexecutor.py | 315 ++++
src/sardana/macroserver/macros/test/sardemoenv.py | 167 ++
.../{msoptions.py => macros/test/test_ct.py} | 54 +-
src/sardana/macroserver/macros/test/test_list.py | 164 ++
src/sardana/macroserver/macros/test/test_scan.py | 182 ++
src/sardana/macroserver/macros/test/test_wm.py | 74 +
src/sardana/macroserver/macroserver.py | 33 +-
src/sardana/macroserver/msbase.py | 31 +-
src/sardana/macroserver/mscontainer.py | 9 +-
src/sardana/macroserver/msdoor.py | 28 +-
src/sardana/macroserver/msenvmanager.py | 6 +-
src/sardana/macroserver/msexception.py | 11 +-
src/sardana/macroserver/msmacromanager.py | 58 +-
src/sardana/macroserver/msmanager.py | 20 +-
src/sardana/macroserver/msmetamacro.py | 71 +-
src/sardana/macroserver/msoptions.py | 9 +-
src/sardana/macroserver/msparameter.py | 100 +-
src/sardana/macroserver/mstypemanager.py | 72 +-
src/sardana/macroserver/scan/gscan.py | 116 +-
.../macroserver/scan/recorder/datarecorder.py | 24 +-
src/sardana/macroserver/scan/recorder/output.py | 14 +-
.../macroserver/scan/recorder/sharedmemory.py | 133 +-
src/sardana/macroserver/scan/recorder/storage.py | 225 ++-
src/sardana/macroserver/scan/scandata.py | 10 +-
src/sardana/pool/controller.py | 8 +-
src/sardana/pool/pool.py | 36 +-
src/sardana/pool/poolacquisition.py | 31 +-
src/sardana/pool/poolaction.py | 4 +-
src/sardana/pool/poolbasechannel.py | 48 +-
src/sardana/pool/poolbaseelement.py | 124 +-
src/sardana/pool/poolbasegroup.py | 45 +-
src/sardana/pool/poolcontroller.py | 260 +--
src/sardana/pool/poolcontrollermanager.py | 146 +-
.../DiscretePseudoMotorController.py | 2 +-
.../pool/poolcontrollers/OneDControllerTimer.py | 255 ---
.../pool/poolcontrollers/OneDControllerTimer.py~ | 257 ---
.../pool/poolcontrollers/TangoController.py | 60 +-
src/sardana/pool/poolcountertimer.py | 21 +-
src/sardana/pool/pooldefs.py | 9 +-
src/sardana/pool/poolelement.py | 40 +-
src/sardana/pool/poolexception.py | 8 +-
src/sardana/pool/poolextension.py | 24 +-
src/sardana/pool/poolexternal.py | 30 +-
src/sardana/pool/poolgroupelement.py | 23 +-
src/sardana/pool/poolinstrument.py | 42 +-
src/sardana/pool/poolioregister.py | 48 +-
src/sardana/pool/poolmeasurementgroup.py | 20 +-
src/sardana/pool/poolmetacontroller.py | 73 +-
src/sardana/pool/poolmonitor.py | 46 +-
src/sardana/pool/poolmotion.py | 9 +-
src/sardana/pool/poolmotor.py | 74 +-
src/sardana/pool/poolmotorgroup.py | 47 +-
src/sardana/pool/poolmoveable.py | 19 +-
src/sardana/pool/poolobject.py | 15 +-
src/sardana/pool/poolonedexpchannel.py | 20 +-
src/sardana/pool/poolpseudocounter.py | 89 +-
src/sardana/pool/poolpseudomotor.py | 84 +-
src/sardana/pool/pooltwodexpchannel.py | 11 +-
src/sardana/pool/poolutil.py | 19 +-
src/sardana/pool/poolzerodexpchannel.py | 127 +-
src/sardana/release.py | 2 +-
src/sardana/requirements.py | 34 +-
src/sardana/sardanaattribute.py | 74 +-
src/sardana/sardanabase.py | 58 +-
src/sardana/sardanacontainer.py | 53 +-
src/sardana/sardanacustomsettings.py | 36 +
src/sardana/sardanadefs.py | 60 +-
src/sardana/sardanaevent.py | 52 +-
src/sardana/sardanaexception.py | 19 +-
src/sardana/sardanalock.py | 25 +-
src/sardana/sardanamanager.py | 4 +-
src/sardana/sardanameta.py | 13 +-
src/sardana/sardanamodulemanager.py | 107 +-
src/sardana/sardanathreadpool.py | 10 +-
src/sardana/sardanautils.py | 31 +-
src/sardana/sardanavalue.py | 18 +-
src/sardana/spock/inputhandler.py | 27 +-
src/sardana/spock/ipython_00_11/genutils.py | 40 +-
src/sardana/spock/ipython_01_00/genutils.py | 40 +-
src/sardana/spock/magic.py | 15 +-
src/sardana/spock/release.py | 2 +-
src/sardana/spock/spockms.py | 50 +-
.../mscontainer.py => spock/test/__init__.py} | 18 +-
src/sardana/spock/test/test_parameter.py | 69 +
src/sardana/tango/core/SardanaDevice.py | 41 +-
src/sardana/tango/core/__init__.py | 15 +-
src/sardana/tango/core/attributehandler.py | 28 +-
src/sardana/tango/core/util.py | 260 +--
src/sardana/tango/macroserver/Door.py | 34 +-
src/sardana/tango/macroserver/MacroServer.py | 3 +-
.../macroserver/test/__init__.py} | 18 +-
.../tango/macroserver/test/macroexecutor.py | 203 +++
src/sardana/tango/pool/CTExpChannel.py | 27 +-
src/sardana/tango/pool/Controller.py | 10 +-
src/sardana/tango/pool/IORegister.py | 31 +-
src/sardana/tango/pool/MeasurementGroup.py | 12 +-
src/sardana/tango/pool/Motor.py | 49 +-
src/sardana/tango/pool/MotorGroup.py | 24 +-
src/sardana/tango/pool/OneDExpChannel.py | 19 +-
src/sardana/tango/pool/Pool.py | 63 +-
src/sardana/tango/pool/PoolDevice.py | 44 +-
src/sardana/tango/pool/PseudoCounter.py | 17 +-
src/sardana/tango/pool/PseudoMotor.py | 34 +-
src/sardana/tango/pool/TwoDExpChannel.py | 29 +-
src/sardana/tango/pool/ZeroDExpChannel.py | 27 +-
src/sardana/tango/pool/__init__.py | 19 +-
.../mscontainer.py => taurus/__init__.py} | 20 +-
.../mscontainer.py => taurus/core/__init__.py} | 20 +-
.../core/tango/__init__.py} | 20 +-
.../core/tango/sardana/__init__.py} | 22 +-
src/sardana/taurus/core/tango/sardana/macro.py | 1126 +++++++++++++
.../taurus/core/tango/sardana/macroserver.py | 1160 +++++++++++++
src/sardana/taurus/core/tango/sardana/motion.py | 567 +++++++
src/sardana/taurus/core/tango/sardana/pool.py | 1781 ++++++++++++++++++++
src/sardana/taurus/core/tango/sardana/sardana.py | 713 ++++++++
.../mscontainer.py => taurus/qt/__init__.py} | 20 +-
.../qt/qtcore/__init__.py} | 20 +-
.../qt/qtcore/tango/__init__.py} | 20 +-
.../qt/qtcore/tango/sardana/__init__.py} | 22 +-
.../taurus/qt/qtcore/tango/sardana/macroserver.py | 175 ++
.../taurus/qt/qtcore/tango/sardana/model.py | 461 +++++
src/sardana/taurus/qt/qtcore/tango/sardana/pool.py | 93 +
.../mscontainer.py => taurus/qt/qtgui/__init__.py} | 20 +-
.../qt/qtgui/extra_macroexecutor/__init__.py} | 26 +-
.../taurus/qt/qtgui/extra_macroexecutor/common.py | 340 ++++
.../qt/qtgui/extra_macroexecutor/dooroutput.py | 212 +++
.../favouriteseditor/__init__.py} | 19 +-
.../favouriteseditor/favouriteseditor.py | 217 +++
.../favouriteseditor/historyviewer.py | 177 ++
.../extra_macroexecutor/favouriteseditor/model.py | 104 ++
.../taurus/qt/qtgui/extra_macroexecutor/globals.py | 186 ++
.../qt/qtgui/extra_macroexecutor/macrobutton.py | 367 ++++
.../extra_macroexecutor/macrodescriptionviewer.py | 101 ++
.../qt/qtgui/extra_macroexecutor/macroeditor.py | 239 +++
.../qt/qtgui/extra_macroexecutor/macroexecutor.py | 997 +++++++++++
.../macroparameterseditor/__init__.py} | 22 +-
.../customeditors/__init__.py} | 18 +-
.../macroparameterseditor/customeditors/senv.py | 374 ++++
.../macroparameterseditor/delegate.py | 126 ++
.../macroparameterseditor/macroparameterseditor.py | 379 +++++
.../macroparameterseditor/model.py | 225 +++
.../macroparameterseditor/parameditors.py | 327 ++++
.../qt/qtgui/extra_macroexecutor/scanplotter.py | 158 ++
.../sequenceeditor/__init__.py} | 20 +-
.../extra_macroexecutor/sequenceeditor/delegate.py | 155 ++
.../extra_macroexecutor/sequenceeditor/model.py | 408 +++++
.../sequenceeditor/sequenceeditor.py | 875 ++++++++++
.../qt/qtgui/extra_macroexecutor/ui/MacroButton.ui | 101 ++
.../qt/qtgui/extra_pool/__init__.py} | 35 +-
.../qt/qtgui/extra_pool/compile_UIs.sh} | 18 +-
src/sardana/taurus/qt/qtgui/extra_pool/motor.py | 1136 +++++++++++++
.../taurus/qt/qtgui/extra_pool/poolchannel.py | 130 ++
.../taurus/qt/qtgui/extra_pool/poolioregister.py | 302 ++++
.../taurus/qt/qtgui/extra_pool/poolmotor.py | 1462 ++++++++++++++++
.../taurus/qt/qtgui/extra_pool/poolmotor.py.tests | 460 +++++
.../qtgui/extra_pool/ui/AppleiiPLCTemperature.ui | 211 +++
.../extra_pool/ui/AppleiiPLCTemperatureAlarms.ui | 255 +++
.../qtgui/extra_pool/ui/PoolIORegisterButtons.ui | 56 +
.../taurus/qt/qtgui/extra_pool/ui/PoolMotorSlim.ui | 380 +++++
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorH.ui | 226 +++
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorH2.ui | 235 +++
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorV.ui | 224 +++
.../taurus/qt/qtgui/extra_pool/ui/TaurusMotorV2.ui | 882 ++++++++++
.../qt/qtgui/extra_sardana/__init__.py} | 25 +-
.../taurus/qt/qtgui/extra_sardana/cmdline.py | 110 ++
.../qt/qtgui/extra_sardana/controllertree.py | 344 ++++
.../taurus/qt/qtgui/extra_sardana/elementtree.py | 100 ++
.../taurus/qt/qtgui/extra_sardana/environment.py | 102 ++
.../qt/qtgui/extra_sardana/expdescription.py | 425 +++++
.../taurus/qt/qtgui/extra_sardana/macrotree.py | 319 ++++
.../qt/qtgui/extra_sardana/measurementgroup.py | 980 +++++++++++
.../qt/qtgui/extra_sardana/sardanabasewizard.py | 82 +
.../taurus/qt/qtgui/extra_sardana/sardanaeditor.py | 557 ++++++
.../taurus/qt/qtgui/extra_sardana/startup.py | 184 ++
.../qtgui/extra_sardana/ui/ExpDescriptionEditor.ui | 282 ++++
.../qt/qtgui/extra_sardana/ui/__init__.py} | 18 +-
src/sardana/test/__init__.py | 98 ++
src/sardana/test/test_sardanavalue.py | 91 +
.../{pool/poolexception.py => test/testsuite.py} | 41 +-
src/sardana/tools/config/fods_to_sar.py | 0
src/sardana/tools/config/sar_to_fods.py | 0
src/sardana/tools/config/sardana.py | 604 +++----
src/sardana/tools/config/xls_to_sar.py | 0
src/sardana/util/motion/motion.py | 140 +-
src/sardana/util/wrap.py | 25 +-
229 files changed, 27412 insertions(+), 3316 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