NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Improve linestyles example#12586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

timhoffm merged 9 commits intomatplotlib:masterfromthoo:linestyles

Oct 30, 2018

Merged

Improve linestyles example#12586

timhoffm merged 9 commits intomatplotlib:masterfromthoo:linestyles

Oct 30, 2018

Conversation

Copy link

Contributor

PR Summary

Close#11908
To combine this two examples:line_styles_reference andlinestyles.
in order to reduce redundancy and also explain more about (offset, on-off-dash-seq).

What had done:

Removeline_styles_reference example and rewritelinestyles example.

thoo force-pushed thelinestyles branch from6b9a5d0 to6da2a5fCompare

October 21, 2018 22:57

thoo closed this

Oct 21, 2018

thoo reopened this

Oct 22, 2018

thoo force-pushed thelinestyles branch from6da2a5f to8d5340eCompare

October 22, 2018 03:00

story645 requested changes

Oct 22, 2018

View reviewed changes

examples/lines_bars_and_markers/linestyles.py Outdated


		# Reverse the list so that plots and linestyles are in same order.
		linestyles = OrderedDict(linestyles[::-1])

		plt.figure(figsize=(10, 6))

Copy link

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Not necessarily part of this PR, but since you're touching this code, would you be ok with putting it in OO format:

fig,ax=plt.subplots()

Copy link

ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

It is a good idea. I will update it with OO format.

