Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4c3cffa

Browse filesBrowse files
committed
Revert "trying to backport [#7913]"
This reverts commit d647104.
1 parent d647104 commit 4c3cffa
Copy full SHA for 4c3cffa

File tree

Expand file treeCollapse file tree

1 file changed

+0
-27
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+0
-27
lines changed

‎lib/matplotlib/quiver.py

Copy file name to clipboardExpand all lines: lib/matplotlib/quiver.py
-27Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
*headaxislength*. To make the head smaller relative to the shaft,
6464
scale down all the head parameters. You will probably do best to leave
6565
minshaft alone.
66-
<<<<<<< HEAD
6766
6867
*linewidths* and *edgecolors* can be used to customize the arrow
6968
outlines.
@@ -88,32 +87,6 @@
8887
8988
'dots' or 'inches': pixels or inches, based on the figure dpi
9089
91-
=======
92-
93-
*linewidths* and *edgecolors* can be used to customize the arrow
94-
outlines.
95-
96-
Parameters
97-
----------
98-
X : 1D or 2D array, sequence, optional
99-
The x coordinates of the arrow locations
100-
Y : 1D or 2D array, sequence, optional
101-
The y coordinates of the arrow locations
102-
U : 1D or 2D array or masked array, sequence
103-
The x components of the arrow vectors
104-
V : 1D or 2D array or masked array, sequence
105-
The y components of the arrow vectors
106-
C : 1D or 2D array, sequence, optional
107-
The arrow colors
108-
units : [ 'width' | 'height' | 'dots' | 'inches' | 'x' | 'y' | 'xy' ]
109-
The arrow dimensions (except for *length*) are measured in multiples of
110-
this unit.
111-
112-
'width' or 'height': the width or height of the axis
113-
114-
'dots' or 'inches': pixels or inches, based on the figure dpi
115-
116-
>>>>>>> 430e308... Merge pull request #7913 from dstansby/quiver-doc
11790
'x', 'y', or 'xy': respectively *X*, *Y*, or :math:`\sqrt{X^2 + Y^2}`
11891
in data units
11992

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.