X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=289e7611bf83c9e565ba4d07ae052fbe52c5e775;hb=a6cd54c46366acd8bc3350a79374b18f9eb0b240;hp=010c73d971276ae80236d14e0fcde112e97affab;hpb=ef23c17739a6fba3a8d455b725782bce4607ac9f;p=jalview.git

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 010c73d..289e761 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -39,14 +39,6 @@ public class AlignFrame
   public static final int NEW_WINDOW_HEIGHT = 500;
   jalview.bin.JalviewLite applet;
 
-  public AlignFrame(AlignmentI al)
-  {
-    this.applet = null;
-    viewport = new AlignViewport(al, null);
-    alignPanel = new AlignmentPanel(this, viewport);
-    add(alignPanel);
-    alignPanel.validate();
-  }
 
   public AlignFrame(AlignmentI al, jalview.bin.JalviewLite applet)
   {
@@ -56,38 +48,66 @@ public class AlignFrame
     add(alignPanel);
     alignPanel.validate();
 
-    String treeFile = applet.getParameter("treeFile");
-    TreePanel treepanel = null;
-    if (treeFile != null)
+    if(applet!=null)
     {
-      try
+      String treeFile = applet.getParameter("treeFile");
+      if (treeFile != null)
       {
-        treeFile = treeFile;
-        jalview.io.NewickFile fin = new jalview.io.NewickFile(applet.
-            getCodeBase() + treeFile, "URL");
-        fin.parse();
+        try
+        {
+          treeFile = treeFile;
+          jalview.io.NewickFile fin = new jalview.io.NewickFile(applet.
+              getCodeBase() + treeFile, "URL");
+          fin.parse();
 
-        if (fin.getTree() != null)
+          if (fin.getTree() != null)
+          {
+            TreePanel tp = null;
+            tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),
+                               fin, "FromFile", applet.getCodeBase() + treeFile);
+            jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500);
+            addTreeMenuItem(tp, treeFile);
+          }
+        }
+        catch (Exception ex)
         {
-          TreePanel tp = null;
-          tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),
-                             fin, "FromFile", applet.getCodeBase() + treeFile);
-          jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500);
-          addTreeMenuItem(tp, treeFile);
+          ex.printStackTrace();
         }
       }
-      catch (Exception ex)
+
+      String param = applet.getParameter("sortBy");
+      if (param != null)
       {
-        ex.printStackTrace();
+        if (param.equalsIgnoreCase("Id"))
+          sortIDMenuItem_actionPerformed(null);
+        else if (param.equalsIgnoreCase("Pairwise Identity"))
+          sortPairwiseMenuItem_actionPerformed(null);
       }
     }
 
+    this.addWindowListener(new WindowAdapter()
+    {
+      public void windowClosing(WindowEvent e)
+          {
+            closeMenuItem_actionPerformed(null);
+          }
+    });
 
+    viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener()
+    {
+     public void propertyChange(java.beans.PropertyChangeEvent evt)
+     {
+       if (evt.getPropertyName().equals("alignment"))
+       {
+         alignmentChanged();
+       }
+     }
+   });
   }
 
   public void inputText_actionPerformed(ActionEvent e)
   {
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true);
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, applet);
     Frame frame = new Frame();
     frame.add(cap);
     jalview.bin.JalviewLite.addFrame(frame, "Cut & Paste Input", 500, 500);
@@ -95,7 +115,7 @@ public class AlignFrame
 
   protected void outputText_actionPerformed(ActionEvent e)
   {
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(false);
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(false, applet);
     Frame frame = new Frame();
     frame.add(cap);
     jalview.bin.JalviewLite.addFrame(frame,
@@ -108,7 +128,10 @@ public class AlignFrame
 
   public void closeMenuItem_actionPerformed(ActionEvent e)
   {
+    PaintRefresher.components.remove(viewport.alignment);
     dispose();
+    if(PaintRefresher.components.size()==0 && applet==null)
+      System.exit(0);
   }
 
   Stack historyList = new Stack();
@@ -153,6 +176,7 @@ public class AlignFrame
     redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment,
                                   HistoryItem.HIDE));
     restoreHistoryItem(hi);
