New upstream version 0.10.1+dfsg

25 files changed, 163 insertions, 20 deletions

diff --git a/doc/source/modules/gui/data/img/ArrayTableWidget.png b/doc/source/modules/gui/data/img/ArrayTableWidget.png
index 7c81d02..6ae9114 100644
--- a/doc/source/modules/gui/data/img/ArrayTableWidget.png
+++ b/doc/source/modules/gui/data/img/ArrayTableWidget.png
diff --git a/doc/source/modules/gui/data/img/DataViewer.png b/doc/source/modules/gui/data/img/DataViewer.png
index 719c822..c2185d3 100644
--- a/doc/source/modules/gui/data/img/DataViewer.png
+++ b/doc/source/modules/gui/data/img/DataViewer.png
diff --git a/doc/source/modules/gui/gallery.rst b/doc/source/modules/gui/gallery.rst
index fffcfd8..9923c0b 100644
--- a/doc/source/modules/gui/gallery.rst
+++ b/doc/source/modules/gui/gallery.rst
@@ -39,14 +39,27 @@ Widgets gallery
 
    * - Widget
      - Description
-   * - .. image:: data/img/ArrayTableWidget.png
+   * - .. snapshotqt:: data/img/ArrayTableWidget.png
          :height: 150px
          :align: center
+
+         from silx.gui.data.ArrayTableWidget import ArrayTableWidget
+         import numpy.random
+         table = ArrayTableWidget()
+         table.setArrayData(numpy.random.random((100, 100, 100)))
+         table.resize(500, 300)
+         table.show()
      - :class:`ArrayTableWidget` is a table widget with browsers designed to
        display the content of multi-dimensional data arrays.
-   * - .. image:: data/img/DataViewer.png
+   * - .. snapshotqt:: data/img/DataViewer.png
          :height: 150px
          :align: center
+
+         import numpy.random
+         from silx.gui.data.DataViewer import DataViewer
+         viewer = DataViewer()
+         viewer.setData(numpy.random.random((100, 100, 100)))
+         viewer.show()
      - :class:`DataViewer` is a widget designed to display data using the most
        adapted view.
    * - .. image:: data/img/DataViewerFrame.png
@@ -208,14 +221,33 @@ Additional widgets:
           :align: center
      - :class:`.PlotTools.PositionInfo` is a widget displaying mouse position and
        information of a :class:`PlotWidget` associated to the mouse position.
-   * - .. image:: plot/img/LimitsToolBar.png
+   * - .. snapshotqt:: plot/img/LimitsToolBar.png
           :width: 300px
           :align: center
+
+          from silx.gui.plot import Plot2D
+          from silx.gui.plot.tools.LimitsToolBar import LimitsToolBar
+          plot = Plot2D()
+          toolbar = LimitsToolBar(plot=plot)
+          toolbar.resize(400, 30)
+          plot.show()
+          toolbar.show()
+          app.processEvents()
      - :class:`.PlotTools.LimitsToolBar` is a QToolBar displaying and
        controlling the limits of a :class:`PlotWidget`.
-   * - .. image:: plot/img/logColorbar.png
+   * - .. snapshotqt:: plot/img/logColorbar.png
           :height: 150px
           :align: center
+
+          from silx.gui.plot import Plot2D
+          from silx.gui.plot.ColorBar import ColorBarWidget
+          from silx.gui.plot.Colors import Colormap
+          import numpy
+          plot = Plot2D()
+          colorbar = ColorBarWidget(plot=plot, legend='Colormap Log scale')
+          colorbar.setColormap(Colormap(name='jet', normalization='log', vmin=1.0, vmax=10e3))
+          colorbar.show()
+          colorbar.resize(20, 500)
      - :class:`.ColorBar.ColorBarWidget` display colormap gradient and can be linked with a plot
        to display the colormap
    * - .. image:: plot/img/statsWidget.png
