From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 5 Dec 2014 14:59:55 +0000 (+0000)
Subject: Merge branch 'features/JAL-1605_html-svg-export' into develop
X-Git-Tag: Jalview_2_9~131
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=e18a55983523b534b2317b64104d32948275b1cd

Merge branch 'features/JAL-1605_html-svg-export' into develop
---

e18a55983523b534b2317b64104d32948275b1cd
diff --cc src/jalview/gui/AlignFrame.java
index be8af7b,42460dc..3273121
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@@ -1233,15 -1230,9 +1233,15 @@@ public class AlignFrame extends GAlignF
      // new HTMLOutput(alignPanel,
      // alignPanel.getSeqPanel().seqCanvas.getSequenceRenderer(),
      // alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
-     new HtmlSvgOutput(alignPanel);
+     new HtmlSvgOutput(null, alignPanel);
    }
  
 +  @Override
 +  public void bioJSMenuItem_actionPerformed(ActionEvent e)
 +  {
 +    new BioJsHTMLOutput(alignPanel,
 +            alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
 +  }
    public void createImageMap(File file, String image)
    {
      alignPanel.makePNGImageMap(file, image);