X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=ab705c2e152fdb71e8997fbd395678c862f8fd97;hp=77c0238bb027b2eae7c6dfc4a83c00d306e2aec7;hb=b78a8a809f8ffbda3ca79e83d3df1c89064ef202;hpb=388622051f3d669942d9df63557c7a1401d7ff6d diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 77c0238..ab705c2 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -140,6 +140,7 @@ import jalview.io.JnetAnnotationMaker; import jalview.io.NewickFile; import jalview.io.ScoreMatrixFile; import jalview.io.TCoffeeScoreFile; +import jalview.io.exceptions.ImageOutputException; import jalview.io.vcf.VCFLoader; import jalview.jbgui.GAlignFrame; import jalview.project.Jalview2XML; @@ -1455,34 +1456,74 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, protected void htmlMenuItem_actionPerformed(ActionEvent e) { HtmlSvgOutput htmlSVG = new HtmlSvgOutput(alignPanel); - htmlSVG.exportHTML(null); + try { + htmlSVG.exportHTML(null); + } catch (ImageOutputException x) { + // report problem to console and raise dialog + } } @Override public void bioJSMenuItem_actionPerformed(ActionEvent e) { BioJsHTMLOutput bjs = new BioJsHTMLOutput(alignPanel); + try { bjs.exportHTML(null); + } catch (ImageOutputException x) { + // report problem to console and raise dialog + } } public void createImageMap(File file, String image) { + try { alignPanel.makePNGImageMap(file, image); + } catch (ImageOutputException x) { + // report problem to console and raise dialog + } } + @Override + public void createPNG_actionPerformed(ActionEvent e) { + try{ + createPNG(null); + } catch (ImageOutputException ioex) + { + // raise dialog, and report via console + } + } + @Override + public void createEPS_actionPerformed(ActionEvent e) { + try{ + createEPS(null); + } catch (ImageOutputException ioex) + { + // raise dialog, and report via console + } + + } + @Override + public void createSVG_actionPerformed(ActionEvent e) { + try{ + createSVG(null); + } catch (ImageOutputException ioex) + { + // raise dialog, and report via console + } + + } /** * Creates a PNG image of the alignment and writes it to the given file. If * the file is null, the user is prompted to choose a file. * * @param f */ - @Override - public void createPNG(File f) + public void createPNG(File f) throws ImageOutputException { createPNG(f, null, BitmapImageSizing.nullBitmapImageSizing()); } - public void createPNG(File f, String renderer, BitmapImageSizing userBis) + public void createPNG(File f, String renderer, BitmapImageSizing userBis) throws ImageOutputException { alignPanel.makeAlignmentImage(TYPE.PNG, f, renderer, userBis); } @@ -1493,13 +1534,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, * * @param f */ - @Override - public void createEPS(File f) + public void createEPS(File f) throws ImageOutputException { createEPS(f, null); } - public void createEPS(File f, String renderer) + public void createEPS(File f, String renderer) throws ImageOutputException { alignPanel.makeAlignmentImage(TYPE.EPS, f, renderer); } @@ -1510,13 +1550,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, * * @param f */ - @Override - public void createSVG(File f) + public void createSVG(File f) throws ImageOutputException { createSVG(f, null); } - public void createSVG(File f, String renderer) + public void createSVG(File f, String renderer) throws ImageOutputException { alignPanel.makeAlignmentImage(TYPE.SVG, f, renderer); }