X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FHtmlSvgOutput.java;h=a18418598e08b4ed6329b46d7cfc7ee373b55e3c;hb=refs%2Fheads%2Ftask%2FJAL-3068lineartDialog;hp=2fabe9a66c8b76d829bf137c8c073384e03cef0a;hpb=26371ff5c38bbb092e432d5616313bc1088e87a2;p=jalview.git diff --git a/src/jalview/io/HtmlSvgOutput.java b/src/jalview/io/HtmlSvgOutput.java index 2fabe9a..a184185 100644 --- a/src/jalview/io/HtmlSvgOutput.java +++ b/src/jalview/io/HtmlSvgOutput.java @@ -22,7 +22,7 @@ package jalview.io; import jalview.exceptions.NoFileSelectedException; import jalview.gui.AlignmentPanel; -import jalview.gui.HTMLOptions; +import jalview.gui.LineartOptions; import jalview.gui.OOMWarning; import jalview.math.AlignmentDimension; import jalview.util.MessageManager; @@ -39,7 +39,6 @@ import org.jfree.graphics2d.svg.SVGHints; public class HtmlSvgOutput extends HTMLOutput { - public HtmlSvgOutput(AlignmentPanel ap) { super(ap); @@ -63,28 +62,20 @@ public class HtmlSvgOutput extends HTMLOutput return; } catch (Exception e) { - setProgressMessage(MessageManager.formatMessage( - "info.error_creating_file", "HTML")); + setProgressMessage(MessageManager + .formatMessage("info.error_creating_file", "HTML")); e.printStackTrace(); return; } new Thread(this).start(); } - - static JalviewFileChooser getHTMLChooser() - { - return new jalview.io.JalviewFileChooser( - jalview.bin.Cache.getProperty("LAST_DIRECTORY"), - new String[] { "html" }, - new String[] { "Hypertext Markup Language" }, - "Hypertext Markup Language"); - } - - public int printUnwrapped(int pwidth, int pheight, int pi, Graphics... pg) + public int printUnwrapped(int pwidth, int pheight, int pi, + Graphics idGraphics, Graphics alignmentGraphics) throws PrinterException { - return ap.printUnwrapped(pwidth, pheight, pi, pg); + return ap.printUnwrapped(pwidth, pheight, pi, idGraphics, + alignmentGraphics); } public int printWrapped(int pwidth, int pheight, int pi, Graphics... pg) @@ -100,10 +91,13 @@ public class HtmlSvgOutput extends HTMLOutput htmlSvg.append("\n"); if (jsonData != null) { - htmlSvg.append(" "); - htmlSvg.append(""); - htmlSvg.append("