X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FRedundancyPanel.java;h=6f5b09d31f86110b06cd2851a752defe5bab2a97;hb=0896dd47a711b260d6f79e1e18d1bb8aa822e111;hp=5dd2fc4c32e46c218e8a547142120c10c96cdb35;hpb=16963d1109bb0989757ed5200baaeb5d59b2203f;p=jalview.git

diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java
index 5dd2fc4..6f5b09d 100755
--- a/src/jalview/gui/RedundancyPanel.java
+++ b/src/jalview/gui/RedundancyPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,18 +18,16 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.*;
-
-import jalview.jbgui.*;
-
-import java.awt.event.*;
-
 import java.util.*;
 
-import javax.swing.event.*;
-import jalview.util.Comparison;
+import java.awt.event.*;
 import javax.swing.*;
+import javax.swing.event.*;
 
+import jalview.commands.*;
+import jalview.datamodel.*;
+import jalview.jbgui.*;
+import jalview.util.*;
 
 /**
  * DOCUMENT ME!
@@ -37,286 +35,301 @@ import javax.swing.*;
  * @author $author$
  * @version $Revision$
  */
-public class RedundancyPanel extends GSliderPanel implements Runnable
+public class RedundancyPanel
+    extends GSliderPanel implements Runnable
 {
-    AlignFrame af;
-    AlignmentPanel ap;
-    Stack historyList = new Stack(); // simpler than synching with alignFrame.
-    float [] redundancy;
-    Vector originalSequences;
-    Hashtable originalColours;
-    JInternalFrame frame;
-
-    /**
-     * Creates a new RedundancyPanel object.
-     *
-     * @param ap DOCUMENT ME!
-     * @param af DOCUMENT ME!
-     */
-    public RedundancyPanel(AlignmentPanel ap, AlignFrame af)
+  AlignFrame af;
+  AlignmentPanel ap;
+  Stack historyList = new Stack(); // simpler than synching with alignFrame.
+  float[] redundancy;
+  SequenceI[] originalSequences;
+  JInternalFrame frame;
+  Vector redundantSeqs;
+
+  /**
+   * Creates a new RedundancyPanel object.
+   *
+   * @param ap DOCUMENT ME!
+   * @param af DOCUMENT ME!
+   */
+  public RedundancyPanel(final AlignmentPanel ap, AlignFrame af)
+  {
+    this.ap = ap;
+    this.af = af;
+    redundantSeqs = new Vector();
+
+    slider.addChangeListener(new ChangeListener()
     {
-        this.ap = ap;
-        this.af = af;
-
-        slider.addChangeListener(new ChangeListener()
-            {
-                public void stateChanged(ChangeEvent evt)
-                {
-                    valueField.setText(slider.getValue() + "");
-                    sliderValueChanged();
-                }
-            });
-
-        applyButton.setText("Remove");
-        allGroupsCheck.setVisible(false);
-        slider.setMinimum(60);
-        slider.setMaximum(100);
-        slider.setValue(100);
-
-        Thread worker = new Thread(this);
-        worker.start();
-
-        frame = new JInternalFrame();
-        frame.setContentPane(this);
-        Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,
-                         100, false);
-        frame.addInternalFrameListener(new InternalFrameAdapter()
-            {
-              public void internalFrameClosing(InternalFrameEvent evt)
-              {
-                resetColours();
-              }
-            }
-            );
+      public void stateChanged(ChangeEvent evt)
+      {
+        valueField.setText(slider.getValue() + "");
+        sliderValueChanged();
+      }
+    });
+
+    applyButton.setText("Remove");
+    allGroupsCheck.setVisible(false);
+    slider.setMinimum(0);
+    slider.setMaximum(100);
+    slider.setValue(100);
+
+    Thread worker = new Thread(this);
+    worker.start();
+
+    frame = new JInternalFrame();
+    frame.setContentPane(this);
+    Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,
+                             100, false);
+    frame.addInternalFrameListener(new InternalFrameAdapter()
+    {
+      public void internalFrameClosing(InternalFrameEvent evt)
+      {
+        ap.idPanel.idCanvas.setHighlighted(null);
+      }
+    }
+    );
+
+  }
+
+  /**
+   * This is a copy of remove redundancy in jalivew.datamodel.Alignment
+   * except we dont want to remove redundancy, just calculate once
+   * so we can use the slider to dynamically hide redundant sequences
+   *
+   * @param threshold DOCUMENT ME!
+   * @param sel DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public void run()
+  {
+    JProgressBar progress = new JProgressBar();
+    progress.setIndeterminate(true);
+    southPanel.add(progress, java.awt.BorderLayout.SOUTH);
+
+    label.setText("Calculating....");
+
+    slider.setVisible(false);
+    applyButton.setEnabled(false);
+    valueField.setVisible(false);
 
+    validate();
+
+    String[] omitHidden = null;
+
+    SequenceGroup sg = ap.av.getSelectionGroup();
+    int height;
+
+    int start, end;
+
+    if ( (sg != null) && (sg.getSize() >= 1))
+    {
+      originalSequences = sg.getSequencesInOrder(ap.av.alignment);
+      start = sg.getStartRes();
+      end = sg.getEndRes();
+    }
+    else
+    {
+      originalSequences = ap.av.alignment.getSequencesArray();
+      start = 0;
+      end = ap.av.alignment.getWidth();
     }
 
+    height = originalSequences.length;
 
-    /**
-     * This is a copy of remove redundancy in jalivew.datamodel.Alignment
-     * except we dont want to remove redundancy, just calculate once
-     * so we can use the slider to dynamically hide redundant sequences
-     *
-     * @param threshold DOCUMENT ME!
-     * @param sel DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public void run()
+    redundancy = new float[height];
+    for (int i = 0; i < height; i++)
     {
-        JProgressBar progress = new JProgressBar();
-        progress.setIndeterminate(true);
-        southPanel.add(progress, java.awt.BorderLayout.SOUTH);
+      redundancy[i] = 0f;
+    }
 
-        label.setText("Calculating....");
+    if (ap.av.hasHiddenColumns)
+    {
+      omitHidden = ap.av.getViewAsString(sg != null);
+    }
 
-        slider.setVisible(false);
-        applyButton.setEnabled(false);
-        valueField.setVisible(false);
+    // long start = System.currentTimeMillis();
 
-        validate();
+    float pid;
+    String seqi, seqj;
+    for (int i = 0; i < height; i++)
+    {
 
-        Vector sel = new Vector();
-        SequenceGroup sg = ap.av.getSelectionGroup();
-        int height;
-        originalSequences = new Vector();
-        originalColours = new Hashtable();
+      for (int j = 0; j < i; j++)
+      {
+        if (i == j)
+        {
+          continue;
+        }
 
-        if ( (sg != null) && (sg.getSize() >= 1))
+        if (omitHidden == null)
         {
-           height = sg.getSize();
-          for (int i = 0; i < sg.getSize(); i++)
-          {
-            sel.addElement(sg.getSequenceAt(i));
-          }
+          seqi = originalSequences[i].getSequenceAsString(start, end);
+          seqj = originalSequences[j].getSequenceAsString(start, end);
         }
         else
         {
-          height = ap.av.alignment.getHeight();
-          for (int i = 0; i < ap.av.alignment.getHeight(); i++)
-          {
-            sel.addElement(ap.av.alignment.getSequenceAt(i));
-          }
+          seqi = omitHidden[i];
+          seqj = omitHidden[j];
         }
 
-        redundancy = new float[height];
-        for (int i = 0; i < height; i++)
+        pid = Comparison.PID(seqi, seqj);
+
+        if (seqj.length() < seqi.length())
         {
-          redundancy[i] = 0f;
+          redundancy[j] = Math.max(pid, redundancy[j]);
         }
-
-
-       // long start = System.currentTimeMillis();
-
-        float pid;
-        SequenceI seqi, seqj;
-        for (int i = 0; i < sel.size(); i++)
+        else
         {
-            originalSequences.addElement(sel.elementAt(i));
-            originalColours.put(sel.elementAt(i),
-                               ((SequenceI) sel.elementAt(i)).getColor());
+          redundancy[i] = Math.max(pid, redundancy[i]);
+        }
 
-            for (int j = 0; j < i; j++)
-            {
-              if(i==j)
-                continue;
+      }
+    }
 
-              seqi = (SequenceI) sel.elementAt(i);
-              seqj = (SequenceI) sel.elementAt(j);
+    progress.setIndeterminate(false);
+    progress.setVisible(false);
+    progress = null;
 
-              if (sg != null)
-                pid = Comparison.PID( seqi,
-                                     seqj,
-                                     sg.getStartRes(), sg.getEndRes());
-              else
-                pid = Comparison.PID( seqi,  seqj );
+    label.setText("Enter the redundancy threshold");
+    slider.setVisible(true);
+    applyButton.setEnabled(true);
+    valueField.setVisible(true);
 
+    validate();
+    // System.out.println((System.currentTimeMillis()-start));
+  }
 
-              if(seqj.getLength() < seqi.getLength())
-                redundancy[j] = Math.max(pid, redundancy[j]);
-              else
-                redundancy[i] = Math.max(pid, redundancy[i]);
+  void sliderValueChanged()
+  {
+    if (redundancy == null)
+    {
+      return;
+    }
 
-            }
-        }
+    float value = slider.getValue();
 
+    for (int i = 0; i < redundancy.length; i++)
+    {
+      if (value > redundancy[i])
+      {
+        redundantSeqs.remove(originalSequences[i]);
+      }
+      else if (!redundantSeqs.contains(originalSequences[i]))
+      {
+        redundantSeqs.add(originalSequences[i]);
+      }
 
-        progress.setIndeterminate(false);
-        progress.setVisible(false);
-        progress = null;
+    }
 
-        label.setText("Enter the redundancy threshold");
-        slider.setVisible(true);
-        applyButton.setEnabled(true);
-        valueField.setVisible(true);
+    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
+  }
 
-        validate();
-       // System.out.println("blob done "+ (System.currentTimeMillis()-start));
-    }
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void applyButton_actionPerformed(ActionEvent e)
+  {
+    Vector del = new Vector();
 
-    void sliderValueChanged()
-    {
-      if(redundancy==null)
-        return;
+    undoButton.setEnabled(true);
 
-      float value = slider.getValue();
+    float value = slider.getValue();
+    SequenceGroup sg = ap.av.getSelectionGroup();
 
-      for(int i=0; i<redundancy.length; i++)
+    for (int i = 0; i < redundancy.length; i++)
+    {
+      if (value <= redundancy[i])
       {
-        if (value > redundancy[i])
-           ((SequenceI)originalSequences.elementAt(i)).setColor(java.awt.Color.white);
-        else
-           ((SequenceI)originalSequences.elementAt(i)).setColor(java.awt.Color.red);
+        del.addElement(originalSequences[i]);
       }
-
-      PaintRefresher.Refresh(null,ap.av.alignment);
-
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void applyButton_actionPerformed(ActionEvent e)
+    // This has to be done before the restoreHistoryItem method of alignFrame will
+    // actually restore these sequences.
+    if (del.size() > 0)
     {
-        historyList.push(new HistoryItem("Remove redundancy",
-                    ap.av.alignment, HistoryItem.HIDE));
+      SequenceI[] deleted = new SequenceI[del.size()];
 
-        if ((historyList.size() == 1) ||
-                !af.historyList.contains(historyList.firstElement()))
+      int width = 0;
+      for (int i = 0; i < del.size(); i++)
+      {
+        deleted[i] = (SequenceI) del.elementAt(i);
+        if (deleted[i].getLength() > width)
         {
-            af.addHistoryItem((HistoryItem) historyList.firstElement());
-            af.updateEditMenuBar();
+          width = deleted[i].getLength();
         }
+      }
 
-        Vector del = new Vector();
-
-        undoButton.setEnabled(true);
-
-        float value = slider.getValue();
-        SequenceGroup sg = ap.av.getSelectionGroup();
+      EditCommand cut = new EditCommand("Remove Redundancy",
+                                        EditCommand.CUT, deleted, 0, width,
+                                        ap.av.alignment);
 
-        for (int i = 0; i < redundancy.length; i++)
+      for (int i = 0; i < del.size(); i++)
+      {
+        ap.av.alignment.deleteSequence(deleted[i]);
+        PaintRefresher.Refresh(this,
+                               ap.av.getSequenceSetId(),
+                               true,
+                               true);
+        if (sg != null)
         {
-          if (value <= redundancy[i])
-          {
-            SequenceI seq = (SequenceI) originalSequences.elementAt(i);
-            ap.av.alignment.deleteSequence(seq);
-            del.add(seq);
-            if (sg != null)
-            {
-              sg.deleteSequence(seq, false);
-            }
-          }
+          sg.deleteSequence(deleted[i], false);
         }
+      }
 
+      historyList.push(cut);
 
-        // This has to be done before the restoreHistoryItem method of alignFrame will
-        // actually restore these sequences.
-        if (del.size() > 0)
-        {
-            for (int i = 0, j = del.size(); i < j; i++)
-            {
-                SequenceI sq = (SequenceI) del.elementAt(i);
-                sq.deleteChars(0, sq.getLength());
-            }
-        }
+      ap.alignFrame.addHistoryItem(cut);
 
-        ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences());
-        af.updateEditMenuBar();
+      ap.av.firePropertyChange("alignment", null,
+                               ap.av.getAlignment().getSequences());
     }
 
-    void resetColours()
-    {
-      for(int i=0; i<originalSequences.size(); i++)
-      {
-        SequenceI seq = (SequenceI)originalSequences.elementAt(i);
-        seq.setColor( (java.awt.Color)originalColours.get(seq));
-      }
+  }
 
-      PaintRefresher.Refresh(ap.av.alignment);
-    }
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void undoButton_actionPerformed(ActionEvent e)
+  {
+    CommandI command = (CommandI) historyList.pop();
+    command.undoCommand();
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void undoButton_actionPerformed(ActionEvent e)
+    if (ap.av.historyList.contains(command))
     {
-      HistoryItem hi = (HistoryItem) historyList.pop();
-      af.restoreHistoryItem(hi);
+      ap.av.historyList.remove(command);
+      af.updateEditMenuBar();
+    }
 
-      if (historyList.size() == 0)
-      {
-        undoButton.setEnabled(false);
+    ap.paintAlignment(true);
 
-        if (af.historyList.contains(hi))
-        {
-          af.historyList.remove(hi);
-          af.updateEditMenuBar();
-        }
-      }
+    if (historyList.size() == 0)
+    {
+      undoButton.setEnabled(false);
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param e DOCUMENT ME!
-     */
-    public void valueField_actionPerformed(ActionEvent e)
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param e DOCUMENT ME!
+   */
+  public void valueField_actionPerformed(ActionEvent e)
+  {
+    try
     {
-        try
-        {
-            int i = Integer.parseInt(valueField.getText());
-            slider.setValue(i);
-        }
-        catch (Exception ex)
-        {
-            valueField.setText(slider.getValue() + "");
-        }
+      int i = Integer.parseInt(valueField.getText());
+      slider.setValue(i);
     }
-
+    catch (Exception ex)
+    {
+      valueField.setText(slider.getValue() + "");
+    }
+  }
 
 }