X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=1628f58d1c911e86b752e51252897843b2c850e4;hb=ef36c8bbd6c5eef95e4d1a2cff57ea772af5110b;hp=95245445ab65c83699fe41bb45dff109ab3966e8;hpb=a6cd54c46366acd8bc3350a79374b18f9eb0b240;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index 9524544..1628f58 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -195,7 +195,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (showDistances && (node.dist > 0)) { - nodeLabel = new Format("%5.2f").form(node.dist).trim(); + nodeLabel = new Format("%-.2f").form(node.dist); } if (showBootstrap) @@ -228,7 +228,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, SequenceGroup selected = av.getSelectionGroup(); if ((selected != null) && - selected.sequences.contains((SequenceI) node.element())) + selected.getSequences(false).contains((SequenceI) node.element())) { g.setColor(Color.gray); @@ -273,7 +273,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (showDistances && (node.dist > 0)) { - g.drawString(new Format("%5.2f").form(node.dist).trim(), xstart+2, + g.drawString(new Format("%-.2f").form(node.dist).trim(), xstart+2, ypos - 2); } } @@ -751,14 +751,15 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, SequenceGroup sg = new SequenceGroup(sequences, "TreeGroup", cs, true, true, false, 0, - av.alignment.getWidth()); + av.alignment.getWidth()-1); if ( av.getGlobalColourScheme()!=null && av.getGlobalColourScheme().conservationApplied()) { Conservation c = new Conservation("Group", - ResidueProperties.propHash, 3, sg.sequences, + ResidueProperties.propHash, 3, + sg.getSequences(false), sg.getStartRes(), sg.getEndRes()); c.calculate();