annotate tools/rect_drawer.py @ 507:caec319a4ae3

Add support for moving zoomed region
author Neil Muller <neil@dip.sun.ac.za>
date Fri, 03 Sep 2010 11:51:43 +0200
parents d54667b2c44d
children 91ee6107a216
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
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
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
17 from pygame.locals import SWSURFACE, K_LEFT, K_RIGHT, K_UP, K_DOWN, \
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
18 K_t, K_d, K_i, K_r, K_o, K_b, K_z, \
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
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 from pygame.colordict import THECOLORS
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
22
250
df57386908c0 Tweak constant overriding
Neil Muller <neil@dip.sun.ac.za>
parents: 243
diff changeset
23 from gamelib import constants
df57386908c0 Tweak constant overriding
Neil Muller <neil@dip.sun.ac.za>
parents: 243
diff changeset
24 constants.DEBUG = True
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
25 MENU_WIDTH = 200
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
26 MENU_BUTTON_HEIGHT = 30
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
27 ZOOM = 4
507
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
28 ZOOM_STEP = 100
250
df57386908c0 Tweak constant overriding
Neil Muller <neil@dip.sun.ac.za>
parents: 243
diff changeset
29
286
776bcf563ea0 Re-enable thing rects by default in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 279
diff changeset
30 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
31 state.DEBUG_RECTS = True
243
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
32 from gamelib.widgets import BoomLabel
174
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
33
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
34
165
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
35 class AppPalette(PaletteView):
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
36
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
37 sel_width = 5
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
38
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
39 colors = [
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
40 '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
41 '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
42 '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
43 '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
44 ]
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
45
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
46 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
47 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
48 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
49 self.selection = 0
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
50 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
51
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
52 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
53 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
54
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
55 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
56 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
57 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
58 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
59
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
60 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
61 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
62 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
63
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
64 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
65 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
66
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
67
174
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
68 class AppImage(Widget):
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
69
181
f98bc17f5e67 Add attributes for drawing rects
Neil Muller <neil@dip.sun.ac.za>
parents: 179
diff changeset
70 rect_thick = 3
f98bc17f5e67 Add attributes for drawing rects
Neil Muller <neil@dip.sun.ac.za>
parents: 179
diff changeset
71 draw_thick = 1
f98bc17f5e67 Add attributes for drawing rects
Neil Muller <neil@dip.sun.ac.za>
parents: 179
diff changeset
72
174
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
73 def __init__(self, state):
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
74 self.state = state
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
75 super(AppImage, self).__init__(pygame.rect.Rect(0, 0, constants.SCREEN[0], constants.SCREEN[1]))
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
76 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
77 self.rects = []
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
78 self.images = []
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
79 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
80 self.end_pos = None
165
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
81 self.rect_color = pygame.color.Color('white')
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
82 self.current_image = None
199
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
83 self.place_image_menu = None
243
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
84 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
85 self.close_button.fg_color = (0, 0, 0)
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
86 self.close_button.bg_color = (0, 0, 0)
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
87 if self.state.current_detail:
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
88 w, h = self.state.current_detail.get_detail_size()
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
89 rect = pygame.rect.Rect(0, 0, w, h)
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
90 self.close_button.rect.midbottom = rect.midbottom
0ea4661d134c Show close button area in helper
Neil Muller <neil@dip.sun.ac.za>
parents: 238
diff changeset
91 self.add(self.close_button)
279
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
92 self.offset = (0, 0)
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
93 else:
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
94 self.offset = (-self.state.current_scene.OFFSET[0], - self.state.current_scene.OFFSET[1])
268
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
95 self.draw_rects = True
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
96 self.draw_things = True
312
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
97 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
98 self.draw_images = True
504
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
99 self.trans_images = False
275
d78ce15bccc8 Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents: 268
diff changeset
100 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
101 self.old_mouse_pos = None
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
102 self.zoom_display = False
507
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
103 self.zoom_offset = (600, 600)
323
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
104 self.find_existing_intersects()
268
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
105
323
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
106 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
107 """Parse the things in the scene for overlaps"""
323
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
108 if self.state.current_detail:
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
109 scene = self.state.current_detail
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
110 else:
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
111 scene = self.state.current_scene
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
112 # Pylint hates this function
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
113 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
114 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
115 thing.set_interact(interact_name)
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
116 if hasattr(thing.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
117 thing_rects = [thing.rect]
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
118 else:
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
119 thing_rects = thing.rect
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
120 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
121 if thing is thing2:
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
122 continue
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
123 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
124 thing2.set_interact(interact2_name)
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
125 if hasattr(thing2.rect, 'collidepoint'):
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
126 thing2_rects = [thing2.rect]
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
127 else:
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
128 thing2_rects = thing2.rect
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
129 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
130 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
131 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
132 print 'Existing Intersecting rects'
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
133 print " Thing1 %s Interact %s" % (thing.name, interact_name)
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
134 print " Thing2 %s Interact %s" % (thing2.name, interact2_name)
0630a37cb371 Print existing intersection in scene on startup
Neil Muller <neil@dip.sun.ac.za>
parents: 321
diff changeset
135 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
136 print
320
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
137
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
138 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
139 """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
140 # I loath N^X brute search algorithm's, but whatever, hey
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
141 if self.state.current_detail:
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
142 scene = self.state.current_detail
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
143 else:
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
144 scene = self.state.current_scene
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
145 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
146 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
147 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
148 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
149 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
150 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
151 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
152 else:
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
153 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
154 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
155 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
156 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
157 print 'Intersecting rects'
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
158 print " Object %s" % num
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
159 print " Thing %s Interact %s" % (thing.name, interact_name)
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
160 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
161 if thing.INITIAL:
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
162 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
163 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
164 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
165 if num2 == num:
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
166 continue
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
167 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
168 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
169 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
170 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
171 print 'Intersecting rects',
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
172 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
173 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
174 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
175 print
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
176
268
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
177 def toggle_things(self):
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
178 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
179
312
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
180 def toggle_thing_rects(self):
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
181 self.draw_thing_rects = not self.draw_thing_rects
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
182 if self.state.current_detail:
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
183 scene = self.state.current_detail
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
184 else:
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
185 scene = self.state.current_scene
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
186 for thing in scene.things.itervalues():
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
187 if not self.draw_thing_rects:
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
188 if not hasattr(thing, 'old_colour'):
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
189 thing.old_colour = thing._interact_hilight_color
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
190 thing._interact_hilight_color = None
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
191 else:
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
192 thing._interact_hilight_color = thing.old_colour
a0d66c0f5a89 Add toggle thing rects option
Neil Muller <neil@dip.sun.ac.za>
parents: 286
diff changeset
193
268
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
194 def toggle_images(self):
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
195 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
196
504
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
197 def toggle_trans_images(self):
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
198 self.trans_images = not self.trans_images
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
199 self.invalidate()
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
200
268
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
201 def toggle_rects(self):
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
202 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
203
275
d78ce15bccc8 Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents: 268
diff changeset
204 def toggle_toolbar(self):
d78ce15bccc8 Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents: 268
diff changeset
205 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
206
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
207 def toggle_zoom(self):
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
208 self.zoom_display = not self.zoom_display
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
209
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
210 def draw_mode(self):
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
211 self.mode = 'draw'
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
212
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
213 def del_mode(self):
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
214 self.mode = 'del'
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
215 self.start_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
216 self.end_pos = None
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
217
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
218 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
219 """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
220 subsurface"""
504
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
221 surf = pygame.surface.Surface((cropped_rect.w, cropped_rect.h), 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
222 frame = surf.get_rect()
504
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
223 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
224 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
225 r.topleft = frame.topleft
504
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
226 if self.trans_images:
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
227 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
228 surf.blit(imsurf, r, None, BLEND_RGBA_MIN)
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
229 else:
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
230 surf.blit(imsurf, r, None)
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
231 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
232
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
233 def draw(self, surface):
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
234 if self.zoom_display:
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
235 base_surface = surface.copy()
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
236 self.do_unzoomed_draw(base_surface)
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
237 zoomed = pygame.transform.scale(base_surface, (ZOOM * constants.SCREEN[0], ZOOM * constants.SCREEN[1]))
507
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
238 area = pygame.rect.Rect(self.zoom_offset[0], self.zoom_offset[1], self.zoom_offset[0] + constants.SCREEN[0], self.zoom_offset[1] + constants.SCREEN[1])
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
239 surface.blit(zoomed, (0, 0), area)
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
240 else:
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
241 self.do_unzoomed_draw(surface)
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
242
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
243 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
244 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
245 if self.draw_things:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
246 self.state.draw_detail(surface, None)
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
247 else:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
248 self.state.current_detail.draw_background(surface)
238
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
249 else:
268
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
250 if self.draw_things:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
251 self.state.draw(surface, None)
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
252 else:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
253 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
254 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
255 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
256 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
257 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
258 rect.normalize()
320
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
259 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
260 if self.draw_rects:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
261 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
262 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
263 if self.draw_images:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
264 for image in self.images:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
265 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
266 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
267 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
268 else:
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
269 print 'image outside surface', image
e4ea9def56b2 Add some toggle options to helper script
Neil Muller <neil@dip.sun.ac.za>
parents: 250
diff changeset
270 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
271 if self.current_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
272 cropped_rect = self.current_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
273 self.draw_sub_image(self.current_image, surface, cropped_rect)
275
d78ce15bccc8 Crew quarters background and toolbar on the rect tool.
Jeremy Thurgood <firxen@gmail.com>
parents: 268
diff changeset
274 if self.draw_toolbar:
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
275 toolbar_rect = pygame.rect.Rect(0, constants.SCREEN[1] - constants.BUTTON_SIZE, constants.SCREEN[0], constants.BUTTON_SIZE)
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
276 tb_surf = surface.subsurface(0, constants.SCREEN[1] - constants.BUTTON_SIZE, constants.SCREEN[0], constants.BUTTON_SIZE).convert_alpha()
276
75f4ee46ac58 Better (and fixed) rect tool with toolbar overlay.
Jeremy Thurgood <firxen@gmail.com>
parents: 275
diff changeset
277 tb_surf.fill(pygame.color.Color(127, 0, 0, 191))
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
278 surface.blit(tb_surf, (0, constants.SCREEN[1] - constants.BUTTON_SIZE))
276
75f4ee46ac58 Better (and fixed) rect tool with toolbar overlay.
Jeremy Thurgood <firxen@gmail.com>
parents: 275
diff changeset
279 # frame_rect(surface, (127, 0, 0), toolbar_rect, 2)
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
280
165
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
281 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
282 d = {}
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
283 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
284 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
285 d.setdefault(col, [])
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
286 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
287 return d
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
288
198
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
289 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
290 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
291 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
292 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
293 print 'Rect %d : ' % num
279
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
294 for rect in d[col]:
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
295 r = rect.move(self.offset)
179
39f75faf16cb Add trailing , for copy-n-paste
Neil Muller <neil@dip.sun.ac.za>
parents: 174
diff changeset
296 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
297 print
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
298 for i, image in enumerate(self.images):
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
299 print 'Image %d' % i
279
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
300 rect = image.rect
c67a4a4d78f6 Compensate for offset in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 276
diff changeset
301 r = rect.move(self.offset)
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
302 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
303 print
320
c295b06b27f8 Warn about intersecting existing things and other drawn rects
Neil Muller <neil@dip.sun.ac.za>
parents: 312
diff changeset
304 print
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
305
199
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
306 def image_load(self):
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
307 image_path= '%s/Resources/images/%s' % (script_path, self.state.current_scene.FOLDER)
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
308 imagename = request_old_filename(directory=image_path)
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
309 try:
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
310 image_data = pygame.image.load(imagename)
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
311 self.current_image = Image(image_data)
199
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
312 self.place_image_menu.enabled = True
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
313 # ensure we're off screen to start
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
314 self.current_image.rect = image_data.get_rect().move(constants.SCREEN[0] + MENU_WIDTH, constants.SCREEN[1])
199
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
315 except pygame.error, e:
4821c290286d Image loading
Neil Muller <neil@dip.sun.ac.za>
parents: 198
diff changeset
316 print 'Unable to load image %s' % e
198
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
317
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
318 def image_mode(self):
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
319 self.mode = 'image'
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
320 self.start_pos = None
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
321 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
322 # 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
323 self.old_mouse_pos = None
198
e73d78d6dd83 Stubs for ftuture functionality
Neil Muller <neil@dip.sun.ac.za>
parents: 197
diff changeset
324
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
325 def _conv_pos(self, mouse_pos):
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
326 if self.zoom_display:
507
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
327 pos = ((mouse_pos[0] + self.zoom_offset[0]) / ZOOM, (mouse_pos[1] + self.zoom_offset[1]) / ZOOM)
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
328 else:
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
329 pos = mouse_pos
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
330 return pos
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
331
507
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
332 def _check_limits(self, offset):
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
333 if offset[0] < 0:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
334 offset[0] = 0
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
335 if offset[1] < 0:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
336 offset[1] = 0
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
337 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
338 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
339 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
340 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
341
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
342 def _make_zoom_offset(self, pos):
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
343 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
344 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
345 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
346 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
347 print offset
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
348 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
349
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
350 def _move_zoom(self, x, y):
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
351 offset = list(self.zoom_offset)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
352 offset[0] += ZOOM_STEP * x
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
353 offset[1] += ZOOM_STEP * y
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
354 self._check_limits(offset)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
355 print offset
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
356 self.zoom_offset = tuple(offset)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
357
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
358 def do_mouse_move(self, e):
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
359 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
360 if not self.zoom_display:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
361 # Construct zoom offset from mouse pos
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
362 self._make_zoom_offset(e.pos)
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
363 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
364 if self.old_mouse_pos:
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
365 delta = (pos[0] - self.old_mouse_pos[0], pos[1] - self.old_mouse_pos[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
366 self.current_image.rect.center = (self.current_image.rect.center[0] + delta[0], self.current_image.rect.center[1] + delta[1])
f53aaba58273 Use relative motion for images to remove jumping when combining key & mouse
Neil Muller <neil@dip.sun.ac.za>
parents: 482
diff changeset
367 else:
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
368 self.current_image.rect.center = pos
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
369 self.invalidate()
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
370 self.old_mouse_pos = pos
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
371
482
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
372 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
373 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
374 # 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
375 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
376 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
377 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
378 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
379 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
380 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
381 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
382 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
383 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
384 elif self.zoom_display:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
385 if e.key == K_LEFT:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
386 self._move_zoom(-1, 0)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
387 elif e.key == K_RIGHT:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
388 self._move_zoom(1, 0)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
389 elif e.key == K_UP:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
390 self._move_zoom(0, -1)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
391 elif e.key == K_DOWN:
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
392 self._move_zoom(0, 1)
caec319a4ae3 Add support for moving zoomed region
Neil Muller <neil@dip.sun.ac.za>
parents: 506
diff changeset
393
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
394 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
395 self.toggle_trans_images()
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
396 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
397 self.toggle_things()
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
398 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
399 self.toggle_thing_rects()
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
400 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
401 self.toggle_images()
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
402 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
403 self.toggle_rects()
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
404 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
405 self.toggle_toolbar()
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
406 elif e.key == K_z:
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
407 self.toggle_zoom()
482
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
408
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
409 def mouse_down(self, e):
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
410 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
411 if self.mode == 'del':
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
412 cand = None
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
413 # Images are drawn above rectangles, so search those first
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
414 for image in self.images:
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
415 if image.rect.collidepoint(pos):
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
416 cand = image
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
417 break
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
418 if cand:
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
419 self.images.remove(cand)
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
420 self.invalidate()
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
421 return
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
422 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
423 if rect.collidepoint(pos):
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
424 cand = (col, rect)
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
425 break
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
426 if cand:
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
427 self.rects.remove(cand)
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
428 self.invalidate()
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
429 elif self.mode == 'draw':
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
430 self.start_pos = pos
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
431 self.end_pos = pos
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
432 elif self.mode == 'image':
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
433 if self.current_image:
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
434 self.images.append(self.current_image)
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
435 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
436 self.old_mouse_pos = None
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
437 self.invalidate()
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
438 else:
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
439 cand = None
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
440 for image in self.images:
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
441 if image.rect.collidepoint(e.pos):
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
442 cand = image
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
443 break
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
444 if cand:
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
445 self.images.remove(cand)
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
446 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
447 # 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
448 self.old_mouse_pos = pos
200
7bedca2376f5 Image placement
Neil Muller <neil@dip.sun.ac.za>
parents: 199
diff changeset
449 self.invalidate()
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
450
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
451 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
452 if self.mode == 'draw':
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
453 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
454 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
455 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
456 rect.normalize()
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
457 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
458 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
459
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
460 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
461 if self.mode == 'draw':
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
462 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
463 self.invalidate()
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
464
197
640044d7ddda Tweak layout
Neil Muller <neil@dip.sun.ac.za>
parents: 196
diff changeset
465 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
466 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
467 button.align = 'l'
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
468 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
469 button.rect.move_ip(805, ypos)
640044d7ddda Tweak layout
Neil Muller <neil@dip.sun.ac.za>
parents: 196
diff changeset
470 return button
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
471
482
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
472 class RectApp(RootWidget):
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
473 """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
474
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
475 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
476 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
477 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
478 self.add(self.image)
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
479 y = 0
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
480 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
481 self.add(draw)
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
482 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
483 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
484 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
485 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
486 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
487 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
488 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
489 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
490 y += add_image.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
491 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
492 self.add(delete)
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
493 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
494 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
495 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
496 self.add(palette)
505
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
497 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
498 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
499 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
500 y += print_rects.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
501 toggle_things = make_button("Show Things (t)", 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
502 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
503 y += toggle_things.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
504 toggle_thing_rects = make_button("Show Thing Rects (r)", 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
505 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
506 y += toggle_thing_rects.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
507 toggle_images = make_button("Show Images (i)", 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
508 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
509 y += toggle_images.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
510 trans_images = make_button("Opaque Images (o)", self.image.toggle_trans_images, y)
504
f3dbe35b6e4b Add 'translucent image mode'
Neil Muller <neil@dip.sun.ac.za>
parents: 503
diff changeset
511 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
512 y += trans_images.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
513 toggle_rects = make_button("Show Drawn Rects (d)", 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
514 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
515 y += toggle_rects.get_rect().h
4c8aa01b606c Tweak menu layout. Add keys for toggle options
Neil Muller <neil@dip.sun.ac.za>
parents: 504
diff changeset
516 toggle_toolbar = make_button("Show Toolbar (b)", 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
517 self.add(toggle_toolbar)
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
518 y += toggle_toolbar.get_rect().h
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
519 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
520 self.add(toggle_zoom)
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
521 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
522 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
523 self.add(quit_but)
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
524
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
525 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
526 # 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
527 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
528
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
529 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
530 # 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
531 # 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
532 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
533
482
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
534
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
535 if __name__ == "__main__":
165
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
536 # FIXME: should load an actual scene with current things, not just a
9b3bba5e65f3 add some features to rect helper. now vaguely useful
Neil Muller <neil@dip.sun.ac.za>
parents: 162
diff changeset
537 # background image
174
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
538 if len(sys.argv) < 2:
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
539 print 'Please provide a scene name'
a2d041e0ab83 Make tool use scenes, not images
Neil Muller <neil@dip.sun.ac.za>
parents: 165
diff changeset
540 sys.exit(0)
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
541 pygame.display.init()
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
542 pygame.font.init()
482
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
543 # enable key repeating
2bef605a0ef2 Refactor to add support for key movement of images
Neil Muller <neil@dip.sun.ac.za>
parents: 323
diff changeset
544 pygame.key.set_repeat(200, 100)
506
d54667b2c44d Partial zoom support
Neil Muller <neil@dip.sun.ac.za>
parents: 505
diff changeset
545 display = pygame.display.set_mode((constants.SCREEN[0] + MENU_WIDTH, constants.SCREEN[1]))
286
776bcf563ea0 Re-enable thing rects by default in rect_drawer
Neil Muller <neil@dip.sun.ac.za>
parents: 279
diff changeset
546 state = state.initial_state()
238
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
547 if len(sys.argv) < 3:
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
548 try:
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
549 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
550 state.do_check = None
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
551 except KeyError:
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
552 print 'Invalid scene name'
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
553 sys.exit(1)
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
554 else:
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
555 try:
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
556 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
557 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
558 state.do_check = None
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
559 except KeyError:
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
560 print 'Invalid scene name'
2510e0b0e901 Add detail view support to helper
Neil Muller <neil@dip.sun.ac.za>
parents: 213
diff changeset
561 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
562 app = RectApp(display)
162
225e3a4b1e85 Start of a tool to help construct interact rectangles
Neil Muller <neil@dip.sun.ac.za>
parents:
diff changeset
563 app.run()