X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=9566bb5731cf47301aecacb1e299a9f2c8b27436;hb=4c27b2c870cb1b4f858f7f4b52c4fe330a8e3b4c;hp=f5d2e0c7fdcdf0760b6915e73c692eeb8049f7ea;hpb=875e6f6f18c96bfea4a43c951852921ee3f5ee75;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index f5d2e0c..9566bb5 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -17,14 +17,14 @@ import jalview.datamodel.*;
 import jalview.analysis.*;
 import jalview.io.*;
 import jalview.ws.*;
-import MCview.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.print.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.util.*;
-import jalview.datamodel.SequenceI;
+import  java.awt.datatransfer.*;
+
 
 public class AlignFrame extends GAlignFrame
 {
@@ -36,20 +36,32 @@ public class AlignFrame extends GAlignFrame
     viewport = new AlignViewport(al,true,true,true,false);
     alignPanel = new AlignmentPanel(this, viewport);
     getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);
-    fontNameMenuItem.setText(viewport.getFont().getName());
-    fontSizeMenuItem.setText(viewport.getFont().getSize()+"");
+
+    addInternalFrameListener(new InternalFrameAdapter()
+   {
+     public void internalFrameActivated(InternalFrameEvent evt)
+     {
+          javax.swing.SwingUtilities.invokeLater(new Runnable()
+          {
+            public void run()
+            {      alignPanel.requestFocus();    }
+          });
+
+     }
+   });
+
   }
 
   protected void saveAs_actionPerformed(ActionEvent e)
   {
-    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.LAST_DIRECTORY);
+    JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
     chooser.setDialogTitle("Save Alignment to file - "+e.getActionCommand() +" format.");
     chooser.setToolTipText("Save");
     int value = chooser.showSaveDialog(this);
     if(value == JFileChooser.APPROVE_OPTION)
     {
       String choice =  chooser.getSelectedFile().getPath();
-      jalview.bin.Cache.LAST_DIRECTORY = choice;
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
       String output = FormatAdapter.get(e.getActionCommand(), viewport.getAlignment().getSequences());
       try{
         java.io.PrintWriter out = new java.io.PrintWriter( new java.io.FileWriter( choice )  );
@@ -77,6 +89,23 @@ public class AlignFrame extends GAlignFrame
     htmlOutput = null;
   }
 
+  protected void createJPG_actionPerformed(ActionEvent e)
+  {
+
+    int height = (viewport.alignment.getWidth() / viewport.getChunkWidth() +1) * viewport.chunkHeight;
+    int width = alignPanel.seqPanel.getWidth() + alignPanel.idPanel.getWidth();
+
+
+    if(!viewport.getWrapAlignment())
+    {
+      height = viewport.alignment.getHeight() * viewport.charHeight;
+      width = alignPanel.idPanel.getWidth() + viewport.alignment.getWidth() * viewport.charWidth;
+    }
+
+    alignPanel.makeJPG( width, height);
+  }
+
+
   public void printMenuItem_actionPerformed(ActionEvent e)
   {
     //Putting in a thread avoids Swing painting problems
@@ -116,8 +145,8 @@ public class AlignFrame extends GAlignFrame
     }catch(Exception ex){}
   }
 
-  ArrayList  historyList = new ArrayList();
-  ArrayList redoList = new ArrayList();
+  Stack historyList = new Stack();
+  Stack redoList = new Stack();
 
   void updateEditMenuBar()
   {
@@ -182,6 +211,167 @@ public class AlignFrame extends GAlignFrame
       alignPanel.RefreshPanels();
   }
 