@@ -243,9 +275,10 @@ Additional widgets:
        and associated toolbars.
        It can display 2D images, 2D scatter data, 3D scatter data and 3D volumes with different visualizations.
        See ``plot3dSceneWindow.py`` in :ref:`plot3d-sample-code`.
-   * - .. image:: plot3d/img/SceneWidget.png
+   * - .. snapshotqt:: plot3d/img/SceneWidget.png
           :height: 150px
           :align: center
+          :script: examples/plot3dSceneWindow.py
      - :class:`SceneWidget` is a :class:`Plot3DWidget` providing a 3D scene for visualizing different kind of data.
        It can display 2D images, 2D scatter data, 3D scatter data and 3D volumes with different visualizations.
        See ``plot3dSceneWindow.py`` in :ref:`plot3d-sample-code`.
@@ -303,49 +336,103 @@ Additional widgets:
 
    * - Widget
      - Description
-   * - .. image:: widgets/img/FrameBrowser.png
+   * - .. snapshotqt:: widgets/img/FrameBrowser.png
          :width: 110px
          :align: center
+
+         from silx.gui.widgets.FrameBrowser import FrameBrowser
+         widget = FrameBrowser()
+         widget.setRange(0, 10)
+         widget.show()
      - :class:`FrameBrowser.FrameBrowser` is a browser widget designed to
        browse through a sequence of integers (e.g. the indices of an array)
-   * - .. image:: widgets/img/HorizontalSliderWithBrowser.png
+   * - .. snapshotqt:: widgets/img/HorizontalSliderWithBrowser.png
          :width: 150px
          :align: center
+
+         from silx.gui.widgets.FrameBrowser import HorizontalSliderWithBrowser
+         slider = HorizontalSliderWithBrowser()
+         slider.show()
      - :class:`FrameBrowser.HorizontalSliderWithBrowser` is a :class:`FrameBrowser`
        with an additional slider.
-   * - .. image:: widgets/img/RangeSlider.png
+   * - .. snapshotqt:: widgets/img/RangeSlider.png
           :width: 150px
           :align: center
+
+          from silx.gui.widgets.RangeSlider import RangeSlider
+          from silx.gui.plot.Colors import Colormap
+          import numpy
+          widget = RangeSlider()
+          widget.setRange(0, 500)
+          widget.setValues(100, 400)
+          background = numpy.sin(numpy.arange(250) / 250.0)
+          background[0], background[-1] = background[-1], background[0]
+          colormap = Colormap("viridis")
+          widget.setGroovePixmapFromProfile(background, colormap)
+          widget.show()
      - :class:`~silx.gui.widgets.RangeSlider.RangeSlider` is a slider with 2 thumbs dedicated
        to the interactive selection of an interval.
-   * - .. image:: widgets/img/PeriodicCombo.png
+   * - .. snapshotqt:: widgets/img/PeriodicCombo.png
          :width: 150px
          :align: center
+
+         from silx.gui.widgets.PeriodicTable import PeriodicCombo
+         widget = PeriodicCombo()
+         widget.setSelection('Yb')
+         widget.show()
      - :class:`PeriodicTable.PeriodicCombo` is a :class:`QComboBox` widget designed to
        select a single atomic element.
-   * - .. image:: widgets/img/PeriodicList.png
+   * - .. snapshotqt:: widgets/img/PeriodicList.png
          :height: 150px
          :align: center
+
+         from silx.gui.widgets.PeriodicTable import PeriodicList
+         widget = PeriodicList()
+         widget.setSelectedElements(('S', 'Cl'))
+         widget.resize(200, 400)
+         widget.show()
      - :class:`PeriodicTable.PeriodicList` is a :class:`QTreeWidget` designed to select one
        or more atomic elements.
-   * - .. image:: widgets/img/PeriodicTable.png
+   * - .. snapshotqt:: widgets/img/PeriodicTable.png
          :height: 150px
          :align: center
+
+         from silx.gui.widgets.PeriodicTable import PeriodicTable
+         widget = PeriodicTable()
+         widget.setSelection(('S', 'H', 'Zr'))
+         widget.show()
      - :class:`PeriodicTable.PeriodicTable` is a periodic table widget designed to select one
        or more atomic elements.
