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
Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
cffc3cb
..
619bdd7
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-259,7
+259,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (showDistances && (node.dist > 0))
{
if (showDistances && (node.dist > 0))
{
- nodeLabel = new Format("%-.2f").form(node.dist);
+ nodeLabel = new Format("%g").form(node.dist);
}
if (showBootstrap && node.bootstrap > -1)
}
if (showBootstrap && node.bootstrap > -1)
@@
-347,7
+347,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (showDistances && (node.dist > 0))
{
if (showDistances && (node.dist > 0))
{
- nodeLabel = new Format("%-.2f").form(node.dist);
+ nodeLabel = new Format("%g").form(node.dist);
}
if (showBootstrap && node.bootstrap > -1)
}
if (showBootstrap && node.bootstrap > -1)
@@
-459,8
+459,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if ((node.left() == null) && (node.right() == null))
{
double height = node.height;
if ((node.left() == null) && (node.right() == null))
{
double height = node.height;
-// double dist = node.dist;
-// int xstart = (int) ((height - dist) * wscale) + offx;
+ // double dist = node.dist;
+ // int xstart = (int) ((height - dist) * wscale) + offx;
int xend = (int) (height * wscale) + offx;
int ypos = (int) (node.ycount * chunk) + offy;
int xend = (int) (height * wscale) + offx;
int ypos = (int) (node.ycount * chunk) + offy;
@@
-828,7
+828,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
void chooseSubtreeColour()
{
String ttl = MessageManager.getString("label.select_subtree_colour");
void chooseSubtreeColour()
{
String ttl = MessageManager.getString("label.select_subtree_colour");
- ColourChooserListener listener = new ColourChooserListener() {
+ ColourChooserListener listener = new ColourChooserListener()
+ {
@Override
public void colourSelected(Color c)
{
@Override
public void colourSelected(Color c)
{
@@
-837,7
+838,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
repaint();
}
};
repaint();
}
};
- JalviewColourChooser.showColourChooser(this, ttl, highlightNode.color, listener);
+ JalviewColourChooser.showColourChooser(this, ttl, highlightNode.color,
+ listener);
}
@Override
}
@Override
@@
-916,7
+918,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceI)
{
treeSelectionChanged((Sequence) ob);
if (ob instanceof SequenceI)
{
treeSelectionChanged((Sequence) ob);
- PaintRefresher.Refresh(tp, getAssociatedPanel().av.getSequenceSetId());
+ PaintRefresher.Refresh(tp,
+ getAssociatedPanel().av.getSequenceSetId());
repaint();
av.sendSelection();
return;
repaint();
av.sendSelection();
return;
@@
-962,7
+965,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
}
}
}
}
- PaintRefresher.Refresh(tp, getAssociatedPanel().av.getSequenceSetId());
+ PaintRefresher.Refresh(tp,
+ getAssociatedPanel().av.getSequenceSetId());
repaint();
}
repaint();
}