From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 7 Aug 2006 15:14:13 +0000 (+0000)
Subject: Use idCanvas highlight system
X-Git-Tag: Release_2_1~150
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=73fac3ff67c2b37e080569c43fc7e100829d2759;p=jalview.git

Use idCanvas highlight system
---

diff --git a/src/jalview/appletgui/RedundancyPanel.java b/src/jalview/appletgui/RedundancyPanel.java
index 7608cb9..98b907e 100755
--- a/src/jalview/appletgui/RedundancyPanel.java
+++ b/src/jalview/appletgui/RedundancyPanel.java
@@ -35,13 +35,14 @@ public class RedundancyPanel extends SliderPanel implements Runnable, WindowList
   Stack historyList = new Stack(); // simpler than synching with alignFrame.
   float [] redundancy;
   SequenceI [] originalSequences;
-  Hashtable originalColours;
   Frame frame;
+  Vector redundantSeqs;
 
   public RedundancyPanel(AlignmentPanel ap)
   {
     super(ap, 0, false, null);
 
+    redundantSeqs = new Vector();
     this.ap = ap;
     undoButton.setVisible(true);
     applyButton.setVisible(true);
@@ -99,7 +100,6 @@ public class RedundancyPanel extends SliderPanel implements Runnable, WindowList
       SequenceGroup sg = ap.av.getSelectionGroup();
       int height;
 
-      originalColours = new Hashtable();
       int start, end;
 
       if ( (sg != null) && (sg.getSize(false) >= 1))
@@ -135,9 +135,6 @@ public class RedundancyPanel extends SliderPanel implements Runnable, WindowList
       String seqi, seqj;
       for (int i = 0; i < height; i++)
       {
-          originalColours.put(originalSequences[i],
-                             originalSequences[i].getColor());
-
           for (int j = 0; j < i; j++)
           {
             if(i==j)
@@ -184,11 +181,13 @@ public class RedundancyPanel extends SliderPanel implements Runnable, WindowList
     for(int i=0; i<redundancy.length; i++)
     {
       if (value > redundancy[i])
-         originalSequences[i].setColor(java.awt.Color.white);
-      else
-         originalSequences[i].setColor(java.awt.Color.red);
+         redundantSeqs.removeElement(originalSequences[i]);
+      else if(!redundantSeqs.contains(originalSequences[i]))
+         redundantSeqs.addElement(originalSequences[i]);
     }
 
+    ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
+
     PaintRefresher.Refresh(null,ap.av.alignment);
 
     }
@@ -273,13 +272,7 @@ public class RedundancyPanel extends SliderPanel implements Runnable, WindowList
 
   public void windowClosing(WindowEvent evt)
   {
-    for(int i=0; i<originalSequences.length; i++)
-    {
-      SequenceI seq = originalSequences[i];
-      seq.setColor( (java.awt.Color)originalColours.get(seq));
-    }
 
-    PaintRefresher.Refresh(ap.av.alignment);
   }
 
   public void windowClosed(WindowEvent evt)
diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java
index 3d1bfb7..5423dc9 100755
--- a/src/jalview/gui/RedundancyPanel.java
+++ b/src/jalview/gui/RedundancyPanel.java
@@ -44,8 +44,8 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
     Stack historyList = new Stack(); // simpler than synching with alignFrame.
     float [] redundancy;
     SequenceI [] originalSequences;
-    Hashtable originalColours;
     JInternalFrame frame;
+    Vector redundantSeqs;
 
     /**
      * Creates a new RedundancyPanel object.
@@ -53,10 +53,11 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
      * @param ap DOCUMENT ME!
      * @param af DOCUMENT ME!
      */
-    public RedundancyPanel(AlignmentPanel ap, AlignFrame af)
+    public RedundancyPanel(final AlignmentPanel ap, AlignFrame af)
     {
         this.ap = ap;
         this.af = af;
+        redundantSeqs = new Vector();
 
         slider.addChangeListener(new ChangeListener()
             {
@@ -69,7 +70,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
 
         applyButton.setText("Remove");
         allGroupsCheck.setVisible(false);
-        slider.setMinimum(60);
+        slider.setMinimum(0);
         slider.setMaximum(100);
         slider.setValue(100);
 
@@ -84,7 +85,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
             {
               public void internalFrameClosing(InternalFrameEvent evt)
               {
-                resetColours();
+               ap.idPanel.idCanvas.setHighlighted(null);
               }
             }
             );
@@ -121,7 +122,6 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
         SequenceGroup sg = ap.av.getSelectionGroup();
         int height;
 
-        originalColours = new Hashtable();
         int start, end;
 
         if ( (sg != null) && (sg.getSize(false) >= 1))
@@ -157,8 +157,6 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
         String seqi, seqj;
         for (int i = 0; i < height; i++)
         {
-            originalColours.put(originalSequences[i],
-                               originalSequences[i].getColor());
 
             for (int j = 0; j < i; j++)
             {
@@ -209,13 +207,13 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
       for(int i=0; i<redundancy.length; i++)
       {
         if (value > redundancy[i])
-           originalSequences[i].setColor(java.awt.Color.white);
-        else
-          originalSequences[i].setColor(java.awt.Color.red);
-      }
+          redundantSeqs.remove(originalSequences[i]);
+        else if(!redundantSeqs.contains(originalSequences[i]))
+          redundantSeqs.add(originalSequences[i]);
 
-      PaintRefresher.Refresh(null,ap.av.alignment);
+      }
 
+      ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
     }
 
     /**
@@ -272,16 +270,6 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
         af.updateEditMenuBar();
     }
 
-    void resetColours()
-    {
-      for(int i=0; i<originalSequences.length; i++)
-      {
-        SequenceI seq = originalSequences[i];
-        seq.setColor( (java.awt.Color)originalColours.get(seq));
-      }
-
-      PaintRefresher.Refresh(ap.av.alignment);
-    }
 
     /**
      * DOCUMENT ME!