Commit 387e6843561dc9f5eb9bb17b2e85c82851d35288
1 parent
0570a05c
Fixed drawing
Showing
2 changed files
with
90 additions
and
90 deletions
07-tapered_bullet/bullet.png
07-tapered_bullet/bullet.svg
... | ... | @@ -22,13 +22,58 @@ |
22 | 22 | <defs |
23 | 23 | id="defs2"> |
24 | 24 | <marker |
25 | + inkscape:isstock="true" | |
26 | + style="overflow:visible;" | |
27 | + id="marker1570" | |
28 | + refX="0.0" | |
29 | + refY="0.0" | |
30 | + orient="auto" | |
31 | + inkscape:stockid="Arrow1Mend"> | |
32 | + <path | |
33 | + transform="scale(0.4) rotate(180) translate(10,0)" | |
34 | + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" | |
35 | + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
36 | + id="path1568" /> | |
37 | + </marker> | |
38 | + <marker | |
39 | + inkscape:stockid="Arrow1Mend" | |
40 | + orient="auto" | |
41 | + refY="0.0" | |
42 | + refX="0.0" | |
43 | + id="marker1338" | |
44 | + style="overflow:visible;" | |
45 | + inkscape:isstock="true" | |
46 | + inkscape:collect="always"> | |
47 | + <path | |
48 | + id="path1336" | |
49 | + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
50 | + style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1" | |
51 | + transform="scale(0.4) rotate(180) translate(10,0)" /> | |
52 | + </marker> | |
53 | + <marker | |
54 | + inkscape:isstock="true" | |
55 | + style="overflow:visible;" | |
56 | + id="marker1106" | |
57 | + refX="0.0" | |
58 | + refY="0.0" | |
59 | + orient="auto" | |
60 | + inkscape:stockid="Arrow1Mend" | |
61 | + inkscape:collect="always"> | |
62 | + <path | |
63 | + transform="scale(0.4) rotate(180) translate(10,0)" | |
64 | + style="fill-rule:evenodd;stroke:#0000ff;stroke-width:1pt;stroke-opacity:1;fill:#0000ff;fill-opacity:1" | |
65 | + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
66 | + id="path1104" /> | |
67 | + </marker> | |
68 | + <marker | |
25 | 69 | inkscape:stockid="Arrow1Mend" |
26 | 70 | orient="auto" |
27 | 71 | refY="0.0" |
28 | 72 | refX="0.0" |
29 | 73 | id="marker13182" |
30 | 74 | style="overflow:visible;" |
31 | - inkscape:isstock="true"> | |
75 | + inkscape:isstock="true" | |
76 | + inkscape:collect="always"> | |
32 | 77 | <path |
33 | 78 | id="path13180" |
34 | 79 | d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " |
... | ... | @@ -80,36 +125,6 @@ |
80 | 125 | transform="scale(0.4) translate(10,0)" /> |
81 | 126 | </marker> |
82 | 127 | <marker |
83 | - inkscape:isstock="true" | |
84 | - style="overflow:visible" | |
85 | - id="marker5567" | |
86 | - refX="0.0" | |
87 | - refY="0.0" | |
88 | - orient="auto" | |
89 | - inkscape:stockid="Arrow1Mstart" | |
90 | - inkscape:collect="always"> | |
91 | - <path | |
92 | - transform="scale(0.4) translate(10,0)" | |
93 | - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" | |
94 | - d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
95 | - id="path5565" /> | |
96 | - </marker> | |
97 | - <marker | |
98 | - inkscape:stockid="Arrow1Mstart" | |
99 | - orient="auto" | |
100 | - refY="0.0" | |
101 | - refX="0.0" | |
102 | - id="marker5491" | |
103 | - style="overflow:visible" | |
104 | - inkscape:isstock="true" | |
105 | - inkscape:collect="always"> | |
106 | - <path | |
107 | - id="path5489" | |
108 | - d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
109 | - style="fill-rule:evenodd;stroke:#ff0000;stroke-width:1pt;stroke-opacity:1;fill:#ff0000;fill-opacity:1" | |
110 | - transform="scale(0.4) translate(10,0)" /> | |
111 | - </marker> | |
112 | - <marker | |
113 | 128 | inkscape:stockid="Arrow1Mstart" |
114 | 129 | orient="auto" |
115 | 130 | refY="0.0" |
... | ... | @@ -171,22 +186,6 @@ |
171 | 186 | orient="auto" |
172 | 187 | refY="0" |
173 | 188 | refX="0" |
174 | - id="marker5491-1" | |
175 | - style="overflow:visible" | |
176 | - inkscape:isstock="true" | |
177 | - inkscape:collect="always"> | |
178 | - <path | |
179 | - inkscape:connector-curvature="0" | |
180 | - id="path5489-9" | |
181 | - d="M 0,0 5,-5 -12.5,0 5,5 Z" | |
182 | - style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:1.00000003pt;stroke-opacity:1" | |
183 | - transform="matrix(0.4,0,0,0.4,4,0)" /> | |
184 | - </marker> | |
185 | - <marker | |
186 | - inkscape:stockid="Arrow1Mstart" | |
187 | - orient="auto" | |
188 | - refY="0" | |
189 | - refX="0" | |
190 | 189 | id="marker5491-1-7" |
191 | 190 | style="overflow:visible" |
192 | 191 | inkscape:isstock="true" |
... | ... | @@ -254,9 +253,9 @@ |
254 | 253 | borderopacity="1.0" |
255 | 254 | inkscape:pageopacity="1" |
256 | 255 | inkscape:pageshadow="2" |
257 | - inkscape:zoom="7.5388057" | |
258 | - inkscape:cx="224.21259" | |
259 | - inkscape:cy="554.85378" | |
256 | + inkscape:zoom="7.9890124" | |
257 | + inkscape:cx="230.28834" | |
258 | + inkscape:cy="557.40778" | |
260 | 259 | inkscape:document-units="mm" |
261 | 260 | inkscape:current-layer="layer1" |
262 | 261 | showgrid="true" |
... | ... | @@ -264,7 +263,8 @@ |
264 | 263 | inkscape:window-height="1007" |
265 | 264 | inkscape:window-x="0" |
266 | 265 | inkscape:window-y="0" |
267 | - inkscape:window-maximized="1"> | |
266 | + inkscape:window-maximized="1" | |
267 | + inkscape:snap-grids="true"> | |
268 | 268 | <inkscape:grid |
269 | 269 | type="xygrid" |
270 | 270 | id="grid815" /> |
... | ... | @@ -316,100 +316,100 @@ |
316 | 316 | <text |
317 | 317 | xml:space="preserve" |
318 | 318 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
319 | - x="67.414375" | |
320 | - y="156.84631" | |
319 | + x="68.739113" | |
320 | + y="157.47557" | |
321 | 321 | id="text12334-6" |
322 | 322 | inkscape:export-filename="/home/gwj/taper.png" |
323 | 323 | inkscape:export-xdpi="644.96997" |
324 | 324 | inkscape:export-ydpi="644.96997"><tspan |
325 | 325 | sodipodi:role="line" |
326 | - x="67.414375" | |
327 | - y="156.84631" | |
326 | + x="68.739113" | |
327 | + y="157.47557" | |
328 | 328 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332" |
329 | 329 | id="tspan12362">(dx_p,dy_p)</tspan></text> |
330 | 330 | <text |
331 | 331 | xml:space="preserve" |
332 | 332 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
333 | - x="67.372391" | |
334 | - y="152.27312" | |
333 | + x="68.697128" | |
334 | + y="152.80301" | |
335 | 335 | id="text12334-1" |
336 | 336 | inkscape:export-filename="/home/gwj/taper.png" |
337 | 337 | inkscape:export-xdpi="644.96997" |
338 | 338 | inkscape:export-ydpi="644.96997"><tspan |
339 | 339 | sodipodi:role="line" |
340 | 340 | id="tspan12332-2" |
341 | - x="67.372391" | |
342 | - y="152.27312" | |
341 | + x="68.697128" | |
342 | + y="152.80301" | |
343 | 343 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">(dx_p_s,dy_p_s)</tspan></text> |
344 | 344 | <text |
345 | 345 | xml:space="preserve" |
346 | 346 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
347 | - x="67.596024" | |
348 | - y="147.73073" | |
347 | + x="68.655815" | |
348 | + y="148.29375" | |
349 | 349 | id="text12334-7" |
350 | 350 | inkscape:export-filename="/home/gwj/taper.png" |
351 | 351 | inkscape:export-xdpi="644.96997" |
352 | 352 | inkscape:export-ydpi="644.96997"><tspan |
353 | 353 | sodipodi:role="line" |
354 | 354 | id="tspan12332-0" |
355 | - x="67.596024" | |
356 | - y="147.73073" | |
355 | + x="68.655815" | |
356 | + y="148.29375" | |
357 | 357 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">(dx_p_s_t,dy_p_s_t)</tspan></text> |
358 | 358 | <text |
359 | 359 | xml:space="preserve" |
360 | 360 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
361 | - x="52.053471" | |
362 | - y="138.93329" | |
361 | + x="63.148136" | |
362 | + y="144.46407" | |
363 | 363 | id="text12334-3" |
364 | 364 | inkscape:export-filename="/home/gwj/taper.png" |
365 | 365 | inkscape:export-xdpi="644.96997" |
366 | 366 | inkscape:export-ydpi="644.96997"><tspan |
367 | 367 | sodipodi:role="line" |
368 | 368 | id="tspan12332-4" |
369 | - x="52.053471" | |
370 | - y="138.93329" | |
369 | + x="63.148136" | |
370 | + y="144.46407" | |
371 | 371 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">(x1_c,y1_c)</tspan></text> |
372 | 372 | <text |
373 | 373 | xml:space="preserve" |
374 | 374 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
375 | - x="62.658905" | |
376 | - y="144.05524" | |
375 | + x="48.384872" | |
376 | + y="139.08748" | |
377 | 377 | id="text12334-53" |
378 | 378 | inkscape:export-filename="/home/gwj/taper.png" |
379 | 379 | inkscape:export-xdpi="644.96997" |
380 | 380 | inkscape:export-ydpi="644.96997"><tspan |
381 | 381 | sodipodi:role="line" |
382 | 382 | id="tspan12332-76" |
383 | - x="62.658905" | |
384 | - y="144.05524" | |
383 | + x="48.384872" | |
384 | + y="139.08748" | |
385 | 385 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">(x2_c,y2_c)</tspan></text> |
386 | 386 | <text |
387 | 387 | xml:space="preserve" |
388 | 388 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
389 | - x="42.657246" | |
390 | - y="148.91151" | |
389 | + x="55.507187" | |
390 | + y="158.28401" | |
391 | 391 | id="text12334-0" |
392 | 392 | inkscape:export-filename="/home/gwj/taper.png" |
393 | 393 | inkscape:export-xdpi="644.96997" |
394 | 394 | inkscape:export-ydpi="644.96997"><tspan |
395 | 395 | sodipodi:role="line" |
396 | 396 | id="tspan12332-06" |
397 | - x="42.657246" | |
398 | - y="148.91151" | |
397 | + x="55.507187" | |
398 | + y="158.28401" | |
399 | 399 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">(x3_c,y3_c)</tspan></text> |
400 | 400 | <text |
401 | 401 | xml:space="preserve" |
402 | 402 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" |
403 | - x="54.816544" | |
404 | - y="158.13651" | |
403 | + x="42.032841" | |
404 | + y="148.79712" | |
405 | 405 | id="text12334-31" |
406 | 406 | inkscape:export-filename="/home/gwj/taper.png" |
407 | 407 | inkscape:export-xdpi="644.96997" |
408 | 408 | inkscape:export-ydpi="644.96997"><tspan |
409 | 409 | sodipodi:role="line" |
410 | 410 | id="tspan12332-00" |
411 | - x="54.816544" | |
412 | - y="158.13651" | |
411 | + x="42.032841" | |
412 | + y="148.79712" | |
413 | 413 | style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.23472226px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">(x4_c,y4_c)</tspan></text> |
414 | 414 | <path |
415 | 415 | style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" |
... | ... | @@ -467,12 +467,6 @@ |
467 | 467 | <path |
468 | 468 | sodipodi:nodetypes="cc" |
469 | 469 | inkscape:connector-curvature="0" |
470 | - id="path4714" | |
471 | - d="M 47.625,158.09375 58.208333,144.86458" | |
472 | - style="fill:none;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.3, 0.1;stroke-dashoffset:0;stroke-opacity:1" /> | |
473 | - <path | |
474 | - sodipodi:nodetypes="cc" | |
475 | - inkscape:connector-curvature="0" | |
476 | 470 | id="path817" |
477 | 471 | d="M 54.239583,158.09375 V 144.86459" |
478 | 472 | style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#marker13182)" /> |
... | ... | @@ -480,20 +474,20 @@ |
480 | 474 | inkscape:connector-curvature="0" |
481 | 475 | id="path819" |
482 | 476 | d="M 76.729166,154.125 H 75.876328 63.5" |
483 | - style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker5567)" | |
477 | + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;marker-start:;marker-end:url(#marker1570)" | |
484 | 478 | sodipodi:nodetypes="ccc" /> |
485 | 479 | <path |
486 | 480 | sodipodi:nodetypes="cc" |
487 | 481 | inkscape:connector-curvature="0" |
488 | 482 | id="path819-8" |
489 | 483 | d="M 70.114583,150.15625 H 63.5" |
490 | - style="fill:none;stroke:#ff0000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker5491)" /> | |
484 | + style="fill:none;stroke:#ff0000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:;marker-end:url(#marker1338)" /> | |
491 | 485 | <path |
492 | - sodipodi:nodetypes="cc" | |
486 | + sodipodi:nodetypes="ccc" | |
493 | 487 | inkscape:connector-curvature="0" |
494 | 488 | id="path819-8-9" |
495 | - d="M 67.46875,146.1875 H 63.5" | |
496 | - style="fill:none;stroke:#0000ff;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker5491-1)" /> | |
489 | + d="m 67.46875,146.1875 -1.187324,0 H 63.5" | |
490 | + style="fill:none;stroke:#0000ff;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:;marker-end:url(#marker1106)" /> | |
497 | 491 | <path |
498 | 492 | sodipodi:nodetypes="cc" |
499 | 493 | inkscape:connector-curvature="0" |
... | ... | @@ -542,6 +536,12 @@ |
542 | 536 | d="m 50.270833,144.86458 h 7.9375" |
543 | 537 | style="fill:none;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.3, 0.1;stroke-dashoffset:0;stroke-opacity:1" |
544 | 538 | sodipodi:nodetypes="cc" /> |
539 | + <path | |
540 | + sodipodi:nodetypes="cc" | |
541 | + inkscape:connector-curvature="0" | |
542 | + id="path4714" | |
543 | + d="M 60.854166,158.09375 50.270833,144.86458" | |
544 | + style="fill:none;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.3, 0.1;stroke-dashoffset:0;stroke-opacity:1" /> | |
545 | 545 | </g> |
546 | 546 | </g> |
547 | 547 | </svg> | ... | ... |