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