Skip to content

Commit 82c6281

Browse files
dessydessy
committed
Combine and/or remove diagrams
1 parent 8b2287f commit 82c6281

10 files changed

Lines changed: 1195 additions & 69 deletions

‎pedometer/chapter-figures/figure-xyz-normal.png‎

-14.6 KB
Binary file not shown.

‎pedometer/chapter-figures/graffles/input-format-to-standard-format-horizontal.graffle‎

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

‎pedometer/chapter-figures/graffles/input-format-to-standard-format.graffle‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<integer>45</integer>
5959
<key>Points</key>
6060
<array>
61-
<string>{240, 542.5001220703125}</string>
62-
<string>{240.33620705680966, 581.50014066023459}</string>
61+
<string>{240, 528.625244140625}</string>
62+
<string>{240.33620705680966, 567.62526273054709}</string>
6363
</array>
6464
<key>Style</key>
6565
<dict>
@@ -100,8 +100,8 @@
100100
<integer>44</integer>
101101
<key>Points</key>
102102
<array>
103-
<string>{240, 466.87528657913208}</string>
104-
<string>{240.33620705680966, 505.87530516905417}</string>
103+
<string>{240, 453.00040864944458}</string>
104+
<string>{240.33620705680966, 492.00042723936667}</string>
105105
</array>
106106
<key>Style</key>
107107
<dict>
@@ -221,7 +221,7 @@
221221
</dict>
222222
<dict>
223223
<key>Bounds</key>
224-
<string>{{129.5, 505.5001220703125}, {222, 37}}</string>
224+
<string>{{129.5, 491.625244140625}, {222, 37}}</string>
225225
<key>Class</key>
226226
<string>ShapedGraphic</string>
227227
<key>ID</key>
@@ -231,7 +231,7 @@
231231
<key>Text</key>
232232
<dict>
233233
<key>Text</key>
234-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
234+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
235235
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
236236
{\colortbl;\red255\green255\blue255;}
237237
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -251,7 +251,7 @@
251251
<key>Text</key>
252252
<dict>
253253
<key>Text</key>
254-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
254+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
255255
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
256256
{\colortbl;\red255\green255\blue255;}
257257
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -261,7 +261,7 @@
261261
</dict>
262262
<dict>
263263
<key>Bounds</key>
264-
<string>{{232.5, 427.12512898445129}, {16, 22}}</string>
264+
<string>{{232.5, 424.25021362304688}, {16, 22}}</string>
265265
<key>Class</key>
266266
<string>ShapedGraphic</string>
267267
<key>FitText</key>
@@ -295,7 +295,7 @@
295295
<key>Pad</key>
296296
<integer>0</integer>
297297
<key>Text</key>
298-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
298+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
299299
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
300300
{\colortbl;\red255\green255\blue255;}
301301
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -309,7 +309,7 @@
309309
</dict>
310310
<dict>
311311
<key>Bounds</key>
312-
<string>{{201.5, 581.5001220703125}, {78, 22}}</string>
312+
<string>{{201.5, 567.625244140625}, {78, 22}}</string>
313313
<key>Class</key>
314314
<string>ShapedGraphic</string>
315315
<key>FitText</key>
@@ -343,7 +343,7 @@
343343
<key>Pad</key>
344344
<integer>0</integer>
345345
<key>Text</key>
346-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
346+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
347347
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
348348
{\colortbl;\red255\green255\blue255;}
349349
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -389,7 +389,7 @@
389389
<key>Pad</key>
390390
<integer>0</integer>
391391
<key>Text</key>
392-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
392+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
393393
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
394394
{\colortbl;\red255\green255\blue255;}
395395
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -623,7 +623,7 @@
623623
<key>Pad</key>
624624
<integer>0</integer>
625625
<key>Text</key>
626-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
626+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
627627
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
628628
{\colortbl;\red255\green255\blue255;}
629629
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -669,7 +669,7 @@
669669
<key>Pad</key>
670670
<integer>0</integer>
671671
<key>Text</key>
672-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
672+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
673673
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
674674
{\colortbl;\red255\green255\blue255;}
675675
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -717,7 +717,7 @@
717717
<key>Pad</key>
718718
<integer>0</integer>
719719
<key>Text</key>
720-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
720+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
721721
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
722722
{\colortbl;\red255\green255\blue255;}
723723
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -767,7 +767,7 @@ n}</string>
767767
<key>Pad</key>
768768
<integer>0</integer>
769769
<key>Text</key>
770-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
770+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
771771
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
772772
{\colortbl;\red255\green255\blue255;}
773773
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -817,7 +817,7 @@ format\
817817
<key>Pad</key>
818818
<integer>0</integer>
819819
<key>Text</key>
820-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
820+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
821821
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
822822
{\colortbl;\red255\green255\blue255;}
823823
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -843,7 +843,7 @@ format\
843843
<key>Text</key>
844844
<dict>
845845
<key>Text</key>
846-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
846+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
847847
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;}
848848
{\colortbl;\red255\green255\blue255;}
849849
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -899,7 +899,7 @@ format\
899899
<key>MasterSheets</key>
900900
<array/>
901901
<key>ModificationDate</key>
902-
<string>2014-08-21 21:18:03 +0000</string>
902+
<string>2014-09-27 22:05:15 +0000</string>
903903
<key>Modifier</key>
904904
<string>Dessy Daskalov</string>
905905
<key>NotesVisible</key>
@@ -1004,7 +1004,7 @@ format\
10041004
<key>SidebarWidth</key>
10051005
<integer>120</integer>
10061006
<key>VisibleRegion</key>
1007-
<string>{{0, 43}, {575, 635}}</string>
1007+
<string>{{0, 68}, {575, 635}}</string>
10081008
<key>Zoom</key>
10091009
<real>1</real>
10101010
<key>ZoomValues</key>

