Skip to content

Commit

Permalink
Merge pull request #4036 from t20100/fix-doc
Browse files Browse the repository at this point in the history
Updated and fixed documentation
  • Loading branch information
payno authored Jan 8, 2024
2 parents ddfd533 + 6bb57a4 commit 5fa8ba5
Show file tree
Hide file tree
Showing 13 changed files with 200 additions and 182 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include requirements-dev.txt
include pyproject.toml
recursive-include src/silx *.pyx *.pxd *.pxi
recursive-include src/silx *.h *.c *.hpp *.cpp
recursive-include doc/source *.py *.rst *.png *.ico *.ipynb
recursive-include doc/source *.py *.rst *.png *.ico *.ipynb *.html *.svg
global-exclude .ipynb_checkpoints/*
recursive-include qtdesigner_plugins *.py *.rst
recursive-include src/silx/resources *
Expand Down
3 changes: 3 additions & 0 deletions doc/source/modules/gui/icons.rst
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ Available icons
- rotate-3d
* - |rudder|
- rudder
* - |ruler|
- ruler
* - |scale-auto|
- scale-auto
* - |scale-fixed|
Expand Down Expand Up @@ -561,6 +563,7 @@ 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
.. |ruler| image:: ../../../../src/silx/resources/gui/icons/ruler.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
Expand Down
Binary file added doc/source/sample_code/img/compareBackends.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed doc/source/sample_code/img/compositeline.png
Binary file not shown.
Binary file added doc/source/sample_code/img/floatedit.png
Loading
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/sample_code/img/stackedprogressbar.png
Loading
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/sample_code/img/waiterOverlay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 26 additions & 4 deletions doc/source/sample_code/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,6 @@ Sample code that illustrates some functionalities of :class:`~silx.gui.plot.Plot
:width: 150px
- This script is an example to illustrate how to use axis synchronization
tool.
* - :download:`compositeline.py <../../../examples/compositeline.py>`
- .. image:: img/compositeline.png
:width: 150px
- Example to show the use of markers to draw head and tail of lines.
* - :download:`dropZones.py <../../../examples/dropZones.py>`
- .. image:: img/dropZones.png
:width: 150px
Expand All @@ -386,6 +382,10 @@ Sample code that illustrates some functionalities of :class:`~silx.gui.plot.Plot
:width: 150px
- This script is an example to illustrate how to use axis synchronization
tool.
* - :download:`compareBackends.py <../../../examples/compareBackends.py>`
- .. image:: img/compareBackends.png
:width: 150px
- This script compares the rendering of PlotWidget's matplotlib and OpenGL backends.


.. _plot3d-sample-code:
Expand Down Expand Up @@ -449,6 +449,28 @@ Sample code that illustrates some functionalities of :class:`~silx.gui.plot.Plot
an interactive cutting plane.
It can also be started without providing a file.

:mod:`silx.gui.widgets` sample code
+++++++++++++++++++++++++++++++++++

.. list-table::
:widths: 1 1 4
:header-rows: 1

* - Source
- Screenshot
- Description
* - :download:`floatedit.py <../../../examples/floatedit.py>`
- .. image:: img/floatedit.png
:width: 150px
- This script illustrates the use of :class:`silx.gui.widgets.FloatEdit.FloatEdit`.
* - :download:`stackedprogressbar.py <../../../examples/stackedprogressbar.py>`
- .. image:: img/stackedprogressbar.png
:width: 150px
- This script illustrates the use of :class:`silx.gui.widgets.StackedProgressBar.StackedProgressBar`.
* - :download:`waiterOverlay.py <../../../examples/waiterOverlay.py>`
- .. image:: img/waiterOverlay.png
:width: 150px
- Demonstration window that displays a wait icon until the plot is updated.

:mod:`silx.io` sample code
++++++++++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion examples/compareBackends.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# ###########################################################################*/

"""
Compare one to one backend rendering
This script compares the rendering of PlotWidget's matplotlib and OpenGL backends.
"""

from __future__ import annotations
Expand Down
2 changes: 1 addition & 1 deletion examples/floatedit.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# ###########################################################################*/
"""
Test FloatEdit widgets
This script illustrates the use of :class:`silx.gui.widgets.FloatEdit.FloatEdit`.
"""

from silx.gui import qt
Expand Down
2 changes: 1 addition & 1 deletion examples/stackedprogressbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# ###########################################################################*/
"""
Test StackedProgressBar widgets
This script illustrates the use of :class:`silx.gui.widgets.StackedProgressBar.StackedProgressBar`.
"""

from silx.gui import qt
Expand Down
Binary file modified src/silx/resources/gui/icons/ruler.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5fa8ba5

Please sign in to comment.