-   * - .. image:: widgets/img/TableWidget.png
+   * - .. snapshotqt:: widgets/img/TableWidget.png
          :height: 150px
          :align: center
+
+         from silx.gui.widgets.TableWidget import TableWidget
+         widget = TableWidget()
+         widget.setRowCount(8)
+         widget.setColumnCount(4)
+         widget.resize(300, 200)
+         widget.show()
      - :class:`TableWidget.TableWidget` and :class:`TableWidget.TableView` inherit respectively
        :class:`QTableWidget` and :class:`QTableView`, and add a context menu with *cut/copy/paste*
        actions.
-   * - .. image:: widgets/img/WaitingPushButton.png
+   * - .. snapshotqt:: widgets/img/WaitingPushButton.png
          :width: 60px
          :align: center
+
+         from silx.gui.widgets.WaitingPushButton import WaitingPushButton
+         from silx.gui import icons
+         animated_icon = icons.getWaitIcon()
+         button = WaitingPushButton(icon=animated_icon.currentIcon(), text='Run')
+         button.show()
      - :class:`WaitingPushButton` is a :class:`QPushButton` that can be graphically disabled,
        for example to wait for a callback function to finish computing.
-   * - .. image:: widgets/img/ThreadPoolPushButton.png
+   * - .. snapshotqt:: widgets/img/ThreadPoolPushButton.png
          :width: 100px
          :align: center
+
+         from silx.gui.widgets.ThreadPoolPushButton import ThreadPoolPushButton
+         button = ThreadPoolPushButton(text="Compute 2^16")
+         button.show()
      - :class:`ThreadPoolPushButton` is a :class:`WaitingPushButton` that executes a
        callback in a thread.
diff --git a/doc/source/modules/gui/plot/dev.rst b/doc/source/modules/gui/plot/dev.rst
index 8966487..0c848e9 100644
--- a/doc/source/modules/gui/plot/dev.rst
+++ b/doc/source/modules/gui/plot/dev.rst
@@ -92,6 +92,7 @@ The following modules are the modules used internally by the plot package.
 
 .. automodule:: silx.gui.plot.CurvesROIWidget
    :members:
+   :noindex:
 
 :mod:`Interaction`
 ++++++++++++++++++
diff --git a/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png b/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png
new file mode 100644
index 0000000..53ddc0e
--- /dev/null
+++ b/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png
diff --git a/doc/source/modules/gui/plot/img/BasicStatsWidget.png b/doc/source/modules/gui/plot/img/BasicStatsWidget.png
new file mode 100644
index 0000000..c9ed2cd
--- /dev/null
+++ b/doc/source/modules/gui/plot/img/BasicStatsWidget.png
diff --git a/doc/source/modules/gui/plot/img/LimitsToolBar.png b/doc/source/modules/gui/plot/img/LimitsToolBar.png
index 99af8bd..54b6c2b 100644
--- a/doc/source/modules/gui/plot/img/LimitsToolBar.png
+++ b/doc/source/modules/gui/plot/img/LimitsToolBar.png
diff --git a/doc/source/modules/gui/plot/img/logColorbar.png b/doc/source/modules/gui/plot/img/logColorbar.png
index cdd247c..c677a9b 100644
--- a/doc/source/modules/gui/plot/img/logColorbar.png
+++ b/doc/source/modules/gui/plot/img/logColorbar.png
diff --git a/doc/source/modules/gui/plot/roi.rst b/doc/source/modules/gui/plot/roi.rst
index 77b5c2a..efe41a7 100644
--- a/doc/source/modules/gui/plot/roi.rst
+++ b/doc/source/modules/gui/plot/roi.rst
@@ -1,12 +1,15 @@
-.. currentmodule:: silx.gui.plot
+.. currentmodule:: silx.gui.plot.CurvesROIWidget
 
 :mod:`CurvesROIWidget`: ROI from curves
 =======================================
 
