pyntnclick: pyntnclick/tools/rect

annotate pyntnclick/tools/rect_drawer.py @ 691:60bf20849231 pyntnclick

Fix detail loading in rect_drawer. Improve error reporting when loading fails

author	Neil Muller <neil@dip.sun.ac.za>
date	Tue, 14 Feb 2012 13:05:10 +0200
parents	4a933444c99b
children	4bf13af26d6a

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
2748d3afcae5 Excise albow. Really. Stefano Rivera <stefano@rivera.za.net> parents: 589 diff changeset	5 request_old_filename = None
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	6
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	7 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	8 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	9 BLEND_RGBA_MIN, SRCALPHA, QUIT,
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	10 MOUSEBUTTONDOWN, MOUSEMOTION,
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	11 MOUSEBUTTONUP)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	12 import pygame
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	13
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	14 import pyntnclick.constants
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	15 from pyntnclick.widgets.text import LabelWidget, TextButton
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	16 from pyntnclick.widgets.base import Container
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
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	34 class AppPalette(object):
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	35
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	36 sel_width = 5
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	37
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	38 colors = [
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	39 '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	40 '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	41 '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	42 '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	43 ]
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	44
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	45 def __init__(self, app_image):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	46 self.image = app_image
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	47 #super(AppPalette, self).__init__((35, 35), 4, 5, margin=2)
6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	48 #self.selection = 0
6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	49 #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	50
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	51 def num_items(self):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	52 return len(self.colors)
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	53
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	54 def draw_item(self, surface, item_no, rect):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	55 d = -2 * self.sel_width
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	56 r = rect.inflate(d, d)
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	57 surface.fill(pygame.color.Color(self.colors[item_no]), r)
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	58
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	59 def click_item(self, item_no, event):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	60 self.selection = item_no
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	61 self.image.rect_color = pygame.color.Color(self.colors[item_no])
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	62
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	63 def item_is_selected(self, item_no):
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	64 return self.selection == item_no
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	65
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	66
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	67 class AppImage(Container):
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	68
181 f98bc17f5e67 Add attributes for drawing rects Neil Muller <neil@dip.sun.ac.za> parents: 179 diff changeset	69 rect_thick = 3
f98bc17f5e67 Add attributes for drawing rects Neil Muller <neil@dip.sun.ac.za> parents: 179 diff changeset	70 draw_thick = 1
f98bc17f5e67 Add attributes for drawing rects Neil Muller <neil@dip.sun.ac.za> parents: 179 diff changeset	71
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	72 def __init__(self, gd, state):
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	73 self.state = state
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	74 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	75 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	76 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	77 self.rects = []
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	78 self.images = []
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	79 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	80 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	81 self.rect_color = pygame.color.Color('white')
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	82 self.current_image = None
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	83 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	84 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	85 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	86 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	87 self.draw_rects = True
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	88 self.draw_things = True
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	89 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	90 self.draw_images = True
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	91 self.trans_images = False
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	92 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	93 self.old_mouse_pos = None
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	94 self.zoom_display = False
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	95 self.draw_anim = False
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	96 self.zoom_offset = (600, 600)
524 a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	97 if self.state.current_detail:
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	98 w, h = self.state.current_detail.get_detail_size()
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	99 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	100 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	101 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	102 else:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	103 self.offset = (-self.state.current_scene.OFFSET[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	104 -self.state.current_scene.OFFSET[1])
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	105 self.find_existing_intersects()
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	106 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	107 self.add_callback(MOUSEBUTTONUP, self.mouse_up)
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	108 self.add_callback(MOUSEMOTION, self.mouse_move)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	109
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	110 def _get_scene(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	111 if self.state.current_detail:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	112 return self.state.current_detail
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	113 else:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	114 return self.state.current_scene
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	115
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	116 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	117 """Parse the things in the scene for overlaps"""
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	118 scene = self._get_scene()
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	119 # Pylint hates this function
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	120 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	121 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	122 thing.set_interact(interact_name)
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	123 if hasattr(thing.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	124 thing_rects = [thing.rect]
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	125 else:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	126 thing_rects = thing.rect
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	127 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	128 if thing is thing2:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	129 continue
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	130 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	131 thing2.set_interact(interact2_name)
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	132 if hasattr(thing2.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	133 thing2_rects = [thing2.rect]
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	134 else:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	135 thing2_rects = thing2.rect
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	136 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	137 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	138 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	139 print 'Existing Intersecting rects'
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	140 print (" Thing1 %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	141 % (thing.name, interact_name))
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	142 print (" Thing2 %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	143 % (thing2.name, interact2_name))
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	144 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	145 print
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	146
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	147 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	148 """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	149 # I loath N^X brute search algorithm's, but whatever, hey
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	150 scene = self._get_scene()
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	151 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	152 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	153 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	154 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	155 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	156 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	157 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	158 else:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	159 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	160 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	161 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	162 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	163 print 'Intersecting rects'
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	164 print " Object %s" % num
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	165 print (" Thing %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	166 % (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	167 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	168 if thing.INITIAL:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	169 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	170 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	171 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	172 if num2 == num:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	173 continue
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	174 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	175 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	176 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	177 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	178 print 'Intersecting rects',
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	179 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	180 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	181 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	182 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	183
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	184 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	185 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	186
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	187 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	188 self.draw_thing_rects = not self.draw_thing_rects
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	189 scene = self._get_scene()
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	190 for thing in scene.things.itervalues():
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	191 if not self.draw_thing_rects:
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	192 if not hasattr(thing, 'old_colour'):
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	193 thing.old_colour = thing._interact_hilight_color
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	194 thing._interact_hilight_color = None
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	195 else:
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	196 thing._interact_hilight_color = thing.old_colour
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	197
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	198 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	199 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	200
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	201 def toggle_trans_images(self, ev, widget):
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	202 self.trans_images = not self.trans_images
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	203 self.invalidate()
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	204
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	205 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	206 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	207
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	208 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	209 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	210
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	211 def toggle_zoom(self, ev, widget):
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	212 self.zoom_display = not self.zoom_display
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	213
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	214 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	215 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	216
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	217 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	218 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	219
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	220 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	221 self.mode = 'del'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	222 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	223 self.end_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	224
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	225 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	226 """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	227 subsurface"""
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	228 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	229 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	230 frame = surf.get_rect()
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	231 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	232 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	233 r.topleft = frame.topleft
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	234 if self.trans_images:
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	235 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	236 surf.blit(imsurf, r, None, BLEND_RGBA_MIN)
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	237 else:
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	238 surf.blit(imsurf, r, None)
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	239 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	240
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	241 def draw(self, surface):
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	242 if self.zoom_display:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	243 base_surface = surface.copy()
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	244 self.do_unzoomed_draw(base_surface)
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	245 zoomed = pygame.transform.scale(base_surface,
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	246 (constants.zoom * constants.screen[0],
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	247 constants.zoom * constants.screen[1]))
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	248 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	249 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	250 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	251 surface.blit(zoomed, (0, 0), area)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	252 else:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	253 self.do_unzoomed_draw(surface)
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	254
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	255 def do_unzoomed_draw(self, surface):
238 2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	256 if self.state.current_detail:
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	257 if self.draw_things:
685 32e554adf538 Fix signatures Neil Muller <neil@dip.sun.ac.za> parents: 671 diff changeset	258 self.state.current_detail.draw(surface)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	259 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	260 self.state.current_detail.draw_background(surface)
524 a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	261 # We duplicate Albow's draw logic here, so we zoom the close
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	262 # 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	263 self.close_button.draw(surface)
238 2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	264 else:
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	265 if self.draw_things:
685 32e554adf538 Fix signatures Neil Muller <neil@dip.sun.ac.za> parents: 671 diff changeset	266 self.state.current_scene.draw(surface)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	267 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	268 self.state.current_scene.draw_background(surface)
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	269 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	270 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	271 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	272 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	273 rect.normalize()
690 4a933444c99b The return of the rects to the rect drawer Neil Muller <neil@dip.sun.ac.za> parents: 689 diff changeset	274 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	275 if self.draw_rects:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	276 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	277 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	278 if self.draw_images:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	279 for image in self.images:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	280 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	281 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	282 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	283 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	284 print 'image outside surface', image
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	285 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	286 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	287 cropped_rect = self.current_image.rect.clip(
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	288 surface.get_rect())
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	289 self.draw_sub_image(self.current_image, surface,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	290 cropped_rect)
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	291 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	292 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	293 - constants.button_size,
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	294 constants.screen[0],
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	295 constants.button_size).convert_alpha()
276 75f4ee46ac58 Better (and fixed) rect tool with toolbar overlay. Jeremy Thurgood <firxen@gmail.com> parents: 275 diff changeset	296 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	297 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	298 - constants.button_size))
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	299
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	300 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	301 d = {}
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	302 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	303 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	304 d.setdefault(col, [])
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	305 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	306 return d
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	307
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	308 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	309 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	310 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	311 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	312 print 'Rect %d : ' % num
279 c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	313 for rect in d[col]:
c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	314 r = rect.move(self.offset)
179 39f75faf16cb Add trailing , for copy-n-paste Neil Muller <neil@dip.sun.ac.za> parents: 174 diff changeset	315 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	316 print
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	317 for i, image in enumerate(self.images):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	318 print 'Image %d' % i
279 c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	319 rect = image.rect
c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	320 r = rect.move(self.offset)
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	321 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	322 print
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	323 print
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	324
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	325 def image_load(self):
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	326 image_path = ('%s/Resources/images/%s'
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	327 % (script_path, self.state.current_scene.FOLDER))
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	328 imagename = request_old_filename(directory=image_path)
4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	329 try:
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	330 image_data = pygame.image.load(imagename)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	331 self.current_image = Image(image_data)
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	332 self.place_image_menu.enabled = True
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	333 # ensure we're off screen to start
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	334 self.current_image.rect = image_data.get_rect() \
576 1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	335 .move(constants.screen[0] + constants.menu_width,
1b1ab71535bd Classify constants, which involves a whole bunch of XXX comments Stefano Rivera <stefano@rivera.za.net> parents: 550 diff changeset	336 constants.screen[1])
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	337 except pygame.error, e:
4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	338 print 'Unable to load image %s' % e
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	339
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	340 def image_mode(self, ev, widget):
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	341 self.mode = 'image'
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	342 self.start_pos = None
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	343 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	344 # 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	345 self.old_mouse_pos = None
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	346
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	347 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	348 self.mode = 'cycle'
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	349
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	350 def _conv_pos(self, mouse_pos):
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	351 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	352 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	353 (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	354 else:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	355 pos = mouse_pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	356 return pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	357
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	358 def _check_limits(self, offset):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	359 if offset[0] < 0:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	360 offset[0] = 0
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	361 if offset[1] < 0:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	362 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	363 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	364 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	365 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	366 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	367 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	368
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	369 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	370 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	371 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	372 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	373 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	374 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	375
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	376 def _move_zoom(self, x, y):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	377 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	378 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	379 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	380 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	381 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	382
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	383 def do_mouse_move(self, ev, widget):
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	384 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	385 if not self.zoom_display:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	386 # 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	387 self._make_zoom_offset(ev.pos)
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	388 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	389 if self.old_mouse_pos:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	390 delta = (pos[0] - self.old_mouse_pos[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	391 pos[1] - self.old_mouse_pos[1])
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	392 self.current_image.rect.center = (
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	393 self.current_image.rect.center[0] + delta[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	394 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	395 else:
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	396 self.current_image.rect.center = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	397 self.invalidate()
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	398 self.old_mouse_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	399
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	400 def key_down(self, e):
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	401 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	402 # 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	403 cur_pos = self.current_image.rect.center
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	404 if e.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	405 self.current_image.rect.center = (cur_pos[0] - 1, cur_pos[1])
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	406 elif e.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	407 self.current_image.rect.center = (cur_pos[0] + 1, cur_pos[1])
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	408 elif e.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	409 self.current_image.rect.center = (cur_pos[0], cur_pos[1] - 1)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	410 elif e.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	411 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	412 elif self.zoom_display:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	413 if e.key == K_LEFT:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	414 self._move_zoom(-1, 0)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	415 elif e.key == K_RIGHT:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	416 self._move_zoom(1, 0)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	417 elif e.key == K_UP:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	418 self._move_zoom(0, -1)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	419 elif e.key == K_DOWN:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	420 self._move_zoom(0, 1)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	421
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	422 if e.key == K_o:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	423 self.toggle_trans_images(None, None)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	424 elif e.key == K_t:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	425 self.toggle_things(None, None)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	426 elif e.key == K_r:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	427 self.toggle_thing_rects(None, None)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	428 elif e.key == K_i:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	429 self.toggle_images(None, None)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	430 elif e.key == K_d:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	431 self.toggle_rects(None, None)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	432 elif e.key == K_b:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	433 self.toggle_toolbar(None, None)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	434 elif e.key == K_z:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	435 self.toggle_zoom(None, None)
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	436 elif e.key == K_a:
664 d1c1253fcd77 Now with somewhat fewer crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 663 diff changeset	437 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	438
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	439 def mouse_down(self, ev, widget):
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	440 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	441 if self.mode == 'del':
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	442 cand = None
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	443 # Images are drawn above rectangles, so search those first
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	444 for image in self.images:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	445 if image.rect.collidepoint(pos):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	446 cand = image
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	447 break
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	448 if cand:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	449 self.images.remove(cand)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	450 self.invalidate()
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	451 return
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	452 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	453 if rect.collidepoint(pos):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	454 cand = (col, rect)
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	455 break
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	456 if cand:
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	457 self.rects.remove(cand)
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	458 self.invalidate()
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	459 elif self.mode == 'cycle':
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	460 scene = self._get_scene()
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	461 cand = None
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	462 for thing in scene.things.itervalues():
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	463 if thing.contains(pos):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	464 cand = thing
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	465 break
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	466 if cand:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	467 # Find current interacts in this thing
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	468 cur_interact = cand.current_interact
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	469 j = cand.interacts.values().index(cur_interact)
538 d1b86d5849a0 More pep8 cleanups Neil Muller <neil@dip.sun.ac.za> parents: 537 diff changeset	470 if j + 1 < len(cand.interacts):
d1b86d5849a0 More pep8 cleanups Neil Muller <neil@dip.sun.ac.za> parents: 537 diff changeset	471 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	472 else:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	473 next_name = cand.interacts.keys()[0]
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	474 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	475 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	476 elif self.mode == 'draw':
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	477 self.start_pos = pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	478 self.end_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	479 elif self.mode == 'image':
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	480 if self.current_image:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	481 self.images.append(self.current_image)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	482 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	483 self.old_mouse_pos = None
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	484 self.invalidate()
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	485 else:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	486 cand = None
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	487 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	488 if image.rect.collidepoint(ev.pos):
200 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.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	494 # 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	495 self.old_mouse_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	496 self.invalidate()
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	497
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	498 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	499 if self.mode == 'draw':
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	500 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	501 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	502 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	503 rect.normalize()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	504 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	505 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	506
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	507 def mouse_move(self, ev, widget):
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	508 # 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	509 if ev.buttons[0] != 1:
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	510 return False
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	511 if self.mode == 'draw':
689 929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	512 self.end_pos = self._conv_pos(ev.pos)
929b63589c96 Further fixes Neil Muller <neil@dip.sun.ac.za> parents: 686 diff changeset	513 return True
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	514
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	515 def animate(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	516 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	517 self.state.animate()
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	518
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	519
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	520 class ModeLabel(LabelWidget):
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	521
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	522 def __init__(self, rect, gd, app_image):
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	523 self.app_image = app_image
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	524 super(ModeLabel, self).__init__(rect,
671 b27b5c6c54e8 Use constants for font location Stefano Rivera <stefano@rivera.za.net> parents: 664 diff changeset	525 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	526 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	527
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	528 def draw_all(self, surface):
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	529 self.set_text('Mode : %s' % self.app_image.mode)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	530 super(ModeLabel, self).draw_all(surface)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	531
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	532
663 b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	533 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	534 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	535 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	536 rect.move_ip(805, ypos)
671 b27b5c6c54e8 Use constants for font location Stefano Rivera <stefano@rivera.za.net> parents: 664 diff changeset	537 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	538 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	539 button.add_callback('clicked', action)
197 640044d7ddda Tweak layout Neil Muller <neil@dip.sun.ac.za> parents: 196 diff changeset	540 return button
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	541
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	542
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	543 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	544 """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	545 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	546 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	547
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	548 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	549 state = gd.initial_state()
60bf20849231 Fix detail loading in rect_drawer. Improve error reporting when loading fails Neil Muller <neil@dip.sun.ac.za> parents: 690 diff changeset	550 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	551 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	552 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	553
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	554 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	555 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	556 state.set_current_detail(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	557 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	558 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	559
686 48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	560 # Handle any setup that needs to happen
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	561 # We start in leave, so do this twice
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	562 # FIXME: Screen parameter to check_enter_leave
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	563 # should go away
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	564 state.check_enter_leave(None)
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	565 state.check_enter_leave(None)
662 6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	566
6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	567 self.image = AppImage(gd, state)
6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	568 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	569 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	570 self.gd, self.image)
6daaeffb37d1 The rect drawer becomes less black Neil Muller <neil@dip.sun.ac.za> parents: 661 diff changeset	571 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	572 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	573 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	574 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	575 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	576 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	577 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	578 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	579 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	580 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	581 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	582 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	583 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	584 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	585 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	586 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	587 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	588 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	589 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	590 y += delete.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	591 #palette = AppPalette(self.image)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	592 #palette.rect.move_ip(810, y)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	593 #self.add(palette)
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	594 #y += palette.rect.height
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	595 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	596 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	597 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	598 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	599 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	600 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	601 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	602 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	603 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	604 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	605 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	606 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	607 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	608 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	609 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	610 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	611 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	612 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	613 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	614 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	615 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	616 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	617 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	618 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	619 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	620 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	621 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	622 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	623 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	624 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	625 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	626 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	627 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	628 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	629 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	630 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	631 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	632
b67fdd4a152d Readd buttons to rect_drawer - now with extra crashy bits Neil Muller <neil@dip.sun.ac.za> parents: 662 diff changeset	633 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	634 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	635
686 48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	636 def animate(self):
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	637 self.image.animate()
48f68ae7d454 Throw out more old stuff. Fix animation support Neil Muller <neil@dip.sun.ac.za> parents: 685 diff changeset	638
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	639
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	640 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	641 """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	642
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	643 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	644 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	645 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	646 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	647 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	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	649 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	650 """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	651 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	652 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	653 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	654 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	655 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	656 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	657 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	658 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	659 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	660 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	661 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	662 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	663 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	664
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	665
589 ebc48b397fd5 Turn rect_drawer into a command line option Neil Muller <neil@dip.sun.ac.za> parents: 576 diff changeset	666 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	667 pygame.display.init()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	668 pygame.font.init()
661 5dc866e1d71d Misc pep8 and pyflakes fixes Neil Muller <neil@dip.sun.ac.za> parents: 648 diff changeset	669 pygame.display.set_mode((constants.screen[0]
5dc866e1d71d Misc pep8 and pyflakes fixes Neil Muller <neil@dip.sun.ac.za> parents: 648 diff changeset	670 + constants.menu_width, constants.screen[1]))

Mercurial > pyntnclick

annotate pyntnclick/tools/rect_drawer.py @ 691:60bf20849231 pyntnclick