diff --git a/doc/source/conf.py b/doc/source/conf.py index 0e503024e4..2d242e9a5b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -40,14 +40,7 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. # sys.path.insert(0, os.path.abspath('.')) project = u'silx' -try: - import silx - project_dir = os.path.abspath(os.path.join(__file__, "..", "..", "..")) - build_dir = os.path.abspath(silx.__file__) - if not build_dir.startswith(project_dir): - raise RuntimeError("%s looks to come from the system. Fix your PYTHONPATH and restart sphinx." % project) -except ImportError: - raise RuntimeError("%s is not on the path. Fix your PYTHONPATH and restart sphinx." % project) +import silx # Disable deprecation warnings: # It avoid to spam documentation logs with deprecation warnings. diff --git a/doc/source/modules/gui/data/img/ArrayTableWidget.png b/doc/source/modules/gui/data/img/ArrayTableWidget.png index e7bb2a914d..138d189eb0 100644 Binary files a/doc/source/modules/gui/data/img/ArrayTableWidget.png and b/doc/source/modules/gui/data/img/ArrayTableWidget.png differ diff --git a/doc/source/modules/gui/data/img/DataViewer.png b/doc/source/modules/gui/data/img/DataViewer.png index 7980de93c9..6d0da71478 100644 Binary files a/doc/source/modules/gui/data/img/DataViewer.png and b/doc/source/modules/gui/data/img/DataViewer.png differ diff --git a/doc/source/modules/gui/icons.rst b/doc/source/modules/gui/icons.rst index cb8e044c77..238c7248f7 100644 --- a/doc/source/modules/gui/icons.rst +++ b/doc/source/modules/gui/icons.rst @@ -49,6 +49,8 @@ Available icons - add-shape-polygon * - |add-shape-rectangle| - add-shape-rectangle + * - |add-shape-rotated-rectangle| + - add-shape-rotated-rectangle * - |add-shape-unknown| - add-shape-unknown * - |add-shape-vertical| @@ -315,6 +317,10 @@ Available icons - rotate-3d * - |rudder| - rudder + * - |scale-auto| + - scale-auto + * - |scale-fixed| + - scale-fixed * - |selected| - selected * - |shape-circle-solid| @@ -421,6 +427,7 @@ Available icons .. |add-shape-point| image:: ../../../../src/silx/resources/gui/icons/add-shape-point.png .. |add-shape-polygon| image:: ../../../../src/silx/resources/gui/icons/add-shape-polygon.png .. |add-shape-rectangle| image:: ../../../../src/silx/resources/gui/icons/add-shape-rectangle.png +.. |add-shape-rotated-rectangle| image:: ../../../../src/silx/resources/gui/icons/add-shape-rotated-rectangle.png .. |add-shape-unknown| image:: ../../../../src/silx/resources/gui/icons/add-shape-unknown.png .. |add-shape-vertical| image:: ../../../../src/silx/resources/gui/icons/add-shape-vertical.png .. |add| image:: ../../../../src/silx/resources/gui/icons/add.png @@ -554,6 +561,8 @@ Available icons .. |rm| image:: ../../../../src/silx/resources/gui/icons/rm.png .. |rotate-3d| image:: ../../../../src/silx/resources/gui/icons/rotate-3d.png .. |rudder| image:: ../../../../src/silx/resources/gui/icons/rudder.png +.. |scale-auto| image:: ../../../../src/silx/resources/gui/icons/scale-auto.png +.. |scale-fixed| image:: ../../../../src/silx/resources/gui/icons/scale-fixed.png .. |selected| image:: ../../../../src/silx/resources/gui/icons/selected.png .. |shape-circle-solid| image:: ../../../../src/silx/resources/gui/icons/shape-circle-solid.png .. |shape-circle| image:: ../../../../src/silx/resources/gui/icons/shape-circle.png diff --git a/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png b/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png index 261909a262..a468cc18fc 100644 Binary files a/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png and b/doc/source/modules/gui/plot/img/BasicGridStatsWidget.png differ diff --git a/doc/source/modules/gui/plot/img/BasicStatsWidget.png b/doc/source/modules/gui/plot/img/BasicStatsWidget.png index b0d815d9d5..6dbdd30cbf 100644 Binary files a/doc/source/modules/gui/plot/img/BasicStatsWidget.png and b/doc/source/modules/gui/plot/img/BasicStatsWidget.png differ diff --git a/doc/source/modules/gui/plot/img/LimitsToolBar.png b/doc/source/modules/gui/plot/img/LimitsToolBar.png index b360fe0720..2d96458e32 100644 Binary files a/doc/source/modules/gui/plot/img/LimitsToolBar.png and b/doc/source/modules/gui/plot/img/LimitsToolBar.png differ diff --git a/doc/source/modules/gui/plot/img/ROIStatsWidget.png b/doc/source/modules/gui/plot/img/ROIStatsWidget.png index 7a634febe2..fae9d62d15 100644 Binary files a/doc/source/modules/gui/plot/img/ROIStatsWidget.png and b/doc/source/modules/gui/plot/img/ROIStatsWidget.png differ diff --git a/doc/source/modules/gui/plot/img/logColorbar.png b/doc/source/modules/gui/plot/img/logColorbar.png index 49282e7fcb..31594e0462 100644 Binary files a/doc/source/modules/gui/plot/img/logColorbar.png and b/doc/source/modules/gui/plot/img/logColorbar.png differ diff --git a/doc/source/modules/gui/plot3d/img/SceneWidget.png b/doc/source/modules/gui/plot3d/img/SceneWidget.png index 4ddc0a8e23..7ad6de4135 100644 Binary files a/doc/source/modules/gui/plot3d/img/SceneWidget.png and b/doc/source/modules/gui/plot3d/img/SceneWidget.png differ diff --git a/doc/source/modules/gui/widgets/img/FrameBrowser.png b/doc/source/modules/gui/widgets/img/FrameBrowser.png index 1d4ebcf246..6f46631092 100644 Binary files a/doc/source/modules/gui/widgets/img/FrameBrowser.png and b/doc/source/modules/gui/widgets/img/FrameBrowser.png differ diff --git a/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png b/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png index 96edd3c002..13a4ddf3dc 100644 Binary files a/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png and b/doc/source/modules/gui/widgets/img/HorizontalSliderWithBrowser.png differ diff --git a/doc/source/modules/gui/widgets/img/PeriodicCombo.png b/doc/source/modules/gui/widgets/img/PeriodicCombo.png index 7534805681..bec3a78b98 100644 Binary files a/doc/source/modules/gui/widgets/img/PeriodicCombo.png and b/doc/source/modules/gui/widgets/img/PeriodicCombo.png differ diff --git a/doc/source/modules/gui/widgets/img/PeriodicList.png b/doc/source/modules/gui/widgets/img/PeriodicList.png index 74ce7d64ff..a695525380 100644 Binary files a/doc/source/modules/gui/widgets/img/PeriodicList.png and b/doc/source/modules/gui/widgets/img/PeriodicList.png differ diff --git a/doc/source/modules/gui/widgets/img/PeriodicTable.png b/doc/source/modules/gui/widgets/img/PeriodicTable.png index bada39a09c..70039ab616 100644 Binary files a/doc/source/modules/gui/widgets/img/PeriodicTable.png and b/doc/source/modules/gui/widgets/img/PeriodicTable.png differ diff --git a/doc/source/modules/gui/widgets/img/RangeSlider.png b/doc/source/modules/gui/widgets/img/RangeSlider.png index e7a1011527..f552fb3040 100644 Binary files a/doc/source/modules/gui/widgets/img/RangeSlider.png and b/doc/source/modules/gui/widgets/img/RangeSlider.png differ diff --git a/doc/source/modules/gui/widgets/img/TableWidget.png b/doc/source/modules/gui/widgets/img/TableWidget.png index a614ae7fc9..959af57bf6 100644 Binary files a/doc/source/modules/gui/widgets/img/TableWidget.png and b/doc/source/modules/gui/widgets/img/TableWidget.png differ diff --git a/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png b/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png index eb55b14899..5d1af4cc9e 100644 Binary files a/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png and b/doc/source/modules/gui/widgets/img/ThreadPoolPushButton.png differ diff --git a/doc/source/modules/gui/widgets/img/WaitingPushButton.png b/doc/source/modules/gui/widgets/img/WaitingPushButton.png index 97bd14ac91..5bfcdb810e 100644 Binary files a/doc/source/modules/gui/widgets/img/WaitingPushButton.png and b/doc/source/modules/gui/widgets/img/WaitingPushButton.png differ diff --git a/doc/source/sample_code/img/plotUpdateImageFromGevent.png b/doc/source/sample_code/img/plotUpdateImageFromGevent.png new file mode 100644 index 0000000000..c0caec312e Binary files /dev/null and b/doc/source/sample_code/img/plotUpdateImageFromGevent.png differ diff --git a/doc/source/sample_code/index.rst b/doc/source/sample_code/index.rst index 0aade4c9c6..c33d560d05 100644 --- a/doc/source/sample_code/index.rst +++ b/doc/source/sample_code/index.rst @@ -343,6 +343,10 @@ Sample code that illustrates some functionalities of :class:`~silx.gui.plot.Plot In this example a thread calls submitToQtMainThread to update the curve of a plot. + * - :download:`plotUpdateImageFromGevent.py <../../../examples/plotUpdateImageFromGevent.py>` + - .. image:: img/plotUpdateImageFromGevent.png + :width: 150px + - This script illustrates the update of a :class:`~silx.gui.plot.Plot2D` widget from a gevent coroutine. * - :download:`plotUpdateImageFromThread.py <../../../examples/plotUpdateImageFromThread.py>` - .. image:: img/plotUpdateImageFromThread.png :width: 150px