X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=f9cb39c590c83302c652ba4944540490f819efa6;hb=82e0c09533b4f568b50fdc290be58589cea3ebb6;hp=d4c88de7acb8c238b51d0079145034ce66379d4b;hpb=a7c9bef24b1d0fedd17c0ab0468864ca97c0b649;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index d4c88de..f9cb39c 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -16,13 +16,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print NJTree tree; JScrollPane scrollPane; AlignViewport av; - + public static final String PLACEHOLDER=" * "; Font font; int fontSize = 12; boolean fitToWindow = true; boolean showDistances = false; boolean showBootstrap = false; + boolean markPlaceholders = false; int offx = 20; int offy = 20; @@ -122,10 +123,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print g.drawString(nodeLabel,xstart,ypos - 10); } - // Colour selected leaves differently - String name = node.getName(); + String name = (markPlaceholders && node.isPlaceholder()) ? (PLACEHOLDER+node.getName()) : node.getName(); FontMetrics fm = g.getFontMetrics(font); - int charWidth = fm.stringWidth(node.getName()) + 3; + int charWidth = fm.stringWidth(name) + 3; int charHeight = fm.getHeight(); Rectangle rect = new Rectangle(xend+20,ypos-charHeight, @@ -133,6 +133,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print nameHash.put((SequenceI)node.element(),rect); + // Colour selected leaves differently SequenceGroup selected = av.getSelectionGroup(); if (selected!=null && selected.sequences.contains((SequenceI)node.element())) { g.setColor(Color.gray); @@ -140,7 +141,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print g.fillRect(xend + 10, ypos - charHeight + 3,charWidth,charHeight); g.setColor(Color.white); } - g.drawString(node.getName(),xend+10,ypos); + g.drawString(name,xend+10,ypos); g.setColor(Color.black); } else { drawNode(g,(SequenceNode)node.left(), chunk,scale,width,offx,offy); @@ -496,6 +497,10 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print this.showBootstrap = state; repaint(); } + public void setMarkPlaceholders(boolean state) { + this.markPlaceholders = state; + repaint(); + } }