From 43bbb43a2d523a0a561b65a13dd75a66d5bc8575 Mon Sep 17 00:00:00 2001 From: ville rantanen Date: Mon, 6 Jan 2014 23:10:10 +0200 Subject: [PATCH] simple focus. maybe should std size, and contrast --- image_list.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/image_list.py b/image_list.py index 692fd9e..46ddc0e 100755 --- a/image_list.py +++ b/image_list.py @@ -390,11 +390,13 @@ def append_sharpness(sqlfile): conn.commit() def get_sharpness(filename): - small_args="convert ( -colorspace gray XXX ( +clone -roll +0+1 ) -compose Difference -composite -shave 1x1 ) \ -( -colorspace gray XXX ( +clone -roll +1+0 ) -compose Difference -composite -shave 1x1 ) \ --compose Plus -composite -format %[fx:mean*1000] info:".split(" ") - small_args[4]=filename+'[0]' - small_args[19]=filename+'[0]' + """ Difference in X, Difference in Y, get smaller diff = smaller sharpness. + May change if bugs found.. """ + small_args="convert ( -define jpeg:size=1024x1024 -resize 1024x1024! -colorspace gray XXX -normalize -equalize ) \ +( -clone 0 ( -clone 0 -roll +1+0 ) -compose Difference -composite -shave 1x1 ) \ +( -clone 0 ( -clone 0 -roll +0+1 ) -compose Difference -composite -shave 1x1 ) \ +-delete 0 -compose Darken -composite -format %[fx:mean*1000] info:".split(" ") + small_args[8]=filename+'[0]' p=subprocess.Popen(small_args,stdout=subprocess.PIPE) sharpness, err = p.communicate() return float(sharpness.strip()) @@ -521,8 +523,8 @@ def main(): append_colors(options.sqlfile) print('Measure fingerprints...') append_fingerprints(options.sqlfile) - #print('Measure sharpness...') - #append_sharpness(options.sqlfile) + print('Measure sharpness...') + append_sharpness(options.sqlfile) if options.random: print('Random lists...') random_lists(options.sqlfile)