+
 .. |roiWidgetImage| image:: img/roiwidget.png
    :height: 400px
    :align: middle
 
+.. automodule:: silx.gui.plot.CurvesROIWidget
+
 You can access to the ROIWidget from a Plot window by :
 
 - using the tool button 'ROI'
@@ -14,4 +17,28 @@ You can access to the ROIWidget from a Plot window by :
 
 |roiWidgetImage|
 
-.. automodule:: silx.gui.plot.CurvesROIWidget
+
+
+
+:class:`ROI` class
+------------------
+
+.. autoclass:: ROI
+   :show-inheritance:
+   :members:
+
+
+:class:`CurvesROIWidget` class
+-------------------------------
+
+.. autoclass:: CurvesROIWidget
+   :show-inheritance:
+   :members:
+
+
+:class:`ROITable` class
+-----------------------
+
+.. autoclass:: ROITable
+   :show-inheritance:
+   :members:
diff --git a/doc/source/modules/gui/plot/statswidget.rst b/doc/source/modules/gui/plot/statswidget.rst
index f534921..6cd8ecf 100644
--- a/doc/source/modules/gui/plot/statswidget.rst
+++ b/doc/source/modules/gui/plot/statswidget.rst
@@ -31,3 +31,19 @@
    :show-inheritance:
    :members:
 
+
+:class:`BasicGridStatsWidget` class
+-----------------------------------
+
+.. autoclass:: BasicGridStatsWidget
+   :show-inheritance:
+   :members:
+
+
+:class:`BasicLineStatsWidget` class
+-----------------------------------
+
+.. autoclass:: BasicLineStatsWidget
+   :show-inheritance:
+   :members:
+
diff --git a/doc/source/modules/gui/plot3d/img/SceneWidget.png b/doc/source/modules/gui/plot3d/img/SceneWidget.png
index 610c41a..dbe7791 100644
--- a/doc/source/modules/gui/plot3d/img/SceneWidget.png
+++ b/doc/source/modules/gui/plot3d/img/SceneWidget.png
diff --git a/doc/source/modules/gui/plot3d/items.rst b/doc/source/modules/gui/plot3d/items.rst
index 1162cb9..5c4884f 100644
--- a/doc/source/modules/gui/plot3d/items.rst
+++ b/doc/source/modules/gui/plot3d/items.rst
@@ -53,7 +53,7 @@ The following classes are items that describes the content of a :class:`SceneWid
 :class:`Scatter2D` inherits from :class:`.DataItem3D` and also provides its API.
 
 .. autoclass:: Scatter2D
-   :members: getData, setData, getXData, getYData, getValues,
+   :members: getData, setData, getXData, getYData, getValueData,
              supportedVisualizations, isPropertyEnabled,
              getVisualization, setVisualization,
              isHeightMap, setHeightMap,
@@ -67,7 +67,7 @@ The following classes are items that describes the content of a :class:`SceneWid
 :class:`Scatter3D` inherits from :class:`.DataItem3D` and also provides its API.
 
 .. autoclass:: Scatter3D
-   :members: getData, setData, getXData, getYData, getZData, getValues,
+   :members: getData, setData, getXData, getYData, getZData, getValueData,
              getColormap, setColormap,
              getSupportedSymbols, getSymbol, setSymbol
 