+    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
   }
 
   protected void redoMenuItem_actionPerformed(ActionEvent e)
@@ -160,9 +184,7 @@ public class AlignFrame
     HistoryItem hi = (HistoryItem) redoList.pop();
     restoreHistoryItem(hi);
     updateEditMenuBar();
-    viewport.updateConsensus();
-    alignPanel.repaint();
-    alignPanel.repaint();
+    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
   }
 
   // used by undo and redo
@@ -206,9 +228,7 @@ public class AlignFrame
 
     updateEditMenuBar();
 
-    viewport.updateConsensus();
-    viewport.updateConservation();
-    alignPanel.repaint();
+    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
   }
 
   public void moveSelectedSequences(boolean up)
@@ -399,9 +419,7 @@ public class AlignFrame
       {
         viewport.setEndSeq(viewport.alignment.getHeight());
         viewport.alignment.getWidth();
-        viewport.updateConservation();
-        viewport.updateConsensus();
-        alignPanel.repaint();
+        viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
       }
 
     }
@@ -467,9 +485,7 @@ public class AlignFrame
       catch (Exception ex)
       {}
     }
-    viewport.updateConservation();
-    viewport.updateConsensus();
-    alignPanel.repaint();
+    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
 
   }
 
@@ -488,7 +504,7 @@ public class AlignFrame
     {
       sg.addSequence(viewport.getAlignment().getSequenceAt(i), false);
     }
-    sg.setEndRes(viewport.alignment.getWidth());
+    sg.setEndRes(viewport.alignment.getWidth()-1);
     viewport.setSelectionGroup(sg);
     alignPanel.repaint();
     PaintRefresher.Refresh(null, viewport.alignment);
@@ -499,6 +515,7 @@ public class AlignFrame
     viewport.setSelectionGroup(null);
     viewport.getColumnSelection().clear();
     viewport.setSelectionGroup(null);
+    alignPanel.repaint();
     PaintRefresher.Refresh(null, viewport.alignment);
   }
 
@@ -538,8 +555,7 @@ public class AlignFrame
           viewport.alignment.deleteGroup(sg);
         }
       }
-
-      alignPanel.repaint();
+      viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
     }
   }
 
@@ -566,8 +582,7 @@ public class AlignFrame
           viewport.alignment.deleteGroup(sg);
         }
       }
-
-      alignPanel.repaint();
+      viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
     }
 
   }
@@ -577,10 +592,17 @@ public class AlignFrame
     addHistoryItem(new HistoryItem("Remove Gapped Columns",
                                    viewport.alignment,
                                    HistoryItem.HIDE));
+
+    //This is to maintain viewport position on first residue
+    //of first sequence
+    SequenceI seq = viewport.alignment.getSequenceAt(0);
+    int startRes = seq.findPosition(viewport.startRes);
+
     viewport.getAlignment().removeGaps();
-    viewport.updateConservation();
-    viewport.updateConsensus();
-    alignPanel.repaint();
+
+    viewport.setStartRes(seq.findIndex(startRes)-1);
+
+    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
   }
 
   public void removeAllGapsMenuItem_actionPerformed(ActionEvent e)
@@ -588,6 +610,11 @@ public class AlignFrame
     addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment,
                                    HistoryItem.HIDE));
 
+    //This is to maintain viewport position on first residue
+    //of first sequence
+    SequenceI seq = viewport.alignment.getSequenceAt(0);
+    int startRes = seq.findPosition(viewport.startRes);
+
     SequenceI current;
     int jSize;
 
@@ -601,35 +628,110 @@ public class AlignFrame
     {
       seqs = viewport.getSelectionGroup().sequences;
       start = viewport.getSelectionGroup().getStartRes();
-      end = viewport.getSelectionGroup().getEndRes();
+      end = viewport.getSelectionGroup().getEndRes()+1;
     }
     else
       seqs = viewport.alignment.getSequences();
 
