/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
package jalview.gui;
-import jalview.analysis.*;
-
-import jalview.datamodel.*;
-
-import jalview.schemes.*;
-
-import jalview.util.*;
+import java.util.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.print.*;
-
-import java.util.*;
-
import javax.swing.*;
+import jalview.analysis.*;
+import jalview.datamodel.*;
+import jalview.schemes.*;
+import jalview.util.*;
/**
* DOCUMENT ME!
* @author $author$
* @version $Revision$
*/
-public class TreeCanvas extends JPanel implements MouseListener, Runnable,
+public class TreeCanvas
+ extends JPanel implements MouseListener, Runnable,
Printable, MouseMotionListener
{
/** DOCUMENT ME!! */
scrollPane = scroller;
addMouseListener(this);
addMouseMotionListener(this);
- PaintRefresher.Register(tp, ap.av.getSequenceSetId());
ToolTipManager.sharedInstance().registerComponent(this);
}
nodeLabel = new Format("%-.2f").form(node.dist);
}
- if (showBootstrap)
+ if (showBootstrap && node.bootstrap>-1)
{
if (showDistances)
{
nodeLabel = nodeLabel + " : ";
}
- nodeLabel = nodeLabel + String.valueOf(node.getBootstrap());
+ nodeLabel = nodeLabel + String.valueOf(node.bootstrap);
}
if (!nodeLabel.equals(""))
SequenceGroup selected = av.getSelectionGroup();
if ( (selected != null) &&
- selected.getSequences(false).contains( (SequenceI) node.element()))
+ selected.getSequences(null).contains( (SequenceI) node.element()))
{
g.setColor(Color.gray);
// Draw horizontal line
g.drawLine(xstart, ypos, xend, ypos);
if (node == highlightNode)
+ {
g.fillRect(xend - 3, ypos - 3, 6, 6);
+ }
else
+ {
g.fillRect(xend - 2, ypos - 2, 4, 4);
+ }
int ystart = (int) ( ( (SequenceNode) node.left()).ycount * chunk) +
offy;
g.drawLine( (int) (height * scale) + offx, ystart,
(int) (height * scale) + offx, yend);
+ String nodeLabel = "";
+
if (showDistances && (node.dist > 0))
{
- g.drawString(new Format("%-.2f").form(node.dist).trim(), xstart + 2,
- ypos - 2);
+ nodeLabel = new Format("%-.2f").form(node.dist);
+ }
+
+ if (showBootstrap && node.bootstrap>-1)
+ {
+ if (showDistances)
+ {
+ nodeLabel = nodeLabel + " : ";
+ }
+
+ nodeLabel = nodeLabel + String.valueOf(node.bootstrap);
+ }
+
+ if (!nodeLabel.equals(""))
+ {
+ g.drawString(nodeLabel, xstart + 2, ypos - 2);
}
}
}
return;
}
- if ( (node.left() == null) && (node.right() == null))
+ if ( (node.left() == null) && (node.right() == null)) // TODO: internal node
{
node.color = c;
{
Color col = JColorChooser.showDialog(this, "Select Sub-Tree Colour",
highlightNode.color);
-
- setColor(highlightNode, col);
+ if (col!=null)
+ {
+ setColor(highlightNode, col);
+ }
}
else
if (evt.getClickCount() > 1)
}
else
+ {
cs = ColourSchemeProperty.getColour(sequences,
av.alignment.getWidth(),
ColourSchemeProperty.
getColourName(
av.getGlobalColourScheme()));
+ }
cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
av.getIgnoreGapsConsensus());
}
SequenceGroup sg = new SequenceGroup(sequences,
- "TreeGroup", cs, true, true, false,
+ null, cs, true, true, false,
0,
av.alignment.getWidth() - 1);
+ sg.setName("JTreeGroup:" + sg.hashCode());
+ sg.setIdColour(col);
AlignmentPanel[] aps = getAssociatedPanels();
for (int a = 0; a < aps.length; a++)
{
{
Conservation c = new Conservation("Group",
ResidueProperties.propHash, 3,
- sg.getSequences(false),
+ sg.getSequences(null),
sg.getStartRes(), sg.getEndRes());
c.calculate();
return PaintRefresher.getAssociatedPanels(av.getSequenceSetId());
}
else
- return new AlignmentPanel[]{ap};
+ {
+ return new AlignmentPanel[]
+ {
+ ap};
+ }
}
}