Merge pull request #10 from andrewlalis/development

changed to 1.3.1

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.andrewlalis</groupId>
     <artifactId>TengwarTranslatorLibrary</artifactId>
-    <version>1.1</version>
+    <version>1.3.1</version>
 
     <build>
         <plugins>

src/main/java/net/agspace/TengwarImageGenerator.java

@@ -0,0 +1,149 @@
+package net.agspace;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author Andrew Lalis
+ * Class to generate images of tengwar text to fit certain criteria.
+ */
+public class TengwarImageGenerator {
+
+    /**
+     * Overloaded method for a simpler image generator, using white-on-black text and neither bold nor italics.
+     * @param tengwarText The string of tengwar text to transform into an image.
+     * @param maxWidth The maximum width, in pixels, that the generated image can be.
+     * @param fontSize The size of the font to use.
+     * @param filePath The path of the file to save the generated image to.
+     * @return An Image Object containing the drawn text.
+     */
+    public static File generateImage(String tengwarText, int maxWidth, float fontSize, String filePath){
+        return generateImage(tengwarText, maxWidth, fontSize, false, false, filePath, Color.black, Color.white);
+    }
+
+    /**
+     * Generates an image of some tengwar text. The text is wrapped so that each line may not take up more than
+     * {@code maxWidth} pixels.
+     * @param tengwarText The string of tengwar text to transform into an image.
+     * @param maxWidth The maximum width, in pixels, that the generated image can be.
+     * @param fontSize The size of the font to use.
+     * @param bold Whether or not the font should be bold.
+     * @param italic Whether or not the font should be italic.
+     * @param filepath The path of the file to save the generated image to.
+     * @param backgroundColor The background color of the image.
+     * @param foregroundColor The foreground color of the image.
+     * @return An Image Object containing the drawn text.
+     */
+    public static File generateImage(String tengwarText, int maxWidth, float fontSize, boolean bold, boolean italic, String filepath, Color backgroundColor, Color foregroundColor) {
+
+        BufferedImage bufferedImage = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
+        Graphics2D graphics = bufferedImage.createGraphics();
+        Font tengwarFont = getTengwarFont(bold, italic, fontSize);
+        graphics.setFont(tengwarFont);
+        FontMetrics fm = graphics.getFontMetrics();
+        //Set width of the image, either max width or the string width itself plus some padding space.
+        int width = fm.stringWidth(tengwarText) + 10;
+        if (width > maxWidth){
+            width = maxWidth;
+        }
+        int height = fm.getHeight();
+        graphics.dispose();
+
+        String wrappedText = wrapTextByPixels(tengwarText, maxWidth-10, fm);
+        String[] lines = wrappedText.split("\n");
+
+        bufferedImage = new BufferedImage(width, (height*lines.length)+fm.getMaxDescent(), BufferedImage.TYPE_INT_RGB);
+        graphics = bufferedImage.createGraphics();
+        //graphics.setBackground(new Color(54, 57, 62)); Color for discord background.
+        graphics.setBackground(backgroundColor);
+        graphics.clearRect(0, 0, width, height*lines.length+fm.getMaxDescent());
+        graphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+        graphics.setColor(foregroundColor);
+        graphics.setFont(tengwarFont);
+        for (int i = 0; i < lines.length; i++){
+            graphics.drawString(lines[i], 5, height*(i+1));
+        }
+        graphics.dispose();
+
+        try {
+            File file = new File(filepath);
+            ImageIO.write(bufferedImage, "png", file);
+            return file;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Returns the tngan.ttf font loaded into a Java Font.
+     * @param bold Whether or not font should be bold.
+     * @param italic Whether or not font should be italic.
+     * @param size The font size, in pt.
+     * @return The Font loaded, or null.
+     */
+    public static Font getTengwarFont(boolean bold, boolean italic, float size){
+        Font font = null;
+        try {
+            String filename;
+            if (bold && italic){
+                filename = "tnganbi.ttf";
+            } else if (bold){
+                filename = "tnganb.ttf";
+            } else if (italic){
+                filename = "tngani.ttf";
+            } else {
+                filename = "tngan.ttf";
+            }
+            font = Font.createFont(Font.TRUETYPE_FONT, TengwarImageGenerator.class.getClassLoader().getResourceAsStream(filename)).deriveFont(size);
+        } catch (FontFormatException | IOException e) {
+            e.printStackTrace();
+        }
+        return font;
+    }
+
+    /**
+     * Inserts newline characters into a string of text so that it will not overflow beyond a line size.
+     * @param text The text to wrap.
+     * @param width The width, in pixels, of the block of text.
+     * @param fm The font metrics object to use.
+     * @return A new string with newline characters inserted.
+     */
+    public static String wrapTextByPixels(String text, int width, FontMetrics fm){
+        String[] words = text.split(" ");
+        StringBuilder sb = new StringBuilder();
+        int currentWidth = 0;
+        for (String word : words) {
+            int wordWidth = fm.stringWidth(word + ' ');
+            //Deal with words greater than the max length.
+            if (wordWidth > width) {
+                char[] chars = word.toCharArray();
+                for (char c : chars) {
+                    int charWidth = fm.charWidth(c);
+                    if (currentWidth + charWidth < width) {
+                        currentWidth += charWidth;
+                        sb.append(c);
+                    } else {
+                        currentWidth = charWidth;
+                        sb.append("-\n").append(c);
+                    }
+                }
+                sb.append(' ');
+            } else if (currentWidth + wordWidth < width) {
+                //If the word fits normally.
+                currentWidth += wordWidth;
+                sb.append(word).append(' ');
+            } else {
+                //If the word causes a new line.
+                currentWidth = wordWidth;
+                sb.append('\n').append(word).append(' ');
+            }
+        }
+        return sb.toString().trim();
+    }
+
+}

src/net/agspace/TengwarImageGenerator.java

@@ -1,83 +0,0 @@
-package net.agspace;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @author Andrew Lalis
- * Class to generate images of tengwar text to fit certain criteria.
- */
-public class TengwarImageGenerator {
-
-    /**
-     * Generates an image of some tengwar text. The text is wrapped so that each line may not take up more than
-     * {@code maxWidth} pixels.
-     * @param tengwarText The string of tengwar text to transform into an image.
-     * @param maxWidth The maximum width, in pixels, that the generated image can be.
-     * @param fontSize The size of the font to use.
-     * @param bold Whether or not the font should be bold.
-     * @param italic Whether or not the font should be italic.
-     * @return An Image Object containing the drawn text.
-     */
-    public static File generateImage(String tengwarText, int maxWidth, float fontSize, boolean bold, boolean italic, String filepath) {
-        BufferedImage bufferedImage = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
-        Graphics2D graphics = bufferedImage.createGraphics();
-        Font tengwarFont = getTengwarFont(bold, italic, fontSize);
-        graphics.setFont(tengwarFont);
-        FontMetrics fm = graphics.getFontMetrics();
-        int width = fm.stringWidth(tengwarText);
-        int height = fm.getHeight();
-        graphics.dispose();
-
-        bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        graphics = bufferedImage.createGraphics();
-        graphics.setBackground(new Color(54, 57, 62));
-        graphics.clearRect(0, 0, width, height);
-        graphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-
-        graphics.setColor(Color.white);
-        graphics.setFont(tengwarFont);
-        graphics.drawString(tengwarText, 0, fm.getAscent());
-        graphics.dispose();
-
-        try {
-            File file = new File(filepath);
-            ImageIO.write(bufferedImage, "png", file);
-            return file;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the tngan.ttf font loaded into a Java Font.
-     * @param bold Whether or not font should be bold.
-     * @param italic Whether or not font should be italic.
-     * @param size The font size, in pt.
-     * @return The Font loaded, or null.
-     */
-    public static Font getTengwarFont(boolean bold, boolean italic, float size){
-        Font font = null;
-        try {
-            String filename;
-            if (bold && italic){
-                filename = "tnganbi.ttf";
-            } else if (bold){
-                filename = "tnganb.ttf";
-            } else if (italic){
-                filename = "tngani.ttf";
-            } else {
-                filename = "tngan.ttf";
-            }
-            font = Font.createFont(Font.TRUETYPE_FONT, TengwarImageGenerator.class.getClassLoader().getResourceAsStream(filename)).deriveFont(size);
-        } catch (FontFormatException | IOException e) {
-            e.printStackTrace();
-        }
-        return font;
-    }
-
-}