X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FImageExporter.java;h=457ea1f835e6ad29013776b4d2dc954092dab2e2;hb=d0aee5b0b2cbd0805c3dec027c6f2d2ac0148e66;hp=5fb69512a4c6cd5e5555a28970439a855b271673;hpb=26b115b0a77d521da92a06572d9b7819c2d0d49a;p=jalview.git diff --git a/src/jalview/gui/ImageExporter.java b/src/jalview/gui/ImageExporter.java index 5fb6951..457ea1f 100644 --- a/src/jalview/gui/ImageExporter.java +++ b/src/jalview/gui/ImageExporter.java @@ -1,18 +1,41 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.gui; +import java.awt.Component; +import java.awt.Graphics; +import java.io.File; +import java.util.concurrent.atomic.AtomicBoolean; + import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; +import jalview.io.exceptions.ImageOutputException; import jalview.util.ImageMaker; import jalview.util.ImageMaker.TYPE; import jalview.util.MessageManager; import jalview.util.Platform; - -import java.awt.Component; -import java.awt.Graphics; -import java.io.File; -import java.util.concurrent.atomic.AtomicBoolean; +import jalview.util.StringUtils; +import jalview.util.imagemaker.BitmapImageSizing; /** * A class that marshals steps in exporting a view in image graphics format @@ -38,8 +61,7 @@ public class ImageExporter */ public interface ImageWriterI { - void exportImage(Graphics g) - throws Exception; + void exportImage(Graphics g) throws Exception; } private IProgressIndicator messageBoard; @@ -83,7 +105,15 @@ public class ImageExporter * what the image is of e.g. Tree, Alignment */ public void doExport(File file, Component parent, int width, int height, - String imageSource) + String imageSource) throws ImageOutputException + { + doExport(file, parent, width, height, imageSource, null, + BitmapImageSizing.defaultBitmapImageSizing()); + } + + public void doExport(File file, Component parent, int width, int height, + String imageSource, String renderer, BitmapImageSizing userBis) + throws ImageOutputException { final long messageId = System.currentTimeMillis(); setStatus( @@ -96,6 +126,12 @@ public class ImageExporter */ if (file == null && !Jalview.isHeadlessMode()) { + if (Desktop.instance.isInBatchMode()) + { + // defensive error report - we could wait for user input.. I guess ? + throw (new ImageOutputException( + "Need an output file to render to when exporting images in batch mode!")); + } JalviewFileChooser chooser = imageType.getFileChooser(); chooser.setFileView(new JalviewFileView()); MessageManager.formatMessage("label.create_image_of", @@ -122,40 +158,31 @@ public class ImageExporter * for this as EPS_RENDERING / SVG_RENDERING * Always set to Text for JalviewJS as Lineart (glyph fonts) not available */ - String renderStyle = Cache.getDefault( - imageType.getName() + "_RENDERING", - LineartOptions.PROMPT_EACH_TIME); + String renderStyle = renderer == null + ? Cache.getDefault(imageType.getName() + "_RENDERING", + LineartOptions.PROMPT_EACH_TIME) + : renderer; if (Platform.isJS()) { renderStyle = "Text"; } AtomicBoolean textSelected = new AtomicBoolean( - !"Lineart".equals(renderStyle)); - if ((imageType == TYPE.EPS || imageType == TYPE.SVG) - && LineartOptions.PROMPT_EACH_TIME.equals(renderStyle) + !StringUtils.equalsIgnoreCase("lineart", renderStyle)); + if ((imageType == TYPE.EPS || imageType == TYPE.SVG) && StringUtils + .equalsIgnoreCase(LineartOptions.PROMPT_EACH_TIME, renderStyle) && !Jalview.isHeadlessMode()) { final File chosenFile = file; - Runnable okAction = new Runnable() - { - @Override - public void run() - { - exportImage(chosenFile, !textSelected.get(), width, height, - messageId); - } + Runnable okAction = () -> { + exportImage(chosenFile, !textSelected.get(), width, height, + messageId, userBis); }; LineartOptions epsOption = new LineartOptions(TYPE.EPS.getName(), textSelected); - epsOption.setResponseAction(1, new Runnable() - { - @Override - public void run() - { - setStatus(MessageManager.formatMessage( - "status.cancelled_image_export_operation", - imageType.getName()), messageId); - } + epsOption.setResponseAction(1, () -> { + setStatus(MessageManager.formatMessage( + "status.cancelled_image_export_operation", + imageType.getName()), messageId); }); epsOption.setResponseAction(0, okAction); epsOption.showDialog(); @@ -164,10 +191,11 @@ public class ImageExporter else { /* - * character rendering not required, or preference already set - * - just do the export + * character rendering not required, or preference already set + * or we're in headless mode - just do the export */ - exportImage(file, !textSelected.get(), width, height, messageId); + exportImage(file, !textSelected.get(), width, height, messageId, + userBis); } } @@ -183,17 +211,17 @@ public class ImageExporter * @param messageId */ protected void exportImage(File chosenFile, boolean asLineart, int width, - int height, long messageId) + int height, long messageId, BitmapImageSizing userBis) { String type = imageType.getName(); try { -// setStatus( -// MessageManager.formatMessage( -// "status.exporting_alignment_as_x_file", type), -// messageId); + // setStatus( + // MessageManager.formatMessage( + // "status.exporting_alignment_as_x_file", type), + // messageId); ImageMaker im = new ImageMaker(imageType, width, height, chosenFile, - title, asLineart); + title, asLineart, userBis); imageWriter.exportImage(im.getGraphics()); im.writeImage(); setStatus( @@ -201,9 +229,8 @@ public class ImageExporter messageId); } catch (Exception e) { - System.out - .println(String.format("Error creating %s file: %s", type, - e.toString())); + jalview.bin.Console.error(String.format("Error creating %s file: %s", + type, e.toString()), e); setStatus(MessageManager.formatMessage("info.error_creating_file", type), messageId); }