X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlSvgOutput.java;h=b5fdc2c4012a68400b9645e3cfa4785b476157ed;hb=ae3fad8019274ca3ab1258a480ba15dd9adac1e9;hp=a18418598e08b4ed6329b46d7cfc7ee373b55e3c;hpb=cee0842270af0aed7091576f3b414fb8a4f96e29;p=jalview.git diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java index a184185..b5fdc2c 100644 --- a/src/jalview/io/HtmlSvgOutput.java +++ b/src/jalview/io/HtmlSvgOutput.java @@ -20,54 +20,29 @@ */ package jalview.io; -import jalview.exceptions.NoFileSelectedException; -import jalview.gui.AlignmentPanel; -import jalview.gui.LineartOptions; -import jalview.gui.OOMWarning; -import jalview.math.AlignmentDimension; -import jalview.util.MessageManager; - import java.awt.Graphics; import java.awt.print.PrinterException; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicBoolean; import org.jfree.graphics2d.svg.SVGGraphics2D; import org.jfree.graphics2d.svg.SVGHints; +import jalview.bin.Cache; +import jalview.gui.AlignmentPanel; +import jalview.gui.LineartOptions; +import jalview.gui.OOMWarning; +import jalview.math.AlignmentDimension; +import jalview.util.MessageManager; + public class HtmlSvgOutput extends HTMLOutput { - public HtmlSvgOutput(AlignmentPanel ap) { - super(ap); - } - - @Override - public void exportHTML(String outputFile) - { - exportStarted(); - try - { - if (outputFile == null) - { - outputFile = getOutputFile(); - } - generatedFile = new File(outputFile); - } catch (NoFileSelectedException e) - { - setProgressMessage(MessageManager.formatMessage( - "status.cancelled_image_export_operation", "HTML")); - return; - } catch (Exception e) - { - setProgressMessage(MessageManager - .formatMessage("info.error_creating_file", "HTML")); - e.printStackTrace(); - return; - } - new Thread(this).start(); + super(ap, "HTML"); } public int printUnwrapped(int pwidth, int pheight, int pi, @@ -84,8 +59,8 @@ public class HtmlSvgOutput extends HTMLOutput return ap.printWrappedAlignment(pwidth, pheight, pi, pg[0]); } - private String getHtml(String titleSvg, String alignmentSvg, - String jsonData, boolean wrapped) + String getHtml(String titleSvg, String alignmentSvg, String jsonData, + boolean wrapped) { StringBuilder htmlSvg = new StringBuilder(); htmlSvg.append("\n"); @@ -214,8 +189,8 @@ public class HtmlSvgOutput extends HTMLOutput @Override public boolean isEmbedData() { - return Boolean.valueOf( - jalview.bin.Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true")); + return Boolean + .valueOf(Cache.getDefault("EXPORT_EMBBED_BIOJSON", "true")); } @Override @@ -225,45 +200,83 @@ public class HtmlSvgOutput extends HTMLOutput } @Override - public File getExportedFile() + public void run() { - return generatedFile; + run(null); } @Override - public void run() + public void run(String renderer) { try { - setProgressMessage(null); - setProgressMessage(MessageManager.formatMessage( - "status.exporting_alignment_as_x_file", "HTML")); - AlignmentDimension aDimension = ap.getAlignmentDimension(); - SVGGraphics2D idPanelGraphics = new SVGGraphics2D( - aDimension.getWidth(), aDimension.getHeight()); - SVGGraphics2D alignPanelGraphics = new SVGGraphics2D( - aDimension.getWidth(), aDimension.getHeight()); + String renderStyle = renderer == null + ? Cache.getDefault("HTML_RENDERING", + LineartOptions.PROMPT_EACH_TIME) + : renderer; + AtomicBoolean textOption = new AtomicBoolean( + !"lineart".equals(renderStyle.toLowerCase(Locale.ROOT))); - String renderStyle = jalview.bin.Cache.getDefault("HTML_RENDERING", - "Prompt each time"); + /* + * configure the action to run on OK in the dialog + */ + Runnable okAction = () -> { + doOutput(textOption.get()); + }; - // If we need to prompt, and if the GUI is visible then - // Prompt for rendering style - if (renderStyle.equalsIgnoreCase("Prompt each time") && !isHeadless()) + /* + * Prompt for character rendering style if preference is not set + */ + if (renderStyle.equalsIgnoreCase(LineartOptions.PROMPT_EACH_TIME) + && !isHeadless()) { - LineartOptions svgOption = new LineartOptions("HTML_RENDERING", - "HTML"); - renderStyle = svgOption.getValue(); - - if (renderStyle == null || svgOption.cancelled) - { + LineartOptions svgOption = new LineartOptions("HTML", textOption); + svgOption.setResponseAction(1, () -> { setProgressMessage(MessageManager.formatMessage( - "status.cancelled_image_export_operation", "HTML")); - return; - } + "status.cancelled_image_export_operation", + getDescription())); + }); + svgOption.setResponseAction(0, okAction); + svgOption.showDialog(); + /* no code here - JalviewJS cannot execute it */ + } + else + { + /* + * else (if preference set) just do the export action + */ + doOutput(textOption.get()); } + } catch (OutOfMemoryError err) + { + jalview.bin.Console.outPrintln("########################\n" + "OUT OF MEMORY " + + generatedFile + "\n" + "########################"); + new OOMWarning("Creating Image for " + generatedFile, err); + } catch (Exception e) + { + e.printStackTrace(); + setProgressMessage(MessageManager + .formatMessage("info.error_creating_file", getDescription())); + } + } - if (renderStyle.equalsIgnoreCase("Lineart")) + /** + * Builds and writes the image to the file specified by field + * generatedFile + * + * @param textCharacters + * true for Text character rendering, false for Lineart + */ + protected void doOutput(boolean textCharacters) + { + try + { + AlignmentDimension aDimension = ap.getAlignmentDimension(); + SVGGraphics2D idPanelGraphics = new SVGGraphics2D( + aDimension.getWidth(), aDimension.getHeight()); + SVGGraphics2D alignPanelGraphics = new SVGGraphics2D( + aDimension.getWidth(), aDimension.getHeight()); + if (!textCharacters) // Lineart selected { idPanelGraphics.setRenderingHint(SVGHints.KEY_DRAW_STRING_TYPE, SVGHints.VALUE_DRAW_STRING_TYPE_VECTOR); @@ -291,18 +304,13 @@ public class HtmlSvgOutput extends HTMLOutput out.flush(); out.close(); setProgressMessage(MessageManager - .formatMessage("status.export_complete", "HTML")); + .formatMessage("status.export_complete", getDescription())); exportCompleted(); - } catch (OutOfMemoryError err) - { - System.out.println("########################\n" + "OUT OF MEMORY " - + generatedFile + "\n" + "########################"); - new OOMWarning("Creating Image for " + generatedFile, err); } catch (Exception e) { e.printStackTrace(); setProgressMessage(MessageManager - .formatMessage("info.error_creating_file", "HTML")); + .formatMessage("info.error_creating_file", getDescription())); } } }