From 88bb9fad0609c3cd5c8233b618ff37f123a7ca14 Mon Sep 17 00:00:00 2001 From: Kevin Coffman Date: Thu, 22 Jul 2010 11:27:40 -0400 Subject: [PATCH] Insert the 80x15 version of Creative Commons License badges --- src/edu/umich/med/umms/CitationManipulate.java | 2 +- src/edu/umich/med/umms/DecompUtil.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/edu/umich/med/umms/CitationManipulate.java b/src/edu/umich/med/umms/CitationManipulate.java index 4abde8f..20e5cb5 100644 --- a/src/edu/umich/med/umms/CitationManipulate.java +++ b/src/edu/umich/med/umms/CitationManipulate.java @@ -23,7 +23,7 @@ public class CitationManipulate { private static final Pattern LIC_PATTERN = Pattern.compile(LIC_EXP); private static final String CC_LIC_LOC = "http://i.creativecommons.org/l/"; - private static final String CC_BADGE_IMG_NAME = "88x31.png"; + private static final String CC_BADGE_IMG_NAME = "80x15.png"; private ArrayList foundURLs = new ArrayList(); private Matcher urlMatcher; diff --git a/src/edu/umich/med/umms/DecompUtil.java b/src/edu/umich/med/umms/DecompUtil.java index 6718e44..91818c7 100644 --- a/src/edu/umich/med/umms/DecompUtil.java +++ b/src/edu/umich/med/umms/DecompUtil.java @@ -229,12 +229,17 @@ public static Point calculateCitationTextPosition(XShape xOrigImage, XShape xCit // Assumes that the original image shape is supplied public static Size calculateCitationImageSize(XShape xOrigImage) { - Point aPos = xOrigImage.getPosition(); - Size aSize = xOrigImage.getSize(); + // Using the original size results in an invalid shape! + //Size aSize = xOrigImage.getSize(); Size citationSize = new Size(); - citationSize.Width = 88 * 20; // Image is 88x31 pixels -- show it 20 times that size - citationSize.Height = 31 * 20; + // This assumes the original image is 80x15 pixels + // According to http://www.unitconversion.org//typography/pixels-x-to-millimeters-conversion.html + // one pixel == 0.26458333333333 mm + // So... + + citationSize.Width = Math.round((float)80 * (float)26.45833); + citationSize.Height = Math.round((float)15 * (float)26.45833); return citationSize; }