Skip to content

Commit c34c1a6

Browse files
WeatherGodWeatherGod
committed
Merge pull request #8 from joferkington/split_part1
Split Part 1 into two separate notebooks
2 parents ac03425 + 01d7202 commit c34c1a6

22 files changed

+665
-536
lines changed

‎AnatomyOfMatplotlib-Part1-Figures_Subplots_and_layouts.ipynb‎

Lines changed: 0 additions & 487 deletions
Large diffs are not rendered by default.

‎AnatomyOfMatplotlib-Part2-Limits_Legends_and_Layouts.ipynb‎

Lines changed: 554 additions & 0 deletions
Large diffs are not rendered by default.

AnatomyOfMatplotlib-Part2-HowToSpeakMPL.ipynb renamed to AnatomyOfMatplotlib-Part3-HowToSpeakMPL.ipynb

Lines changed: 64 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
{
22
"metadata": {
3-
"name": "",
4-
"signature": "sha256:fd78007a40ee7741b1dcfaa7d2433f856d967b938376774e12322eeccaf2f9ec"
3+
"kernelspec": {
4+
"display_name": "Python 2",
5+
"language": "python",
6+
"name": "python2"
7+
},
8+
"language_info": {
9+
"codemirror_mode": {
10+
"name": "ipython",
11+
"version": 2
12+
},
13+
"file_extension": ".py",
14+
"mimetype": "text/x-python",
15+
"name": "python",
16+
"nbconvert_exporter": "python",
17+
"pygments_lexer": "ipython2",
18+
"version": "2.7.10"
19+
},
20+
"name": ""
521
},
622
"nbformat": 3,
723
"nbformat_minor": 0,
@@ -15,13 +31,15 @@
1531
"# Let printing work the same in Python 2 and 3\n",
1632
"from __future__ import print_function\n",
1733
"# Turning on inline plots -- just for use in ipython notebooks.\n",
18-
"%matplotlib inline\n",
34+
"import matplotlib\n",
35+
"matplotlib.use('nbagg')\n",
1936
"import numpy as np\n",
2037
"import matplotlib.pyplot as plt"
2138
],
2239
"language": "python",
2340
"metadata": {},
24-
"outputs": []
41+
"outputs": [],
42+
"prompt_number": null
2543
},
2644
{
2745
"cell_type": "markdown",
@@ -69,19 +87,20 @@
6987
"cell_type": "markdown",
7088
"metadata": {},
7189
"source": [
72-
"## Exercise 2.1\n",
90+
"## Exercise 3.1\n",
7391
"Try out some different string representations of colors (you can't do RGB[A] tuples here)."
7492
]
7593
},
7694
{
7795
"cell_type": "code",
7896
"collapsed": false,
7997
"input": [
80-
"%load exercises/2.1-colors.py"
98+
"%load exercises/3.1-colors.py"
8199
],
82100
"language": "python",
83101
"metadata": {},
84-
"outputs": []
102+
"outputs": [],
103+
"prompt_number": null
85104
},
86105
{
87106
"cell_type": "markdown",
@@ -124,25 +143,27 @@
124143
],
125144
"language": "python",
126145
"metadata": {},
127-
"outputs": []
146+
"outputs": [],
147+
"prompt_number": null
128148
},
129149
{
130150
"cell_type": "markdown",
131151
"metadata": {},
132152
"source": [
133-
"## Exercise 2.2\n",
153+
"## Exercise 3.2\n",
134154
"Try out some different markers and colors"
135155
]
136156
},
137157
{
138158
"cell_type": "code",
139159
"collapsed": false,
140160
"input": [
141-
"%load exercises/2.2-markers.py"
161+
"%load exercises/3.2-markers.py"
142162
],
143163
"language": "python",
144164
"metadata": {},
145-
"outputs": []
165+
"outputs": [],
166+
"prompt_number": null
146167
},
147168
{
148169
"cell_type": "markdown",
@@ -174,7 +195,8 @@
174195
],
175196
"language": "python",
176197
"metadata": {},
177-
"outputs": []
198+
"outputs": [],
199+
"prompt_number": null
178200
},
179201
{
180202
"cell_type": "markdown",
@@ -193,7 +215,8 @@
193215
],
194216
"language": "python",
195217
"metadata": {},
196-
"outputs": []
218+
"outputs": [],
219+
"prompt_number": null
197220
},
198221
{
199222
"cell_type": "markdown",
@@ -214,7 +237,8 @@
214237
],
215238
"language": "python",
216239
"metadata": {},
217-
"outputs": []
240+
"outputs": [],
241+
"prompt_number": null
218242
},
219243
{
220244
"cell_type": "markdown",
@@ -246,19 +270,20 @@
246270
"|visible | [`True` `False`]\n",
247271
"|zorder | any number\n",
248272
"\n",
249-
"## Exercise 2.3\n",
273+
"## Exercise 3.3\n",
250274
"Make a plot that has a dotted red line, with large yellow diamond markers that have a green edge"
251275
]
252276
},
253277
{
254278
"cell_type": "code",
255279
"collapsed": false,
256280
"input": [
257-
"%load exercises/2.3-properties.py"
281+
"%load exercises/3.3-properties.py"
258282
],
259283
"language": "python",
260284
"metadata": {},
261-
"outputs": []
285+
"outputs": [],
286+
"prompt_number": null
262287
},
263288
{
264289
"cell_type": "markdown",
@@ -280,7 +305,8 @@
280305
],
281306
"language": "python",
282307
"metadata": {},
283-
"outputs": []
308+
"outputs": [],
309+
"prompt_number": null
284310
},
285311
{
286312
"cell_type": "code",
@@ -368,7 +394,8 @@
368394
],
369395
"language": "python",
370396
"metadata": {},
371-
"outputs": []
397+
"outputs": [],
398+
"prompt_number": null
372399
},
373400
{
374401
"cell_type": "markdown",
@@ -389,7 +416,8 @@
389416
],
390417
"language": "python",
391418
"metadata": {},
392-
"outputs": []
419+
"outputs": [],
420+
"prompt_number": null
393421
},
394422
{
395423
"cell_type": "markdown",
@@ -409,7 +437,8 @@
409437
],
410438
"language": "python",
411439
"metadata": {},
412-
"outputs": []
440+
"outputs": [],
441+
"prompt_number": null
413442
},
414443
{
415444
"cell_type": "markdown",
@@ -435,7 +464,8 @@
435464
],
436465
"language": "python",
437466
"metadata": {},
438-
"outputs": []
467+
"outputs": [],
468+
"prompt_number": null
439469
},
440470
{
441471
"cell_type": "markdown",
@@ -492,25 +522,27 @@
492522
],
493523
"language": "python",
494524
"metadata": {},
495-
"outputs": []
525+
"outputs": [],
526+
"prompt_number": null
496527
},
497528
{
498529
"cell_type": "markdown",
499530
"metadata": {},
500531
"source": [
501-
"## Exercise 2.4\n",
532+
"## Exercise 3.4\n",
502533
"Point out a local minimum with a fancy red arrow."
503534
]
504535
},
505536
{
506537
"cell_type": "code",
507538
"collapsed": false,
508539
"input": [
509-
"%load exercises/2.4-arrows.py"
540+
"%load exercises/3.4-arrows.py"
510541
],
511542
"language": "python",
512543
"metadata": {},
513-
"outputs": []
544+
"outputs": [],
545+
"prompt_number": null
514546
},
515547
{
516548
"cell_type": "markdown",
@@ -545,7 +577,8 @@
545577
],
546578
"language": "python",
547579
"metadata": {},
548-
"outputs": []
580+
"outputs": [],
581+
"prompt_number": null
549582
},
550583
{
551584
"cell_type": "markdown",
@@ -580,7 +613,8 @@
580613
],
581614
"language": "python",
582615
"metadata": {},
583-
"outputs": []
616+
"outputs": [],
617+
"prompt_number": null
584618
},
585619
{
586620
"cell_type": "markdown",
@@ -609,7 +643,8 @@
609643
],
610644
"language": "python",
611645
"metadata": {},
612-
"outputs": []
646+
"outputs": [],
647+
"prompt_number": null
613648
},
614649
{
615650
"cell_type": "markdown",

AnatomyOfMatplotlib-Part3-Artists.ipynb renamed to AnatomyOfMatplotlib-Part4-Artists.ipynb

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
{
22
"metadata": {
3-
"name": "",
4-
"signature": "sha256:0ed463ce3e3c15589941f95292232da728af5c8fd4698e2ece99a953d2619171"
3+
"kernelspec": {
4+
"display_name": "Python 2",
5+
"language": "python",
6+
"name": "python2"
7+
},
8+
"language_info": {
9+
"codemirror_mode": {
10+
"name": "ipython",
11+
"version": 2
12+
},
13+
"file_extension": ".py",
14+
"mimetype": "text/x-python",
15+
"name": "python",
16+
"nbconvert_exporter": "python",
17+
"pygments_lexer": "ipython2",
18+
"version": "2.7.10"
19+
},
20+
"name": ""
521
},
622
"nbformat": 3,
723
"nbformat_minor": 0,
@@ -15,13 +31,15 @@
1531
"# Let printing work the same in Python 2 and 3\n",
1632
"from __future__ import print_function\n",
1733
"# Turning on inline plots -- just for use in ipython notebooks.\n",
18-
"%matplotlib inline\n",
34+
"import matplotlib\n",
35+
"matplotlib.use('nbagg')\n",
1936
"import numpy as np\n",
2037
"import matplotlib.pyplot as plt"
2138
],
2239
"language": "python",
2340
"metadata": {},
24-
"outputs": []
41+
"outputs": [],
42+
"prompt_number": null
2543
},
2644
{
2745
"cell_type": "markdown",
@@ -136,7 +154,8 @@
136154
],
137155
"language": "python",
138156
"metadata": {},
139-
"outputs": []
157+
"outputs": [],
158+
"prompt_number": null
140159
},
141160
{
142161
"cell_type": "markdown",
@@ -159,7 +178,8 @@
159178
],
160179
"language": "python",
161180
"metadata": {},
162-
"outputs": []
181+
"outputs": [],
182+
"prompt_number": null
163183
},
164184
{
165185
"cell_type": "markdown",
@@ -177,7 +197,8 @@
177197
],
178198
"language": "python",
179199
"metadata": {},
180-
"outputs": []
200+
"outputs": [],
201+
"prompt_number": null
181202
},
182203
{
183204
"cell_type": "markdown",
@@ -205,7 +226,8 @@
205226
],
206227
"language": "python",
207228
"metadata": {},
208-
"outputs": []
229+
"outputs": [],
230+
"prompt_number": null
209231
},
210232
{
211233
"cell_type": "code",
@@ -225,7 +247,8 @@
225247
],
226248
"language": "python",
227249
"metadata": {},
228-
"outputs": []
250+
"outputs": [],
251+
"prompt_number": null
229252
},
230253
{
231254
"cell_type": "markdown",
@@ -253,13 +276,14 @@
253276
],
254277
"language": "python",
255278
"metadata": {},
256-
"outputs": []
279+
"outputs": [],
280+
"prompt_number": null
257281
},
258282
{
259283
"cell_type": "markdown",
260284
"metadata": {},
261285
"source": [
262-
"## Exercise 3.1\n",
286+
"## Exercise 4.1\n",
263287
"Give yourselves 4 gold stars!\n",
264288
"\n",
265289
"Hint: [StarPolygonCollection](http://matplotlib.org/api/collections_api.html#matplotlib.collections.StarPolygonCollection)"
@@ -269,11 +293,12 @@
269293
"cell_type": "code",
270294
"collapsed": false,
271295
"input": [
272-
"%load exercises/3.1-goldstar.py"
296+
"%load exercises/4.1-goldstar.py"
273297
],
274298
"language": "python",
275299
"metadata": {},
276-
"outputs": []
300+
"outputs": [],
301+
"prompt_number": null
277302
}
278303
],
279304
"metadata": {}

AnatomyOfMatplotlib-Part4-mpl_toolkits.ipynb renamed to AnatomyOfMatplotlib-Part5-mpl_toolkits.ipynb

File renamed without changes.

0 commit comments

Comments
 (0)