[gnome-games] gnome-sudoku: Style cleanup in printing.py
- From: Zhang Sen <zhangsen src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games] gnome-sudoku: Style cleanup in printing.py
- Date: Wed, 13 May 2009 09:55:29 -0400 (EDT)
commit 53e3a99068bcb2e8de0ab100e1ca444a644dafe4
Author: Zhang Sen <zh jesse gmail com>
Date: Wed May 13 20:57:26 2009 +0800
gnome-sudoku: Style cleanup in printing.py
Nothing but adding spaces and newlines. Part of bug 578903.
---
gnome-sudoku/src/lib/printing.py | 92 +++++++++++++++++++------------------
1 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/gnome-sudoku/src/lib/printing.py b/gnome-sudoku/src/lib/printing.py
index c8314f0..4cbfd4c 100644
--- a/gnome-sudoku/src/lib/printing.py
+++ b/gnome-sudoku/src/lib/printing.py
@@ -4,7 +4,7 @@ import os.path
import sudoku, gsudoku, saver, defaults
from gtk_goodies import gconf_wrapper
-def fit_squares_in_rectangle (width, height, n, margin=0):
+def fit_squares_in_rectangle (width, height, n, margin = 0):
"""Optimally fit squares into a rectangle.
Return number of columns, number of rows, and square size
@@ -14,14 +14,14 @@ def fit_squares_in_rectangle (width, height, n, margin=0):
"""
best_square_size = 0
best_fit = None
- for n_across in range(1,int(n)+1):
+ for n_across in range(1, int(n) + 1):
# if there's a remainder, we need to add an extra row...
# i.e. 5 / 2 = 2 remainder 1, which means with two rows we
# would need three columns, not two.
n_down = n / n_across + (n % n_across and 1 or 0)
- across_size = width - ((n_across+1) * margin)
+ across_size = width - ((n_across + 1) * margin)
across_size = across_size / n_across
- down_size = height - ((n_down+1) * margin)
+ down_size = height - ((n_down + 1) * margin)
down_size = down_size / n_down
if across_size < down_size:
square_size = across_size
@@ -29,20 +29,20 @@ def fit_squares_in_rectangle (width, height, n, margin=0):
square_size = down_size
if square_size > best_square_size:
best_square_size = square_size
- best_fit = n_across,n_down
+ best_fit = n_across, n_down
if best_fit:
- return best_fit,best_square_size
+ return best_fit, best_square_size
class SudokuPrinter:
def __init__ (self,
sudokus,
main_window,
- margin=50,
- sudokus_per_page=1,
+ margin = 50,
+ sudokus_per_page = 1,
):
self.drawn = False
self.margin = margin
- self.sudokus_per_page=sudokus_per_page
+ self.sudokus_per_page = sudokus_per_page
self.n_sudokus = len(sudokus)
self.sudokus = sudokus
self.print_op = gtk.PrintOperation()
@@ -63,16 +63,16 @@ class SudokuPrinter:
width = context.get_width()
height = context.get_height()
- best_fit,best_square_size = fit_squares_in_rectangle(width, height, self.sudokus_per_page, margin)
+ best_fit, best_square_size = fit_squares_in_rectangle(width, height, self.sudokus_per_page, margin)
- start = int(page_nr*self.sudokus_per_page)
- sudokus_on_page = self.sudokus[start : start+int(self.sudokus_per_page)]
+ start = int(page_nr * self.sudokus_per_page)
+ sudokus_on_page = self.sudokus[start : start + int(self.sudokus_per_page)]
left = margin
top = margin
- pos = [1,1]
+ pos = [1, 1]
for sudoku in sudokus_on_page:
- if type(sudoku)==tuple:
+ if type(sudoku) == tuple:
label = sudoku[1]
sudoku = sudoku[0]
else:
@@ -80,9 +80,9 @@ class SudokuPrinter:
cr.set_font_size(12)
cr.select_font_face("", cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD)
- cr.set_source_rgb(0,0,0)
+ cr.set_source_rgb(0, 0, 0)
xbearing, ybearing, width, height, xadvance, yadvance = cr.text_extents(label)
- cr.move_to(left, top-height/2)
+ cr.move_to(left, top - height / 2)
cr.show_text(label)
if isinstance(sudoku, gsudoku.SudokuGameDisplay):
@@ -91,7 +91,7 @@ class SudokuPrinter:
sudoku_thumber.draw_sudoku (cr, sudoku.grid, None, best_square_size, left, top)
if pos[0] < best_fit[0]:
left = left + best_square_size + margin
- pos[0] += 1
+ pos[0] += 1
else:
top = top + best_square_size + margin
left = margin
@@ -99,8 +99,8 @@ class SudokuPrinter:
pos[1] += 1
-def print_sudokus(*args,**kwargs):
- sp = SudokuPrinter(*args,**kwargs)
+def print_sudokus(*args, **kwargs):
+ sp = SudokuPrinter(*args, **kwargs)
res = sp.print_op.run(gtk.PRINT_OPERATION_ACTION_PRINT_DIALOG, sp.main_window)
if res == gtk.PRINT_OPERATION_RESULT_ERROR:
error_dialog = gtk.MessageDialog(sp.main_window,
@@ -108,7 +108,7 @@ def print_sudokus(*args,**kwargs):
gtk.MESSAGE_ERROR,
gtk.BUTTONS_CLOSE,
"Error printing file:\n")
- error_dialog.connect("response", lambda w,id: w.destroy())
+ error_dialog.connect("response", lambda w, id: w.destroy())
error_dialog.show()
class GamePrinter (gconf_wrapper.GConfWrapper):
@@ -126,31 +126,33 @@ class GamePrinter (gconf_wrapper.GConfWrapper):
}
def __init__ (self, sudoku_maker, gconf):
- gconf_wrapper.GConfWrapper.__init__(self,gconf)
+ gconf_wrapper.GConfWrapper.__init__(self, gconf)
self.sudoku_maker = sudoku_maker
self.builder = gtk.Builder()
self.builder.add_from_file(self.ui_file)
# Set up toggles...
- for key,wname in [('mark_printed_as_played','markAsPlayedToggle'),
- ('print_already_played_games','includeOldGamesToggle'),
- ('print_easy','easyCheckButton'),
- ('print_medium','mediumCheckButton'),
- ('print_hard','hardCheckButton'),
- ('print_very_hard','very_hardCheckButton'),
+ for key, wname in [('mark_printed_as_played', 'markAsPlayedToggle'),
+ ('print_already_played_games', 'includeOldGamesToggle'),
+ ('print_easy', 'easyCheckButton'),
+ ('print_medium', 'mediumCheckButton'),
+ ('print_hard', 'hardCheckButton'),
+ ('print_very_hard', 'very_hardCheckButton'),
]:
- setattr(self,wname,self.builder.get_object(wname))
- try: assert(getattr(self,wname))
- except: raise AssertionError('Widget %s does not exist'%wname)
- self.gconf_wrap_toggle(key,getattr(self,wname))
+ setattr(self, wname, self.builder.get_object(wname))
+ try:
+ assert(getattr(self, wname))
+ except:
+ raise AssertionError('Widget %s does not exist' % wname)
+ self.gconf_wrap_toggle(key, getattr(self, wname))
self.sudokusToPrintSpinButton = self.builder.get_object('sudokusToPrintSpinButton')
self.sudokusPerPageSpinButton = self.builder.get_object('sudokusPerPageSpinButton')
- for key,widg in [('print_multiple_sudokus_to_print',self.sudokusToPrintSpinButton.get_adjustment()),
- ('sudokus_per_page',self.sudokusPerPageSpinButton.get_adjustment())
+ for key, widg in [('print_multiple_sudokus_to_print', self.sudokusToPrintSpinButton.get_adjustment()),
+ ('sudokus_per_page', self.sudokusPerPageSpinButton.get_adjustment())
]:
- self.gconf_wrap_adjustment(key,widg)
+ self.gconf_wrap_adjustment(key, widg)
self.dialog = self.builder.get_object('dialog')
self.dialog.set_default_response(gtk.RESPONSE_OK)
- self.dialog.connect('response',self.response_cb)
+ self.dialog.connect('response', self.response_cb)
def response_cb (self, dialog, response):
if response not in (gtk.RESPONSE_ACCEPT, gtk.RESPONSE_OK):
@@ -160,7 +162,7 @@ class GamePrinter (gconf_wrapper.GConfWrapper):
levels = []
for cat in sudoku.DifficultyRating.categories:
if getattr(self,
- cat.replace(' ','_')+'CheckButton'
+ cat.replace(' ', '_') + 'CheckButton'
).get_active():
levels.append(cat)
if not levels:
@@ -169,16 +171,16 @@ class GamePrinter (gconf_wrapper.GConfWrapper):
sudokus = self.sudoku_maker.get_puzzles(
nsudokus,
levels,
- new=not self.includeOldGamesToggle.get_active()
+ new = not self.includeOldGamesToggle.get_active()
)
# Convert floating point difficulty into a label string
- sudokus.sort(cmp=lambda a,b: cmp(a[1],b[1]))
+ sudokus.sort(cmp = lambda a, b: cmp(a[1], b[1]))
sudokus = [(sudoku.sudoku_grid_from_string(puzzle),
- "%s (%.2f)"%(sudoku.get_difficulty_category_name(d),d)
- ) for puzzle,d in sudokus]
+ "%s (%.2f)" % (sudoku.get_difficulty_category_name(d), d)
+ ) for puzzle, d in sudokus]
sp = SudokuPrinter(sudokus,
self.dialog,
- sudokus_per_page=self.sudokusPerPageSpinButton.get_adjustment().get_value())
+ sudokus_per_page = self.sudokusPerPageSpinButton.get_adjustment().get_value())
self.sudokus_printed = sudokus
response = sp.print_op.run(gtk.PRINT_OPERATION_ACTION_PRINT_DIALOG, sp.main_window)
@@ -187,11 +189,11 @@ class GamePrinter (gconf_wrapper.GConfWrapper):
pass
elif response == gtk.PRINT_OPERATION_RESULT_APPLY:
if self.markAsPlayedToggle.get_active():
- for sud,lab in self.sudokus_printed:
+ for sud, lab in self.sudokus_printed:
jar = {}
- jar['game']=sud.to_string()
- jar['printed']=True
- jar['printed_at']=time.time()
+ jar['game'] = sud.to_string()
+ jar['printed'] = True
+ jar['printed_at'] = time.time()
tracker = saver.SudokuTracker()
tracker.finish_jar(jar)
self.dialog.hide()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]