Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release-Jan16'
Browse files Browse the repository at this point in the history
Release of Taurus 3.7.0 (the Jan16 milestone)

The main improvements since taurus 3.6.0 (aka Jul15) are:

- Added support for sqlite DB in Tango (ticket #148)
- Fixed many usability bugs in TaurusTrend2D and other
  guiqwt-based widgets (#238, #240, #244, #247, #251, #258)
- Fixed issues with "export to ASCII" feature of plots
- Fixed issues with PLY optimization (#262)
- "taurus-polling-period" argument works for evaluation
  attributes now too (#249)
- many other bugs fixed

For a detailed list of solved issues, see:
  http://sf.net/p/tauruslib/tickets/milestone/Jan16/

or, for a full log of commits, run (in your git repo):
  git log 3.6.0..3.7.0
  • Loading branch information
cpascual committed Feb 17, 2016
2 parents d61cb39 + 46c0e90 commit a4185e5
Show file tree
Hide file tree
Showing 53 changed files with 431 additions and 220 deletions.
6 changes: 3 additions & 3 deletions doc/man/tau2taurus.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAU2TAURUS "1" "July 2015" "tau2taurus 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAU2TAURUS "1" "February 2016" "tau2taurus 3.7.0" "User Commands"
.SH NAME
tau2taurus \- manual page for tau2taurus 3.6.0
tau2taurus \- manual page for tau2taurus 3.7.0
.SH SYNOPSIS
.B tau2taurus
[\fI\,options\/\fR] \fI\,inputfile\/\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusconfigbrowser.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSCONFIGEDITOR "1" "July 2015" "taurusconfigeditor 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSCONFIGEDITOR "1" "February 2016" "taurusconfigeditor 3.7.0" "User Commands"
.SH NAME
taurusconfigeditor \- manual page for taurusconfigeditor 3.6.0
taurusconfigeditor \- manual page for taurusconfigeditor 3.7.0
.SH SYNOPSIS
.B taurusconfigbrowser
[\fI\,options\/\fR] [\fI\,INIFILENAME\/\fR]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/tauruscurve.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUS "1" "July 2015" "Taurus Curve Dialog 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUS "1" "February 2016" "Taurus Curve Dialog 3.7.0" "User Commands"
.SH NAME
Taurus \- manual page for Taurus Curve Dialog 3.6.0
Taurus \- manual page for Taurus Curve Dialog 3.7.0
.SH SYNOPSIS
.B tauruscurve
[\fI\,options\/\fR] [\fI\,<model1> \/\fR[\fI\,<model2>\/\fR] ...]
Expand Down
4 changes: 2 additions & 2 deletions doc/man/taurusdemo.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSDEMO "1" "July 2015" "taurusdemo 1.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSDEMO "1" "February 2016" "taurusdemo 1.0" "User Commands"
.SH NAME
taurusdemo \- manual page for taurusdemo 1.0
.SH SYNOPSIS
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusdesigner.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSDESIGNER "1" "July 2015" "taurusdesigner 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSDESIGNER "1" "February 2016" "taurusdesigner 3.7.0" "User Commands"
.SH NAME
taurusdesigner \- manual page for taurusdesigner 3.6.0
taurusdesigner \- manual page for taurusdesigner 3.7.0
.SH SYNOPSIS
.B taurusdesigner
[\fI\,options\/\fR] \fI\,<ui file(s)>\/\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusdevicepanel.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSDEVICEPANEL "1" "July 2015" "TaurusDevicePanel 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSDEVICEPANEL "1" "February 2016" "TaurusDevicePanel 3.7.0" "User Commands"
.SH NAME
TaurusDevicePanel \- manual page for TaurusDevicePanel 3.6.0
TaurusDevicePanel \- manual page for TaurusDevicePanel 3.7.0
.SH SYNOPSIS
.B taurusdevicepanel
[\fI\,options\/\fR] [\fI\,devname \/\fR[\fI\,attrs\/\fR]]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusdoc.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSDOC "1" "July 2015" "taurusdoc 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSDOC "1" "February 2016" "taurusdoc 3.7.0" "User Commands"
.SH NAME
taurusdoc \- manual page for taurusdoc 3.6.0
taurusdoc \- manual page for taurusdoc 3.7.0
.SH SYNOPSIS
.B taurusdoc
[\fI\,options\/\fR]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusform.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSFORM "1" "July 2015" "taurusform 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSFORM "1" "February 2016" "taurusform 3.7.0" "User Commands"
.SH NAME
taurusform \- manual page for taurusform 3.6.0
taurusform \- manual page for taurusform 3.7.0
.SH SYNOPSIS
.B taurusform
[\fI\,options\/\fR] [\fI\,model1 \/\fR[\fI\,model2 \/\fR...]]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusgui.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSGUI "1" "July 2015" "taurusgui 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSGUI "1" "February 2016" "taurusgui 3.7.0" "User Commands"
.SH NAME
taurusgui \- manual page for taurusgui 3.6.0
taurusgui \- manual page for taurusgui 3.7.0
.SH SYNOPSIS
.B taurusgui
[\fI\,options\/\fR] \fI\,confname\/\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusimage.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUS "1" "July 2015" "Taurus Image Dialog 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUS "1" "February 2016" "Taurus Image Dialog 3.7.0" "User Commands"
.SH NAME
Taurus \- manual page for Taurus Image Dialog 3.6.0
Taurus \- manual page for Taurus Image Dialog 3.7.0
.SH SYNOPSIS
.B taurusimage
[\fI\,options\/\fR] \fI\,<model>\/\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/tauruspanel.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSPANEL "1" "July 2015" "tauruspanel 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSPANEL "1" "February 2016" "tauruspanel 3.7.0" "User Commands"
.SH NAME
tauruspanel \- manual page for tauruspanel 3.6.0
tauruspanel \- manual page for tauruspanel 3.7.0
.SH SYNOPSIS
.B tauruspanel
[\fI\,options\/\fR] [\fI\,devname\/\fR]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusplot.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSPLOT "1" "July 2015" "taurusplot 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSPLOT "1" "February 2016" "taurusplot 3.7.0" "User Commands"
.SH NAME
taurusplot \- manual page for taurusplot 3.6.0
taurusplot \- manual page for taurusplot 3.7.0
.SH SYNOPSIS
.B taurusplot
[\fI\,options\/\fR] [\fI\,<model1> \/\fR[\fI\,<model2>\/\fR] ...]
Expand Down
6 changes: 4 additions & 2 deletions doc/man/taurusremotelogmonitor.1
@@ -1,10 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUS "1" "July 2015" "Taurus remote logger 1.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUS "1" "February 2016" "Taurus remote logger 1.0" "User Commands"
.SH NAME
Taurus \- manual page for Taurus remote logger 1.0
.SH SYNOPSIS
.B taurusremotelogmonitor
[\fI\,options\/\fR]
.SH DESCRIPTION
Table that displays the taurus logging messages
.SH OPTIONS
.TP
\fB\-h\fR, \fB\-\-help\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurustrend.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSTREND "1" "July 2015" "taurustrend 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSTREND "1" "February 2016" "taurustrend 3.7.0" "User Commands"
.SH NAME
taurustrend \- manual page for taurustrend 3.6.0
taurustrend \- manual page for taurustrend 3.7.0
.SH SYNOPSIS
.B taurustrend
[\fI\,options\/\fR] [\fI\,<model1> \/\fR[\fI\,<model2>\/\fR] ...]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurustrend1d.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUS "1" "July 2015" "Taurus Trend 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUS "1" "February 2016" "Taurus Trend 3.7.0" "User Commands"
.SH NAME
Taurus \- manual page for Taurus Trend 3.6.0
Taurus \- manual page for Taurus Trend 3.7.0
.SH SYNOPSIS
.B taurustrend1d
[\fI\,options\/\fR] \fI\,<model>\/\fR
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurustrend2d.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUS "1" "July 2015" "Taurus Trend 2D 3.6.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUS "1" "February 2016" "Taurus Trend 2D 3.7.0" "User Commands"
.SH NAME
Taurus \- manual page for Taurus Trend 2D 3.6.0
Taurus \- manual page for Taurus Trend 2D 3.7.0
.SH SYNOPSIS
.B taurustrend2d
[\fI\,options\/\fR] \fI\,<model>\/\fR
Expand Down
4 changes: 2 additions & 2 deletions doc/man/taurusui.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSUI "1" "July 2015" "taurusui 1.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSUI "1" "February 2016" "taurusui 1.0" "User Commands"
.SH NAME
taurusui \- manual page for taurusui 1.0
.SH SYNOPSIS
Expand Down
6 changes: 3 additions & 3 deletions doc/man/taurusuic4.1
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.6.
.TH TAURUSUIC4 "1" "July 2015" "taurusuic4 *******************************************************************************" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH TAURUSUIC4 "1" "February 2016" "taurusuic4 *******************************************************************************" "User Commands"
.SH NAME
taurusuic4 \- manual page for taurusuic4 *******************************************************************************
.SH SYNOPSIS
Expand Down Expand Up @@ -44,4 +44,4 @@ generate an additional taurus python file
taurusuic4 is deprecated since SEP11 (http://sf.net/p/sardana/wiki/SEP11)
Consider using the taurus.qt.qtgui.util.UILoadable decorator instead
*******************************************************************************
taurusuic4 3.6.0
taurusuic4 3.7.0
Binary file added doc/source/_static/taurusconfigbrowser.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/source/_static/taurusdemo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/source/_static/taurustrend2d.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions doc/source/users/ui/configurations.rst
@@ -0,0 +1,40 @@
.. currentmodule:: taurus.qt.qtgui.panel

.. _configurations:

=============================================
Taurus Configuration Browser User's Interface
=============================================

.. contents::

Taurus provides an user interface for browsing TaurusMainWindow setting
files (.ini files), allowing a power user to visualize and edit the
different perspectives of a Taurus GUI.
The configuration tree is organized in branches, with the perspective
at the root.

Taurus Configuration Browser Application
----------------------------------------

You may browse the configuration of a TaurusMainWindow-based application
(e.g. any TaurusGUI) by launching the taurusconfigbrowser application
with the following command::

taurusconfigbrowser [<configuration.ini>]

Run the following command for more details::

taurusconfigbrowser --help

In the figure below the taurusconfigbrowser application shows a taurus
configuration .ini file containing three perspectives: 'LAST',
'second_perspective' and 'third_perspective'. 'LAST' is an special perspective
automatically stored just before the closing of the Taurus GUI; it reflects
the state of the GUI just before the last closing. The other two perspectives
were saved explicitly during the Taurus GUI execution.

.. figure:: /_static/taurusconfigbrowser.png
:align: center

taurusconfigbrowser with a perspective unfolded to show the panel entries
42 changes: 42 additions & 0 deletions doc/source/users/ui/devpanels.rst
@@ -0,0 +1,42 @@
.. currentmodule:: taurus.qt.qtgui.panel

======================================
Taurus Device Panels User's Interface
======================================

There are two different widgets that can be used to provide a view on a Taurus
Device: :class:`TaurusDevicePanel` and :class:`TaurusDevPanel`.
The first is a compact widget that gives access to attributes and commands
of a given device. The second is a full main window application that
provides the same access plus a device selector and a trend widget in a more
configurable (but less compact way).

.. _taurusdevicepanel:

TaurusDevicePanel as a stand-alone application
----------------------------------------------

The :class:`TaurusDevicePanel` can be launched as a stand-alone application with
the following command::

taurusdevicepanel [options] [<device_name>]

Run the following command for more details::

taurusdevicepanel --help

.. _tauruspanel:

TaurusPanel as a stand-alone application
----------------------------------------

The :class:`TaurusDevPanel` can be launched as a stand-alone application with
the following command::

tauruspanel [options] [<device_name>]

Run the following command for more details::

tauruspanel --help


29 changes: 6 additions & 23 deletions doc/source/users/ui/forms.rst
Expand Up @@ -41,37 +41,21 @@ at Taurus installation time.
.. _standalonetaurusform:

TaurusForm as a stand-alone application
-----------------------------------------
---------------------------------------

You may also use TaurusForm as a stand-alone application for controlling some
attributes or devices from the control system. You can launch the stand-alone TaurusForm
with the following command::

taurusform [options] [<model_list>]
Options::

-h, --help show this help message and exit
--version show program's version number and exit

Taurus Options:
Basic options present in any taurus application

--taurus-log-level=LEVEL
taurus log level. Allowed values are (case
insensitive): critical, error, warning/warn, info,
debug, trace
--taurus-polling-period=MILLISEC
taurus global polling period in milliseconds
--taurus-serialization-mode=SERIAL
taurus serialization mode. Allowed values are (case
insensitive): serial, concurrent (default)
--tango-host=TANGO_HOST
Tango host name
Run the following command for more details::

taurusform --help

The model list is optional and is a space-separated list of models for
TaurusForm. Valid models are: attribute names, device names or alias. See
:class:`TaurusForm` API for more information about valid models
:class:`TaurusForm` API for more information about valid models.

The widgets used for different types of attributes and devices
---------------------------------------------------------------
Expand Down Expand Up @@ -105,7 +89,6 @@ For an example on how a custom widget can be used for a certain type of device,
see the :class:`taurus.qt.qtgui.extra_pool.PoolChannelTV` or
:class:`taurus.qt.qtgui.extra_pool.PoolMotorTV` widgets.


Changing the contents of a form
-------------------------------

Expand Down Expand Up @@ -220,4 +203,4 @@ this way, concurrent editions will not interfere with your own editions, but at
the same time you will be aware of them.

.. tip:: Remember that you can check the cause of a pending operation by
consulting the write widget tooltip.
consulting the write widget tooltip.
5 changes: 4 additions & 1 deletion doc/source/users/ui/index.rst
Expand Up @@ -17,8 +17,12 @@ User's Interface
Images <taurusimage>
Array Editor <arrayeditor>
Synoptics <synoptics>
TaurusPanel & TaurusDevicePanel <devpanels>
Macros <macros/index>
TaurusGui <taurusgui>
TaurusDemo <taurusdemo>
Logs <logs>
Configurations <configurations>
Experiment Configuration <experimentconfiguration>
Sardana Editor <sardanaeditor>

Expand All @@ -30,4 +34,3 @@ with taurus. This is done from the GUI user point of view (not for developers).
For a detailed list of features of each widget, please refer to the
:ref:`developers-guide-index`


22 changes: 22 additions & 0 deletions doc/source/users/ui/logs.rst
@@ -0,0 +1,22 @@
.. currentmodule:: taurus.qt.qtgui.table

.. _logs:

===========================================
Taurus Remote Log Monitor User's Interface
===========================================

.. contents::

Taurus provides an application to visualize logs generated by a
running Taurus Application.
The visualization can be done either in a GUI (based on
:class:`QLoggingWidget` ) or in the command line interface.

This application can be launched using the following command::

taurusremotelogmonitor [options]

Run the following command for more details::

taurusremotelogmonitor --help

0 comments on commit a4185e5

Please sign in to comment.