git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made error for browser configuration on unix a bit easier to see.
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
d4c88de
..
f9cb39c
100755
(executable)
--- 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;
\r
JScrollPane scrollPane;
\r
AlignViewport av;
\r
NJTree tree;
\r
JScrollPane scrollPane;
\r
AlignViewport av;
\r
-
\r
+ public static final String PLACEHOLDER=" * ";
\r
Font font;
\r
int fontSize = 12;
\r
\r
boolean fitToWindow = true;
\r
boolean showDistances = false;
\r
boolean showBootstrap = false;
\r
Font font;
\r
int fontSize = 12;
\r
\r
boolean fitToWindow = true;
\r
boolean showDistances = false;
\r
boolean showBootstrap = false;
\r
+ boolean markPlaceholders = false;
\r
\r
int offx = 20;
\r
int offy = 20;
\r
\r
int offx = 20;
\r
int offy = 20;
\r
@@
-122,10
+123,9
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print
g.drawString(nodeLabel,xstart,ypos - 10);
\r
}
\r
\r
g.drawString(nodeLabel,xstart,ypos - 10);
\r
}
\r
\r
- // Colour selected leaves differently
\r
- String name = node.getName();
\r
+ String name = (markPlaceholders && node.isPlaceholder()) ? (PLACEHOLDER+node.getName()) : node.getName();
\r
FontMetrics fm = g.getFontMetrics(font);
\r
FontMetrics fm = g.getFontMetrics(font);
\r
- int charWidth = fm.stringWidth(node.getName()) + 3;
\r
+ int charWidth = fm.stringWidth(name) + 3;
\r
int charHeight = fm.getHeight();
\r
\r
Rectangle rect = new Rectangle(xend+20,ypos-charHeight,
\r
int charHeight = fm.getHeight();
\r
\r
Rectangle rect = new Rectangle(xend+20,ypos-charHeight,
\r
@@
-133,6
+133,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print
\r
nameHash.put((SequenceI)node.element(),rect);
\r
\r
\r
nameHash.put((SequenceI)node.element(),rect);
\r
\r
+ // Colour selected leaves differently
\r
SequenceGroup selected = av.getSelectionGroup();
\r
if (selected!=null && selected.sequences.contains((SequenceI)node.element())) {
\r
g.setColor(Color.gray);
\r
SequenceGroup selected = av.getSelectionGroup();
\r
if (selected!=null && selected.sequences.contains((SequenceI)node.element())) {
\r
g.setColor(Color.gray);
\r
@@
-140,7
+141,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print
g.fillRect(xend + 10, ypos - charHeight + 3,charWidth,charHeight);
\r
g.setColor(Color.white);
\r
}
\r
g.fillRect(xend + 10, ypos - charHeight + 3,charWidth,charHeight);
\r
g.setColor(Color.white);
\r
}
\r
- g.drawString(node.getName(),xend+10,ypos);
\r
+ g.drawString(name,xend+10,ypos);
\r
g.setColor(Color.black);
\r
} else {
\r
drawNode(g,(SequenceNode)node.left(), chunk,scale,width,offx,offy);
\r
g.setColor(Color.black);
\r
} else {
\r
drawNode(g,(SequenceNode)node.left(), chunk,scale,width,offx,offy);
\r
@@
-496,6
+497,10
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable, Print
this.showBootstrap = state;
\r
repaint();
\r
}
\r
this.showBootstrap = state;
\r
repaint();
\r
}
\r
+ public void setMarkPlaceholders(boolean state) {
\r
+ this.markPlaceholders = state;
\r
+ repaint();
\r
+ }
\r
\r
}
\r
\r
\r
}
\r
\r