X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRedundancyPanel.java;h=3d7c80f232339feeaa6a9d9d11b77ac3f47bcef4;hb=e83311d25dc8fda9df4ab06f3b1bd53f242a5814;hp=0b4987c5eb112581a58f159c084893bff8ba3343;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git

diff --git a/src/jalview/appletgui/RedundancyPanel.java b/src/jalview/appletgui/RedundancyPanel.java
old mode 100755
new mode 100644
index 0b4987c..3d7c80f
--- a/src/jalview/appletgui/RedundancyPanel.java
+++ b/src/jalview/appletgui/RedundancyPanel.java
@@ -1,29 +1,32 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.appletgui;
 
 import java.util.*;
-
+import java.util.List;
 import java.awt.*;
 import java.awt.event.*;
 
+import jalview.analysis.AlignSeq;
 import jalview.commands.*;
 import jalview.datamodel.*;
+import jalview.util.MessageManager;
 
 public class RedundancyPanel extends SliderPanel implements Runnable,
         WindowListener
@@ -48,7 +51,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
     applyButton.setVisible(true);
     allGroupsCheck.setVisible(false);
 
-    label.setText("Enter the redundancy threshold");
+    label.setText(MessageManager.getString("label.enter_redundancy_threshold"));
     valueField.setText("100");
 
     slider.setVisibleAmount(1);
@@ -68,7 +71,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
     frame = new Frame();
     frame.add(this);
     jalview.bin.JalviewLite.addFrame(frame,
-            "Redundancy threshold selection", 400, 100);
+            MessageManager.getString("label.redundancy_threshold_selection"), 400, 100);
 
     frame.addWindowListener(this);
 
@@ -90,7 +93,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
    */
   public void run()
   {
-    label.setText("Calculating....");
+    label.setText(MessageManager.getString("label.calculating"));
 
     slider.setVisible(false);
     applyButton.setEnabled(false);
@@ -120,61 +123,15 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
 
     height = originalSequences.length;
 
-    redundancy = new float[height];
-    for (int i = 0; i < height; i++)
-    {
-      redundancy[i] = 0f;
-    }
-
-    // if (ap.av.hasHiddenColumns)
-    {
-      // omitHidden = ap.av.getSelectionAsString();
-    }
-
-    // long start = System.currentTimeMillis();
-
-    float pid;
-    String seqi, seqj;
-    for (int i = 0; i < height; i++)
-    {
-      for (int j = 0; j < i; j++)
-      {
-        if (i == j)
-        {
-          continue;
-        }
-
-        if (omitHidden == null)
-        {
-          seqi = originalSequences[i].getSequenceAsString(start, end);
-          seqj = originalSequences[j].getSequenceAsString(start, end);
-        }
-        else
-        {
-          seqi = omitHidden[i];
-          seqj = omitHidden[j];
-        }
-
-        pid = jalview.util.Comparison.PID(seqi, seqj);
-
-        if (seqj.length() < seqi.length())
-        {
-          redundancy[j] = Math.max(pid, redundancy[j]);
-        }
-        else
-        {
-          redundancy[i] = Math.max(pid, redundancy[i]);
-        }
-
-      }
-    }
-
-    label.setText("Enter the redundancy threshold");
+    redundancy = AlignSeq.computeRedundancyMatrix(originalSequences,
+            omitHidden, start, end, false);
+    label.setText(MessageManager.getString("label.enter_redundancy_threshold"));
     slider.setVisible(true);
     applyButton.setEnabled(true);
     valueField.setVisible(true);
 
     validate();
+    sliderValueChanged();
     // System.out.println("blob done "+ (System.currentTimeMillis()-start));
   }
 
@@ -187,19 +144,16 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
 
     float value = slider.getValue();
 
+    List<SequenceI> redundantSequences = new ArrayList<SequenceI>();
     for (int i = 0; i < redundancy.length; i++)
     {
-      if (value > redundancy[i])
-      {
-        redundantSeqs.removeElement(originalSequences[i]);
-      }
-      else if (!redundantSeqs.contains(originalSequences[i]))
+      if (value <= redundancy[i])
       {
-        redundantSeqs.addElement(originalSequences[i]);
+        redundantSequences.add(originalSequences[i]);
       }
     }
 
-    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
+    ap.idPanel.idCanvas.setHighlighted(redundantSequences);
     PaintRefresher.Refresh(this, ap.av.getSequenceSetId(), true, true);
 
   }
@@ -240,11 +194,10 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
 
       EditCommand cut = new EditCommand("Remove Redundancy",
               EditCommand.CUT, deleted, 0, width, ap.av.getAlignment());
-      AlignmentI alignment=ap.av.getAlignment();
+      AlignmentI alignment = ap.av.getAlignment();
       for (int i = 0; i < del.size(); i++)
       {
         alignment.deleteSequence(deleted[i]);
-        PaintRefresher.Refresh(this, ap.av.getSequenceSetId(), true, true);
         if (sg != null)
         {
           sg.deleteSequence(deleted[i], false);
@@ -255,8 +208,9 @@ public class RedundancyPanel extends SliderPanel implements Runnable,
 
       ap.alignFrame.addHistoryItem(cut);
 
-      ap.av.firePropertyChange("alignment", null, ap.av.getAlignment()
-              .getSequences());
+      PaintRefresher.Refresh(this, ap.av.getSequenceSetId(), true, true);
+      // ap.av.firePropertyChange("alignment", null, ap.av.getAlignment()
+      // .getSequences());
     }
 
   }