X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FImageMaker.java;h=4438de4b84337335dc1ff8c0eababd0e0817293c;hb=44f55ac060f9839cd19c4f415a5a149aece5eb2f;hp=099bcee5eec9db266c1862b26d0fb84b03b4b934;hpb=0b71927e1ea5f85cd190cf7814eaeaec3db9ba43;p=jalview.git diff --git a/src/jalview/util/ImageMaker.java b/src/jalview/util/ImageMaker.java index 099bcee..4438de4 100755 --- a/src/jalview/util/ImageMaker.java +++ b/src/jalview/util/ImageMaker.java @@ -20,6 +20,7 @@ */ package jalview.util; +import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.gui.EPSOptions; import jalview.gui.IProgressIndicator; @@ -60,8 +61,6 @@ public class ImageMaker EpsGraphics2D pg; - SVGGraphics2D g2; - Graphics graphics; FileOutputStream out; @@ -291,15 +290,13 @@ public class ImageMaker void setupSVG(int width, int height, String title) { + Graphics2D svgGraphics = new SVGGraphics2D(width, height); - g2 = new SVGGraphics2D(width, height); - Graphics2D ig2 = g2; - - String renderStyle = jalview.bin.Cache.getDefault("SVG_RENDERING", + String renderStyle = Cache.getDefault("SVG_RENDERING", "Prompt each time"); // If we need to prompt, and if the GUI is visible then - // Prompt for EPS rendering style + // Prompt for SVG rendering style if (renderStyle.equalsIgnoreCase("Prompt each time") && !(System.getProperty("java.awt.headless") != null && System .getProperty("java.awt.headless").equals("true"))) @@ -317,13 +314,13 @@ public class ImageMaker if (renderStyle.equalsIgnoreCase("Lineart")) { - ig2.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE, + svgGraphics.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE, SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR); } setProgressMessage(MessageManager .formatMessage("status.export_complete", type.getName())); - graphics = g2; + graphics = svgGraphics; } static JalviewFileChooser getPNGChooser()