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

version number 0.4.0

Browse Source 
calmagick: launch callirhoe in background



git-svn-id: https://callirhoe.googlecode.com/svn/trunk@146 81c8bb96-aa45-f2e2-0eef-c4fa4a15c6df
This commit is contained in:
geortz@gmail.com 2014-09-28 15:22:10 +00:00
parent a98ce69e6a
commit d947a85f29
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
callirhoe.py
View File

@ -44,7 +44,7 @@
# CANNOT UPGRADE TO argparse !!! -- how to handle [[month] year] form? # CANNOT UPGRADE TO argparse !!! -- how to handle [[month] year] form?
_version = "0.3.1" _version = "0.4.0"
import calendar import calendar
import sys import sys

39
calmagick.py
View File

@ -36,12 +36,13 @@ from callirhoe import extract_parser_args, parse_month_range, parse_year
from lib.geom import rect_rel_scale from lib.geom import rect_rel_scale
# TODO: # TODO:
# cache stuff when --sample is used, move --sample to filedef, like '*.jpg:0' # cache stuff when --sample is used
# fork processes (independent stuff...) # multithreaded range operation
# raise exceptions instead of sys.exit
# convert input to ImageMagick native format for faster access?
def run_callirhoe(style, w, h, args, outfile): def run_callirhoe(style, w, h, args, outfile):
if subprocess.call(['callirhoe', '-s', style, '--paper=-%d:-%d' % (w,h)] + args + [outfile]): return subprocess.Popen(['callirhoe', '-s', style, '--paper=-%d:-%d' % (w,h)] + args + [outfile])
sys.exit("calmagick: calendar creation failed")
class PNMImage(object): class PNMImage(object):
def __init__(self, strlist): def __init__(self, strlist):
@ -101,7 +102,7 @@ class PNMImage(object):
if cur[0] <= entropy_thres: return cur + (best[0],) if cur[0] <= entropy_thres: return cur + (best[0],)
return best + (best[0],) # avg, sz_ratio, x, y, sz, best_avg return best + (best[0],) # avg, sz_ratio, x, y, sz, best_avg
_version = "0.1.0" _version = "0.4.0"
def get_parser(): def get_parser():
"""get the argument parser object""" """get the argument parser object"""
@ -110,7 +111,7 @@ def get_parser():
If IMAGE is a single file, then a calendar of the current month is overlayed. If IMAGE contains wildcards, If IMAGE is a single file, then a calendar of the current month is overlayed. If IMAGE contains wildcards,
then every month is generated according to the --range option, advancing one month for every photo file. then every month is generated according to the --range option, advancing one month for every photo file.
Photos will be reused in a round-robin fashion if more calendar Photos will be reused in a round-robin fashion if more calendar
months are requested.""", version="calmagick " + _version) months are requested.""", version="callirhoe.CalMagick " + _version)
parser.add_option("--outdir", default=".", parser.add_option("--outdir", default=".",
help="set directory for the output image(s); directory will be created if it does not already exist [%default]") help="set directory for the output image(s); directory will be created if it does not already exist [%default]")
parser.add_option("--outfile", default=None, parser.add_option("--outfile", default=None,
@ -328,22 +329,24 @@ def compose_calendar(img, outimg, options, callirhoe_args, magick_args):
outimg]) outimg])
return return
# measure luminance
if options.verbose: print "Measuring luminance...",
if options.negative > 0 and options.negative < 255:
luma = _get_image_luminance(img, magick_args[0], geometry)
if options.verbose: print "(%s)" % luma,
else:
luma = 255 - options.negative
dark = luma < options.negative
if options.verbose: print "DARK" if dark else "LIGHT"
# generate callirhoe calendar # generate callirhoe calendar
if options.verbose: print "Generating calendar image (%s)..." % options.style if options.verbose: print "Generating calendar image (%s) ... [&]" % options.style
if not options.vanilla: callirhoe_args = callirhoe_args + ['--no-footer', '--border=0'] if not options.vanilla: callirhoe_args = callirhoe_args + ['--no-footer', '--border=0']
calimg = mktemp('.png') calimg = mktemp('.png')
try: try:
run_callirhoe(options.style, geometry[0], geometry[1], callirhoe_args, calimg); pcal = run_callirhoe(options.style, geometry[0], geometry[1], callirhoe_args, calimg)
# measure luminance
if options.verbose: print "Measuring luminance...",
if options.negative > 0 and options.negative < 255:
luma = _get_image_luminance(img, magick_args[0], geometry)
if options.verbose: print "(%s)" % luma,
else:
luma = 255 - options.negative
dark = luma < options.negative
if options.verbose: print "DARK" if dark else "LIGHT"
pcal.wait()
if pcal.returncode != 0: raise RuntimeError("calmagick: calendar creation failed")
# perform final composition # perform final composition
if options.verbose: print "Composing overlay (%s)..." % outimg if options.verbose: print "Composing overlay (%s)..." % outimg