From ff78ca3953a25b31db0c633c1a96bbe6c7131e7f Mon Sep 17 00:00:00 2001 From: Sai Vineet Date: Thu, 12 Dec 2013 18:22:33 +0000 Subject: Add Erase Trace Points button Also refactored the tracing code. --- diff --git a/activity.py b/activity.py index 79e32bd..2d34eee 100644 --- a/activity.py +++ b/activity.py @@ -130,6 +130,15 @@ class PhysicsActivity(activity.Activity): toolbar_box.toolbar.insert(separator, -1) separator.show() + clear_trace = ToolButton("clear-trace") + clear_trace.set_tooltip(_("Clear Trace Marks")) + clear_trace.set_accelerator(_("x")) + clear_trace.connect("clicked", self.clear_trace_cb) + clear_trace.set_sensitive(False) + toolbar_box.toolbar.insert(clear_trace, -1) + clear_trace.show() + self.clear_trace = clear_trace + self._insert_clear_all_button(toolbar_box.toolbar) separator = gtk.SeparatorToolItem() @@ -184,6 +193,7 @@ class PhysicsActivity(activity.Activity): self.clear_all.set_accelerator(_('a')) self.clear_all.connect('clicked', self.clear_all_cb) toolbar.insert(self.clear_all, -1) + self.clear_all.set_sensitive(False) self.clear_all.show() def _insert_create_tools(self, create_toolbar): @@ -212,12 +222,26 @@ class PhysicsActivity(activity.Activity): separator.show() button.set_tooltip(c.toolTip) - # button.set_accelerator(c.toolAccelerator) + button.set_accelerator(c.toolAccelerator) button.connect('clicked', self.radioClicked) _insert_item(create_toolbar, button, -1) button.show() self.radioList[button] = c.name + def clear_trace_alert_cb(self, alert, response): + self.remove_alert(alert) + if response is gtk.RESPONSE_OK: + self.game.full_pos_list = [[] for _ in self.game.full_pos_list] + self.game.tracked_bodies = 0 + + def clear_trace_cb(self, button): + clear_trace_alert = ConfirmationAlert() + clear_trace_alert.props.title = _('Are You Sure?') + clear_trace_alert.props.msg = \ + _('All trace points will be erased. This cannot be undone!') + clear_trace_alert.connect('response', self.clear_trace_alert_cb) + self.add_alert(clear_trace_alert) + def stop_play_cb(self, button): pygame.event.post(pygame.event.Event(pygame.USEREVENT, action="stop_start_toggle")) diff --git a/icons/clear-trace.svg b/icons/clear-trace.svg new file mode 100644 index 0000000..41fc143 --- /dev/null +++ b/icons/clear-trace.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/physics.py b/physics.py index b0cad5e..c5f161e 100644 --- a/physics.py +++ b/physics.py @@ -50,6 +50,7 @@ from helpers import * class PhysicsGame: def __init__(self, activity): + self.activity = activity # Get everything set up self.clock = pygame.time.Clock() self.canvas = activity.canvas @@ -69,8 +70,9 @@ class PhysicsGame: self.pygame_started = False self.full_pos_list = [] - self.tracked_bodies = [] - self.body_colors = [] + self.tracked_bodies = 0 + + self.trackinfo = {} def switch_off_fake_pygame_cursor_cb(self, panel, event): self.show_fake_cursor = False @@ -135,31 +137,50 @@ class PhysicsGame: if self.in_focus: # Drive motors if self.world.run_physics: + bodies_present = len(self.world.world.GetBodyList()) + clear_all_active = self.activity.clear_all.get_sensitive() + if (bodies_present > 1) and clear_all_active is False: + self.activity.clear_all.set_sensitive(True) + elif (bodies_present > 1) is False and \ + clear_all_active is True: + self.activity.clear_all.set_sensitive(False) + + poslist = self.full_pos_list + clear_trace_active = self.activity.clear_trace.get_sensitive() + if poslist: + if not poslist[0]: + if clear_trace_active: + self.activity.clear_trace.set_sensitive(False) + else: + if clear_trace_active is False: + self.activity.clear_trace.set_sensitive(True) + + + for key, info in self.trackinfo.iteritems(): + body = info[1] # Format - [host_body, tracker, color] + trackdex = body.userData['track_index'] + def to_screen(pos): + px = self.world.meter_to_screen( + pos[0]) + py = self.world.meter_to_screen( + pos[1]) + py = self.world.renderer.get_surface() \ + .get_height() - py + return (px, py) + + x = body.position.x + y = body.position.y + tupled_pos = to_screen((x, y)) + posx = tupled_pos[0] + posy = tupled_pos[1] + try: + self.full_pos_list[trackdex].append(posx) + self.full_pos_list[trackdex].append(posy) + except IndexError: + self.full_pos_list.append([posx, posy]) + for body in self.world.world.GetBodyList(): if type(body.userData) == type({}): - if body.userData.has_key('track_index'): - trackdex = body.userData['track_index'] - - def to_screen(pos): - px = self.world.meter_to_screen( - pos[0]) - py = self.world.meter_to_screen( - pos[1]) - py = self.world.renderer.get_surface() \ - .get_height() - py - return (px, py) - - x = body.position.x - y = body.position.y - tupled_pos = to_screen((x, y)) - posx = tupled_pos[0] - posy = tupled_pos[1] - try: - self.full_pos_list[trackdex].append(posx) - self.full_pos_list[trackdex].append(posy) - except IndexError: - self.full_pos_list.append([posx, posy]) - if body.userData.has_key('rollMotor'): diff = body.userData['rollMotor'] \ ['targetVelocity'] \ diff --git a/tools.py b/tools.py index af515b8..4861485 100644 --- a/tools.py +++ b/tools.py @@ -88,10 +88,9 @@ class Tool(object): full_pos_list = self.game.full_pos_list surface = self.game.world.renderer.get_surface() for i, pos_list in enumerate(full_pos_list): - if len(self.game.body_colors) > i: - color = self.game.body_colors[i] - else: - color = 0 + dictkey = "pen{0}".format(i) + color = self.game.trackinfo[dictkey][2] + for i in range(0, len(pos_list), 2): posx = int(pos_list[i]) posy = int(pos_list[i+1]) @@ -690,13 +689,17 @@ class TrackTool(Tool): track_circle = self.game.world.add.ball( point_pos, self.radius, dynamic=True, density=0.001, restitution=0.16, friction=0.1) - track_circle.userData['track_index'] = \ - len(self.game.tracked_bodies) - + trackdex = self.game.tracked_bodies + track_circle.userData['track_index'] = trackdex + dictkey = "pen{0}".format(trackdex) self.game.world.add.joint( track_circle, current_body, point_pos, point_pos, False) - self.game.tracked_bodies.append(track_circle) - self.game.body_colors.append(color) + + self.game.trackinfo[dictkey] = [0, 1, 2] + self.game.trackinfo[dictkey][0] = current_body + self.game.trackinfo[dictkey][1] = track_circle + self.game.trackinfo[dictkey][2] = color + self.game.tracked_bodies += 1 # counter of tracked bodies. def getAllTools(): -- cgit v0.9.1