From 7e1e7bfdc25427abb5c824cb91ff2d1d6daf8ca9 Mon Sep 17 00:00:00 2001 From: Billy Su Date: Sat, 3 Feb 2018 00:07:49 +0800 Subject: [PATCH 1/3] Add bold style to the list Title --- doc/source/mouse_interaction.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/source/mouse_interaction.rst b/doc/source/mouse_interaction.rst index 0e149f0c..3aea2527 100644 --- a/doc/source/mouse_interaction.rst +++ b/doc/source/mouse_interaction.rst @@ -9,11 +9,11 @@ Most applications that use pyqtgraph's data visualization will generate widgets In pyqtgraph, most 2D visualizations follow the following mouse interaction: -* Left button: Interacts with items in the scene (select/move objects, etc). If there are no movable objects under the mouse cursor, then dragging with the left button will pan the scene instead. -* Right button drag: Scales the scene. Dragging left/right scales horizontally; dragging up/down scales vertically (although some scenes will have their x/y scales locked together). If there are x/y axes fisible in the scene, then right-dragging over the axis will _only_ affect that axis. -* Right button click: Clicking the right button in most cases will show a context menu with a variety of options depending on the object(s) under the mouse cursor. -* Middle button (or wheel) drag: Dragging the mouse with the wheel pressed down will always pan the scene (this is useful in instances where panning with the left button is prevented by other objects in the scene). -* Wheel spin: Zooms the scene in and out. +* **Left button:** Interacts with items in the scene (select/move objects, etc). If there are no movable objects under the mouse cursor, then dragging with the left button will pan the scene instead. +* **Right button drag:** Scales the scene. Dragging left/right scales horizontally; dragging up/down scales vertically (although some scenes will have their x/y scales locked together). If there are x/y axes fisible in the scene, then right-dragging over the axis will _only_ affect that axis. +* **Right button click:** Clicking the right button in most cases will show a context menu with a variety of options depending on the object(s) under the mouse cursor. +* **Middle button (or wheel) drag:** Dragging the mouse with the wheel pressed down will always pan the scene (this is useful in instances where panning with the left button is prevented by other objects in the scene). +* **Wheel spin:** Zooms the scene in and out. For machines where dragging with the right or middle buttons is difficult (usually Mac), another mouse interaction mode exists. In this mode, dragging with the left mouse button draws a box over a region of the scene. After the button is released, the scene is scaled and panned to fit the box. This mode can be accessed in the context menu or by calling:: @@ -38,11 +38,11 @@ The exact set of items available in the menu depends on the contents of the scen 3D visualizations use the following mouse interaction: -* Left button drag: Rotates the scene around a central point -* Middle button drag: Pan the scene by moving the central "look-at" point within the x-y plane -* Middle button drag + CTRL: Pan the scene by moving the central "look-at" point along the z axis -* Wheel spin: zoom in/out -* Wheel + CTRL: change field-of-view angle +* **Left button drag:** Rotates the scene around a central point +* **Middle button drag:** Pan the scene by moving the central "look-at" point within the x-y plane +* **Middle button drag + CTRL:** Pan the scene by moving the central "look-at" point along the z axis +* **Wheel spin:** zoom in/out +* **Wheel + CTRL:** change field-of-view angle And keyboard controls: From 708d9d252d480cc6fc5782b77f16a0d6bff5fc1e Mon Sep 17 00:00:00 2001 From: Billy Su Date: Sat, 3 Feb 2018 10:13:22 +0800 Subject: [PATCH 2/3] Add installation method using pip3 --- doc/source/installation.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/source/installation.rst b/doc/source/installation.rst index e2bf0f8d..b53e53ee 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -3,7 +3,10 @@ Installation PyQtGraph does not really require any installation scripts. All that is needed is for the pyqtgraph folder to be placed someplace importable. Most people will prefer to simply place this folder within a larger project folder. If you want to make pyqtgraph available system-wide, use one of the methods listed below: +* **Using pip3(or pip):** Just run "`pip3 install pyqtgraph`" on your command line. * **Debian, Ubuntu, and similar Linux:** Download the .deb file linked at the top of the pyqtgraph web page or install using apt by putting "deb http://luke.campagnola.me/debian dev/" in your /etc/apt/sources.list file and install the python-pyqtgraph package. * **Arch Linux:** Looks like someone has posted unofficial packages for Arch (thanks windel). (https://aur.archlinux.org/packages.php?ID=62577) * **Windows:** Download and run the .exe installer file linked at the top of the pyqtgraph web page. -* **Everybody (including OSX):** Download the .tar.gz source package linked at the top of the pyqtgraph web page, extract its contents, and run "python setup.py install" from within the extracted directory. +* **From Source(including OSX):** Download the .tar.gz source package linked at the top of the pyqtgraph_ web page, extract its contents, and run "`python setup.py install`" from within the extracted directory. + +.. _pyqtgraph: http://www.pyqtgraph.org/ From 447001876e6461dc14d2158d98883164b6122f8d Mon Sep 17 00:00:00 2001 From: Billy Su Date: Mon, 5 Feb 2018 22:47:45 +0800 Subject: [PATCH 3/3] API Reference add Graphics Windows --- doc/source/apireference.rst | 1 + .../graphicsWindows/graphicsWindows.rst | 22 +++++++++++++++++++ doc/source/graphicsWindows/index.rst | 11 ++++++++++ 3 files changed, 34 insertions(+) create mode 100644 doc/source/graphicsWindows/graphicsWindows.rst create mode 100644 doc/source/graphicsWindows/index.rst diff --git a/doc/source/apireference.rst b/doc/source/apireference.rst index c4dc64aa..bca04bb8 100644 --- a/doc/source/apireference.rst +++ b/doc/source/apireference.rst @@ -9,6 +9,7 @@ Contents: config_options functions graphicsItems/index + graphicsWindows/index widgets/index 3dgraphics/index colormap diff --git a/doc/source/graphicsWindows/graphicsWindows.rst b/doc/source/graphicsWindows/graphicsWindows.rst new file mode 100644 index 00000000..4ce96b36 --- /dev/null +++ b/doc/source/graphicsWindows/graphicsWindows.rst @@ -0,0 +1,22 @@ +Graphics Windows +================ + +.. autoclass:: pyqtgraph.GraphicsWindow + :members: + + .. automethod:: pyqtgraph.GraphicsWindow.__init__ + +.. autoclass:: pyqtgraph.TabWindow + :members: + + .. automethod:: pyqtgraph.TabWindow.__init__ + +.. autoclass:: pyqtgraph.PlotWindow + :members: + + .. automethod:: pyqtgraph.PlotWindow.__init__ + +.. autoclass:: pyqtgraph.ImageWindow + :members: + + .. automethod:: pyqtgraph.ImageWindow.__init__ \ No newline at end of file diff --git a/doc/source/graphicsWindows/index.rst b/doc/source/graphicsWindows/index.rst new file mode 100644 index 00000000..5187cfdc --- /dev/null +++ b/doc/source/graphicsWindows/index.rst @@ -0,0 +1,11 @@ +Graphics Windows +================ + +Convenience classes which create a new window with PlotWidget or ImageView. + +Contents: + +.. toctree:: + :maxdepth: 2 + + graphicsWindows \ No newline at end of file