pedometer/chapter-figures/graffles/figure-xyz-normal.graffle/data.plist renamed to pedometer/chapter-figures/graffles/walk-1.graffle/data.plist

Lines changed: 50 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,45 @@
5151
<integer>8</integer>
5252
<key>GraphicsList</key>
5353
<array>
54+
<dict>
55+
<key>Bounds</key>
56+
<string>{{205, 179}, {349.9238263950399, 216}}</string>
57+
<key>Class</key>
58+
<string>ShapedGraphic</string>
59+
<key>ID</key>
60+
<integer>21</integer>
61+
<key>ImageID</key>
62+
<integer>8</integer>
63+
<key>Shape</key>
64+
<string>Rectangle</string>
65+
<key>Style</key>
66+
<dict>
67+
<key>fill</key>
68+
<dict>
69+
<key>Draws</key>
70+
<string>NO</string>
71+
</dict>
72+
<key>shadow</key>
73+
<dict>
74+
<key>Draws</key>
75+
<string>NO</string>
76+
</dict>
77+
<key>stroke</key>
78+
<dict>
79+
<key>Draws</key>
80+
<string>NO</string>
81+
</dict>
82+
</dict>
83+
</dict>
5484
<dict>
5585
<key>Class</key>
5686
<string>LineGraphic</string>
5787
<key>ID</key>
5888
<integer>12</integer>
5989
<key>Points</key>
6090
<array>
61-
<string>{217, 314}</string>
62-
<string>{291.18749913362223, 240.875}</string>
91+
<string>{101, 311.99999999999983}</string>
92+
<string>{175.18749913362223, 238.87499999999983}</string>
6393
</array>
6494
<key>Style</key>
6595
<dict>
@@ -100,7 +130,7 @@
100130
</dict>
101131
<dict>
102132
<key>Bounds</key>
103-
<string>{{245, 247}, {9, 64}}</string>
133+
<string>{{129, 244.99999999999983}, {9, 64}}</string>
104134
<key>Class</key>
105135
<string>ShapedGraphic</string>
106136
<key>ID</key>
@@ -130,7 +160,7 @@
130160
</dict>
131161
<dict>
132162
<key>Bounds</key>
133-
<string>{{304, 269}, {9, 22}}</string>
163+
<string>{{188, 266.99999999999983}, {9, 22}}</string>
134164
<key>Class</key>
135165
<string>ShapedGraphic</string>
136166
<key>FitText</key>
@@ -164,7 +194,7 @@
164194
<key>Pad</key>
165195
<integer>0</integer>
166196
<key>Text</key>
167-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
197+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
168198
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
169199
{\colortbl;\red255\green255\blue255;}
170200
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -178,7 +208,7 @@
178208
</dict>
179209
<dict>
180210
<key>Bounds</key>
181-
<string>{{244.5, 103.99999999999983}, {9, 31.141274238227169}}</string>
211+
<string>{{143, 135.99999999999932}, {9, 31.141274238227169}}</string>
182212
<key>Class</key>
183213
<string>ShapedGraphic</string>
184214
<key>ID</key>
@@ -208,7 +238,7 @@
208238
<key>Pad</key>
209239
<integer>0</integer>
210240
<key>Text</key>
211-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
241+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
212242
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
213243
{\colortbl;\red255\green255\blue255;}
214244
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -222,7 +252,7 @@
222252
</dict>
223253
<dict>
224254
<key>Bounds</key>
225-
<string>{{205, 303}, {9, 22}}</string>
255+
<string>{{89, 300.99999999999983}, {9, 22}}</string>
226256
<key>Class</key>
227257
<string>ShapedGraphic</string>
228258
<key>FitText</key>
@@ -256,7 +286,7 @@
256286
<key>Pad</key>
257287
<integer>0</integer>
258288
<key>Text</key>
259-
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
289+
<string>{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
260290
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
261291
{\colortbl;\red255\green255\blue255;}
262292
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
@@ -275,8 +305,8 @@
275305
<integer>11</integer>
276306
<key>Points</key>
277307
<array>
278-
<string>{194, 280.75}</string>
279-
<string>{304, 279.25}</string>
308+
<string>{78, 278.74999999999983}</string>
309+
<string>{188, 277.24999999999983}</string>
280310
</array>
281311
<key>Rotation</key>
282312
<real>90</real>
@@ -319,8 +349,8 @@
319349
<integer>9</integer>
320350
<key>Points</key>
321351
<array>
322-
<string>{247.5, 359.49999999999989}</string>
323-
<string>{248, 137.97229916897487}</string>
352+
<string>{131.5, 357.49999999999972}</string>
353+
<string>{133, 148}</string>
324354
</array>
325355
<key>Style</key>
326356
<dict>
@@ -356,7 +386,7 @@
356386
</dict>
357387
<dict>
358388
<key>Bounds</key>
359-
<string>{{132, 164}, {170, 300}}</string>
389+
<string>{{16, 161.99999999999983}, {170, 300}}</string>
360390
<key>Class</key>
361391
<string>ShapedGraphic</string>
362392
<key>ID</key>
@@ -394,14 +424,16 @@
394424
<key>HPages</key>
395425
<integer>1</integer>
396426
<key>ImageCounter</key>
397-
<integer>7</integer>
427+
<integer>9</integer>
398428
<key>ImageLinkBack</key>
399429
<array>
400430
<dict/>
401431
<dict/>
432+
<dict/>
402433
</array>
403434
<key>ImageList</key>
404435
<array>
436+
<string>image8.tiff</string>
405437
<string>image6.tiff</string>
406438
<string>image5.tiff</string>
407439
</array>
@@ -442,7 +474,7 @@
442474
<key>MasterSheets</key>
443475
<array/>
444476
<key>ModificationDate</key>
445-
<string>2014-08-31 05:21:42 +0000</string>
477+
<string>2014-09-27 21:30:25 +0000</string>
446478
<key>Modifier</key>
447479
<string>Dessy Daskalov</string>
448480
<key>NotesVisible</key>
@@ -533,7 +565,7 @@
533565
</dict>
534566
</array>
535567
<key>Frame</key>
536-
<string>{{167, 4}, {710, 774}}</string>
568+
<string>{{44, 4}, {905, 774}}</string>
537569
<key>ListView</key>
538570
<true/>
539571
<key>OutlineWidth</key>
@@ -547,7 +579,7 @@
547579
<key>SidebarWidth</key>
548580
<integer>120</integer>
549581
<key>VisibleRegion</key>
550-
<string>{{0, 58}, {575, 635}}</string>
582+
<string>{{-97, 0}, {770, 635}}</string>
551583
<key>Zoom</key>
552584
<real>1</real>
553585
<key>ZoomValues</key>

pedometer/chapter-figures/graffles/figure-xyz-normal.graffle/image5.tiff renamed to pedometer/chapter-figures/graffles/walk-1.graffle/image5.tiff

File renamed without changes.

pedometer/chapter-figures/graffles/figure-xyz-normal.graffle/image6.tiff renamed to pedometer/chapter-figures/graffles/walk-1.graffle/image6.tiff

File renamed without changes.

‎pedometer/chapter-figures/graffles/walk-1.graffle/image8.tiff‎

149 KB
Binary file not shown.

‎pedometer/chapter-figures/input-format-to-standard-format.png‎

8.94 KB
Loading

‎pedometer/chapter-figures/walk-1.png‎

39.9 KB
Loading

0 commit comments

Comments
 (0)