Remove development code

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 90e911e..d6be387 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -2338,30 +2338,4 @@ public class AlignFrame
     // TODO: group services by location as well as function.\r
   }\r
 \r
-  public void vamsasStore_actionPerformed(ActionEvent e)\r
-{\r
-  /* JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.\r
-       getProperty("LAST_DIRECTORY"));\r
-\r
-   chooser.setFileView(new JalviewFileView());\r
-   chooser.setDialogTitle("Export to Vamsas file");\r
-   chooser.setToolTipText("Export");\r
-\r
-   int value = chooser.showSaveDialog(this);\r
-   */\r
-  //  if (value == JalviewFileChooser.APPROVE_OPTION)\r
-  {\r
-         jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);\r
-    vs.store("C:\\Documents And Settings\\andrew\\Desktop\\vamsas.zip");\r
-   // chooser.getSelectedFile().getAbsolutePath();\r
-  }\r
-}\r
-\r
-public void vamsasLoad_actionPerformed(ActionEvent e)\r
-{\r
-  jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);\r
-  vs.load("C:\\Documents And Settings\\andrew\\Desktop\\vamsas.zip");\r
-}\r
-\r
-\r
 }\r

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 42c52d3..7f9ee97 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -519,55 +519,22 @@ public class SeqCanvas extends JComponent
 \r
   SequenceI nextSeq;\r
 \r
-  SequenceI dna = null;\r
-\r
-  int aaHeight = (int)(av.getCharHeight()*aaRatio);\r
-  int dnaHeight =(int)(av.getCharHeight() * (1-aaRatio));\r
-\r
-\r
-  java.awt.geom.AffineTransform transform = new java.awt.geom.AffineTransform();\r
-  transform.scale(1f/3f , 1);\r
-  Font dnafont = new Font(av.getFont().getName(), av.getFont().getStyle(),\r
-                              dnaHeight);\r
-  dnafont = dnafont.deriveFont(transform);\r
-\r
-  Font aafont = new Font(av.getFont().getName(), av.getFont().getStyle(),\r
-                              aaHeight);\r
-  transform = new java.awt.geom.AffineTransform();\r
-  transform.scale(1/aaRatio, 1);\r
-  aafont = aafont.deriveFont(transform);\r
 \r
         /// First draw the sequences\r
         /////////////////////////////\r
         for (int i = y1; i < y2; i++)\r
         {\r
             nextSeq = av.alignment.getSequenceAt(i);\r
-            g.setFont(aafont);\r
-/*\r
-            StringBuffer dnasb = new StringBuffer();\r
-            for (int j = 0; j < nextSeq.getLength(); j++)\r
-            {\r
-              java.util.Vector codons = jalview.schemes.ResidueProperties.getCodons(nextSeq.getSequence(j,\r
-                  j + 1));\r
-              if (codons != null && codons.size() > 0)\r
-                dnasb.append(codons.elementAt(0).toString());\r
-            }\r
-\r
-            dna = new Sequence("dna", dnasb.toString());*/\r
+            g.setFont(av.getFont());\r
 \r
 \r
             sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq),\r
                             x1, x2, (x1 - startx) * av.charWidth,\r
                             offset + ( (i - starty) * av.charHeight), av.charWidth,\r
-                            aaHeight);\r
+                            av.charHeight);\r
 \r
 \r
-         /*   g.setFont(dnafont);\r
 \r
-            sr.drawSequence(g, dna, null,\r
-                            x1, x2 * 3 +2, ( (x1 - startx) * av.charWidth) / 3,\r
-                            offset + ( (i - starty) * av.charHeight) + aaHeight, av.charWidth / 3,\r
-                            dnaHeight);*/\r
 \r
             if (av.showSequenceFeatures)\r
             {\r