-    for (int i = 0; i <seqs.size(); i++)
+    for (int i = 0; i < seqs.size(); i++)
     {
-      current = (SequenceI)seqs.elementAt(i);
+      current = (SequenceI) seqs.elementAt(i);
       jSize = current.getLength();
 
+      // Removing a range is much quicker than removing gaps
+      // one by one for long sequences
       int j = start;
+      int rangeStart=-1, rangeEnd=-1;
+
       do
       {
         if (jalview.util.Comparison.isGap(current.getCharAt(j)))
         {
-          current.deleteCharAt(j);
-          j--;
-          jSize--;
+          if(rangeStart==-1)
+           {
+             rangeStart = j;
+             rangeEnd = j+1;
+           }
+           else
+           {
+             rangeEnd++;
+           }
+           j++;
         }
-        j++;
+        else
+        {
+          if(rangeStart>-1)
+          {
+            current.deleteChars(rangeStart, rangeEnd);
+            j-=rangeEnd-rangeStart;
+            jSize-=rangeEnd-rangeStart;
+            rangeStart = -1;
+            rangeEnd = -1;
+          }
+          else
+            j++;
+        }
+      }
+      while (j < end && j < jSize);
+      if(rangeStart>-1)
+      {
+       current.deleteChars(rangeStart, rangeEnd);
       }
-      while(j < end && j < jSize) ;
     }
+    viewport.setStartRes(seq.findIndex(startRes)-1);
+    viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+  }
 
-    viewport.updateConservation();
+  public void alignmentChanged()
+  {
     viewport.updateConsensus();
+    viewport.updateConservation ();
+    resetAllColourSchemes();
+    if(alignPanel.overviewPanel!=null)
+      alignPanel.overviewPanel.updateOverviewImage();
     alignPanel.repaint();
   }
 
+  void resetAllColourSchemes()
+  {
+    ColourSchemeI cs = viewport.globalColourScheme;
+    if(cs!=null)
+    {
+      if (cs instanceof ClustalxColourScheme)
+      {
+        ( (ClustalxColourScheme) viewport.getGlobalColourScheme()).
+            resetClustalX(viewport.alignment.getSequences(),
+                          viewport.alignment.getWidth());
+      }
+
+      cs.setConsensus(viewport.vconsensus);
+      if (cs.conservationApplied())
+      {
+        Alignment al = (Alignment) viewport.alignment;
+        Conservation c = new Conservation("All",
+                                          ResidueProperties.propHash, 3,
+                                          al.getSequences(), 0,
+                                          al.getWidth() - 1);
+        c.calculate();
+        c.verdict(false, viewport.ConsPercGaps);
+
+        cs.setConservation(c);
+      }
+    }
+
+    int s, sSize = viewport.alignment.getGroups().size();
+    for(s=0; s<sSize; s++)
+    {
+      SequenceGroup sg = (SequenceGroup)viewport.alignment.getGroups().elementAt(s);
+      if(sg.cs!=null && sg.cs instanceof ClustalxColourScheme)
+      {
+        ((ClustalxColourScheme)sg.cs).resetClustalX(sg.sequences, sg.getWidth());
+      }
+      sg.recalcConservation();
+    }
+  }
+
+
 
   public void findMenuItem_actionPerformed(ActionEvent e)
   {
@@ -804,49 +906,48 @@ public class AlignFrame
   {
     int threshold = 0;
 
-    if (viewport.getAbovePIDThreshold())
+    if(cs!=null)
     {
-      threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");
-
-      cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
+      if (viewport.getAbovePIDThreshold())
+      {
+        threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");
 
-      viewport.setGlobalColourScheme(cs);
-    }
-    else
-    {
-      cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
-    }
+        cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
 
-    if (viewport.getConservationSelected())
-    {
+        viewport.setGlobalColourScheme(cs);
+      }
+      else
+      {
+        cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+      }
 
-      Alignment al = (Alignment) viewport.alignment;
-      Conservation c = new Conservation("All",
-                                        ResidueProperties.propHash, 3,
-                                        al.getSequences(), 0,
-                                        al.getWidth() - 1);
+      if (viewport.getConservationSelected())
+      {
 
-      c.calculate();
-      c.verdict(false, viewport.ConsPercGaps);
+        Alignment al = (Alignment) viewport.alignment;
+        Conservation c = new Conservation("All",
+                                          ResidueProperties.propHash, 3,
+                                          al.getSequences(), 0,
+                                          al.getWidth() - 1);
 
-      cs.setConservation(c);
+        c.calculate();
+        c.verdict(false, viewport.ConsPercGaps);
 
-      // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-      cs.setConsensus(viewport.vconsensus);
-      viewport.setGlobalColourScheme(cs);
+        cs.setConservation(c);
 
-      SliderPanel.setConservationSlider(alignPanel, cs, "Background");
+        cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel, cs,
+            "Background"));
 
-    }
-    else
-    {
-      // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-      if (cs != null)
+      }
+      else
       {
-        cs.setConsensus(viewport.vconsensus);
+        cs.setConservation(null);
       }
-      viewport.setGlobalColourScheme(cs);
+
+      cs.setConsensus(viewport.vconsensus);
+
     }
