Commit e9c2dd97 authored by Guido van Rossum's avatar Guido van Rossum

Fix some comments; move 'import random' to top.

parent b59cef86
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
# #
# Usage: electrons [n [bitmapfile]] # Usage: electrons [n [bitmapfile]]
# #
# n is the number of electrons to animate; default is 4, maximum 15. # n is the number of electrons to animate; default is 30.
# #
# The bitmap file can be any X11 bitmap file (look in # The bitmap file can be any X11 bitmap file (look in
# /usr/include/X11/bitmaps for samples); it is displayed as the # /usr/include/X11/bitmaps for samples); it is displayed as the
# background of the animation. Default is no bitmap. # background of the animation. Default is no bitmap.
# This uses Steen Lumholt's Tk interface
from Tkinter import * from Tkinter import *
import random
# The graphical interface # The graphical interface
...@@ -32,25 +32,23 @@ class Electrons: ...@@ -32,25 +32,23 @@ class Electrons:
bitmap=bitmap, bitmap=bitmap,
foreground='blue') foreground='blue')
self.pieces = {} self.pieces = []
x1, y1, x2, y2 = 10,70,14,74 x1, y1, x2, y2 = 10,70,14,74
for i in range(n,0,-1): for i in range(n):
p = c.create_oval(x1, y1, x2, y2, fill='red') p = c.create_oval(x1, y1, x2, y2, fill='red')
self.pieces[i] = p self.pieces.append(p)
y1, y2 = y1 +2, y2 + 2 y1, y2 = y1 +2, y2 + 2
self.tk.update() self.tk.update()
def random_move(self,n): def random_move(self, n):
import random
c = self.canvas c = self.canvas
for i in range(1,n+1): for p in self.pieces:
p = self.pieces[i]
x = random.choice(range(-2,4)) x = random.choice(range(-2,4))
y = random.choice(range(-3,4)) y = random.choice(range(-3,4))
c.move(p, x, y) c.move(p, x, y)
self.tk.update() self.tk.update()
# Run -- never returns # Run -- allow 500 movemens
def run(self): def run(self):
try: try:
for i in range(500): for i in range(500):
...@@ -66,7 +64,7 @@ class Electrons: ...@@ -66,7 +64,7 @@ class Electrons:
def main(): def main():
import sys, string import sys, string
# First argument is number of pegs, default 4 # First argument is number of electrons, default 30
if sys.argv[1:]: if sys.argv[1:]:
n = string.atoi(sys.argv[1]) n = string.atoi(sys.argv[1])
else: else:
...@@ -91,5 +89,3 @@ def main(): ...@@ -91,5 +89,3 @@ def main():
# Call main when run as script # Call main when run as script
if __name__ == '__main__': if __name__ == '__main__':
main() main()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment