sharpetronics/callirhoe
1
0
Fork 0
mirror of https://github.com/oDinZu/callirhoe.git synced 2025-02-22 00:04:52 -05:00
Code Issues Projects Releases Wiki Activity

tmp fix for missing 'fractal' option in sparse layout

Browse Source 
(fractal makes sense only in classic (matrix) layout)
This commit is contained in:
George Tzoumas 2017-01-08 02:12:21 +01:00
parent 91d922cb2e
commit 849a082a12
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layouts/_base.py
View File

@ -183,7 +183,7 @@ class CalendarRenderer(object):
self.holiday_provider = holiday_provider self.holiday_provider = holiday_provider
self.version_string = version_string self.version_string = version_string
self.options = options self.options = options
def _draw_month(self, cr, rect, month, year): def _draw_month(self, cr, rect, month, year):
"""this method renders a calendar month, it B{should be overridden} in any subclass """this method renders a calendar month, it B{should be overridden} in any subclass
@ -193,7 +193,7 @@ class CalendarRenderer(object):
@param year: year @param year: year
""" """
raise NotImplementedError("base _draw_month() should be overridden") raise NotImplementedError("base _draw_month() should be overridden")
#1 1 1 #1 1 1
#2 2 1 #2 2 1
#3 3 1 #3 3 1
@ -228,19 +228,19 @@ class CalendarRenderer(object):
S.month.box_shadow = False S.month.box_shadow = False
if self.Year % 2: self.options.swap_colors = not self.options.swap_colors if self.Year % 2: self.options.swap_colors = not self.options.swap_colors
if self.options.swap_colors: if self.options.swap_colors:
S.month.color_map_bg = (S.month.color_map_bg[1], S.month.color_map_bg[0]) S.month.color_map_bg = (S.month.color_map_bg[1], S.month.color_map_bg[0])
S.month.color_map_fg = (S.month.color_map_fg[1], S.month.color_map_fg[0]) S.month.color_map_fg = (S.month.color_map_fg[1], S.month.color_map_fg[0])
try: try:
page = PageWriter(self.Outfile, G.pagespec, not self.options.opaque, G.landscape, G.border) page = PageWriter(self.Outfile, G.pagespec, not self.options.opaque, G.landscape, G.border)
except InvalidFormat as e: except InvalidFormat as e:
print >> sys.stderr, "invalid output format", e.args[0] print >> sys.stderr, "invalid output format", e.args[0]
sys.exit(1) sys.exit(1)
if rows == 0 and cols == 0: if rows == 0 and cols == 0:
# if MonthSpan < 4: # if MonthSpan < 4:
# cols = 1; rows = MonthSpan # cols = 1; rows = MonthSpan
# elif MonthSpan < 9: # elif MonthSpan < 9:
# cols = 2; rows = int(math.ceil(MonthSpan/2.0)) # cols = 2; rows = int(math.ceil(MonthSpan/2.0))
# else: # else:
# TODO: improve this heuristic # TODO: improve this heuristic
@ -255,7 +255,7 @@ class CalendarRenderer(object):
elif cols == 0: elif cols == 0:
cols = int(ceil(self.MonthSpan*1.0/rows)) cols = int(ceil(self.MonthSpan*1.0/rows))
G.landscape = page.landscape # PNG is pseudo-landscape (portrait with width>height) G.landscape = page.landscape # PNG is pseudo-landscape (portrait with width>height)
if not self.options.no_footer: if not self.options.no_footer:
V0 = VLayout(page.Text_rect, 40, (1,)*4) V0 = VLayout(page.Text_rect, 40, (1,)*4)
Rcal = V0.item_span(39,0) Rcal = V0.item_span(39,0)
@ -278,9 +278,9 @@ class CalendarRenderer(object):
cur_month += 1 cur_month += 1
if cur_month > 12: cur_month = 1; cur_year += 1 if cur_month > 12: cur_month = 1; cur_year += 1
if num_placed >= self.MonthSpan: break if num_placed >= self.MonthSpan: break
num_pages_written = 0 num_pages_written = 0
z_order = "increasing" if self.options.fractal else self.options.z_order z_order = "increasing" if self.options.fractal else self.options.z_order
if z_order == "auto": if z_order == "auto":
if G.month.sloppy_dx != 0 or G.month.sloppy_dy != 0 or G.month.sloppy_rot != 0: if G.month.sloppy_dx != 0 or G.month.sloppy_dy != 0 or G.month.sloppy_rot != 0:

3
layouts/sparse.py
View File

@ -29,6 +29,7 @@ from datetime import date, timedelta
import _base import _base
# TODO: merge with base parser...
def get_parser(layout_name): def get_parser(layout_name):
"""get the parser object for the layout command-line arguments """get the parser object for the layout command-line arguments
@ -67,6 +68,8 @@ def get_parser(layout_name):
help="make background opaque (white fill)") help="make background opaque (white fill)")
parser.add_option("--swap-colors", action="store_true", default=False, parser.add_option("--swap-colors", action="store_true", default=False,
help="swap month colors for even/odd years") help="swap month colors for even/odd years")
parser.add_option("--fractal", action="store_true", default=False,
help=optparse.SUPPRESS_HELP)
return parser return parser
parser = get_parser(__name__) parser = get_parser(__name__)