From 29835775f221c3ee6fdf872fb5e3410feccb29ad Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 18:36:22 +0200 Subject: [PATCH 1/7] documenation fix related to #9088 --- lib/matplotlib/contour.py | 4 +++- lib/matplotlib/tri/tricontour.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py index b67f905426d5..7353264709b3 100644 --- a/lib/matplotlib/contour.py +++ b/lib/matplotlib/contour.py @@ -1672,7 +1672,9 @@ def _initialize_x_y(self, z): contour(Z,N) contour(X,Y,Z,N) - contour up to *N* automatically-chosen levels. + contour up to *N+1* automatically-chosen levels. + If exactly *N* levels are required either *V* or an + optional :class:`~matplotlib.ticker.Locator` can be passed. :: diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index ce113544eb08..3ccb0d05b513 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -132,7 +132,9 @@ def _contour_args(self, args, kwargs): tricontour(..., Z, N) - contour *N* automatically-chosen levels. + contour up to *N+1* automatically-chosen levels. + If exactly *N* levels are required either *V* or an + optional :class:`~matplotlib.ticker.Locator` can be passed. :: From a80ee672c9353f6d4a9c0967526c4c12985d8ee4 Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 21:52:10 +0200 Subject: [PATCH 2/7] Update contour.py --- lib/matplotlib/contour.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py index 7353264709b3..79562f04500d 100644 --- a/lib/matplotlib/contour.py +++ b/lib/matplotlib/contour.py @@ -1672,9 +1672,7 @@ def _initialize_x_y(self, z): contour(Z,N) contour(X,Y,Z,N) - contour up to *N+1* automatically-chosen levels. - If exactly *N* levels are required either *V* or an - optional :class:`~matplotlib.ticker.Locator` can be passed. + contour up to *N+1* automatically chosed contour levels (*N* intervals). :: From 4d8229785c04d7665e74c008609d0b290b3c4fb3 Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 21:52:45 +0200 Subject: [PATCH 3/7] Update tricontour.py --- lib/matplotlib/tri/tricontour.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index 3ccb0d05b513..c9f1637ba00a 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -132,9 +132,7 @@ def _contour_args(self, args, kwargs): tricontour(..., Z, N) - contour up to *N+1* automatically-chosen levels. - If exactly *N* levels are required either *V* or an - optional :class:`~matplotlib.ticker.Locator` can be passed. + contour up to *N+1* automatically chosed contour levels (*N* intervals). :: From 7a54c1e57838c9db6d4f58cb67949500ec31a7f4 Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 23:42:31 +0200 Subject: [PATCH 4/7] Wrap long line --- lib/matplotlib/contour.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py index 79562f04500d..d0604ceb15aa 100644 --- a/lib/matplotlib/contour.py +++ b/lib/matplotlib/contour.py @@ -1672,7 +1672,8 @@ def _initialize_x_y(self, z): contour(Z,N) contour(X,Y,Z,N) - contour up to *N+1* automatically chosed contour levels (*N* intervals). + contour up to *N+1* automatically chosed contour levels + (*N* intervals). :: From 6b6dfed64c9a365b6b4ef695974650ac9aa5f128 Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 23:43:35 +0200 Subject: [PATCH 5/7] Wrap long line in tricontour --- lib/matplotlib/tri/tricontour.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index c9f1637ba00a..724f6bd4729f 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -132,7 +132,8 @@ def _contour_args(self, args, kwargs): tricontour(..., Z, N) - contour up to *N+1* automatically chosed contour levels (*N* intervals). + contour up to *N+1* automatically chosed contour levels + (*N* intervals). :: From 2c2e19bc60a7385a16503e6993075bddb4019af4 Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 23:46:17 +0200 Subject: [PATCH 6/7] Fixes typo --- lib/matplotlib/contour.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py index d0604ceb15aa..e174fe222b76 100644 --- a/lib/matplotlib/contour.py +++ b/lib/matplotlib/contour.py @@ -1672,7 +1672,7 @@ def _initialize_x_y(self, z): contour(Z,N) contour(X,Y,Z,N) - contour up to *N+1* automatically chosed contour levels + contour up to *N+1* automatically chosen contour levels (*N* intervals). :: From 3222b1ea65b32eb25191d417bde119971a5be692 Mon Sep 17 00:00:00 2001 From: Luca Verginer Date: Wed, 18 Oct 2017 23:47:15 +0200 Subject: [PATCH 7/7] Fixes typo --- lib/matplotlib/tri/tricontour.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py index 724f6bd4729f..8282186d99bf 100644 --- a/lib/matplotlib/tri/tricontour.py +++ b/lib/matplotlib/tri/tricontour.py @@ -132,7 +132,7 @@ def _contour_args(self, args, kwargs): tricontour(..., Z, N) - contour up to *N+1* automatically chosed contour levels + contour up to *N+1* automatically chosen contour levels (*N* intervals). ::