+    viewport.setGlobalColourScheme(cs);
 
     if (viewport.getColourAppliesToAllGroups())
     {
@@ -862,9 +963,7 @@ public class AlignFrame
         }
         if (cs instanceof ClustalxColourScheme)
         {
-          ClustalxColourScheme cxs = (ClustalxColourScheme) cs;
-          cxs.resetClustalX(viewport.alignment.getSequences(), viewport.alignment.getWidth());
-          sg.cs = cxs;
+          sg.cs = new ClustalxColourScheme(sg.sequences, sg.getWidth());
         }
         else
         {
@@ -886,6 +985,8 @@ public class AlignFrame
           sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
           sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));
         }
+        else
+          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
 
         if (viewport.getConservationSelected())
         {
@@ -895,21 +996,17 @@ public class AlignFrame
                                             viewport.alignment.getWidth() - 1);
           c.calculate();
           c.verdict(false, viewport.ConsPercGaps);
-
-          // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-          cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));
-          sg.cs = cs;
+          sg.cs.setConservation(c);
         }
         else
         {
-          // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-          sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));
+          sg.cs.setConservation(null);
+          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
         }
 
       }
     }
 
-    updateCSConsensus();
 
     if (alignPanel.getOverviewPanel() != null)
     {
@@ -919,15 +1016,11 @@ public class AlignFrame
     alignPanel.repaint();
   }
 
-  public void updateCSConsensus()
-  {
-    //Colour schemes must have their consensus updated
 
-  }
 
   protected void modifyPID_actionPerformed(ActionEvent e)
   {
-    if (viewport.getAbovePIDThreshold())
+    if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null)
     {
       SliderPanel.setPIDSliderSource(alignPanel, viewport.getGlobalColourScheme(),
                                      "Background");
@@ -937,7 +1030,7 @@ public class AlignFrame
 
   protected void modifyConservation_actionPerformed(ActionEvent e)
   {
-    if (viewport.getConservationSelected())
+    if (viewport.getConservationSelected() && viewport.globalColourScheme!=null)
     {
       SliderPanel.setConservationSlider(alignPanel, viewport.globalColourScheme,
                                         "Background");
@@ -1025,7 +1118,7 @@ public class AlignFrame
     if (viewport.getSelectionGroup().getSize() > 1)
     {
       Frame frame = new Frame();
-      frame.add(new PairwiseAlignPanel(viewport));
+      frame.add(new PairwiseAlignPanel(alignPanel));
       jalview.bin.JalviewLite.addFrame(frame, "Pairwise Alignment", 600, 500);
     }
   }