boomslang: pyntnclick/tools/rect

annotate pyntnclick/tools/rect_drawer.py @ 708:9b6d68ba627e pyntnclick

Partially hook up file chooser code

author	Neil Muller <neil@dip.sun.ac.za>
date	Sat, 04 Aug 2012 22:30:44 +0200
parents	cbf6d4573785
children	f33dd2093f77

rev	line source
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	1 # Quickly hacked together helper for working out
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	2 # interactive regions in Suspended Sentence
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	3
636 2748d3afcae5 Excise albow. Really. Stefano Rivera <stefano@rivera.za.net> parents: 589 diff changeset	4 Image = object
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	5
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	6 from pygame.locals import (K_LEFT, K_RIGHT, K_UP, K_DOWN,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	7 K_a, K_t, K_d, K_i, K_r, K_o, K_b, K_z,
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	8 BLEND_RGBA_MIN, SRCALPHA, QUIT,
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	9 MOUSEBUTTONDOWN, MOUSEMOTION,
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	10 MOUSEBUTTONUP, KEYDOWN)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	11 import pygame
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	12
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	13 import pyntnclick.constants
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	14 from pyntnclick.widgets.text import LabelWidget, TextButton
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	15 from pyntnclick.widgets.base import Container, Button
708 9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	16 from pyntnclick.widgets.filechooser import FileChooser
690 4a933444c99b The return of the rects to the rect drawer Neil Muller <neil@dip.sun.ac.za> parents: 689 diff changeset	17 from pyntnclick.tools.utils import draw_rect_image
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	18
a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	19
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	20 class RectDrawerError(Exception):
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	21 """Raised when initilaization failed"""
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	22
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	23
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	24 class RectDrawerConstants(pyntnclick.constants.GameConstants):
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	25 debug = True
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	26 menu_width = 200
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	27 menu_button_height = 25
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	28 zoom = 4
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	29 zoom_step = 100
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	30
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	31 constants = RectDrawerConstants()
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	32
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	33
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	34 class ColourButton(Button):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	35 """Button for selecting a colour"""
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	36
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	37 sel_colour = pygame.color.Color(255, 255, 255)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	38 unsel_colour = pygame.color.Color(128, 128, 128)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	39
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	40 padding = 2
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	41 border = 3
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	42
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	43 def __init__(self, rect, gd, colour, palette):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	44 super(ColourButton, self).__init__(rect, gd)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	45 self._colour = pygame.color.Color(colour)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	46 self._button_rect = self.rect.inflate(-self.padding, -self.padding)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	47 self._colour_rect = self._button_rect.inflate(-self.border,
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	48 -self.border)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	49 self.selected = False
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	50 self._palette = palette
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	51 self.add_callback('clicked', self.fix_selection)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	52
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	53 def fix_selection(self, ev, widget):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	54 self._palette.cur_selection.selected = False
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	55 self.selected = True
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	56 self._palette.cur_selection = self
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	57
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	58 def draw(self, surface):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	59 surface.fill(pygame.color.Color(0, 0, 0), self.rect)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	60 if self.selected:
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	61 surface.fill(self.sel_colour, self._button_rect)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	62 else:
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	63 surface.fill(self.unsel_colour, self._button_rect)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	64 surface.fill(self._colour, self._colour_rect)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	65
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	66
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	67 class AppPalette(Container):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	68
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	69 but_size = 35
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	70
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	71 colors = [
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	72 'red', 'maroon1', 'palevioletred1', 'moccasin', 'orange',
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	73 'honeydew', 'yellow', 'gold', 'goldenrod', 'brown',
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	74 'blue', 'purple', 'darkorchid4', 'thistle', 'skyblue1',
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	75 'green', 'palegreen1', 'darkgreen', 'aquamarine', 'darkolivegreen',
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	76 ]
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	77
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	78 def __init__(self, rect, gd, app_image):
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	79 self.image = app_image
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	80 super(AppPalette, self).__init__(rect, gd)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	81 self.selection = 0
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	82 self.image.rect_color = pygame.color.Color(self.colors[self.selection])
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	83
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	84 x = rect.left
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	85 y = rect.top
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	86 for num, col in enumerate(self.colors):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	87 if (x - rect.left + self.but_size) >= rect.width:
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	88 x = rect.left
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	89 y += self.but_size
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	90 button = ColourButton(
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	91 pygame.Rect((x, y), (self.but_size, self.but_size)),
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	92 gd, col, self)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	93 x += self.but_size
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	94 if num == 0:
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	95 self.cur_selection = button
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	96 button.fix_selection(None, None)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	97 button.add_callback('clicked', self.click_item, num)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	98 self.add(button)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	99 # Fix height
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	100 self.rect.height = y + self.but_size - self.rect.top
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	101
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	102 def click_item(self, ev, widget, number):
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	103 self.selection = number
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	104 self.image.rect_color = pygame.color.Color(self.colors[number])
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	105
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	106
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	107 class AppImage(Container):
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	108
181 f98bc17f5e67 Add attributes for drawing rects Neil Muller <neil@dip.sun.ac.za> parents: 179 diff changeset	109 rect_thick = 3
f98bc17f5e67 Add attributes for drawing rects Neil Muller <neil@dip.sun.ac.za> parents: 179 diff changeset	110 draw_thick = 1
f98bc17f5e67 Add attributes for drawing rects Neil Muller <neil@dip.sun.ac.za> parents: 179 diff changeset	111
708 9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	112 def __init__(self, parent, gd, state, scene, detail):
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	113 self.state = state
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	114 super(AppImage, self).__init__(pygame.rect.Rect(0, 0,
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	115 constants.screen[0], constants.screen[1]), gd)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	116 self.mode = 'draw'
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	117 self._scene = scene
708 9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	118 self._parent = parent
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	119 self._detail = detail
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	120 self.rects = []
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	121 self.images = []
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	122 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	123 self.end_pos = None
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	124 self.rect_color = pygame.color.Color('white')
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	125 self.current_image = None
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	126 self.place_image_menu = None
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	127 self.close_button = LabelWidget((0, 0), gd, 'Close')
243 0ea4661d134c Show close button area in helper Neil Muller <neil@dip.sun.ac.za> parents: 238 diff changeset	128 self.close_button.fg_color = (0, 0, 0)
0ea4661d134c Show close button area in helper Neil Muller <neil@dip.sun.ac.za> parents: 238 diff changeset	129 self.close_button.bg_color = (0, 0, 0)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	130 self.draw_rects = True
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	131 self.draw_things = True
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	132 self.draw_thing_rects = True
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	133 self.draw_images = True
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	134 self.trans_images = False
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	135 self.draw_toolbar = True
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	136 self.old_mouse_pos = None
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	137 self.zoom_display = False
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	138 self.draw_anim = False
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	139 self.zoom_offset = (600, 600)
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	140 self.clear_display = False
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	141 if self._detail:
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	142 w, h = self._scene.get_detail_size()
524 a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	143 rect = pygame.rect.Rect(0, 0, w, h)
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	144 self.close_button.rect.midbottom = rect.midbottom
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	145 self.offset = (0, 0)
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	146 else:
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	147 self.offset = (-self._scene.OFFSET[0],
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	148 -self._scene.OFFSET[1])
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	149 self.find_existing_intersects()
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	150 self.add_callback(MOUSEBUTTONDOWN, self.mouse_down)
690 4a933444c99b The return of the rects to the rect drawer Neil Muller <neil@dip.sun.ac.za> parents: 689 diff changeset	151 self.add_callback(MOUSEBUTTONUP, self.mouse_up)
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	152 self.add_callback(MOUSEMOTION, self.mouse_move)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	153 self.add_callback(KEYDOWN, self.key_down)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	154
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	155 def find_existing_intersects(self):
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	156 """Parse the things in the scene for overlaps"""
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	157 scene = self._scene
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	158 # Pylint hates this function
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	159 for thing in scene.things.itervalues():
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	160 for interact_name in thing.interacts:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	161 thing.set_interact(interact_name)
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	162 if hasattr(thing.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	163 thing_rects = [thing.rect]
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	164 else:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	165 thing_rects = thing.rect
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	166 for thing2 in scene.things.itervalues():
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	167 if thing is thing2:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	168 continue
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	169 for interact2_name in thing2.interacts:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	170 thing2.set_interact(interact2_name)
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	171 if hasattr(thing2.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	172 thing2_rects = [thing2.rect]
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	173 else:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	174 thing2_rects = thing2.rect
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	175 for my_rect in thing_rects:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	176 for other_rect in thing2_rects:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	177 if my_rect.colliderect(other_rect):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	178 print 'Existing Intersecting rects'
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	179 print (" Thing1 %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	180 % (thing.name, interact_name))
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	181 print (" Thing2 %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	182 % (thing2.name, interact2_name))
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	183 print " Rects", my_rect, other_rect
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	184 print
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	185
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	186 def find_intersecting_rects(self, d):
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	187 """Find if any rect collections intersect"""
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	188 # I loath N^X brute search algorithm's, but whatever, hey
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	189 scene = self._scene
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	190 for (num, col) in enumerate(d):
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	191 rect_list = d[col]
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	192 for thing in scene.things.itervalues():
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	193 for interact_name in thing.interacts:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	194 thing.set_interact(interact_name)
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	195 if hasattr(thing.rect, 'collidepoint'):
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	196 thing_rects = [thing.rect]
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	197 else:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	198 thing_rects = thing.rect
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	199 for other_rect in thing_rects:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	200 for my_rect in rect_list:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	201 if my_rect.colliderect(other_rect):
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	202 print 'Intersecting rects'
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	203 print " Object %s" % num
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	204 print (" Thing %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	205 % (thing.name, interact_name))
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	206 print " Rects", my_rect, other_rect
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	207 if thing.INITIAL:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	208 thing.set_interact(thing.INITIAL)
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	209 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	210 for (num2, col2) in enumerate(d):
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	211 if num2 == num:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	212 continue
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	213 other_list = d[col2]
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	214 for my_rect in rect_list:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	215 for other_rect in other_list:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	216 if my_rect.colliderect(other_rect):
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	217 print 'Intersecting rects',
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	218 print ' Object %s and %s' % (num, num2)
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	219 print " Rects", my_rect, other_rect
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	220 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	221 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	222
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	223 def toggle_things(self, ev, widget):
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	224 self.draw_things = not self.draw_things
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	225
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	226 def toggle_thing_rects(self, ev, widget):
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	227 self.draw_thing_rects = not self.draw_thing_rects
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	228 scene = self._scene
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	229 for thing in scene.things.itervalues():
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	230 if not self.draw_thing_rects:
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	231 if not hasattr(thing, 'old_colour'):
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	232 thing.old_colour = thing._interact_hilight_color
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	233 thing._interact_hilight_color = None
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	234 else:
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	235 thing._interact_hilight_color = thing.old_colour
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	236
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	237 def toggle_images(self, ev, widget):
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	238 self.draw_images = not self.draw_images
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	239
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	240 def toggle_trans_images(self, ev, widget):
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	241 self.trans_images = not self.trans_images
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	242 self.invalidate()
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	243
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	244 def toggle_rects(self, ev, widget):
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	245 self.draw_rects = not self.draw_rects
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	246
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	247 def toggle_toolbar(self, ev, widget):
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	248 self.draw_toolbar = not self.draw_toolbar
d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	249
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	250 def toggle_zoom(self, ev, widget):
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	251 self.zoom_display = not self.zoom_display
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	252 self.invalidate()
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	253
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	254 def toggle_anim(self, ev, widget):
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	255 self.draw_anim = not self.draw_anim
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	256
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	257 def draw_mode(self, ev, widget):
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	258 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	259
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	260 def del_mode(self, ev, widget):
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	261 self.mode = 'del'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	262 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	263 self.end_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	264
503 65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	265 def draw_sub_image(self, image, surface, cropped_rect):
65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	266 """Tweaked image drawing to avoid albow's centring the image in the
65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	267 subsurface"""
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	268 surf = pygame.surface.Surface((cropped_rect.w, cropped_rect.h),
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	269 SRCALPHA).convert_alpha()
503 65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	270 frame = surf.get_rect()
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	271 imsurf = image.get_image().convert_alpha()
503 65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	272 r = imsurf.get_rect()
65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	273 r.topleft = frame.topleft
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	274 if self.trans_images:
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	275 surf.fill(pygame.color.Color(255, 255, 255, 96))
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	276 surf.blit(imsurf, r, None, BLEND_RGBA_MIN)
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	277 else:
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	278 surf.blit(imsurf, r, None)
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	279 surface.blit(surf, cropped_rect)
503 65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	280
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	281 def invalidate(self):
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	282 self.clear_display = True
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	283
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	284 def draw(self, surface):
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	285 if self.clear_display:
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	286 surface.fill(pygame.color.Color(0, 0, 0))
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	287 self.clear_display = False
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	288
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	289 if self.zoom_display:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	290 base_surface = surface.copy()
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	291 self.do_unzoomed_draw(base_surface)
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	292 zoomed = pygame.transform.scale(base_surface,
703 cbf6d4573785 Fix bug in zooming code Neil Muller <neil@dip.sun.ac.za> parents: 701 diff changeset	293 (constants.zoom * base_surface.get_width(),
cbf6d4573785 Fix bug in zooming code Neil Muller <neil@dip.sun.ac.za> parents: 701 diff changeset	294 constants.zoom * base_surface.get_height()))
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	295 area = pygame.rect.Rect(self.zoom_offset[0], self.zoom_offset[1],
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	296 self.zoom_offset[0] + constants.screen[0],
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	297 self.zoom_offset[1] + constants.screen[1])
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	298 surface.blit(zoomed, (0, 0), area)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	299 else:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	300 self.do_unzoomed_draw(surface)
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	301
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	302 def do_unzoomed_draw(self, surface):
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	303 if self.draw_things:
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	304 self._scene.draw(surface)
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	305 else:
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	306 self._scene.draw_background(surface)
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	307 if self._detail:
4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	308 # We duplicate draw logic here, so we zoom the close
524 a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	309 # button correctly
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	310 self.close_button.draw(surface)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	311 if self.mode == 'draw' and self.start_pos and self.draw_rects:
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	312 rect = pygame.rect.Rect(self.start_pos[0], self.start_pos[1],
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	313 self.end_pos[0] - self.start_pos[0],
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	314 self.end_pos[1] - self.start_pos[1])
321 e5f3a97ee812 Fix rect drawing bug Neil Muller <neil@dip.sun.ac.za> parents: 320 diff changeset	315 rect.normalize()
690 4a933444c99b The return of the rects to the rect drawer Neil Muller <neil@dip.sun.ac.za> parents: 689 diff changeset	316 draw_rect_image(surface, self.rect_color, rect, self.draw_thick)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	317 if self.draw_rects:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	318 for (col, rect) in self.rects:
690 4a933444c99b The return of the rects to the rect drawer Neil Muller <neil@dip.sun.ac.za> parents: 689 diff changeset	319 draw_rect_image(surface, col, rect, self.rect_thick)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	320 if self.draw_images:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	321 for image in self.images:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	322 if image.rect.colliderect(surface.get_rect()):
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	323 cropped_rect = image.rect.clip(surface.get_rect())
503 65e17aba12c5 Tweak various aspects of image drawing/mouse code to handle edge cases better Neil Muller <neil@dip.sun.ac.za> parents: 502 diff changeset	324 self.draw_sub_image(image, surface, cropped_rect)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	325 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	326 print 'image outside surface', image
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	327 if self.current_image and self.mode == 'image':
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	328 if self.current_image.rect.colliderect(surface.get_rect()):
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	329 cropped_rect = self.current_image.rect.clip(
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	330 surface.get_rect())
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	331 self.draw_sub_image(self.current_image, surface,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	332 cropped_rect)
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	333 if self.draw_toolbar:
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	334 tb_surf = surface.subsurface(0, constants.screen[1]
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	335 - constants.button_size,
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	336 constants.screen[0],
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	337 constants.button_size).convert_alpha()
276 75f4ee46ac58 Better (and fixed) rect tool with toolbar overlay. Jeremy Thurgood <firxen@gmail.com> parents: 275 diff changeset	338 tb_surf.fill(pygame.color.Color(127, 0, 0, 191))
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	339 surface.blit(tb_surf, (0, constants.screen[1]
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	340 - constants.button_size))
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	341
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	342 def _make_dict(self):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	343 d = {}
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	344 for col, rect in self.rects:
213 20998c650ce1 Fixed rect_drawer tool and adjusted JIM message background. Jeremy Thurgood <firxen@gmail.com> parents: 200 diff changeset	345 col = (col.r, col.g, col.b)
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	346 d.setdefault(col, [])
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	347 d[col].append(rect)
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	348 return d
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	349
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	350 def print_objs(self, ev, widget):
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	351 d = self._make_dict()
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	352 self.find_intersecting_rects(d)
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	353 for (num, col) in enumerate(d):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	354 print 'Rect %d : ' % num
279 c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	355 for rect in d[col]:
c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	356 r = rect.move(self.offset)
179 39f75faf16cb Add trailing , for copy-n-paste Neil Muller <neil@dip.sun.ac.za> parents: 174 diff changeset	357 print ' (%d, %d, %d, %d),' % (r.x, r.y, r.w, r.h)
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	358 print
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	359 for i, image in enumerate(self.images):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	360 print 'Image %d' % i
279 c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	361 rect = image.rect
c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	362 r = rect.move(self.offset)
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	363 print ' (%d, %d, %d, %d),' % (r.x, r.y, r.w, r.h)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	364 print
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	365 print
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	366
700 22e1893152c5 Comment out crash button Neil Muller <neil@dip.sun.ac.za> parents: 699 diff changeset	367 def image_load(self, ev, widget):
708 9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	368 image_path = '.'
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	369 filechooser = FileChooser((0, 0), self.gd, image_path)
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	370 self._parent.add(filechooser)
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	371 self._parent.modal = True
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	372 #try:
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	373 # image_data = pygame.image.load(imagename)
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	374 # self.current_image = Image(image_data)
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	375 # self.place_image_menu.enabled = True
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	376 # # ensure we're off screen to start
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	377 # self.current_image.rect = image_data.get_rect() \
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	378 # .move(constants.screen[0] + constants.menu_width,
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	379 # constants.screen[1])
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	380 #except pygame.error, e:
9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	381 # print 'Unable to load image %s' % e
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	382
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	383 def image_mode(self, ev, widget):
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	384 self.mode = 'image'
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	385 self.start_pos = None
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	386 self.end_pos = None
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	387 # So we do the right thing for off screen images
f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	388 self.old_mouse_pos = None
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	389
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	390 def cycle_mode(self, ev, widget):
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	391 self.mode = 'cycle'
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	392
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	393 def _conv_pos(self, mouse_pos):
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	394 if self.zoom_display:
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	395 pos = ((mouse_pos[0] + self.zoom_offset[0]) / constants.zoom,
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	396 (mouse_pos[1] + self.zoom_offset[1]) / constants.zoom)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	397 else:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	398 pos = mouse_pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	399 return pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	400
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	401 def _check_limits(self, offset):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	402 if offset[0] < 0:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	403 offset[0] = 0
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	404 if offset[1] < 0:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	405 offset[1] = 0
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	406 width, height = constants.screen
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	407 if offset[0] > constants.zoom * width - width:
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	408 offset[0] = constants.zoom * width - width
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	409 if offset[1] > constants.zoom * height - height:
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	410 offset[1] = constants.zoom * height - height
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	411
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	412 def _make_zoom_offset(self, pos):
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	413 zoom_pos = (pos[0] * constants.zoom, pos[1] * constants.zoom)
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	414 offset = [zoom_pos[0] - constants.screen[0] / 2,
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	415 zoom_pos[1] - constants.screen[1] / 2]
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	416 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	417 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	418
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	419 def _move_zoom(self, x, y):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	420 offset = list(self.zoom_offset)
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	421 offset[0] += constants.zoom_step * x
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	422 offset[1] += constants.zoom_step * y
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	423 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	424 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	425
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	426 def do_mouse_move(self, ev, widget):
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	427 pos = self._conv_pos(ev.pos)
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	428 if not self.zoom_display:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	429 # Construct zoom offset from mouse pos
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	430 self._make_zoom_offset(ev.pos)
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	431 if self.mode == 'image' and self.current_image:
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	432 if self.old_mouse_pos:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	433 delta = (pos[0] - self.old_mouse_pos[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	434 pos[1] - self.old_mouse_pos[1])
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	435 self.current_image.rect.center = (
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	436 self.current_image.rect.center[0] + delta[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	437 self.current_image.rect.center[1] + delta[1])
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	438 else:
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	439 self.current_image.rect.center = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	440 self.invalidate()
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	441 self.old_mouse_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	442
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	443 def key_down(self, ev, widget):
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	444 if self.mode == 'image' and self.current_image:
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	445 # Move the image by 1 pixel
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	446 cur_pos = self.current_image.rect.center
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	447 if ev.key == K_LEFT:
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	448 self.current_image.rect.center = (cur_pos[0] - 1, cur_pos[1])
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	449 elif ev.key == K_RIGHT:
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	450 self.current_image.rect.center = (cur_pos[0] + 1, cur_pos[1])
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	451 elif ev.key == K_UP:
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	452 self.current_image.rect.center = (cur_pos[0], cur_pos[1] - 1)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	453 elif ev.key == K_DOWN:
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	454 self.current_image.rect.center = (cur_pos[0], cur_pos[1] + 1)
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	455 elif self.zoom_display:
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	456 if ev.key == K_LEFT:
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	457 self._move_zoom(-1, 0)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	458 elif ev.key == K_RIGHT:
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	459 self._move_zoom(1, 0)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	460 elif ev.key == K_UP:
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	461 self._move_zoom(0, -1)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	462 elif ev.key == K_DOWN:
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	463 self._move_zoom(0, 1)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	464
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	465 if ev.key == K_o:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	466 self.toggle_trans_images(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	467 elif ev.key == K_t:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	468 self.toggle_things(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	469 elif ev.key == K_r:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	470 self.toggle_thing_rects(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	471 elif ev.key == K_i:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	472 self.toggle_images(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	473 elif ev.key == K_d:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	474 self.toggle_rects(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	475 elif ev.key == K_b:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	476 self.toggle_toolbar(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	477 elif ev.key == K_z:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	478 self.toggle_zoom(None, None)
699 8edd7b52423a Re-enable keys Neil Muller <neil@dip.sun.ac.za> parents: 698 diff changeset	479 elif ev.key == K_a:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	480 self.toggle_anim(None, None)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	481
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	482 def mouse_down(self, ev, widget):
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	483 pos = self._conv_pos(ev.pos)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	484 if self.mode == 'del':
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	485 cand = None
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	486 # Images are drawn above rectangles, so search those first
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	487 for image in self.images:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	488 if image.rect.collidepoint(pos):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	489 cand = image
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	490 break
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	491 if cand:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	492 self.images.remove(cand)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	493 self.invalidate()
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	494 return
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	495 for (col, rect) in self.rects:
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	496 if rect.collidepoint(pos):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	497 cand = (col, rect)
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	498 break
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	499 if cand:
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	500 self.rects.remove(cand)
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	501 self.invalidate()
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	502 elif self.mode == 'cycle':
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	503 scene = self._scene
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	504 cand = None
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	505 for thing in scene.things.itervalues():
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	506 if thing.contains(pos):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	507 cand = thing
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	508 break
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	509 if cand:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	510 # Find current interacts in this thing
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	511 cur_interact = cand.current_interact
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	512 j = cand.interacts.values().index(cur_interact)
538 d1b86d5849a0 More pep8 cleanups Neil Muller <neil@dip.sun.ac.za> parents: 537 diff changeset	513 if j + 1 < len(cand.interacts):
d1b86d5849a0 More pep8 cleanups Neil Muller <neil@dip.sun.ac.za> parents: 537 diff changeset	514 next_name = cand.interacts.keys()[j + 1]
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	515 else:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	516 next_name = cand.interacts.keys()[0]
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	517 if cand.interacts[next_name] != cur_interact:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	518 cand.set_interact(next_name)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	519 elif self.mode == 'draw':
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	520 self.start_pos = pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	521 self.end_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	522 elif self.mode == 'image':
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	523 if self.current_image:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	524 self.images.append(self.current_image)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	525 self.current_image = None
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	526 self.old_mouse_pos = None
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	527 self.invalidate()
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	528 else:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	529 cand = None
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	530 for image in self.images:
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	531 if image.rect.collidepoint(ev.pos):
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	532 cand = image
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	533 break
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	534 if cand:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	535 self.images.remove(cand)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	536 self.current_image = cand
502 f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse Neil Muller <neil@dip.sun.ac.za> parents: 482 diff changeset	537 # We want to move relative to the current mouse pos, so
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	538 self.old_mouse_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	539 self.invalidate()
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	540
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	541 def mouse_up(self, ev, widget):
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	542 if self.mode == 'draw':
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	543 rect = pygame.rect.Rect(self.start_pos[0], self.start_pos[1],
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	544 self.end_pos[0] - self.start_pos[0],
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	545 self.end_pos[1] - self.start_pos[1])
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	546 rect.normalize()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	547 self.rects.append((self.rect_color, rect))
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	548 self.start_pos = self.end_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	549
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	550 def mouse_move(self, ev, widget):
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	551 # We're only interested in this if left mouse button is down
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	552 if ev.buttons[0] != 1:
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	553 return False
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	554 if self.mode == 'draw':
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	555 self.end_pos = self._conv_pos(ev.pos)
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	556 return True
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	557
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	558 def animate(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	559 if self.draw_anim:
686 48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	560 self.state.animate()
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	561
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	562
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	563 class ModeLabel(LabelWidget):
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	564
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	565 def __init__(self, rect, gd, app_image):
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	566 self.app_image = app_image
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	567 super(ModeLabel, self).__init__(rect,
671 b27b5c6c54e8 Use constants for font location Stefano Rivera <stefano@rivera.za.net> parents: 664 diff changeset	568 gd, 'Mode : ', fontname=constants.bold_font,
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	569 fontsize=15, color=pygame.color.Color(128, 0, 255))
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	570
698 1e54c6966666 Mode label updates again Neil Muller <neil@dip.sun.ac.za> parents: 697 diff changeset	571 def draw(self, surface):
1e54c6966666 Mode label updates again Neil Muller <neil@dip.sun.ac.za> parents: 697 diff changeset	572 text = 'Mode : %s' % self.app_image.mode
1e54c6966666 Mode label updates again Neil Muller <neil@dip.sun.ac.za> parents: 697 diff changeset	573 if self.text != text:
1e54c6966666 Mode label updates again Neil Muller <neil@dip.sun.ac.za> parents: 697 diff changeset	574 self.text = text
1e54c6966666 Mode label updates again Neil Muller <neil@dip.sun.ac.za> parents: 697 diff changeset	575 self.prepare()
1e54c6966666 Mode label updates again Neil Muller <neil@dip.sun.ac.za> parents: 697 diff changeset	576 super(ModeLabel, self).draw(surface)
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	577
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	578
663 b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	579 def make_button(text, gd, action, ypos):
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	580 rect = pygame.rect.Rect(0, 0, constants.menu_width,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	581 constants.menu_button_height)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	582 rect.move_ip(805, ypos)
671 b27b5c6c54e8 Use constants for font location Stefano Rivera <stefano@rivera.za.net> parents: 664 diff changeset	583 button = TextButton(rect, gd, text, fontname=constants.font, fontsize=12,
663 b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	584 color=pygame.color.Color(255, 255, 0), border=1, padding=3)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	585 button.add_callback('clicked', action)
197 640044d7ddda Tweak layout Neil Muller <neil@dip.sun.ac.za> parents: 196 diff changeset	586 return button
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	587
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	588
648 b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	589 class RectApp(Container):
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	590 """The actual rect drawer main app"""
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	591 def __init__(self, rect, gd, detail):
648 b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	592 super(RectApp, self).__init__(rect, gd)
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	593
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	594 try:
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	595 state = gd.initial_state()
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	596 scene = state.scenes[gd._initial_scene]
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	597 except KeyError:
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	598 raise RectDrawerError('Invalid scene: %s' % gd._initial_scene)
686 48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	599 gd.sound.disable_sound() # No sound here
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	600
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	601 if detail:
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	602 try:
697 4bf13af26d6a Fix detail loading. Clear display on state changes Neil Muller <neil@dip.sun.ac.za> parents: 691 diff changeset	603 scene = state.detail_views[detail]
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	604 except KeyError:
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	605 raise RectDrawerError('Invalid detail: %s' % detail)
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	606
708 9b6d68ba627e Partially hook up file chooser code Neil Muller <neil@dip.sun.ac.za> parents: 703 diff changeset	607 self.image = AppImage(self, gd, state, scene, detail is not None)
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	608 self.add(self.image)
663 b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	609 mode_label = ModeLabel(pygame.Rect((805, 0), (200, 25)),
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	610 self.gd, self.image)
6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	611 self.add(mode_label)
663 b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	612 y = mode_label.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	613 draw = make_button('Draw Rect', gd, self.image.draw_mode, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	614 self.add(draw)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	615 y += draw.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	616 load_image = make_button("Load image", gd, self.image.image_load, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	617 self.add(load_image)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	618 y += load_image.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	619 add_image = make_button("Place/Move images", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	620 self.image.image_mode, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	621 add_image.enabled = False
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	622 self.add(add_image)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	623 self.image.place_image_menu = add_image
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	624 y += add_image.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	625 cycle = make_button("Cycle interacts", gd, self.image.cycle_mode, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	626 self.add(cycle)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	627 y += cycle.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	628 delete = make_button("Delete Objects", gd, self.image.del_mode, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	629 self.add(delete)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	630 y += delete.rect.height
701 9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	631 palette = AppPalette(pygame.Rect((810, y), (200, 0)), gd, self.image)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	632 self.add(palette)
9c920deb28c2 Recreate the palette selection Neil Muller <neil@dip.sun.ac.za> parents: 700 diff changeset	633 y += palette.rect.height
663 b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	634 print_rects = make_button("Print objects", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	635 self.image.print_objs, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	636 self.add(print_rects)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	637 y += print_rects.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	638 toggle_things = make_button("Show Things (t)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	639 self.image.toggle_things, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	640 self.add(toggle_things)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	641 y += toggle_things.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	642 toggle_thing_rects = make_button("Show Thing Rects (r)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	643 self.image.toggle_thing_rects, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	644 self.add(toggle_thing_rects)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	645 y += toggle_thing_rects.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	646 toggle_images = make_button("Show Images (i)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	647 self.image.toggle_images, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	648 self.add(toggle_images)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	649 y += toggle_images.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	650 trans_images = make_button("Opaque Images (o)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	651 self.image.toggle_trans_images, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	652 self.add(trans_images)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	653 y += trans_images.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	654 toggle_rects = make_button("Show Drawn Rects (d)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	655 self.image.toggle_rects, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	656 self.add(toggle_rects)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	657 y += toggle_rects.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	658 toggle_toolbar = make_button("Show Toolbar (b)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	659 self.image.toggle_toolbar, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	660 self.add(toggle_toolbar)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	661 y += toggle_toolbar.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	662 toggle_anim = make_button("Show Animations (a)", gd,
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	663 self.image.toggle_anim, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	664 self.add(toggle_anim)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	665 y += toggle_anim.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	666 toggle_zoom = make_button("Zoom (z)", gd, self.image.toggle_zoom, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	667 self.add(toggle_zoom)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	668 y += toggle_zoom.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	669 quit_but = make_button("Quit", gd, self.quit, 570)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	670 self.add(quit_but)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	671
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	672 def quit(self, ev, widget):
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	673 pygame.event.post(pygame.event.Event(QUIT))
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	674
686 48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	675 def animate(self):
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	676 self.image.animate()
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	677
648 b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	678
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	679 class RectEngine(object):
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	680 """Engine for the rect drawer."""
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	681
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	682 def __init__(self, gd, detail):
648 b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	683 self.state = None
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	684 self._gd = gd
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	685 rect = pygame.display.get_surface().get_rect()
691 60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	686 self.app = RectApp(rect, self._gd, detail)
648 b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	687
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	688 def run(self):
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	689 """App loop"""
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	690 clock = pygame.time.Clock()
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	691 while True:
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	692 events = pygame.event.get()
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	693 for ev in events:
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	694 if ev.type == QUIT:
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	695 return
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	696 else:
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	697 self.app.event(ev)
686 48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	698 self.app.animate()
648 b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	699 surface = pygame.display.get_surface()
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	700 self.app.draw(surface)
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	701 pygame.display.flip()
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	702 clock.tick(self._gd.constants.frame_rate)
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	703
b2c2b6f56291 baby steps to fixing rect_drawer - it has now progressed to being completely useless Neil Muller <neil@dip.sun.ac.za> parents: 636 diff changeset	704
589 ebc48b397fd5 Turn rect_drawer into a command line option Neil Muller <neil@dip.sun.ac.za> parents: 576 diff changeset	705 def make_rect_display():
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	706 pygame.display.init()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	707 pygame.font.init()
661 5dc866e1d71d Misc pep8 and pyflakes fixes Neil Muller <neil@dip.sun.ac.za> parents: 648 diff changeset	708 pygame.display.set_mode((constants.screen[0]
5dc866e1d71d Misc pep8 and pyflakes fixes Neil Muller <neil@dip.sun.ac.za> parents: 648 diff changeset	709 + constants.menu_width, constants.screen[1]))

Mercurial > boomslang

annotate pyntnclick/tools/rect_drawer.py @ 708:9b6d68ba627e pyntnclick