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
formatting
[jalview.git]
/
src
/
jalview
/
appletgui
/
TreeCanvas.java
diff --git
a/src/jalview/appletgui/TreeCanvas.java
b/src/jalview/appletgui/TreeCanvas.java
index
ca78bda
..
217217e
100755
(executable)
--- a/
src/jalview/appletgui/TreeCanvas.java
+++ b/
src/jalview/appletgui/TreeCanvas.java
@@
-65,6
+65,7
@@
public class TreeCanvas extends Panel implements MouseListener,
SequenceNode highlightNode;
AlignmentPanel ap;
SequenceNode highlightNode;
AlignmentPanel ap;
+
public TreeCanvas(AlignmentPanel ap, ScrollPane scroller)
{
this.ap = ap;
public TreeCanvas(AlignmentPanel ap, ScrollPane scroller)
{
this.ap = ap;
@@
-199,8
+200,7
@@
public class TreeCanvas extends Panel implements MouseListener,
// Colour selected leaves differently
SequenceGroup selected = av.getSelectionGroup();
if (selected != null
// Colour selected leaves differently
SequenceGroup selected = av.getSelectionGroup();
if (selected != null
- && selected.getSequences(null).contains(
- node.element()))
+ && selected.getSequences(null).contains(node.element()))
{
g.setColor(Color.gray);
{
g.setColor(Color.gray);
@@
-442,8
+442,7
@@
public class TreeCanvas extends Panel implements MouseListener,
// for
// scrollbar
// for
// scrollbar
- float wscale = (width - labelLength - offx * 2)
- / tree.getMaxHeight();
+ float wscale = (width - labelLength - offx * 2) / tree.getMaxHeight();
SequenceNode top = tree.getTopNode();
SequenceNode top = tree.getTopNode();
@@
-467,8
+466,7
@@
public class TreeCanvas extends Panel implements MouseListener,
g.setColor(Color.gray);
}
g.setColor(Color.gray);
}
- int x = (int) (threshold
- * (getSize().width - labelLength - 2 * offx) + offx);
+ int x = (int) (threshold * (getSize().width - labelLength - 2 * offx) + offx);
g.drawLine(x, 0, x, getSize().height);
}
g.drawLine(x, 0, x, getSize().height);
}
@@
-631,19
+629,20
@@
public class TreeCanvas extends Panel implements MouseListener,
}
else
{
}
else
{
- cs = ColourSchemeProperty.getColour(sg, ColourSchemeProperty.getColourName(av
- .getGlobalColourScheme()));
+ cs = ColourSchemeProperty.getColour(sg, ColourSchemeProperty
+ .getColourName(av.getGlobalColourScheme()));
}
// cs is null if shading is an annotationColourGradient
}
// cs is null if shading is an annotationColourGradient
- if (cs!=null)
+ if (cs != null)
{
cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
av.getIgnoreGapsConsensus());
}
}
{
cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
av.getIgnoreGapsConsensus());
}
}
- // TODO: cs used to be initialized with a sequence collection and recalcConservation called automatically
+ // TODO: cs used to be initialized with a sequence collection and
+ // recalcConservation called automatically
// instead we set it manually - recalc called after updateAnnotation
// instead we set it manually - recalc called after updateAnnotation
- sg.cs=cs;
+ sg.cs = cs;
sg.setName("JTreeGroup:" + sg.hashCode());
sg.setIdColour(col);
sg.setName("JTreeGroup:" + sg.hashCode());
sg.setIdColour(col);