Merge branch 'develop' into features/JAL-2094_colourInterface

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

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index c8f526c..9072a62 100755 (executable)
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -27,10 +27,12 @@ import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.datamodel.SequenceNode;
+import jalview.schemes.Colour;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.ColourSchemeProperty;
 import jalview.schemes.ResidueProperties;
 import jalview.schemes.UserColourScheme;
+import jalview.util.ColorUtils;
 import jalview.util.Format;
 import jalview.util.MappingUtils;
 import jalview.viewmodel.AlignmentViewport;
@@ -176,7 +178,8 @@ public class TreeCanvas extends Panel implements MouseListener,
         }
         else
         {
-          g.setColor(av.getSequenceColour(seq).darker());
+          g.setColor(ColorUtils.getColor(av.getSequenceColour(seq))
+                  .darker());
         }
 
       }
@@ -403,7 +406,7 @@ public class TreeCanvas extends Panel implements MouseListener,
 
       if (node.element() instanceof SequenceI)
       {
-        av.setSequenceColour((SequenceI) node.element(), c);
+        av.setSequenceColour((SequenceI) node.element(), new Colour(c));
       }
     }
     else
@@ -706,7 +709,7 @@ public class TreeCanvas extends Panel implements MouseListener,
           for (SequenceI seq : mappedGroup.getSequences())
           {
             // TODO why does gui require col.brighter() here??
-            codingComplement.setSequenceColour(seq, col);
+            codingComplement.setSequenceColour(seq, new Colour(col));
           }
         }
       }