File tree Expand file tree Collapse file tree 10 files changed +33
-6
lines changed
Filter options
Expand file tree Collapse file tree 10 files changed +33
-6
lines changed
Original file line number Diff line number Diff line change @@ -158,7 +158,11 @@ <h1>Toolkits</h1>
158158including a choice of two projection and mapping toolkits < a href ="http://matplotlib.org/basemap "> basemap</ a > and
159159< a href ="http://scitools.org.uk/cartopy/docs/latest "> cartopy</ a > ,
1601603d plotting with < a href ="{{ pathto('mpl_toolkits/mplot3d/index') }} "> mplot3d</ a > ,
161- axes and axis helpers in < a href ="{{ pathto('mpl_toolkits/axes_grid/index') }} "> axes_grid</ a > and more.
161+ axes and axis helpers in < a href ="{{ pathto('mpl_toolkits/axes_grid/index') }} "> axes_grid</ a > ,
162+ several higher-level plotting interfaces
163+ < a href ="http://web.stanford.edu/~mwaskom/software/seaborn "> seaborn</ a > ,
164+ < a href ="http://holoviews.org "> holoviews</ a > ,
165+ < a href ="http://ggplot.yhathq.com "> ggplot</ a > , and more.
162166 </ p >
163167
164168< h1 > Citing matplotlib</ h1 >
Original file line number Diff line number Diff line change @@ -169,8 +169,6 @@ <h3>We're updating the default styles for Matplotlib 2.0</h3>
169169
170170{% block relbar1 %}
171171
172- < link rel ="shortcut icon " href ="/_static/favicon.ico ">
173-
174172<!-- The "Fork me on github" ribbon -->
175173< img style ="float: right; margin-bottom: -40px; top: 0; right: 0; border: 0; " src ="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png " usemap ="#ribbonmap "/>
176174< map name ="ribbonmap ">
Original file line number Diff line number Diff line change 213213# Output file base name for HTML help builder.
214214htmlhelp_basename = 'Matplotlibdoc'
215215
216+ # Path to favicon
217+ html_favicon = '_static/favicon.ico'
216218
217219# Options for LaTeX output
218220# ------------------------
Original file line number Diff line number Diff line change @@ -172,6 +172,26 @@ level interface for drawing statistical graphics with matplotlib. It
172172aims to make visualization a central part of exploring and
173173understanding complex datasets.
174174
175+ .. image :: /_static/seaborn.png
176+ :height: 157px
177+
178+ .. _toolkit_holoviews :
179+
180+ holoviews
181+ =========
182+ (*Not distributed with matplotlib *)
183+
184+ `holoviews <http://holoviews.org >`_ makes it easier to visualize data
185+ interactively, especially in a `Jupyter notebook
186+ <http://jupyter.org> `_, by providing a set of declarative
187+ plotting objects that store your data and associated metadata. Your
188+ data is then immediately visualizable alongside or overlaid with other
189+ data, either statically or with automatically provided widgets for
190+ parameter exploration.
191+
192+ .. image :: /_static/holoviews.png
193+ :height: 354px
194+
175195.. _toolkit_ggplot :
176196
177197ggplot
@@ -181,6 +201,9 @@ ggplot
181201`ggplot <https://github.com/yhat/ggplot >`_ is a port of the R ggplot2
182202to python based on matplotlib.
183203
204+ .. image :: /_static/ggplot.png
205+ :height: 195px
206+
184207
185208.. _toolkit_prettyplotlib :
186209
Original file line number Diff line number Diff line change @@ -497,7 +497,7 @@ def set_linestyle(self, ls):
497497 =========================== =================
498498 ``'-'`` or ``'solid'`` solid line
499499 ``'--'`` or ``'dashed'`` dashed line
500- ``'-.'`` or ``'dash_dot '`` dash-dotted line
500+ ``'-.'`` or ``'dashdot '`` dash-dotted line
501501 ``':'`` or ``'dotted'`` dotted line
502502 =========================== =================
503503
Original file line number Diff line number Diff line change @@ -990,7 +990,7 @@ def set_linestyle(self, ls):
990990 =========================== =================
991991 ``'-'`` or ``'solid'`` solid line
992992 ``'--'`` or ``'dashed'`` dashed line
993- ``'-.'`` or ``'dash_dot '`` dash-dotted line
993+ ``'-.'`` or ``'dashdot '`` dash-dotted line
994994 ``':'`` or ``'dotted'`` dotted line
995995 ``'None'`` draw nothing
996996 ``' '`` draw nothing
Original file line number Diff line number Diff line change @@ -358,7 +358,7 @@ def set_linestyle(self, ls):
358358 =========================== =================
359359 ``'-'`` or ``'solid'`` solid line
360360 ``'--'`` or ``'dashed'`` dashed line
361- ``'-.'`` or ``'dash_dot '`` dash-dotted line
361+ ``'-.'`` or ``'dashdot '`` dash-dotted line
362362 ``':'`` or ``'dotted'`` dotted line
363363 =========================== =================
364364
You can’t perform that action at this time.
0 commit comments