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
EPSOptions added
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
672d200
..
eea181f
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-50,7
+50,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
JScrollPane scrollPane;
\r
AlignViewport av;
\r
Font font;
\r
JScrollPane scrollPane;
\r
AlignViewport av;
\r
Font font;
\r
- int fontSize = 12;
\r
+ int fontSize;
\r
boolean fitToWindow = true;
\r
boolean showDistances = false;
\r
boolean showBootstrap = false;
\r
boolean fitToWindow = true;
\r
boolean showDistances = false;
\r
boolean showBootstrap = false;
\r
@@
-77,6
+77,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
public TreeCanvas(AlignViewport av, JScrollPane scroller)
\r
{
\r
this.av = av;
\r
public TreeCanvas(AlignViewport av, JScrollPane scroller)
\r
{
\r
this.av = av;
\r
+ font = av.getFont();
\r
scrollPane = scroller;
\r
addMouseListener(this);
\r
PaintRefresher.Register(this, av.alignment);
\r
scrollPane = scroller;
\r
addMouseListener(this);
\r
PaintRefresher.Register(this, av.alignment);
\r
@@
-523,17
+524,14
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
public void paintComponent(Graphics g)
\r
{
\r
super.paintComponent(g);
\r
public void paintComponent(Graphics g)
\r
{
\r
super.paintComponent(g);
\r
+ g.setFont(font);
\r
+
\r
if(tree==null)
\r
{
\r
if(tree==null)
\r
{
\r
- g.setFont(new Font("Verdana", Font.PLAIN, 18));
\r
g.drawString("Calculating tree....", 20, getHeight()/2);
\r
}
\r
else
\r
{
\r
g.drawString("Calculating tree....", 20, getHeight()/2);
\r
}
\r
else
\r
{
\r
-
\r
- font = new Font("Verdana", Font.PLAIN, fontSize);
\r
- g.setFont(font);
\r
-
\r
FontMetrics fm = g.getFontMetrics(font);
\r
\r
if (nameHash.size() == 0)
\r
FontMetrics fm = g.getFontMetrics(font);
\r
\r
if (nameHash.size() == 0)
\r
@@
-578,6
+576,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
public void setFontSize(int fontSize)
\r
{
\r
this.fontSize = fontSize;
\r
public void setFontSize(int fontSize)
\r
{
\r
this.fontSize = fontSize;
\r
+ font = new Font(font.getName(), font.getStyle(), fontSize);
\r
repaint();
\r
}
\r
\r
repaint();
\r
}
\r
\r
@@
-596,6
+595,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
g2.setColor(Color.white);
\r
g2.fillRect(0, 0, width, height);
\r
\r
g2.setColor(Color.white);
\r
g2.fillRect(0, 0, width, height);
\r
\r
+ g2.setFont(font);
\r
+
\r
labelLength = g2.getFontMetrics(font).stringWidth(longestName) + 20; //20 allows for scrollbar
\r
\r
float wscale = (float) (width - labelLength - (offx * 2)) / tree.getMaxHeight();
\r
labelLength = g2.getFontMetrics(font).stringWidth(longestName) + 20; //20 allows for scrollbar
\r
\r
float wscale = (float) (width - labelLength - (offx * 2)) / tree.getMaxHeight();
\r