+  public void moveSelectedSequences(boolean up)
+  {
+    SequenceGroup sg = viewport.getRubberbandGroup();
+    if (sg == null)
+      return;
+
+    if (up)
+    {
+      for (int i = 1; i < viewport.alignment.getHeight(); i++)
+      {
+        SequenceI seq = viewport.alignment.getSequenceAt(i);
+        if (!sg.sequences.contains(seq))
+          continue;
+
+        SequenceI temp = viewport.alignment.getSequenceAt(i - 1);
+        if (sg.sequences.contains(temp))
+          continue;
+
+        viewport.alignment.getSequences().setElementAt(temp, i);
+        viewport.alignment.getSequences().setElementAt(seq, i - 1);
+      }
+    }
+    else
+    {
+      for (int i = viewport.alignment.getHeight() - 2; i > -1; i--)
+      {
+        SequenceI seq = viewport.alignment.getSequenceAt(i);
+        if (!sg.sequences.contains(seq))
+          continue;
+
+        SequenceI temp = viewport.alignment.getSequenceAt(i + 1);
+        if (sg.sequences.contains(temp))
+          continue;
+
+        viewport.alignment.getSequences().setElementAt(temp, i);
+        viewport.alignment.getSequences().setElementAt(seq, i + 1);
+      }
+    }
+
+    alignPanel.RefreshPanels();
+  }
+
+
+
+  protected void copy_actionPerformed(ActionEvent e)
+  {
+   if(viewport.getRubberbandGroup()==null)
+     return;
+
+   SequenceGroup sg = viewport.getRubberbandGroup();
+
+     Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
+     StringBuffer buffer= new StringBuffer();
+
+       for(int i=0; i<sg.getSize(); i++)
+       {
+         SequenceI seq = sg.getSequenceAt(i);
+         buffer.append( seq.getName()+"\t"+seq.findPosition( sg.getStartRes() ) +"\t"
+                        +seq.findPosition( sg.getEndRes() )+ "\t"
+                        +sg.getSequenceAt(i).getSequence(sg.getStartRes(), sg.getEndRes()+1)+"\n");
+       }
+     c.setContents( new StringSelection( buffer.toString()) , null ) ;
+
+  }
+
+
+  protected void pasteNew_actionPerformed(ActionEvent e)
+  {
+    paste(true);
+  }
+
+  protected void pasteThis_actionPerformed(ActionEvent e)
+  {
+    addHistoryItem("Paste");
+    paste(false);
+  }
+
+  void paste(boolean newAlignment)
+  {
+    try{
+      Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
+      Transferable contents = c.getContents(this);
+      if (contents == null)
+        return;
+
+      String str = (String) contents.getTransferData(DataFlavor.stringFlavor);
+      StringTokenizer st = new StringTokenizer(str);
+      ArrayList seqs = new ArrayList();
+      while (st.hasMoreElements())
+      {
+        String name = st.nextToken();
+        int start = Integer.parseInt(st.nextToken());
+        int end = Integer.parseInt(st.nextToken());
+        Sequence sequence = new Sequence(name,st.nextToken(), start, end);
+
+        if(!newAlignment)
+          viewport.alignment.addSequence(sequence);
+        else
+          seqs.add(sequence);
+      }
+
+      if(newAlignment)
+      {
+        SequenceI[] newSeqs = new SequenceI[seqs.size()];
+        seqs.toArray(newSeqs);
+        AlignFrame af = new AlignFrame(new Alignment(newSeqs));
+        int newHeight = newSeqs.length * af.viewport.getCharHeight() + 200;
+        if (newHeight > 500)
+          newHeight = 500;
+        Desktop.addInternalFrame(af, "Copied sequences", 700, newHeight);
+      }
+      else
+      {
+        viewport.setEndSeq(viewport.alignment.getHeight());
+        viewport.alignment.getWidth();
+        alignPanel.RefreshPanels();
+      }
+
+    }catch(Exception ex){}// could be anything being pasted in here
+
+  }
+
+
+  protected void cut_actionPerformed(ActionEvent e)
+  {
+    copy_actionPerformed(null);
+    delete_actionPerformed(null);
+  }
+
+  protected void delete_actionPerformed(ActionEvent e)
+  {
+    addHistoryItem("Delete");
+    if (viewport.getRubberbandGroup() == null)
+      return;
+
+     SequenceGroup sg = viewport.getRubberbandGroup();
+     for (int i=0;i < sg.sequences.size(); i++)
+     {
+       SequenceI seq = sg.getSequenceAt(i);
+       int index = viewport.getAlignment().findIndex(seq);
+       seq.deleteChars(sg.getStartRes(), sg.getEndRes()+1);
+
+       if(seq.getSequence().length()<1)
+          viewport.getAlignment().deleteSequence(seq);
+      else
+          viewport.getAlignment().getSequences().setElementAt(seq, index);
+     }
+
+     viewport.setRubberbandGroup(null);
+     viewport.alignment.deleteGroup(sg);
+     viewport.resetSeqLimits( alignPanel.seqPanel.seqCanvas.getHeight());
+     if(viewport.getAlignment().getHeight()<1)
+     try
+     {
+       this.setClosed(true);
+     }catch(Exception ex){}
+     alignPanel.RefreshPanels();
+
+  }
+
+
 
   protected void redoMenuItem_actionPerformed(ActionEvent e)
   {
@@ -222,6 +412,7 @@ public class AlignFrame extends GAlignFrame
 
   public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e)
   {
+    viewport.setRubberbandGroup(null);
     viewport.getSelection().clear();
     PaintRefresher.Refresh(null);
   }
@@ -328,55 +519,15 @@ public class AlignFrame extends GAlignFrame
   }
 
 
-
-  public void fontNameMenuItem_actionPerformed(ActionEvent e)
-  {
-    String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
-
-
-    String selection = JOptionPane.showInternalInputDialog(this,
-                                "Select font",
-                                "Font selection",
-                                JOptionPane.QUESTION_MESSAGE,
-                                null,fonts
-                                ,fontNameMenuItem.getText()).toString();
-    if(selection!=null)
-    {
-       fontNameMenuItem.setText(selection);
-       SetFont();
-     }
-
-  }
-
-  public void fontSizeMenuItem_actionPerformed(ActionEvent e)
-  {
-    String selection = JOptionPane.showInternalInputDialog(this,
-                                "Select font size",
-                                "Font size",
-                                JOptionPane.QUESTION_MESSAGE,
-                                null, new String[]{"1","2","4","6","8","10","12","14","16","18","20"}
-                                ,fontSizeMenuItem.getText()).toString();
-    if(selection!=null)
-     {
-       fontSizeMenuItem.setText(selection);
-       SetFont();
-     }
-  }
-
-  public void fontStyleMenuItem_actionPerformed(ActionEvent e)
+  public void font_actionPerformed(ActionEvent e)
   {
-    String selection = JOptionPane.showInternalInputDialog(this,
-                                "Select font style",
-                                "Font style",
-                                JOptionPane.QUESTION_MESSAGE,
-                                null, new String[]{"plain", "bold", "italic"}
-                                ,fontStyleMenuItem.getText()).toString();
-    if(selection!=null)
-    {
-      fontStyleMenuItem.setText(selection);
-      SetFont();
-    }
-
+    JOptionPane op = new JOptionPane();
+    JInternalFrame frame = op.createInternalFrame(this, "Change Font");
+    FontChooser fc = new FontChooser( alignPanel );
+    frame.setClosable(true);
+    frame.setContentPane(fc);
+    frame.setSize(480, 100);
+    frame.setVisible(true);
   }
 
   protected void colourTextMenuItem_actionPerformed(ActionEvent e)
@@ -385,25 +536,10 @@ public class AlignFrame extends GAlignFrame
       alignPanel.RefreshPanels();
   }
 
-  void SetFont()
-  {
-      int style = java.awt.Font.PLAIN;
-      if(fontStyleMenuItem.getText().equals("bold"))
-        style = java.awt.Font.BOLD;
-      else if(fontStyleMenuItem.getText().equals("italic"))
-        style = java.awt.Font.ITALIC;
-
-      viewport.setFont(new java.awt.Font(fontNameMenuItem.getText(),
-                                           style,
-                                           Integer.parseInt(fontSizeMenuItem.getText())));
-      alignPanel.RefreshPanels();
-
-  }
-
   protected void wrapMenuItem_actionPerformed(ActionEvent e)
   {
     viewport.setWrapAlignment( wrapMenuItem.isSelected() );
-    alignPanel.RefreshPanels();
+    alignPanel.setWrapAlignment( wrapMenuItem.isSelected() );
   }
 
 
@@ -426,9 +562,15 @@ public class AlignFrame extends GAlignFrame
     alignPanel.RefreshPanels();
   }
 
-  public void secondaryStructure_actionPerformed(ActionEvent evt)
+  public void sequenceFeatures_actionPerformed(ActionEvent evt)
   {
-    alignPanel.setSecondaryStructureVisible(secondaryStructure.isSelected());
+    viewport.showSequenceFeatures(sequenceFeatures.isSelected());
+    if(viewport.showSequenceFeatures && !((Alignment)viewport.alignment).featuresAdded)
+    {
+         AlignmentUtil.fetchSequenceFeatures( viewport.alignment , alignPanel);
+         ((Alignment)viewport.alignment).featuresAdded = true;
+    }
+    alignPanel.RefreshPanels();
   }
 
   public void consensusGraphMenuItem_actionPerformed(ActionEvent e)
@@ -469,192 +611,187 @@ public class AlignFrame extends GAlignFrame
 
   protected void noColourmenuItem_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( null );
-    changeColour();
+    changeColour( null );
   }
 
 
-  public void Colour_actionPerformed(ActionEvent e)
+  public void clustalColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme(new ClustalxColourScheme( ));
-    conservationMenuItem.setSelected(false);
     abovePIDThreshold.setSelected(false);
-    changeColour();
+    changeColour(new ClustalxColourScheme(viewport.alignment.getSequences(), viewport.alignment.getWidth()));
   }
 
   public void zappoColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme(new ZappoColourScheme() );
-    changeColour();
+    changeColour(new ZappoColourScheme());
   }
 
   public void taylorColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme(new TaylorColourScheme() );
-    changeColour();
+    changeColour(new TaylorColourScheme());
   }
 
 
   public void hydrophobicityColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( new HydrophobicColourScheme() );
-    changeColour();
+    changeColour( new HydrophobicColourScheme() );
   }
 
   public void helixColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( new HelixColourScheme()  );
-    changeColour();
+    changeColour(new HelixColourScheme() );
   }
 
 
   public void strandColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme(new StrandColourScheme() );
-    changeColour();
+    changeColour(new StrandColourScheme());
   }
 
 
   public void turnColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme(new TurnColourScheme() );
-    changeColour();
+    changeColour(new TurnColourScheme());
   }
 
 
   public void buriedColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( new BuriedColourScheme() );
-    changeColour();
+    changeColour(new BuriedColourScheme() );
   }
 
   public void nucleotideColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( new NucleotideColourScheme() );
-    changeColour();
+    changeColour(new NucleotideColourScheme());
   }
 
 
-  void changeColour()
+  protected void applyToAllGroups_actionPerformed(ActionEvent e)
   {
-    if(abovePIDThreshold.isSelected())
-      abovePIDThreshold_actionPerformed(null);
-    else if(conservationMenuItem.isSelected())
-      conservationMenuItem_actionPerformed(null);
+    viewport.setColourAppliesToAllGroups(applyToAllGroups.isSelected());
+  }
 
 
-     alignPanel.RefreshPanels();
-  }
 
-  void addConservationOrPIDColour()
+  void changeColour(ColourSchemeI cs)
   {
-    int x=0, y=0, threshold = 70;
 
-    if(sliderFrame!=null)
-       try
-       {
-         x = sliderFrame.getX();
-         y = sliderFrame.getY();
-         SliderPanel sp = (SliderPanel) sliderFrame.getContentPane();
-         threshold = sp.getValue();
-         sliderFrame.setClosed(true);
-       }
-       catch (Exception ex)
-       {    ex.printStackTrace();   }
+    if(viewport.getColourAppliesToAllGroups())
+    {
+      Vector groups = viewport.alignment.getGroups();
+      for(int i=0; i<groups.size(); i++)
+      {
+        SequenceGroup sg = (SequenceGroup)groups.elementAt(i);
+        sg.cs = cs;
 
-     ColourSchemeI oldCs = viewport.getGlobalColourScheme();
+        if(abovePIDThreshold.isSelected())
+          abovePIDThreshold_actionPerformed(null);
+        else if( viewport.getConservationSelected() )
+        {
+          Conservation c = new Conservation("Group",
+                                            ResidueProperties.propHash, 3,
+                                            sg.sequences, sg.getStartRes(),
+                                            sg.getEndRes());
+          c.calculate();
+          c.verdict(false, 100);
+          ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);
+
+          sg.cs = ccs;
+        }
 
-     ConservationColourScheme ccs = null;
-     if (oldCs instanceof ConservationColourScheme)
-       ccs = (ConservationColourScheme) oldCs;
+      }
+    }
 
-     if(conservationMenuItem.isSelected())
-     {
-       Alignment al = (Alignment)viewport.alignment;
-       Conservation c = new Conservation("All",
-                            ResidueProperties.propHash, 3, al.getSequences(), 0,
-                            al.getWidth() );
 
-       c.calculate();
-       c.verdict(false, 100);
+    if ( viewport.getAbovePIDThreshold())
+    {
+      int threshold = 0;
+      threshold = Desktop.setPIDSliderSource(alignPanel, cs, "Background");
+      Desktop.hideConservationSlider();
 
-       if(ccs!=null)
-         ccs = new ConservationColourScheme(c, ccs.cs);
-       else
-         ccs = new ConservationColourScheme(c, oldCs);
+      if (cs instanceof ResidueColourScheme)
+        ( (ResidueColourScheme) cs).setThreshold(threshold);
+      else if (cs instanceof ScoreColourScheme)
+        ( (ScoreColourScheme) cs).setThreshold(threshold);
 
-        viewport.setGlobalColourScheme( ccs );
+      viewport.setGlobalColourScheme(cs);
 
-     }
-     else if(oldCs instanceof ConservationColourScheme)
-     {
-       oldCs = ccs.cs;
-       viewport.setGlobalColourScheme( oldCs );
-     }
+    }
+    else
+    if (cs instanceof ResidueColourScheme)
+      ( (ResidueColourScheme) cs).setThreshold(0);
+    else if (cs instanceof ScoreColourScheme)
+      ( (ScoreColourScheme) cs).setThreshold(0);
 
 
-     if( conservationMenuItem.isSelected() || abovePIDThreshold.isSelected() )
-     {
-       sliderFrame = new JInternalFrame();
-       sliderFrame.setMaximizable(false);
-       sliderFrame.setResizable(false);
 
-       SliderPanel sp = null;
-       if (conservationMenuItem.isSelected())
-       {
-        if(threshold > 50)
-          threshold = 30;
-        sp = new SliderPanel(alignPanel, threshold, true,ccs);
-        Desktop.addInternalFrame(sliderFrame, "Conservation Colour Increment  (Global colour)", 400, 90);
-        threshold = 0;
-       }
-       else if (abovePIDThreshold.isSelected())
-       {
-         sp = new SliderPanel(alignPanel, threshold, false, oldCs);
-         sp.cs = oldCs;
-         Desktop.addInternalFrame(sliderFrame, "Percentage Identity Threshold (Global colour)", 400, 90);
-       }
 
-       sliderFrame.setContentPane(sp);
-       if(x!=0 && y!=0)
-               sliderFrame.setLocation(x,y);
+if ( viewport.getConservationSelected() )
+ {
+   ConservationColourScheme ccs = null;
 
-     }
-     else
-       threshold = 0;
+   Alignment al = (Alignment) viewport.alignment;
+   Conservation c = new Conservation("All",
+                                     ResidueProperties.propHash, 3,
+                                     al.getSequences(), 0,
+                                     al.getWidth());
 
+   c.calculate();
+   c.verdict(false, 100);
 
-     if (oldCs instanceof ResidueColourScheme)
-     {
-       ResidueColourScheme rcs = (ResidueColourScheme) oldCs;
-       rcs.setThreshold(threshold);
-     }
-     else if (oldCs instanceof ScoreColourScheme)
-     {
-       ScoreColourScheme scs = (ScoreColourScheme) oldCs;
-       scs.setThreshold(threshold);
-     }
+   ccs = new ConservationColourScheme(c, cs);
+
+   int threshold = Desktop.setConservationSliderSource(alignPanel, ccs,
+       "Background");
 
+   ccs.inc = threshold;
+
+   viewport.setGlobalColourScheme(ccs);
+
+  }
+  else
+       viewport.setGlobalColourScheme( cs );
 
+    alignPanel.RefreshPanels();
   }
 
+
   protected  void conservationMenuItem_actionPerformed(ActionEvent e)
   {
-   if(abovePIDThreshold.isSelected())
-    abovePIDThreshold.setSelected(false);
+    viewport.setConservationSelected(conservationMenuItem.isSelected());
 
-   viewport.setConservationSelected(conservationMenuItem.isSelected());
+    viewport.setAbovePIDThreshold(false);
+    abovePIDThreshold.setSelected(false);
+    Desktop.hidePIDSlider();
+    if(!viewport.getConservationSelected())
+      Desktop.hideConservationSlider();
 
-   addConservationOrPIDColour();
+   ColourSchemeI cs = viewport.getGlobalColourScheme();
+   if(cs instanceof ConservationColourScheme )
+     changeColour( ((ConservationColourScheme)cs).cs );
+    else
+      changeColour( cs );
   }
 
-  JInternalFrame sliderFrame;
+
   public void abovePIDThreshold_actionPerformed(ActionEvent e)
   {
-      if(conservationMenuItem.isSelected())
-        conservationMenuItem.setSelected(false);
+    viewport.setAbovePIDThreshold(abovePIDThreshold.isSelected());
+
+    conservationMenuItem.setSelected(false);
+    viewport.setConservationSelected(false);
+    Desktop.hideConservationSlider();
+
+    if(!viewport.getAbovePIDThreshold())
+      Desktop.hidePIDSlider();
+
+
+    ColourSchemeI cs = viewport.getGlobalColourScheme();
+    if(cs instanceof ConservationColourScheme )
+        changeColour( ((ConservationColourScheme)cs).cs );
+    else
+        changeColour( cs );
 
-      addConservationOrPIDColour();
   }
 
 
@@ -672,26 +809,17 @@ public class AlignFrame extends GAlignFrame
 
   public void PIDColour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( new PIDColourScheme() );
-    alignPanel.setColourScheme( );
+    changeColour( new PIDColourScheme() );
   }
 
 
   public void BLOSUM62Colour_actionPerformed(ActionEvent e)
   {
-    viewport.setGlobalColourScheme( new Blosum62ColourScheme(viewport)  );
-    alignPanel.setColourScheme();
+    changeColour(new Blosum62ColourScheme(viewport) );
   }
 
 
 
