From 0518bf2b459f0732b06e824212bae449c0312795 Mon Sep 17 00:00:00 2001 From: Sai Vineet Date: Tue, 17 Dec 2013 18:05:21 +0000 Subject: pep8 pep8'ed as much code as possible. --- diff --git a/activity.py b/activity.py index 2d34eee..856be1c 100644 --- a/activity.py +++ b/activity.py @@ -24,7 +24,6 @@ import gtk import csv import tempfile import json -from StringIO import StringIO from gettext import gettext as _ import logging @@ -67,18 +66,18 @@ class PhysicsActivity(activity.Activity): self.__configure_cb) logging.debug(os.path.join( - activity.get_activity_root(), 'data', 'data')) + activity.get_activity_root(), 'data', 'data')) self._canvas.run_pygame(self.game.run) def __configure_cb(self, event): ''' Screen size has changed ''' self.write_file(os.path.join( - activity.get_activity_root(), 'data', 'data')) + activity.get_activity_root(), 'data', 'data')) pygame.display.set_mode((gtk.gdk.screen_width(), gtk.gdk.screen_height() - 2 * GRID_CELL_SIZE), pygame.RESIZABLE) self.read_file(os.path.join( - activity.get_activity_root(), 'data', 'data')) + activity.get_activity_root(), 'data', 'data')) self.game.run(True) def read_file(self, file_path): @@ -264,7 +263,7 @@ class PhysicsActivity(activity.Activity): clear_all_alert = ConfirmationAlert() clear_all_alert.props.title = _('Are You Sure?') clear_all_alert.props.msg = \ - _('All your work will be discarded. This cannot be undone!') + _('All your work will be discarded. This cannot be undone!') clear_all_alert.connect('response', clear_all_alert_cb) self.add_alert(clear_all_alert) diff --git a/physics.py b/physics.py index 6ce600a..6664f18 100644 --- a/physics.py +++ b/physics.py @@ -27,17 +27,13 @@ Code: git://git.sugarlabs.org/physics/mainline.git import os import sys -import math import gtk -import logging import pygame from pygame.locals import * from pygame.color import * -import sugargame sys.path.append("lib/") -import pkg_resources # If your architecture is different, comment these lines and install # the modules in your system. sys.path.append("lib/Box2D-2.0.2b1-py2.5-linux-i686.egg") @@ -84,8 +80,8 @@ class PhysicsGame: #Saving to journal self.world.add.remove_mouseJoint() additional_data = { - "trackinfo" : self.trackinfo, - "full_pos_list" : self.full_pos_list + "trackinfo": self.trackinfo, + "full_pos_list": self.full_pos_list } self.world.json_save(path, additional_data, serialize=True) @@ -122,7 +118,8 @@ class PhysicsGame: path = self.opening_queue.encode('ascii', 'convert') if os.path.exists(path): self.world.json_load(path, serialized=True) - self.full_pos_list = self.world.additional_vars['full_pos_list'] + self.full_pos_list = \ + self.world.additional_vars['full_pos_list'] self.trackinfo = self.world.additional_vars['trackinfo'] while self.loop: @@ -148,11 +145,12 @@ class PhysicsGame: 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: + 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() + clear_trace_active = \ + self.activity.clear_trace.get_sensitive() if poslist: if not poslist[0]: if clear_trace_active: @@ -161,18 +159,19 @@ class PhysicsGame: if clear_trace_active is False: self.activity.clear_trace.set_sensitive(True) - for key, info in self.trackinfo.iteritems(): - body = info[1] # [host_body, tracker, color, destroyed?] - if info[3] is False: # Not destroyed the pen + # [host_body, tracker, color, destroyed?] + body = info[1] + if info[3] is False: # Not destroyed the pen trackdex = info[4] + def to_screen(pos): px = self.world.meter_to_screen( - pos[0]) + pos[0]) py = self.world.meter_to_screen( - pos[1]) + pos[1]) py = self.world.renderer.get_surface() \ - .get_height() - py + .get_height() - py return (px, py) x = body.position.x @@ -187,7 +186,7 @@ class PhysicsGame: self.full_pos_list.append([posx, posy]) for body in self.world.world.GetBodyList(): - if type(body.userData) == type({}): + if isinstance(body.userData, dict): if body.userData.has_key('rollMotor'): diff = body.userData['rollMotor'] \ ['targetVelocity'] \ @@ -198,7 +197,7 @@ class PhysicsGame: # Update & Draw World self.world.update() - self.screen.fill((255, 255, 255)) # 255 for white + self.screen.fill((255, 255, 255)) # 255 for white self.world.draw() # Draw output from tools @@ -213,17 +212,17 @@ class PhysicsGame: pygame.display.flip() # Stay < 30 FPS to help keep the rest of the platform responsive - self.clock.tick(30) # Originally 50 + self.clock.tick(30) # Originally 50 def setTool(self, tool): self.currentTool.cancel() self.currentTool = self.toolList[tool] + def main(activity): - game = PhysicsGame(activity) + game = PhysicsGame(activity) return game # Make sure that main get's called if __name__ == '__main__': main() - diff --git a/tools.py b/tools.py index 190b558..d9c107b 100644 --- a/tools.py +++ b/tools.py @@ -23,10 +23,8 @@ # By Alex Levenson #================================================================== import pygame -import sugargame from pygame.locals import * from helpers import * -from inspect import getmro from gettext import gettext as _ from sugar.graphics.alert import ConfirmationAlert import gtk @@ -85,12 +83,11 @@ class Tool(object): def draw(self): # Default drawing method is draw the pen points. - full_pos_list = self.game.full_pos_list surface = self.game.world.renderer.get_surface() for key, info in self.game.trackinfo.iteritems(): color = info[2] trackdex = info[4] - try: + try: pos_list = self.game.full_pos_list[trackdex] for i in range(0, len(pos_list), 2): posx = int(pos_list[i]) @@ -131,7 +128,7 @@ class CircleTool(Tool): def draw(self): Tool.draw(self) # Draw a circle from pt1 to mouse - if self.pt1 != None: + if self.pt1 is not None: delta = distance(self.pt1, tuple_to_int(pygame.mouse.get_pos())) if delta > 0: @@ -165,7 +162,7 @@ class BoxTool(Tool): if event.button == 1: self.pt1 = tuple_to_int(event.pos) elif event.type == MOUSEBUTTONUP: - if event.button == 1 and self.pt1 != None: + if event.button == 1 and self.pt1 is not None: mouse_x_y = tuple_to_int(event.pos) if mouse_x_y[0] == self.pt1[0] and mouse_x_y[1] == self.pt1[1]: self.rect = pygame.Rect(self.pt1, @@ -183,7 +180,7 @@ class BoxTool(Tool): def draw(self): Tool.draw(self) # Draw a box from pt1 to mouse - if self.pt1 != None: + if self.pt1 is not None: mouse_x_y = tuple_to_int(pygame.mouse.get_pos()) if mouse_x_y[0] != self.pt1[0] or mouse_x_y[1] != self.pt1[1]: self.width = mouse_x_y[0] - self.pt1[0] @@ -217,7 +214,7 @@ class TriangleTool(Tool): if event.button == 1: self.pt1 = tuple_to_int(event.pos) elif event.type == MOUSEBUTTONUP: - if event.button == 1 and self.pt1 != None: + if event.button == 1 and self.pt1 is not None: mouse_x_y = tuple_to_int(event.pos) if mouse_x_y[0] == self.pt1[0] and mouse_x_y[1] == self.pt1[1]: self.pt1 = [mouse_x_y[0] - self.line_delta[0], @@ -252,14 +249,14 @@ class TriangleTool(Tool): def draw(self): Tool.draw(self) # Draw a triangle from pt1 to mouse - if self.pt1 != None: + if self.pt1 is not None: mouse_x_y = tuple_to_int(pygame.mouse.get_pos()) if mouse_x_y[0] != self.pt1[0] or mouse_x_y[1] != self.pt1[1]: self.vertices = constructTriangleFromLine(self.pt1, mouse_x_y) self.line_delta = [mouse_x_y[0] - self.pt1[0], mouse_x_y[1] - self.pt1[1]] pygame.draw.polygon(self.game.screen, (100, 180, 255), - self.vertices, 3) + self.vertices, 3) pygame.draw.line(self.game.screen, (100, 180, 255), self.pt1, mouse_x_y, 1) @@ -288,15 +285,15 @@ class PolygonTool(Tool): self.vertices = [tuple_to_int(event.pos)] self.safe = False if event.type == MOUSEBUTTONUP and self.vertices is not None and \ - len(self.vertices) == 1 and \ - tuple_to_int(event.pos)[0] == self.vertices[0][0] and \ - tuple_to_int(event.pos)[1] == self.vertices[0][1]: + len(self.vertices) == 1 and \ + tuple_to_int(event.pos)[0] == self.vertices[0][0] and \ + tuple_to_int(event.pos)[1] == self.vertices[0][1]: if self.previous_vertices is not None: last_x_y = self.previous_vertices[-1] delta_x = last_x_y[0] - tuple_to_int(event.pos)[0] delta_y = last_x_y[1] - tuple_to_int(event.pos)[1] self.vertices = [[i[0] - delta_x, i[1] - delta_y] - for i in self.previous_vertices] + for i in self.previous_vertices] self.safe = True self.game.world.add.complexPoly(self.vertices, dynamic=True, density=1.0, @@ -311,8 +308,8 @@ class PolygonTool(Tool): # Skip if coordinate is same as last one return if distance(tuple_to_int(event.pos), self.vertices[0]) < 15 \ - and self.safe: - self.vertices.append(self.vertices[0]) # Connect polygon + and self.safe: + self.vertices.append(self.vertices[0]) # Connect polygon self.game.world.add.complexPoly(self.vertices, dynamic=True, density=1.0, @@ -368,7 +365,7 @@ class MagicPenTool(Tool): delta_x = last_x_y[0] - tuple_to_int(event.pos)[0] delta_y = last_x_y[1] - tuple_to_int(event.pos)[1] self.vertices = [[i[0] - delta_x, i[1] - delta_y] - for i in self.previous_vertices] + for i in self.previous_vertices] self.safe = True if self.vertices and self.safe: self.game.world.add.complexPoly(self.vertices, dynamic=True, @@ -380,7 +377,7 @@ class MagicPenTool(Tool): elif event.type == MOUSEMOTION and self.vertices: self.vertices.append(tuple_to_int(event.pos)) if distance(tuple_to_int(event.pos), self.vertices[0]) >= 55 and \ - len(self.vertices) > 3: + len(self.vertices) > 3: self.safe = True def draw(self): @@ -419,12 +416,12 @@ class GrabTool(Tool): if event.button == 1: # Grab the first object at the mouse pointer bodylist = self.game.world.get_bodies_at_pos( - tuple_to_int(event.pos), - include_static=False) + tuple_to_int(event.pos), + include_static=False) if bodylist and len(bodylist) > 0: if self.game.world.run_physics: self.game.world.add.mouseJoint(bodylist[0], - tuple_to_int(event.pos)) + tuple_to_int(event.pos)) else: self._current_body = bodylist[0] elif event.type == MOUSEBUTTONUP: @@ -469,14 +466,14 @@ class JointTool(Tool): # Grab the first body self.jb1pos = tuple_to_int(event.pos) self.jb1 = self.game.world.get_bodies_at_pos( - tuple_to_int(event.pos)) + tuple_to_int(event.pos)) self.jb2 = self.jb2pos = None elif event.type == MOUSEBUTTONUP: if event.button == 1: # Grab the second body self.jb2pos = tuple_to_int(event.pos) self.jb2 = self.game.world.get_bodies_at_pos( - tuple_to_int(event.pos)) + tuple_to_int(event.pos)) # If we have two distinct bodies, add a distance joint! if self.jb1 and self.jb2 and str(self.jb1) != str(self.jb2): self.game.world.add.joint(self.jb1[0], self.jb2[0], @@ -515,7 +512,7 @@ class PinTool(Tool): if event.type == MOUSEBUTTONDOWN: self.jb1pos = tuple_to_int(event.pos) self.jb1 = self.game.world.get_bodies_at_pos( - tuple_to_int(event.pos)) + tuple_to_int(event.pos)) if self.jb1: self.game.world.add.joint(self.jb1[0], self.jb1pos) self.jb1 = self.jb1pos = None @@ -542,7 +539,7 @@ class MotorTool(Tool): # Grab the first body self.jb1pos = tuple_to_int(event.pos) self.jb1 = self.game.world.get_bodies_at_pos( - tuple_to_int(event.pos)) + tuple_to_int(event.pos)) if self.jb1: self.game.world.add.motor(self.jb1[0], self.jb1pos) self.jb1 = self.jb1pos = None @@ -591,7 +588,8 @@ class DestroyTool(Tool): def handleToolEvent(self, event): Tool.handleToolEvent(self, event) if pygame.mouse.get_pressed()[0]: - if not self.vertices: self.vertices = [] + if not self.vertices: + self.vertices = [] self.vertices.append(tuple_to_int(event.pos)) if len(self.vertices) > 10: self.vertices.pop(0) @@ -604,7 +602,7 @@ class DestroyTool(Tool): for key, info in tracklist: trackdex = info[4] if trackdex in tokill[0].userData['track_indices'] and \ - info[3] is False: + info[3] is False: self.game.world.world.DestroyBody(info[1]) self.game.trackinfo[key][3] = True destroyed_body = True @@ -712,15 +710,15 @@ class TrackTool(Tool): if 'track_indices' in current_body.userData: current_body.userData['track_indices'].append(trackdex) else: - current_body.userData['track_indices'] = [trackdex] + current_body.userData['track_indices'] = [trackdex] self.game.trackinfo[dictkey] = [0, 1, 2, 4, 5] self.game.trackinfo[dictkey][0] = current_body self.game.trackinfo[dictkey][1] = track_circle self.game.trackinfo[dictkey][2] = color - self.game.trackinfo[dictkey][3] = False # Pen destroyed or not. - self.game.trackinfo[dictkey][4] = trackdex # Tracking index. - self.game.tracked_bodies += 1 # counter of tracked bodies. + self.game.trackinfo[dictkey][3] = False # Pen destroyed or not + self.game.trackinfo[dictkey][4] = trackdex # Tracking index. + self.game.tracked_bodies += 1 # counter of tracked bodies def getAllTools(): -- cgit v0.9.1