From d6ba93514b1d1e31c1b43bc6c82a0f0206034c06 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 25 Sep 2022 18:06:54 +0200 Subject: [PATCH 1/4] Fix wording and links lifecycle tutorial --- tutorials/introductory/lifecycle.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tutorials/introductory/lifecycle.py b/tutorials/introductory/lifecycle.py index 59cb55831fe1..7d268034ebfa 100644 --- a/tutorials/introductory/lifecycle.py +++ b/tutorials/introductory/lifecycle.py @@ -26,7 +26,7 @@ In the explicit object-oriented (OO) interface we directly utilize instances of :class:`axes.Axes` to build up the visualization in an instance of :class:`figure.Figure`. In the implicit interface, inspired by and modeled on -MATLAB, uses an global state-based interface which is encapsulated in the +MATLAB, we use a global state-based interface which is encapsulated in the :mod:`.pyplot` module to plot to the "current Axes". See the :doc:`pyplot tutorials ` for a more in-depth look at the pyplot interface. @@ -34,8 +34,8 @@ Most of the terms are straightforward but the main thing to remember is that: -* The Figure is the final image that may contain 1 or more Axes. -* The Axes represent an individual plot (don't confuse this with the word +* The `.Figure` is the final image that may contain one or more `.Axes`. +* The `.Axes` represent an individual plot (don't confuse this with the word "axis", which refers to the x/y axis of a plot). We call methods that do the plotting directly from the Axes, which gives @@ -43,7 +43,7 @@ .. note:: - In general prefer the explicit interface over the implicit pyplot interface + In general, prefer the explicit interface over the implicit pyplot interface for plotting. Our data From 61208b49553b8ddba22775369eeab235ed47aca9 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 25 Sep 2022 19:04:13 +0200 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: hannah --- tutorials/introductory/lifecycle.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tutorials/introductory/lifecycle.py b/tutorials/introductory/lifecycle.py index 7d268034ebfa..fdb97db5072c 100644 --- a/tutorials/introductory/lifecycle.py +++ b/tutorials/introductory/lifecycle.py @@ -34,16 +34,16 @@ Most of the terms are straightforward but the main thing to remember is that: -* The `.Figure` is the final image that may contain one or more `.Axes`. -* The `.Axes` represent an individual plot (don't confuse this with the word - "axis", which refers to the x/y axis of a plot). +* The `.Figure` is the final image, and may contain one or more `~.axes.Axes`. +* The `~.axes.Axes` represents an individual plot (not to be confused with + `.Axis`, which refers to the x/y axis of a plot). We call methods that do the plotting directly from the Axes, which gives us much more flexibility and power in customizing our plot. .. note:: - In general, prefer the explicit interface over the implicit pyplot interface + In general, use the explicit interface over the implicit pyplot interface for plotting. Our data From 7bee9ae2f6394a856fe1703c23a668eb9eef96fe Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Mon, 26 Sep 2022 14:21:33 +0200 Subject: [PATCH 3/4] Update tutorials/introductory/lifecycle.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- tutorials/introductory/lifecycle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/introductory/lifecycle.py b/tutorials/introductory/lifecycle.py index fdb97db5072c..c56ba70c1b09 100644 --- a/tutorials/introductory/lifecycle.py +++ b/tutorials/introductory/lifecycle.py @@ -35,7 +35,7 @@ is that: * The `.Figure` is the final image, and may contain one or more `~.axes.Axes`. -* The `~.axes.Axes` represents an individual plot (not to be confused with +* The `~.axes.Axes` represents an individual plot (not to be confused with `.Axis`, which refers to the x/y axis of a plot). We call methods that do the plotting directly from the Axes, which gives From 748a95c2b671db3f3f4cfd033b42473121d54544 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Mon, 26 Sep 2022 16:41:38 +0200 Subject: [PATCH 4/4] Update tutorials/introductory/lifecycle.py --- tutorials/introductory/lifecycle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/introductory/lifecycle.py b/tutorials/introductory/lifecycle.py index c56ba70c1b09..da976a39de3e 100644 --- a/tutorials/introductory/lifecycle.py +++ b/tutorials/introductory/lifecycle.py @@ -36,7 +36,7 @@ * The `.Figure` is the final image, and may contain one or more `~.axes.Axes`. * The `~.axes.Axes` represents an individual plot (not to be confused with - `.Axis`, which refers to the x/y axis of a plot). + `~.axis.Axis`, which refers to the x/y axis of a plot). We call methods that do the plotting directly from the Axes, which gives us much more flexibility and power in customizing our plot.