From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 3 Oct 2005 10:30:04 +0000 (+0000)
Subject: Remove development code
X-Git-Tag: Release_2_07~71
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1a7bcdb924eaa9403d2ad10b26f0afa93c9828a;p=jalview.git

Remove development code
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 90e911e..d6be387 100755
--- 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.
   }
 
-  public void vamsasStore_actionPerformed(ActionEvent e)
-{
-  /* JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
-       getProperty("LAST_DIRECTORY"));
-
-   chooser.setFileView(new JalviewFileView());
-   chooser.setDialogTitle("Export to Vamsas file");
-   chooser.setToolTipText("Export");
-
-   int value = chooser.showSaveDialog(this);
-   */
-  //  if (value == JalviewFileChooser.APPROVE_OPTION)
-  {
-	  jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
-    vs.store("C:\\Documents And Settings\\andrew\\Desktop\\vamsas.zip");
-   // chooser.getSelectedFile().getAbsolutePath();
-  }
-}
-
-public void vamsasLoad_actionPerformed(ActionEvent e)
-{
-  jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
-  vs.load("C:\\Documents And Settings\\andrew\\Desktop\\vamsas.zip");
-}
-
-
 }
diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 42c52d3..7f9ee97 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -519,55 +519,22 @@ public class SeqCanvas extends JComponent
 
   SequenceI nextSeq;
 
-  SequenceI dna = null;
-
-  int aaHeight = (int)(av.getCharHeight()*aaRatio);
-  int dnaHeight =(int)(av.getCharHeight() * (1-aaRatio));
-
-
-  java.awt.geom.AffineTransform transform = new java.awt.geom.AffineTransform();
-  transform.scale(1f/3f , 1);
-  Font dnafont = new Font(av.getFont().getName(), av.getFont().getStyle(),
-                              dnaHeight);
-  dnafont = dnafont.deriveFont(transform);
-
-  Font aafont = new Font(av.getFont().getName(), av.getFont().getStyle(),
-                              aaHeight);
-  transform = new java.awt.geom.AffineTransform();
-  transform.scale(1/aaRatio, 1);
-  aafont = aafont.deriveFont(transform);
 
         /// First draw the sequences
         /////////////////////////////
         for (int i = y1; i < y2; i++)
         {
             nextSeq = av.alignment.getSequenceAt(i);
-            g.setFont(aafont);
-/*
-            StringBuffer dnasb = new StringBuffer();
-            for (int j = 0; j < nextSeq.getLength(); j++)
-            {
-              java.util.Vector codons = jalview.schemes.ResidueProperties.getCodons(nextSeq.getSequence(j,
-                  j + 1));
-              if (codons != null && codons.size() > 0)
-                dnasb.append(codons.elementAt(0).toString());
-            }
-
-            dna = new Sequence("dna", dnasb.toString());*/
+            g.setFont(av.getFont());
 
 
             sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq),
                             x1, x2, (x1 - startx) * av.charWidth,
                             offset + ( (i - starty) * av.charHeight), av.charWidth,
-                            aaHeight);
+                            av.charHeight);
 
 
-         /*   g.setFont(dnafont);
 
-            sr.drawSequence(g, dna, null,
-                            x1, x2 * 3 +2, ( (x1 - startx) * av.charWidth) / 3,
-                            offset + ( (i - starty) * av.charHeight) + aaHeight, av.charWidth / 3,
-                            dnaHeight);*/
 
             if (av.showSequenceFeatures)
             {