paintrefresher

[jalview.git] / src / jalview / appletgui / TreeCanvas.java

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 434ad60..136be52 100755 (executable)
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -70,7 +70,7 @@ public class TreeCanvas
     longestName = label;\r
     setLayout(null);\r
 \r
-    PaintRefresher.Register(this);\r
+    PaintRefresher.Register(this, av.alignment);\r
   }\r
 \r
   public void TreeSelectionChanged(Sequence sequence)\r
@@ -83,9 +83,10 @@ public class TreeCanvas
     }\r
 \r
     selected.setEndRes(av.alignment.getWidth());\r
-    selected.addOrRemove(sequence);\r
+    selected.addOrRemove(sequence, true);\r
 \r
-    PaintRefresher.Refresh(this);\r
+System.out.println("called here");\r
+    PaintRefresher.Refresh(this, av.alignment);\r
     repaint();\r
   }\r
 \r
@@ -291,7 +292,7 @@ public class TreeCanvas
           SequenceGroup sg = av.getSelectionGroup();\r
           if (sg != null)\r
           {\r
-            sg.addOrRemove(seq);\r
+            sg.addOrRemove(seq, true);\r
           }\r
         }\r
       }\r
@@ -424,7 +425,6 @@ public class TreeCanvas
 \r
   public void mousePressed(MouseEvent e)\r
   {\r
-\r
     av.setCurrentTree(tree);\r
 \r
     int x = e.getX();\r
@@ -472,19 +472,22 @@ public class TreeCanvas
 \r
           Vector l = tree.findLeaves( (SequenceNode) tree.getGroups().elementAt(\r
               i), new Vector());\r
-          SequenceGroup sg = null;\r
+\r
+          Vector sequences = new Vector();\r
           for (int j = 0; j < l.size(); j++)\r
           {\r
-            SequenceNode sn = (SequenceNode) l.elementAt(j);\r
-            if (sg == null)\r
-            {\r
-              sg = new SequenceGroup("TreeGroup", av.getGlobalColourScheme(), true, true, false,\r
-                                     0, av.alignment.getWidth());\r
-            }\r
-\r
-            sg.addSequence( (Sequence) sn.element());\r
+            sequences.addElement( (Sequence) ( (SequenceNode) l.elementAt(j)).element());\r
           }\r
 \r
+          ColourSchemeI cs = ColourSchemeProperty.getColour(sequences, av.alignment.getWidth(),\r
+              ColourSchemeProperty.getColourName(av.getGlobalColourScheme()));\r
+\r
+\r
+          SequenceGroup sg = new SequenceGroup(sequences, "TreeGroup",\r
+                                               cs, true, true,\r
+                                               false, 0, av.alignment.getWidth());\r
+\r
+\r
           if (av.getGlobalColourScheme() instanceof ConservationColourScheme)\r
           {\r
             ConservationColourScheme ccs = (ConservationColourScheme) av.\r
@@ -508,7 +511,7 @@ public class TreeCanvas
       }\r
     }\r
 \r
-    PaintRefresher.Refresh(this);\r
+    PaintRefresher.Refresh(this, av.alignment);\r
     repaint();\r
 \r
   }\r