-  protected void schemeKeyMenuItem_actionPerformed(ActionEvent e)
-  {
-    ColourKey colourKey = new ColourKey( viewport.getGlobalColourScheme() );
-    Desktop.addInternalFrame(colourKey, "Colour scheme key", 400, 320);
-  }
-
-
   public void sortPairwiseMenuItem_actionPerformed(ActionEvent e)
   {
     addHistoryItem("sort");
@@ -796,22 +924,27 @@ public class AlignFrame extends GAlignFrame
 
   void NewTreePanel(String type, String pwType, String title)
   {
-    JInternalFrame frame = new javax.swing.JInternalFrame();
+    //are the sequences aligned?
+    if(!viewport.alignment.isAligned())
+    {
+      JOptionPane.showMessageDialog(Desktop.desktop, "The sequences must be aligned before creating a tree.",
+                                    "Sequences not aligned", JOptionPane.WARNING_MESSAGE);
+      return;
+    }
+
     TreePanel tp=null;
    if (viewport.getSelection() != null && viewport.getSelection().size() > 3)
    {
      tp = new TreePanel(viewport, viewport.getSelection().asVector(),type, pwType,
-                         viewport.getStartRes(), viewport.getEndRes());
+                         0, viewport.alignment.getWidth());
    }
    else
    {
      tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),
-                         type, pwType, viewport.getStartRes(),
-                         viewport.getEndRes());
+                         type, pwType,  0, viewport.alignment.getWidth());
    }
 
-   frame.setContentPane(tp);
-   Desktop.addInternalFrame(frame, title, 600, 500);
+   Desktop.addInternalFrame(tp, title, 600, 500);
   }
 
 
@@ -840,7 +973,7 @@ public class AlignFrame extends GAlignFrame
       image = new Image[9];
       for(int i=0; i<9; i++)
       {
-        java.net.URL url = getClass().getResource("/dna" + (i+1) + ".gif");
+        java.net.URL url = getClass().getResource("/images/dna" + (i+1) + ".gif");
         if (url != null)
         {
           image[i] = java.awt.Toolkit.getDefaultToolkit().createImage(url);
@@ -893,6 +1026,8 @@ public class AlignFrame extends GAlignFrame
          if (alignment != null)
          {
            AlignFrame af = new AlignFrame(new Alignment(alignment));
+          af.clustalColour.setSelected(true);
+          af.clustalColour_actionPerformed(null);
            Desktop.addInternalFrame(af, getTitle().concat(" - ClustalW Alignment"),
                                     700, 500); // JBPNote - is there a new window geom. property ?
          }
@@ -918,52 +1053,5 @@ public class AlignFrame extends GAlignFrame
          g.setColor(Color.black);
          g.drawString("Clustal Alignment Web Service running", 30,30);
        }
-
-
-  }
-
-
-  public void pdbTest_actionPerformed(ActionEvent e)
-  {
-   String reply =
-       JOptionPane.showInternalInputDialog(this, "Enter pdb code",
-                                           "PDB test viewer", JOptionPane.QUESTION_MESSAGE);
-
-   String url = "http://www.ebi.ac.uk/cgi-bin/pdbfetch?id=1a4u";
-   if (reply.length()>1)
-     url = "http://www.ebi.ac.uk/cgi-bin/pdbfetch?id="+reply;
-
-   try
-   {
-     PDBfile pdb = new PDBfile(url,
-                               "URL");
-    Sequence seq = (Sequence)viewport.getAlignment().getSequenceAt(0);
-    seq.setPDBfile(pdb);
-     ( (PDBChain) pdb.chains.elementAt(seq.maxchain)).isVisible = true;
-     ( (PDBChain) pdb.chains.elementAt(seq.maxchain)).sequence = seq;
-  // ( (PDBChain) pdb.chains.elementAt(seq.maxchain)).colourBySequence();
-
-     rotCanvas rc = new rotCanvas(pdb);
-     JInternalFrame frame = new JInternalFrame();
-     frame.setContentPane(rc);
-     Desktop.addInternalFrame(frame, url, 400,400);
-   }
-   catch (Exception ex)
-   {
-     ex.printStackTrace();
-   }
-
-  }
-
-
-  public void doKeyPressed(KeyEvent evt)
-  {
-
-    System.out.println(evt.getKeyChar());
-    if(evt.isControlDown() && evt.getKeyChar()=='f')
-      findMenuItem_actionPerformed(null);
-
   }
-
-
 }