Changeset 592
- Timestamp:
- 07/05/08 20:29:14 (5 months ago)
- Files:
-
- trunk/py/wscompose/markers.py (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/py/wscompose/markers.py
r575 r592 93 93 self.x_padding = int(self.padding / 2) 94 94 self.y_padding = int(self.padding / 2) 95 95 96 96 self.img_width = imgw 97 self.img_height = imgh 98 97 self.img_height = imgh 98 99 99 # ########################################################## 100 100 … … 379 379 380 380 dr.pieslice((x1, y1, x2, y2), 90, 180, fill=fill) 381 # dr.pieslice((x1, y1, x2, y2), 0, 360, outline='white')382 # dr.line(c, fill='white')383 381 384 382 # bottom right - this one has gaps but we don't … … 403 401 404 402 dr.pieslice((x1, y1, x2, y2), 0, 90, fill=fill) 405 # dr.pieslice((x1, y1, x2, y2), 0, 360, outline='white')406 # dr.line(c, fill='white')407 403 408 404 # top right … … 426 422 427 423 dr.pieslice((x1, y1, x2, y2), 270, 0, fill=fill) 428 # dr.pieslice((x1, y1, x2, y2), 0, 360, outline='white')429 # dr.line(c, fill='white')430 424 431 425 if not blurry : … … 520 514 521 515 # add the pinwin 522 523 im.paste(pw, (0, 0), pw) 516 517 # note the offset; required so that the top and left 518 # side outlines of the pinwin don't obscured by the 519 # alpha channel; this also affects the values of dx 520 # and dy in plotting.draw_marker 521 522 im.paste(pw, (1,1), pw) 524 523 525 524 return im … … 531 530 h = pw.size[1] 532 531 w = max(pw.size[0], sh.size[0]) 533 532 534 533 im = Image.new('RGBA', (w, h)) 535 534 dr = ImageDraw.Draw(im) … … 537 536 # add the shadow 538 537 539 im.paste(sh, (0, 0), sh)538 im.paste(sh, (0,0), sh) 540 539 541 540 # add the dot … … 558 557 559 558 # add the pinwin 560 561 im.paste(pw, (0, 0), pw) 559 560 # note the offset; required so that the top and left 561 # side outlines of the pinwin don't obscured by the 562 # alpha channel; this also affects the values of dx 563 # and dy in plotting.draw_marker 564 565 im.paste(pw, (1,1), pw) 562 566 563 567 im.putalpha(al)
