X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FImageMaker.java;h=723204285c7a729349138e93a08166d38f5062ca;hb=ed96e73a6db654d52a6a1b1d27c2ee707876a4c7;hp=b7aa4ca2b530e4f4cfa4af64b65e1d048eef61d2;hpb=e1767448d422ab26a6920bae2173804eda662e31;p=jalview.git diff --git a/src/jalview/util/ImageMaker.java b/src/jalview/util/ImageMaker.java index b7aa4ca..7232042 100755 --- a/src/jalview/util/ImageMaker.java +++ b/src/jalview/util/ImageMaker.java @@ -42,6 +42,22 @@ import org.jibble.epsgraphics.EpsGraphics2D; public class ImageMaker { + public static final String SVG_DESCRIPTION = "Scalable Vector Graphics"; + + public static final String SVG_EXTENSION = "svg"; + + public static final String EPS_DESCRIPTION = "Encapsulated Postscript"; + + public static final String EPS_EXTENSION = "eps"; + + public static final String PNG_EXTENSION = "png"; + + public static final String PNG_DESCRIPTION = "Portable network graphics"; + + public static final String HTML_EXTENSION = "html"; + + public static final String HTML_DESCRIPTION = "Hypertext Markup Language"; + EpsGraphics2D pg; SVGGraphics2D g2; @@ -54,23 +70,34 @@ public class ImageMaker TYPE type; + private IProgressIndicator pIndicator; + + private long pSessionId; + + private boolean headless; + public enum TYPE { - EPS("EPS", MessageManager.getString("label.eps_file"), getEPSChooser()), PNG( - "PNG", MessageManager.getString("label.png_image"), - getPNGChooser()), SVG("SVG", "SVG", getSVGChooser()); - - private JalviewFileChooser chooser; + EPS("EPS", MessageManager.getString("label.eps_file"), EPS_EXTENSION, + EPS_DESCRIPTION), + PNG("PNG", MessageManager.getString("label.png_image"), + PNG_EXTENSION, PNG_DESCRIPTION), + SVG("SVG", "SVG", SVG_EXTENSION, SVG_DESCRIPTION); private String name; private String label; - TYPE(String name, String label, JalviewFileChooser chooser) + private String extension; + + private String description; + + TYPE(String name, String label, String ext, String desc) { this.name = name; this.label = label; - this.chooser = chooser; + this.extension = ext; + this.description = desc; } public String getName() @@ -78,9 +105,9 @@ public class ImageMaker return name; } - public JalviewFileChooser getChooser() + public JalviewFileChooser getFileChooser() { - return chooser; + return new JalviewFileChooser(extension, description); } public String getLabel() @@ -94,19 +121,16 @@ public class ImageMaker int height, File file, String fileTitle, IProgressIndicator pIndicator, long pSessionId, boolean headless) { + this.pIndicator = pIndicator; this.type = type; - + this.pSessionId = pSessionId; + this.headless = headless; if (file == null) { - if (pIndicator != null && !headless) - { - pIndicator.setProgressBar( - MessageManager.formatMessage( - "status.waiting_for_user_to_select_output_file", - type.name), pSessionId); - } + setProgressMessage(MessageManager.formatMessage( + "status.waiting_for_user_to_select_output_file", type.name)); JalviewFileChooser chooser; - chooser = type.getChooser(); + chooser = type.getFileChooser(); chooser.setFileView(new jalview.io.JalviewFileView()); chooser.setDialogTitle(title); chooser.setToolTipText(MessageManager.getString("action.save")); @@ -114,18 +138,14 @@ public class ImageMaker if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION) { - jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser - .getSelectedFile().getParent()); + jalview.bin.Cache.setProperty("LAST_DIRECTORY", + chooser.getSelectedFile().getParent()); file = chooser.getSelectedFile(); } else { - if (pIndicator != null && !headless) - { - pIndicator.setProgressBar(MessageManager.formatMessage( - "status.cancelled_image_export_operation", type.name), - pSessionId); - } + setProgressMessage(MessageManager.formatMessage( + "status.cancelled_image_export_operation", type.name)); } } @@ -134,6 +154,9 @@ public class ImageMaker try { out = new FileOutputStream(file); + setProgressMessage(null); + setProgressMessage(MessageManager.formatMessage( + "status.exporting_alignment_as_x_file", type.getName())); if (type == TYPE.SVG) { setupSVG(width, height, fileTitle); @@ -146,19 +169,13 @@ public class ImageMaker { setupPNG(width, height); } - if (pIndicator != null && !headless) - { - pIndicator.setProgressBar( -MessageManager.formatMessage( - "status.export_complete", type.getName()), - pSessionId); - } + } catch (Exception ex) { System.out.println("Error creating " + type.getName() + " file."); - pIndicator.setProgressBar(MessageManager.formatMessage( - "info.error_creating_file", type.getName()), pSessionId); + setProgressMessage(MessageManager + .formatMessage("info.error_creating_file", type.getName())); } } } @@ -185,7 +202,7 @@ MessageManager.formatMessage( out.close(); break; case PNG: - ImageIO.write(bi, "png", out); + ImageIO.write(bi, PNG_EXTENSION, out); out.flush(); out.close(); break; @@ -214,6 +231,8 @@ MessageManager.formatMessage( if (renderStyle == null || eps.cancelled) { + setProgressMessage(MessageManager.formatMessage( + "status.cancelled_image_export_operation", "EPS")); return; } } @@ -233,6 +252,8 @@ MessageManager.formatMessage( pg.setAccurateTextMode(accurateText); graphics = pg; + setProgressMessage(MessageManager + .formatMessage("status.export_complete", type.getName())); } catch (Exception ex) { } @@ -245,6 +266,8 @@ MessageManager.formatMessage( Graphics2D ig2 = (Graphics2D) graphics; ig2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + setProgressMessage(MessageManager + .formatMessage("status.export_complete", type.getName())); } @@ -268,16 +291,20 @@ MessageManager.formatMessage( if (renderStyle == null || svgOption.cancelled) { + setProgressMessage(MessageManager.formatMessage( + "status.cancelled_image_export_operation", "SVG")); return; } } - if (renderStyle.equalsIgnoreCase("lineart")) + if (renderStyle.equalsIgnoreCase("Lineart")) { ig2.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE, SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR); } + setProgressMessage(MessageManager + .formatMessage("status.export_complete", type.getName())); graphics = g2; } @@ -287,11 +314,7 @@ MessageManager.formatMessage( { return null; } - return new jalview.io.JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), - new String[] { "png" }, - new String[] { "Portable network graphics" }, - "Portable network graphics"); + return new JalviewFileChooser(PNG_EXTENSION, PNG_DESCRIPTION); } static JalviewFileChooser getEPSChooser() @@ -300,11 +323,15 @@ MessageManager.formatMessage( { return null; } - return new jalview.io.JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), - new String[] { "eps" }, - new String[] { "Encapsulated Postscript" }, - "Encapsulated Postscript"); + return new JalviewFileChooser(EPS_EXTENSION, EPS_DESCRIPTION); + } + + private void setProgressMessage(String message) + { + if (pIndicator != null && !headless) + { + pIndicator.setProgressBar(message, pSessionId); + } } static JalviewFileChooser getSVGChooser() @@ -313,10 +340,6 @@ MessageManager.formatMessage( { return null; } - return new jalview.io.JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), - new String[] { "svg" }, - new String[] { "Scalable Vector Graphics" }, - "Scalable Vector Graphics"); + return new JalviewFileChooser(SVG_EXTENSION, SVG_DESCRIPTION); } }