pyntnclick: tools/rect_drawer.py annotate

annotate tools/rect_drawer.py @ 537:5b9f371c2bb8

PEP-8 cleanup of tools

author	Stefano Rivera <stefano@rivera.za.net>
date	Sat, 11 Feb 2012 12:10:58 +0200
parents	a91cb4bffd5d
children	d1b86d5849a0

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
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	4 import sys
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	5 import os.path
a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	6
a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	7 script_path = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	8 sys.path.append(script_path)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	9
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	10 from albow.root import RootWidget
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	11 from albow.utils import frame_rect
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	12 from albow.widget import Widget
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	13 from albow.controls import Button, Image
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	14 from albow.palette_view import PaletteView
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	15 from albow.file_dialogs import request_old_filename
243 0ea4661d134c Show close button area in helper Neil Muller <neil@dip.sun.ac.za> parents: 238 diff changeset	16 from albow.resource import get_font
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	17 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	18 K_a, K_t, K_d, K_i, K_r, K_o, K_b, K_z,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	19 BLEND_RGBA_MIN, SRCALPHA)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	20 import pygame
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	21
250 df57386908c0 Tweak constant overriding Neil Muller <neil@dip.sun.ac.za> parents: 243 diff changeset	22 from gamelib import constants
df57386908c0 Tweak constant overriding Neil Muller <neil@dip.sun.ac.za> parents: 243 diff changeset	23 constants.DEBUG = True
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	24 MENU_WIDTH = 200
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	25 MENU_BUTTON_HEIGHT = 25
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	26 ZOOM = 4
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	27 ZOOM_STEP = 100
250 df57386908c0 Tweak constant overriding Neil Muller <neil@dip.sun.ac.za> parents: 243 diff changeset	28
286 776bcf563ea0 Re-enable thing rects by default in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 279 diff changeset	29 from gamelib import state
776bcf563ea0 Re-enable thing rects by default in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 279 diff changeset	30 state.DEBUG_RECTS = True
243 0ea4661d134c Show close button area in helper Neil Muller <neil@dip.sun.ac.za> parents: 238 diff changeset	31 from gamelib.widgets import BoomLabel
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	32
a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	33
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	34 class AppPalette(PaletteView):
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
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	47 super(AppPalette, self).__init__((35, 35), 4, 5, margin=2)
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	48 self.selection = 0
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	49 self.image.rect_color = pygame.color.Color(self.colors[self.selection])
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
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	67 class AppImage(Widget):
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
174 a2d041e0ab83 Make tool use scenes, not images Neil Muller <neil@dip.sun.ac.za> parents: 165 diff changeset	72 def __init__(self, state):
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,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	75 constants.SCREEN[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	76 constants.SCREEN[1]))
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	77 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	78 self.rects = []
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	79 self.images = []
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	80 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	81 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	82 self.rect_color = pygame.color.Color('white')
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	83 self.current_image = None
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	84 self.place_image_menu = None
243 0ea4661d134c Show close button area in helper Neil Muller <neil@dip.sun.ac.za> parents: 238 diff changeset	85 self.close_button = BoomLabel('Close', font=get_font(20, 'Vera.ttf'))
0ea4661d134c Show close button area in helper Neil Muller <neil@dip.sun.ac.za> parents: 238 diff changeset	86 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	87 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	88 self.draw_rects = True
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	89 self.draw_things = True
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	90 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	91 self.draw_images = True
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	92 self.trans_images = False
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	93 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	94 self.old_mouse_pos = None
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	95 self.zoom_display = False
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	96 self.draw_anim = False
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	97 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	98 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	99 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	100 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	101 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	102 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	103 else:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	104 self.offset = (-self.state.current_scene.OFFSET[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	105 -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	106 self.find_existing_intersects()
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	107
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	108 def _get_scene(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	109 if self.state.current_detail:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	110 return self.state.current_detail
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	111 else:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	112 return self.state.current_scene
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	113
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	114 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	115 """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	116 scene = self._get_scene()
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	117 # Pylint hates this function
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	118 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	119 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	120 thing.set_interact(interact_name)
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	121 if hasattr(thing.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	122 thing_rects = [thing.rect]
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	123 else:
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 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	126 if thing is thing2:
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	127 continue
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	128 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	129 thing2.set_interact(interact2_name)
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	130 if hasattr(thing2.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	131 thing2_rects = [thing2.rect]
0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	132 else:
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 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	135 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	136 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	137 print 'Existing Intersecting rects'
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	138 print (" Thing1 %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	139 % (thing.name, interact_name))
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	140 print (" Thing2 %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	141 % (thing2.name, interact2_name))
323 0630a37cb371 Print existing intersection in scene on startup Neil Muller <neil@dip.sun.ac.za> parents: 321 diff changeset	142 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	143 print
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	144
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	145 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	146 """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	147 # 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	148 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	149 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	150 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	151 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	152 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	153 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	154 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	155 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	156 else:
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 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	159 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	160 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	161 print 'Intersecting rects'
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	162 print " Object %s" % num
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	163 print (" Thing %s Interact %s"
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	164 % (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	165 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	166 if thing.INITIAL:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	167 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	168 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	169 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	170 if num2 == num:
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	171 continue
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	172 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	173 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	174 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	175 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	176 print 'Intersecting rects',
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	177 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	178 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	179 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	180 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	181
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	182 def toggle_things(self):
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	183 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	184
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	185 def toggle_thing_rects(self):
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	186 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	187 scene = self._get_scene()
312 a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	188 for thing in scene.things.itervalues():
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	189 if not self.draw_thing_rects:
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	190 if not hasattr(thing, 'old_colour'):
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	191 thing.old_colour = thing._interact_hilight_color
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	192 thing._interact_hilight_color = None
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	193 else:
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	194 thing._interact_hilight_color = thing.old_colour
a0d66c0f5a89 Add toggle thing rects option Neil Muller <neil@dip.sun.ac.za> parents: 286 diff changeset	195
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	196 def toggle_images(self):
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	197 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	198
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	199 def toggle_trans_images(self):
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	200 self.trans_images = not self.trans_images
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	201 self.invalidate()
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	202
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	203 def toggle_rects(self):
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	204 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	205
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	206 def toggle_toolbar(self):
d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	207 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	208
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	209 def toggle_zoom(self):
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	210 self.zoom_display = not self.zoom_display
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	211
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	212 def toggle_anim(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	213 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	214
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	215 def draw_mode(self):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	216 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	217
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	218 def del_mode(self):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	219 self.mode = 'del'
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	220 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	221 self.end_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	222
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	223 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	224 """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	225 subsurface"""
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	226 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	227 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	228 frame = surf.get_rect()
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	229 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	230 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	231 r.topleft = frame.topleft
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	232 if self.trans_images:
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	233 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	234 surf.blit(imsurf, r, None, BLEND_RGBA_MIN)
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	235 else:
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	236 surf.blit(imsurf, r, None)
f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	237 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	238
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	239 def draw(self, surface):
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	240 if self.zoom_display:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	241 base_surface = surface.copy()
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	242 self.do_unzoomed_draw(base_surface)
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	243 zoomed = pygame.transform.scale(base_surface,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	244 (ZOOM * constants.SCREEN[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	245 ZOOM * constants.SCREEN[1]))
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	246 area = pygame.rect.Rect(self.zoom_offset[0], self.zoom_offset[1],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	247 self.zoom_offset[0] + constants.SCREEN[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	248 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	249 surface.blit(zoomed, (0, 0), area)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	250 else:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	251 self.do_unzoomed_draw(surface)
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	252
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	253 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	254 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	255 if self.draw_things:
523 08dbb7f3a34d Fix calls to draw to match recent changes Neil Muller <neil@dip.sun.ac.za> parents: 521 diff changeset	256 self.state.current_detail.draw(surface, None)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	257 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	258 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	259 # 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	260 # button correctly
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	261 r = self.close_button.get_rect()
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	262 surf_rect = surface.get_rect()
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	263 sub_rect = surf_rect.clip(r)
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	264 try:
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	265 sub = surface.subsurface(sub_rect)
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	266 self.close_button.draw_all(sub)
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	267 except ValueError, e:
a91cb4bffd5d Make close button helper in rect_drawer zoom correctly Neil Muller <neil@dip.sun.ac.za> parents: 523 diff changeset	268 print 'Error, failed to draw close button', e
238 2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	269 else:
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	270 if self.draw_things:
523 08dbb7f3a34d Fix calls to draw to match recent changes Neil Muller <neil@dip.sun.ac.za> parents: 521 diff changeset	271 self.state.current_scene.draw(surface, None)
268 e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	272 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	273 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	274 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	275 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	276 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	277 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	278 rect.normalize()
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	279 frame_rect(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	280 if self.draw_rects:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	281 for (col, rect) in self.rects:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	282 frame_rect(surface, col, rect, self.rect_thick)
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	283 if self.draw_images:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	284 for image in self.images:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	285 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	286 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	287 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	288 else:
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	289 print 'image outside surface', image
e4ea9def56b2 Add some toggle options to helper script Neil Muller <neil@dip.sun.ac.za> parents: 250 diff changeset	290 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	291 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	292 cropped_rect = self.current_image.rect.clip(
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	293 surface.get_rect())
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	294 self.draw_sub_image(self.current_image, surface,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	295 cropped_rect)
275 d78ce15bccc8 Crew quarters background and toolbar on the rect tool. Jeremy Thurgood <firxen@gmail.com> parents: 268 diff changeset	296 if self.draw_toolbar:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	297 tb_surf = surface.subsurface(0, constants.SCREEN[1]
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	298 - constants.BUTTON_SIZE,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	299 constants.SCREEN[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	300 constants.BUTTON_SIZE).convert_alpha()
276 75f4ee46ac58 Better (and fixed) rect tool with toolbar overlay. Jeremy Thurgood <firxen@gmail.com> parents: 275 diff changeset	301 tb_surf.fill(pygame.color.Color(127, 0, 0, 191))
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	302 surface.blit(tb_surf, (0, constants.SCREEN[1]
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	303 - constants.BUTTON_SIZE))
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	304
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	305 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	306 d = {}
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	307 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	308 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	309 d.setdefault(col, [])
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	310 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	311 return d
9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	312
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	313 def print_objs(self):
165 9b3bba5e65f3 add some features to rect helper. now vaguely useful Neil Muller <neil@dip.sun.ac.za> parents: 162 diff changeset	314 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	315 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	316 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	317 print 'Rect %d : ' % num
279 c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	318 for rect in d[col]:
c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	319 r = rect.move(self.offset)
179 39f75faf16cb Add trailing , for copy-n-paste Neil Muller <neil@dip.sun.ac.za> parents: 174 diff changeset	320 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	321 print
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	322 for i, image in enumerate(self.images):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	323 print 'Image %d' % i
279 c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	324 rect = image.rect
c67a4a4d78f6 Compensate for offset in rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 276 diff changeset	325 r = rect.move(self.offset)
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	326 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	327 print
320 c295b06b27f8 Warn about intersecting existing things and other drawn rects Neil Muller <neil@dip.sun.ac.za> parents: 312 diff changeset	328 print
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	329
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	330 def image_load(self):
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	331 image_path = ('%s/Resources/images/%s'
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	332 % (script_path, self.state.current_scene.FOLDER))
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	333 imagename = request_old_filename(directory=image_path)
4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	334 try:
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	335 image_data = pygame.image.load(imagename)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	336 self.current_image = Image(image_data)
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	337 self.place_image_menu.enabled = True
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	338 # ensure we're off screen to start
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	339 self.current_image.rect = image_data.get_rect() \
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	340 .move(constants.SCREEN[0] + MENU_WIDTH,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	341 constants.SCREEN[1])
199 4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	342 except pygame.error, e:
4821c290286d Image loading Neil Muller <neil@dip.sun.ac.za> parents: 198 diff changeset	343 print 'Unable to load image %s' % e
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	344
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	345 def image_mode(self):
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	346 self.mode = 'image'
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	347 self.start_pos = None
e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	348 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	349 # 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	350 self.old_mouse_pos = None
198 e73d78d6dd83 Stubs for ftuture functionality Neil Muller <neil@dip.sun.ac.za> parents: 197 diff changeset	351
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	352 def cycle_mode(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	353 self.mode = 'cycle'
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	354
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	355 def _conv_pos(self, mouse_pos):
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	356 if self.zoom_display:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	357 pos = ((mouse_pos[0] + self.zoom_offset[0]) / ZOOM,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	358 (mouse_pos[1] + self.zoom_offset[1]) / ZOOM)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	359 else:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	360 pos = mouse_pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	361 return pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	362
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	363 def _check_limits(self, offset):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	364 if offset[0] < 0:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	365 offset[0] = 0
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	366 if offset[1] < 0:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	367 offset[1] = 0
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	368 if offset[0] > ZOOM * constants.SCREEN[0] - constants.SCREEN[0]:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	369 offset[0] = ZOOM * constants.SCREEN[0] - constants.SCREEN[0]
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	370 if offset[1] > ZOOM * constants.SCREEN[1] - constants.SCREEN[1]:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	371 offset[1] = ZOOM * constants.SCREEN[1] - constants.SCREEN[1]
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	372
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	373 def _make_zoom_offset(self, pos):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	374 zoom_pos = (pos[0] * ZOOM, pos[1] * ZOOM)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	375 offset = [zoom_pos[0] - constants.SCREEN[0] / 2,
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	376 zoom_pos[1] - constants.SCREEN[1] / 2]
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	377 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	378 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	379
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	380 def _move_zoom(self, x, y):
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	381 offset = list(self.zoom_offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	382 offset[0] += ZOOM_STEP * x
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	383 offset[1] += ZOOM_STEP * y
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	384 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	385 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	386
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	387 def do_mouse_move(self, e):
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	388 pos = self._conv_pos(e.pos)
507 caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	389 if not self.zoom_display:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	390 # Construct zoom offset from mouse pos
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	391 self._make_zoom_offset(e.pos)
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	392 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	393 if self.old_mouse_pos:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	394 delta = (pos[0] - self.old_mouse_pos[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	395 pos[1] - self.old_mouse_pos[1])
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	396 self.current_image.rect.center = (
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	397 self.current_image.rect.center[0] + delta[0],
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	398 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	399 else:
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	400 self.current_image.rect.center = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	401 self.invalidate()
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	402 self.old_mouse_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	403
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	404 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	405 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	406 # 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	407 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	408 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	409 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	410 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	411 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	412 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	413 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	414 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	415 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	416 elif self.zoom_display:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	417 if e.key == K_LEFT:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	418 self._move_zoom(-1, 0)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	419 elif e.key == K_RIGHT:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	420 self._move_zoom(1, 0)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	421 elif e.key == K_UP:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	422 self._move_zoom(0, -1)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	423 elif e.key == K_DOWN:
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	424 self._move_zoom(0, 1)
caec319a4ae3 Add support for moving zoomed region Neil Muller <neil@dip.sun.ac.za> parents: 506 diff changeset	425
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	426 if e.key == K_o:
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	427 self.toggle_trans_images()
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_t:
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	429 self.toggle_things()
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_r:
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	431 self.toggle_thing_rects()
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_i:
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	433 self.toggle_images()
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	434 elif e.key == K_d:
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	435 self.toggle_rects()
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	436 elif e.key == K_b:
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	437 self.toggle_toolbar()
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	438 elif e.key == K_z:
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	439 self.toggle_zoom()
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	440 elif e.key == K_a:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	441 self.toggle_anim()
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	442
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	443 def mouse_down(self, e):
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	444 pos = self._conv_pos(e.pos)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	445 if self.mode == 'del':
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	446 cand = None
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	447 # Images are drawn above rectangles, so search those first
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	448 for image in self.images:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	449 if image.rect.collidepoint(pos):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	450 cand = image
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	451 break
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	452 if cand:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	453 self.images.remove(cand)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	454 self.invalidate()
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	455 return
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	456 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	457 if rect.collidepoint(pos):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	458 cand = (col, rect)
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	459 break
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	460 if cand:
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	461 self.rects.remove(cand)
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	462 self.invalidate()
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	463 elif self.mode == 'cycle':
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	464 scene = self._get_scene()
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	465 cand = None
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	466 for thing in scene.things.itervalues():
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	467 if thing.contains(pos):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	468 cand = thing
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	469 break
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	470 if cand:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	471 # Find current interacts in this thing
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	472 cur_interact = cand.current_interact
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	473 j = cand.interacts.values().index(cur_interact)
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	474 if j + 1< len(cand.interacts):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	475 next_name = cand.interacts.keys()[j+1]
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	476 else:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	477 next_name = cand.interacts.keys()[0]
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	478 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	479 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	480 elif self.mode == 'draw':
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	481 self.start_pos = pos
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	482 self.end_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	483 elif self.mode == 'image':
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	484 if self.current_image:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	485 self.images.append(self.current_image)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	486 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	487 self.old_mouse_pos = None
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	488 self.invalidate()
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	489 else:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	490 cand = None
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	491 for image in self.images:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	492 if image.rect.collidepoint(e.pos):
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	493 cand = image
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	494 break
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	495 if cand:
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	496 self.images.remove(cand)
7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	497 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	498 # 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	499 self.old_mouse_pos = pos
200 7bedca2376f5 Image placement Neil Muller <neil@dip.sun.ac.za> parents: 199 diff changeset	500 self.invalidate()
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	501
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	502 def mouse_up(self, e):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	503 if self.mode == 'draw':
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	504 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	505 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	506 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	507 rect.normalize()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	508 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	509 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	510
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	511 def mouse_drag(self, e):
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	512 if self.mode == 'draw':
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	513 self.end_pos = self._conv_pos(e.pos)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	514 self.invalidate()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	515
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	516 def animate(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	517 if self.draw_anim:
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	518 if self.state.animate():
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	519 self.invalidate()
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	520
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	521
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	522 class ModeLabel(BoomLabel):
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	523
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	524 def __init__(self, app_image):
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	525 self.app_image = app_image
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	526 super(ModeLabel, self).__init__('Mode : ', 200,
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	527 font=get_font(15, 'VeraBd.ttf'),
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	528 fg_color=pygame.color.Color(128, 0, 255))
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	529 self.rect.move_ip(805, 0)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	530
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	531 def draw_all(self, surface):
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	532 self.set_text('Mode : %s' % self.app_image.mode)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	533 super(ModeLabel, self).draw_all(surface)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	534
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	535
197 640044d7ddda Tweak layout Neil Muller <neil@dip.sun.ac.za> parents: 196 diff changeset	536 def make_button(text, action, ypos):
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	537 button = Button(text, action=action, font=get_font(15, 'VeraBd.ttf'))
197 640044d7ddda Tweak layout Neil Muller <neil@dip.sun.ac.za> parents: 196 diff changeset	538 button.align = 'l'
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	539 button.rect = pygame.rect.Rect(0, 0, MENU_WIDTH, MENU_BUTTON_HEIGHT)
197 640044d7ddda Tweak layout Neil Muller <neil@dip.sun.ac.za> parents: 196 diff changeset	540 button.rect.move_ip(805, ypos)
640044d7ddda Tweak layout Neil Muller <neil@dip.sun.ac.za> parents: 196 diff changeset	541 return button
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	542
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	543
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	544 class RectApp(RootWidget):
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	545 """Handle the app stuff for the rect drawer"""
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	546
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	547 def __init__(self, display):
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	548 super(RectApp, self).__init__(display)
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	549 self.image = AppImage(state)
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	550 self.add(self.image)
509 616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	551 mode_label = ModeLabel(self.image)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	552 self.add(mode_label)
616334ea5e8c Add mode label Neil Muller <neil@dip.sun.ac.za> parents: 508 diff changeset	553 y = mode_label.get_rect().h
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	554 draw = make_button('Draw Rect', self.image.draw_mode, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	555 self.add(draw)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	556 y += draw.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	557 load_image = make_button("Load image", self.image.image_load, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	558 self.add(load_image)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	559 y += load_image.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	560 add_image = make_button("Place/Move images", self.image.image_mode, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	561 add_image.enabled = False
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	562 self.add(add_image)
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	563 self.image.place_image_menu = add_image
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	564 y += add_image.get_rect().h
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	565 cycle = make_button("Cycle interacts", self.image.cycle_mode, y)
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	566 self.add(cycle)
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	567 y += cycle.get_rect().h
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	568 delete = make_button('Delete Objects', self.image.del_mode, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	569 self.add(delete)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	570 y += delete.get_rect().h
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	571 palette = AppPalette(self.image)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	572 palette.rect.move_ip(810, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	573 self.add(palette)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	574 y += palette.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	575 print_rects = make_button("Print objects", self.image.print_objs, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	576 self.add(print_rects)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	577 y += print_rects.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	578 toggle_things = make_button("Show Things (t)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	579 self.image.toggle_things, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	580 self.add(toggle_things)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	581 y += toggle_things.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	582 toggle_thing_rects = make_button("Show Thing Rects (r)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	583 self.image.toggle_thing_rects, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	584 self.add(toggle_thing_rects)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	585 y += toggle_thing_rects.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	586 toggle_images = make_button("Show Images (i)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	587 self.image.toggle_images, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	588 self.add(toggle_images)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	589 y += toggle_images.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	590 trans_images = make_button("Opaque Images (o)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	591 self.image.toggle_trans_images, y)
504 f3dbe35b6e4b Add 'translucent image mode' Neil Muller <neil@dip.sun.ac.za> parents: 503 diff changeset	592 self.add(trans_images)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	593 y += trans_images.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	594 toggle_rects = make_button("Show Drawn Rects (d)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	595 self.image.toggle_rects, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	596 self.add(toggle_rects)
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	597 y += toggle_rects.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	598 toggle_toolbar = make_button("Show Toolbar (b)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	599 self.image.toggle_toolbar, y)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	600 self.add(toggle_toolbar)
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	601 y += toggle_toolbar.get_rect().h
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	602 toggle_anim = make_button("Show Animations (a)",
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	603 self.image.toggle_anim, y)
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	604 self.add(toggle_anim)
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	605 y += toggle_anim.get_rect().h
506 d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	606 toggle_zoom = make_button("Zoom (z)", self.image.toggle_zoom, y)
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	607 self.add(toggle_zoom)
d54667b2c44d Partial zoom support Neil Muller <neil@dip.sun.ac.za> parents: 505 diff changeset	608 y += toggle_zoom.get_rect().h
505 4c8aa01b606c Tweak menu layout. Add keys for toggle options Neil Muller <neil@dip.sun.ac.za> parents: 504 diff changeset	609 quit_but = make_button("Quit", self.quit, 570)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	610 self.add(quit_but)
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	611 self.set_timer(constants.FRAME_RATE)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	612
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	613 def key_down(self, event):
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	614 # Dispatch to image widget
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	615 self.image.key_down(event)
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	616
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	617 def mouse_delta(self, event):
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	618 # We propogate mouse move from here to draw region, so images move
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	619 # off-screen
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	620 self.image.do_mouse_move(event)
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	621
510 d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	622 def begin_frame(self):
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	623 self.image.animate()
d274cc414178 Add show animate & cycle interact options Neil Muller <neil@dip.sun.ac.za> parents: 509 diff changeset	624
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	625
521 d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	626 def list_scenes(state):
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	627 """List the scenes in the state"""
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	628 print 'Available scenes are : '
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	629 for scene in state.scenes:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	630 print ' ', scene
521 d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	631 print 'Available details are : '
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	632 for detail in state.detail_views:
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	633 print ' ', detail
521 d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	634
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	635 if __name__ == "__main__":
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	636 pygame.display.init()
225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	637 pygame.font.init()
537 5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	638 display = pygame.display.set_mode((constants.SCREEN[0] + MENU_WIDTH,
5b9f371c2bb8 PEP-8 cleanup of tools Stefano Rivera <stefano@rivera.za.net> parents: 524 diff changeset	639 constants.SCREEN[1]))
521 d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	640 state = state.initial_state()
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	641 if len(sys.argv) < 2:
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	642 print 'Please provide a scene name or scene and detail names'
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	643 list_scenes(state)
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	644 sys.exit(0)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	645 # enable key repeating
2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	646 pygame.key.set_repeat(200, 100)
238 2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	647 if len(sys.argv) < 3:
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	648 try:
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	649 state.set_current_scene(sys.argv[1])
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	650 state.do_check = None
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	651 except KeyError:
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	652 print 'Invalid scene name'
521 d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	653 list_scenes(state)
238 2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	654 sys.exit(1)
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	655 else:
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	656 try:
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	657 state.set_current_scene(sys.argv[1])
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	658 state.set_current_detail(sys.argv[2])
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	659 state.do_check = None
2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	660 except KeyError:
521 d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	661 print 'Invalid scene or detail name'
d143947690d9 Add list_scenes to rect_drawer Neil Muller <neil@dip.sun.ac.za> parents: 510 diff changeset	662 list_scenes(state)
238 2510e0b0e901 Add detail view support to helper Neil Muller <neil@dip.sun.ac.za> parents: 213 diff changeset	663 sys.exit(1)
482 2bef605a0ef2 Refactor to add support for key movement of images Neil Muller <neil@dip.sun.ac.za> parents: 323 diff changeset	664 app = RectApp(display)
162 225e3a4b1e85 Start of a tool to help construct interact rectangles Neil Muller <neil@dip.sun.ac.za> parents: diff changeset	665 app.run()

Mercurial > pyntnclick

annotate tools/rect_drawer.py @ 537:5b9f371c2bb8