examples/lines_bars_and_markers/linestyles.py Outdated

		Note: The dash style can also be configured via `.Line2D.set_dashes`
		as shown in :doc:`/gallery/lines_bars_and_markers/line_demo_dash_control`
		and passing a list of dash sequences using the keyword dashes to the
		cycler in :doc:`property_cycle </tutorials/intermediate/color_cycle>`.
		"""
		import numpy as np
		import matplotlib.pyplot as plt
		from collections import OrderedDict

Copy link

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

this can now be removed, since no longer an ordered dict.

Copy link

ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I am still usinglinestyles = OrderedDict(linestyles[::-1]) here. I just reversed the list so that it follows the same order between the list description and the plot.

Copy link

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Sorry about that then, but I don't think you need the ordered dict anyway?

examples/lines_bars_and_markers/linestyles.py Outdated

		@@ -3,31 +3,44 @@
		Linestyles
		==========

		This examples showcases different linestyles copying those of Tikz/PGF.
		This example showcases different linestyles copying those of Tikz/PGF.

Copy link

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Can this be linked to example of Tikz/PGF linestlyes? Otherwise, there's no context.

examples/lines_bars_and_markers/linestyles.py Outdated

		@@ -3,31 +3,44 @@
		Linestyles
		==========

		This examples showcases different linestyles copying those of Tikz/PGF.
		This example showcases different linestyles copying those of Tikz/PGF.
		Linestyle can be provided as simple as solid , dotted or dashed.

Copy link

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Unclear whether this means I can use the wordsolid as an argument to Linestyle or this is talking about lines.

Copy link

Member

story645 commentedOct 22, 2018

Thanks for the PR! I like the idea of combining the two examples, but maybe they should be left as standalone subplots so that there's a clean example of the symbol denoted way to do things versus the tuple way?

thoo force-pushed thelinestyles branch from8d5340e to2f59110Compare

October 22, 2018 23:14

QuLogic changed the title~~Linestyles~~Improve linestyles example

Oct 23, 2018

thoo force-pushed thelinestyles branch from9d3ede6 toc27d0e4Compare

October 24, 2018 21:32

Copy link

ContributorAuthor

thoo commentedOct 25, 2018•
edited
Loading

@story645 Let me know if you want me to change anything. Thanks.

story645 approved these changes

Oct 26, 2018

View reviewed changes

QuLogic reviewed

Oct 26, 2018

View reviewed changes

examples/lines_bars_and_markers/linestyles.py Outdated

		Linestyle can be provided as simple as solid , dotted, dashed
		or dashdot. Moreover, the dashing of the line can be controlled by
		a dash tuple such as (offset, (on_off_seq)) as mentioned in
		`.Line2D.set_linestyle`. For e.g., ``(0, (3, 10, 1, 15))`` means

Copy link

Member

QuLogicOct 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

e.g. already means 'for example'; use 'For example' here.

examples/lines_bars_and_markers/linestyles.py Outdated

		('dotted', (0, (1, 5))),
		('densely dotted', (0, (1, 1))),
		linestyle_str = [
		('solid', ('solid')), # Same as (0, ()) or '-'

Copy link

Member

QuLogicOct 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

The parentheses around the second element do nothing; are they necessary for something?

thoo force-pushed thelinestyles branch fromfa17a9f to0d5e223Compare

October 26, 2018 05:37

Copy link

ContributorAuthor

thoo commentedOct 26, 2018

@QuLogic Done. Thanks.

jklymak added the Documentation label

Oct 26, 2018

Copy link

Member

jklymak commentedOct 26, 2018

@thoo, this needs to pass CI obviously...

Copy link

ContributorAuthor

thoo commentedOct 27, 2018

@jklymak All tests are passed except Azure which I needazure-pipelines.yml'.

timhoffm previously requested changes

Oct 28, 2018

View reviewed changes

examples/lines_bars_and_markers/linestyles.py Outdated



		plt.figure(figsize=(10, 6))
		ax = plt.subplot(1, 1, 1)
		def simple_plot(ax, linestyles):

Copy link

Member

timhoffmOct 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Suggested change

	defsimple_plot(ax,linestyles):
	defplot_linestyles(ax,linestyles):

examples/lines_bars_and_markers/linestyles.py Outdated

		ax.annotate(str(linestyle), xy=(0.0, i), xycoords=reference_transform,
		xytext=(-6, -12), textcoords='offset points', color="blue",
		fontsize=8, ha="right", family="monospace")
		fig, ax = plt.subplots(2, 1, gridspec_kw={'height_ratios': [1, 2]},

Copy link

Member

timhoffmOct 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Either usefig, axs = orfig, (ax1, ax2) =.ax is canonically used for a single Axes only.

examples/lines_bars_and_markers/linestyles.py

		('dashdotdotted', (0, (3, 5, 1, 5, 1, 5))),
		('densely dashdotdotted', (0, (3, 1, 1, 1, 1, 1)))])
		('loosely dashdotdotted', (0, (3, 10, 1, 10, 1, 10))),

Copy link

Member

timhoffmOct 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I would keep the order loosely, normal, densely.

examples/lines_bars_and_markers/linestyles.py Outdated

		for i, (name, linestyle) in enumerate(linestyles):
		ax.annotate(repr(linestyle), xy=(0.0, i), xycoords=reference_transform,
		xytext=(-6, -12), textcoords='offset points', color="blue",
		fontsize=8, ha="right", family="monospace")

		X, Y = np.linspace(0, 100, 10), np.zeros(10)

Copy link

Member

timhoffmOct 28, 2018•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Move X, Y into the plot function.

examples/lines_bars_and_markers/linestyles.py Outdated

		@@ -3,50 +3,65 @@
		Linestyles
		==========

		This examples showcases different linestyles copying those of Tikz/PGF.
		Linestyle can be provided as simple as solid , dotted, dashed

Copy link

Member

timhoffmOct 28, 2018•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Simple linestyles can be defined using the strings "solid", "dotted", "dashed"or "dashdot". More refined control can be achieved by providing a dash tuple``(offset, (on_off_seq))``. For example, ``(0, (3, 10, 1, 15))`` means(3pt line, 10pt space, 1pt line, 15pt space) with no offset. See also`.Line2D.set_linestyle`.

Copy link

Member

QuLogicOct 28, 2018•
edited by timhoffm
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

~~If you are going to change this line, please remove the dashes between 'pt' and 'line'/'space'; they are not technically required.~~

@QuLogic thanks. Incorporated in the proposal above.

thoo added9 commits

October 29, 2018 16:30

combine two examples into one

0880c16

Made changes as recommended

236eb23

Split into two subplots

bcc63a4

remove OrderedDict

adb9733

remove blank lines

01792dc

Fix typo and remove ()

310c722

Fix typo

efebe76

Fix Sphinx error

318ff59

changes as recommended

d2e6e92

thoo force-pushed thelinestyles branch from17600e6 tod2e6e92Compare

October 29, 2018 20:30

timhoffm dismissed theirstale review

October 29, 2018 20:50

Comments handled.

timhoffm approved these changes

Oct 29, 2018

View reviewed changes

Copy link

Member

timhoffm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Anyone can merge after CI pass.

timhoffm merged commit9fa3e60 intomatplotlib:master

Oct 30, 2018

QuLogic added this to thev3.1 milestone

Oct 30, 2018

thoo added a commit to thoo/matplotlib that referenced this pull request

Nov 3, 2018

Merge branch 'master' ofhttps://github.com/matplotlib/matplotlib

ee90452

* 'master' ofhttps://github.com/matplotlib/matplotlib: (50 commits)  Set up CI with Azure Pipelines (matplotlib#12617)  Added comment for test.  Correctly remove nans when drawing paths with pycairo.  Improve docs on Axes limits and direction  Extend sphinx Makefile to cleanup completely  Remove explicit figure number  Update contributing.rst  Update contributing.rst  DOC: Add badge and link to making PR tutorial  Added test cases for scatter plot: 1) empty data/color, 2) pandas.Series with non-0 starting index.  TST: mark test_constrainedlayout.py::test_colorbar_location as flaky (matplotlib#12683)  Remove deprecation warnings in tests (matplotlib#12686)  Make ticks in demo_axes_rgb.py visible  Change ipython block to code-block  Improve linestyles example (matplotlib#12586)  document-textpath  Fix index out of bound error for testing first element of iterable.  TST: test that get_ticks works  FIX: fix error in colorbar.get_ticks not having valid data  Replaced warnings.warn with either logging.warnings or cbook._warn_external  ...

timhoffm mentioned this pull request

Oct 11, 2024

DOC: correct linestyle example and reference rcParams#28971

Merged

1 task

Labels

Documentation

5 participants

Movatterモバイル変換

Uh oh!

Improve linestyles example#12586

Improve linestyles example#12586

Uh oh!

Conversation

thoo commentedOct 21, 2018

PR Summary

What had done:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

story645 commentedOct 22, 2018

Uh oh!

thoo commentedOct 25, 2018• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thoo commentedOct 26, 2018

Uh oh!

jklymak commentedOct 26, 2018

Uh oh!

thoo commentedOct 27, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

timhoffmOct 28, 2018• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

timhoffmOct 28, 2018• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

QuLogicOct 28, 2018• edited by timhoffmLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

timhoffm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

thoo commentedOct 25, 2018•
edited
Loading

timhoffmOct 28, 2018•
edited
Loading

timhoffmOct 28, 2018•
edited
Loading

QuLogicOct 28, 2018•
edited by timhoffm
Loading