diff --git a/doc/source/modules/gui/widgets/img/FrameBrowser.png b/doc/source/modules/gui/widgets/img/FrameBrowser.png
index c5624f7..3843e70 100644
--- a/doc/source/modules/gui/widgets/img/FrameBrowser.png
+++ b/doc/source/modules/gui/widgets/img/FrameBrowser.png
diff --git a/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png b/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png
index d64b2df..8cfdb25 100644
--- a/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png
+++ b/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png
diff --git a/doc/source/modules/gui/widgets/img/PeriodicCombo.png b/doc/source/modules/gui/widgets/img/PeriodicCombo.png
index e0b40c2..4a93e86 100644
--- a/doc/source/modules/gui/widgets/img/PeriodicCombo.png
+++ b/doc/source/modules/gui/widgets/img/PeriodicCombo.png
diff --git a/doc/source/modules/gui/widgets/img/PeriodicList.png b/doc/source/modules/gui/widgets/img/PeriodicList.png
index d1e540b..42f432e 100644
--- a/doc/source/modules/gui/widgets/img/PeriodicList.png
+++ b/doc/source/modules/gui/widgets/img/PeriodicList.png
diff --git a/doc/source/modules/gui/widgets/img/PeriodicTable.png b/doc/source/modules/gui/widgets/img/PeriodicTable.png
index c06dded..ce52262 100644
--- a/doc/source/modules/gui/widgets/img/PeriodicTable.png
+++ b/doc/source/modules/gui/widgets/img/PeriodicTable.png
diff --git a/doc/source/modules/gui/widgets/img/RangeSlider.png b/doc/source/modules/gui/widgets/img/RangeSlider.png
index b068c6f..f552fb3 100644
--- a/doc/source/modules/gui/widgets/img/RangeSlider.png
+++ b/doc/source/modules/gui/widgets/img/RangeSlider.png
diff --git a/doc/source/modules/gui/widgets/img/TableWidget.png b/doc/source/modules/gui/widgets/img/TableWidget.png
index a0f819f..b6a4965 100644
--- a/doc/source/modules/gui/widgets/img/TableWidget.png
+++ b/doc/source/modules/gui/widgets/img/TableWidget.png
diff --git a/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png b/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png
index 4710d16..18a7416 100644
--- a/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png
+++ b/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png
diff --git a/doc/source/modules/gui/widgets/img/WaitingPushButton.png b/doc/source/modules/gui/widgets/img/WaitingPushButton.png
index fa1d51a..4fd3e3c 100644
--- a/doc/source/modules/gui/widgets/img/WaitingPushButton.png
+++ b/doc/source/modules/gui/widgets/img/WaitingPushButton.png
diff --git a/doc/source/modules/image/index.rst b/doc/source/modules/image/index.rst
index 477cc9f..cf4867b 100644
--- a/doc/source/modules/image/index.rst
+++ b/doc/source/modules/image/index.rst
@@ -12,4 +12,6 @@
    marchingsquares.rst
    shapes.rst
    sift.rst
+   projection.rst
    backprojection.rst
+   reconstruction.rst
diff --git a/doc/source/modules/image/shapes.rst b/doc/source/modules/image/shapes.rst
index a20b0cd..be51975 100644
--- a/doc/source/modules/image/shapes.rst
+++ b/doc/source/modules/image/shapes.rst
@@ -2,7 +2,7 @@
 .. currentmodule:: silx.image
 
 :mod:`shapes`: 2D shapes drawing
----------------------------------
+--------------------------------
 
 .. automodule:: silx.image.shapes
-   :members: circle_fill, draw_line, polygon_fill_mask, Polygon
+   :members: circle_fill, ellipse_fill, draw_line, polygon_fill_mask, Polygon
diff --git a/doc/source/modules/opencl/index.rst b/doc/source/modules/opencl/index.rst
index e17eecb..20a3a01 100644
--- a/doc/source/modules/opencl/index.rst
+++ b/doc/source/modules/opencl/index.rst
@@ -10,6 +10,7 @@
 
    sift/index.rst
    fbp.rst
+   sinofilter.rst
    medfilt.rst
    codec_cbf.rst
 
diff --git a/doc/source/modules/opencl/sinofilter.rst b/doc/source/modules/opencl/sinofilter.rst
new file mode 100644
index 0000000..81fe100
--- /dev/null
+++ b/doc/source/modules/opencl/sinofilter.rst
@@ -0,0 +1,9 @@
+
+.. currentmodule:: silx.opencl
+
+:mod:`sinofilter`: Sinogram filtering.
+--------------------------------------------------
+
+.. automodule:: silx.opencl.sinofilter
+    :members:
+    :show-inheritance: