From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 13 Nov 2014 16:46:06 +0000 (+0000)
Subject: Merge branch 'features/JAL-1469_svg-output-for-figure-export' into develop
X-Git-Tag: Jalview_2_9~153^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=70fd4c40d0b2046c6d402e365e4d04f9cfbb68ef;p=jalview.git

Merge branch 'features/JAL-1469_svg-output-for-figure-export' into develop

Conflicts:
	.classpath
	.gitignore
	src/jalview/gui/AlignmentPanel.java
	src/jalview/jbgui/GAlignFrame.java
---

70fd4c40d0b2046c6d402e365e4d04f9cfbb68ef
diff --cc src/jalview/gui/AppJmol.java
index 5cc174a,5d4b910..fcb31eb
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@@ -995,19 -987,29 +995,19 @@@ public class AppJmol extends GStructure
              600);
    }
  
 -  /**
 -   * DOCUMENT ME!
 -   * 
 -   * @param e
 -   *          DOCUMENT ME!
 -   */
 +  @Override
    public void eps_actionPerformed(ActionEvent e)
    {
-     makePDBImage(jalview.util.ImageMaker.EPS);
+     makePDBImage(jalview.util.ImageMaker.TYPE.EPS);
    }
  
 -  /**
 -   * DOCUMENT ME!
 -   * 
 -   * @param e
 -   *          DOCUMENT ME!
 -   */
 +  @Override
    public void png_actionPerformed(ActionEvent e)
    {
-     makePDBImage(jalview.util.ImageMaker.PNG);
+     makePDBImage(jalview.util.ImageMaker.TYPE.PNG);
    }
  
-   void makePDBImage(int type)
+   void makePDBImage(jalview.util.ImageMaker.TYPE type)
    {
      int width = getWidth();
      int height = getHeight();
diff --cc src/jalview/jbgui/GAlignFrame.java
index 1bee953,5146128..b75576e
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@@ -214,8 -210,8 +214,10 @@@ public class GAlignFrame extends JInter
  
    JMenuItem createPNG = new JMenuItem();
  
 +  JMenuItem createBioJS = new JMenuItem();
 +
+   JMenuItem createSVG = new JMenuItem();
+ 
    protected JMenuItem font = new JMenuItem();
  
    public JCheckBoxMenuItem seqLimits = new JCheckBoxMenuItem();
@@@ -2353,7 -2239,7 +2367,8 @@@
      jMenu2.add(htmlMenuItem);
      jMenu2.add(epsFile);
      jMenu2.add(createPNG);
 +    jMenu2.add(createBioJS);
+     jMenu2.add(createSVG);
      addSequenceMenu.add(addFromFile);
      addSequenceMenu.add(addFromText);
      addSequenceMenu.add(addFromURL);