X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreeCanvas.java;h=9072a62757b9cdff3a31ce3766d4c377d416667d;hb=refs%2Fheads%2Ffeatures%2FJAL-2094_colourInterface;hp=c8f526ceedd611ef60a43684fedc4e98ac4c6c6a;hpb=ab4e8d6988969d68d972d308c4159e9b9eb51e84;p=jalview.git diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java index c8f526c..9072a62 100755 --- 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)); } } }