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

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

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 6bfea9e..874513e 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -27,11 +27,13 @@ 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.structure.SelectionSource;
+import jalview.util.ColorUtils;
 import jalview.util.Format;
 import jalview.util.MappingUtils;
 import jalview.util.MessageManager;
@@ -246,7 +248,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
         }
         else
         {
-          g.setColor(av.getSequenceColour(seq).darker());
+          g.setColor(ColorUtils.getColor(av.getSequenceColour(seq))
+                  .darker());
         }
       }
       else
@@ -523,7 +526,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
           for (int a = 0; a < aps.length; a++)
           {
             final SequenceI seq = (SequenceI) node.element();
-            aps[a].av.setSequenceColour(seq, c);
+            aps[a].av.setSequenceColour(seq, new Colour(c));
           }
         }
       }
@@ -1042,7 +1045,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
             codingComplement.getAlignment().addGroup(mappedGroup);
             for (SequenceI seq : mappedGroup.getSequences())
             {
-              codingComplement.setSequenceColour(seq, col.brighter());
+              codingComplement.setSequenceColour(seq,
+                      new Colour(col.brighter()));
             }
           }
         }