X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=42a09aaad6cc717b8987712fad24de0ac01d5ffb;hp=9ca36ccb6cc98b6ce5704a5196a03f1e988dc8d2;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hpb=7b3241c464d774516c4295a5023f4aef7939298e
diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index 9ca36cc..42a09aa 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -1,97 +1,115 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview 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 3 of the License, or (at your option) any later version.
+ *
+ * Jalview 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 Jalview. If not, see .
*/
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,
- Printable, MouseMotionListener
+ Printable, MouseMotionListener
{
/** DOCUMENT ME!! */
public static final String PLACEHOLDER = " * ";
+
NJTree tree;
+
JScrollPane scrollPane;
+
+ TreePanel tp;
+
AlignViewport av;
+
AlignmentPanel ap;
+
Font font;
+
FontMetrics fm;
+
boolean fitToWindow = true;
+
boolean showDistances = false;
+
boolean showBootstrap = false;
+
boolean markPlaceholders = false;
+
int offx = 20;
+
int offy;
+
float threshold;
+
String longestName;
+
int labelLength = -1;
Hashtable nameHash = new Hashtable();
+
Hashtable nodeHash = new Hashtable();
+
SequenceNode highlightNode;
boolean applyToAllViews = false;
/**
* Creates a new TreeCanvas object.
- *
- * @param av DOCUMENT ME!
- * @param tree DOCUMENT ME!
- * @param scroller DOCUMENT ME!
- * @param label DOCUMENT ME!
+ *
+ * @param av
+ * DOCUMENT ME!
+ * @param tree
+ * DOCUMENT ME!
+ * @param scroller
+ * DOCUMENT ME!
+ * @param label
+ * DOCUMENT ME!
*/
- public TreeCanvas(AlignmentPanel ap, JScrollPane scroller)
+ public TreeCanvas(TreePanel tp, AlignmentPanel ap, JScrollPane scroller)
{
+ this.tp = tp;
this.av = ap.av;
this.ap = ap;
font = av.getFont();
scrollPane = scroller;
addMouseListener(this);
addMouseMotionListener(this);
- PaintRefresher.Register(this, ap.av.getSequenceSetId());
ToolTipManager.sharedInstance().registerComponent(this);
}
/**
* DOCUMENT ME!
- *
- * @param sequence DOCUMENT ME!
+ *
+ * @param sequence
+ * DOCUMENT ME!
*/
public void treeSelectionChanged(SequenceI sequence)
{
@@ -114,8 +132,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param tree DOCUMENT ME!
+ *
+ * @param tree
+ * DOCUMENT ME!
*/
public void setTree(NJTree tree)
{
@@ -136,11 +155,11 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
has_placeholders = true;
}
- if (longestName.length() < ( (Sequence) lf.element()).getName()
- .length())
+ if (longestName.length() < ((Sequence) lf.element()).getName()
+ .length())
{
- longestName = TreeCanvas.PLACEHOLDER +
- ( (Sequence) lf.element()).getName();
+ longestName = TreeCanvas.PLACEHOLDER
+ + ((Sequence) lf.element()).getName();
}
}
@@ -149,37 +168,44 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param g DOCUMENT ME!
- * @param node DOCUMENT ME!
- * @param chunk DOCUMENT ME!
- * @param scale DOCUMENT ME!
- * @param width DOCUMENT ME!
- * @param offx DOCUMENT ME!
- * @param offy DOCUMENT ME!
+ *
+ * @param g
+ * DOCUMENT ME!
+ * @param node
+ * DOCUMENT ME!
+ * @param chunk
+ * DOCUMENT ME!
+ * @param scale
+ * DOCUMENT ME!
+ * @param width
+ * DOCUMENT ME!
+ * @param offx
+ * DOCUMENT ME!
+ * @param offy
+ * DOCUMENT ME!
*/
public void drawNode(Graphics g, SequenceNode node, float chunk,
- float scale, int width, int offx, int offy)
+ float scale, int width, int offx, int offy)
{
if (node == null)
{
return;
}
- if ( (node.left() == null) && (node.right() == null))
+ if ((node.left() == null) && (node.right() == null))
{
// Drawing leaf node
float height = node.height;
float dist = node.dist;
- int xstart = (int) ( (height - dist) * scale) + offx;
+ int xstart = (int) ((height - dist) * scale) + offx;
int xend = (int) (height * scale) + offx;
int ypos = (int) (node.ycount * chunk) + offy;
if (node.element() instanceof SequenceI)
{
- SequenceI seq = (SequenceI) ( (SequenceNode) node).element();
+ SequenceI seq = (SequenceI) ((SequenceNode) node).element();
if (av.getSequenceColour(seq) == Color.white)
{
@@ -205,14 +231,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
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(""))
@@ -220,27 +246,27 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
g.drawString(nodeLabel, xstart + 2, ypos - 2);
}
- String name = (markPlaceholders && node.isPlaceholder())
- ? (PLACEHOLDER + node.getName()) : node.getName();
+ String name = (markPlaceholders && node.isPlaceholder()) ? (PLACEHOLDER + node
+ .getName()) : node.getName();
int charWidth = fm.stringWidth(name) + 3;
int charHeight = font.getSize();
Rectangle rect = new Rectangle(xend + 10, ypos - charHeight / 2,
- charWidth, charHeight);
+ charWidth, charHeight);
- nameHash.put( (SequenceI) node.element(), rect);
+ nameHash.put((SequenceI) node.element(), rect);
// Colour selected leaves differently
SequenceGroup selected = av.getSelectionGroup();
- if ( (selected != null) &&
- selected.getSequences(false).contains( (SequenceI) node.element()))
+ if ((selected != null)
+ && selected.getSequences(null).contains(
+ (SequenceI) node.element()))
{
g.setColor(Color.gray);
- g.fillRect(xend + 10, ypos - charHeight / 2, charWidth,
- charHeight);
+ g.fillRect(xend + 10, ypos - charHeight / 2, charWidth, charHeight);
g.setColor(Color.white);
}
@@ -250,51 +276,73 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
else
{
drawNode(g, (SequenceNode) node.left(), chunk, scale, width, offx,
- offy);
+ offy);
drawNode(g, (SequenceNode) node.right(), chunk, scale, width, offx,
- offy);
+ offy);
float height = node.height;
float dist = node.dist;
- int xstart = (int) ( (height - dist) * scale) + offx;
+ int xstart = (int) ((height - dist) * scale) + offx;
int xend = (int) (height * scale) + offx;
int ypos = (int) (node.ycount * chunk) + offy;
- g.setColor( ( (SequenceNode) node).color.darker());
+ g.setColor(((SequenceNode) node).color.darker());
// 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;
- int yend = (int) ( ( (SequenceNode) node.right()).ycount * chunk) +
- offy;
+ int ystart = (int) (((SequenceNode) node.left()).ycount * chunk)
+ + offy;
+ int yend = (int) (((SequenceNode) node.right()).ycount * chunk)
+ + offy;
Rectangle pos = new Rectangle(xend - 2, ypos - 2, 5, 5);
nodeHash.put(node, pos);
- g.drawLine( (int) (height * scale) + offx, ystart,
- (int) (height * scale) + offx, yend);
+ 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);
}
}
}
/**
* DOCUMENT ME!
- *
- * @param x DOCUMENT ME!
- * @param y DOCUMENT ME!
- *
+ *
+ * @param x
+ * DOCUMENT ME!
+ * @param y
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
*/
public Object findElement(int x, int y)
@@ -306,8 +354,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
Object ob = keys.nextElement();
Rectangle rect = (Rectangle) nameHash.get(ob);
- if ( (x >= rect.x) && (x <= (rect.x + rect.width)) && (y >= rect.y) &&
- (y <= (rect.y + rect.height)))
+ if ((x >= rect.x) && (x <= (rect.x + rect.width)) && (y >= rect.y)
+ && (y <= (rect.y + rect.height)))
{
return ob;
}
@@ -320,8 +368,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
Object ob = keys.nextElement();
Rectangle rect = (Rectangle) nodeHash.get(ob);
- if ( (x >= rect.x) && (x <= (rect.x + rect.width)) && (y >= rect.y) &&
- (y <= (rect.y + rect.height)))
+ if ((x >= rect.x) && (x <= (rect.x + rect.width)) && (y >= rect.y)
+ && (y <= (rect.y + rect.height)))
{
return ob;
}
@@ -332,8 +380,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param pickBox DOCUMENT ME!
+ *
+ * @param pickBox
+ * DOCUMENT ME!
*/
public void pickNodes(Rectangle pickBox)
{
@@ -342,12 +391,13 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
SequenceNode top = tree.getTopNode();
- float wscale = (float) ( (width * .8) - (offx * 2)) / tree.getMaxHeight();
+ float wscale = (float) ((width * .8) - (offx * 2))
+ / tree.getMaxHeight();
if (top.count == 0)
{
- top.count = ( (SequenceNode) top.left()).count +
- ( (SequenceNode) top.right()).count;
+ top.count = ((SequenceNode) top.left()).count
+ + ((SequenceNode) top.right()).count;
}
float chunk = (float) (height - (offy)) / top.count;
@@ -357,29 +407,36 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param pickBox DOCUMENT ME!
- * @param node DOCUMENT ME!
- * @param chunk DOCUMENT ME!
- * @param scale DOCUMENT ME!
- * @param width DOCUMENT ME!
- * @param offx DOCUMENT ME!
- * @param offy DOCUMENT ME!
+ *
+ * @param pickBox
+ * DOCUMENT ME!
+ * @param node
+ * DOCUMENT ME!
+ * @param chunk
+ * DOCUMENT ME!
+ * @param scale
+ * DOCUMENT ME!
+ * @param width
+ * DOCUMENT ME!
+ * @param offx
+ * DOCUMENT ME!
+ * @param offy
+ * DOCUMENT ME!
*/
public void pickNode(Rectangle pickBox, SequenceNode node, float chunk,
- float scale, int width, int offx, int offy)
+ float scale, int width, int offx, int offy)
{
if (node == null)
{
return;
}
- if ( (node.left() == null) && (node.right() == null))
+ if ((node.left() == null) && (node.right() == null))
{
float height = node.height;
float dist = node.dist;
- int xstart = (int) ( (height - dist) * scale) + offx;
+ int xstart = (int) ((height - dist) * scale) + offx;
int xend = (int) (height * scale) + offx;
int ypos = (int) (node.ycount * chunk) + offy;
@@ -401,17 +458,19 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
else
{
pickNode(pickBox, (SequenceNode) node.left(), chunk, scale, width,
- offx, offy);
+ offx, offy);
pickNode(pickBox, (SequenceNode) node.right(), chunk, scale, width,
- offx, offy);
+ offx, offy);
}
}
/**
* DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- * @param c DOCUMENT ME!
+ *
+ * @param node
+ * DOCUMENT ME!
+ * @param c
+ * DOCUMENT ME!
*/
public void setColor(SequenceNode node, Color c)
{
@@ -420,24 +479,27 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
return;
}
- if ( (node.left() == null) && (node.right() == null))
+ if ((node.left() == null) && (node.right() == null)) // TODO: internal node
{
node.color = c;
if (node.element() instanceof SequenceI)
{
AlignmentPanel[] aps = getAssociatedPanels();
- for (int a = 0; a < aps.length; a++)
+ if (aps != null)
{
- aps[a].av.setSequenceColour( (SequenceI) node.element(), c);
+ for (int a = 0; a < aps.length; a++)
+ {
+ aps[a].av.setSequenceColour((SequenceI) node.element(), c);
+ }
}
}
}
else
{
node.color = c;
- setColor( (SequenceNode) node.left(), c);
- setColor( (SequenceNode) node.right(), c);
+ setColor((SequenceNode) node.left(), c);
+ setColor((SequenceNode) node.right(), c);
}
}
@@ -463,8 +525,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
try
{
printJob.print();
- }
- catch (Exception PrintException)
+ } catch (Exception PrintException)
{
PrintException.printStackTrace();
}
@@ -473,20 +534,24 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param pg DOCUMENT ME!
- * @param pf DOCUMENT ME!
- * @param pi DOCUMENT ME!
- *
+ *
+ * @param pg
+ * DOCUMENT ME!
+ * @param pf
+ * DOCUMENT ME!
+ * @param pi
+ * DOCUMENT ME!
+ *
* @return DOCUMENT ME!
- *
- * @throws PrinterException DOCUMENT ME!
+ *
+ * @throws PrinterException
+ * DOCUMENT ME!
*/
public int print(Graphics pg, PageFormat pf, int pi)
- throws PrinterException
+ throws PrinterException
{
pg.setFont(font);
- pg.translate( (int) pf.getImageableX(), (int) pf.getImageableY());
+ pg.translate((int) pf.getImageableX(), (int) pf.getImageableY());
int pwidth = (int) pf.getImageableWidth();
int pheight = (int) pf.getImageableHeight();
@@ -532,8 +597,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param g DOCUMENT ME!
+ *
+ * @param g
+ * DOCUMENT ME!
*/
public void paintComponent(Graphics g)
{
@@ -553,10 +619,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
repaint();
}
- if (fitToWindow ||
- (!fitToWindow &&
- (scrollPane.getHeight() > ( (fm.getHeight() * nameHash.size()) +
- offy))))
+ if (fitToWindow
+ || (!fitToWindow && (scrollPane.getHeight() > ((fm
+ .getHeight() * nameHash.size()) + offy))))
{
draw(g, scrollPane.getWidth(), scrollPane.getHeight());
setPreferredSize(null);
@@ -564,7 +629,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
else
{
setPreferredSize(new Dimension(scrollPane.getWidth(),
- fm.getHeight() * nameHash.size()));
+ fm.getHeight() * nameHash.size()));
draw(g, scrollPane.getWidth(), fm.getHeight() * nameHash.size());
}
@@ -574,8 +639,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param fontSize DOCUMENT ME!
+ *
+ * @param fontSize
+ * DOCUMENT ME!
*/
public void setFont(Font font)
{
@@ -585,16 +651,19 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param g1 DOCUMENT ME!
- * @param width DOCUMENT ME!
- * @param height DOCUMENT ME!
+ *
+ * @param g1
+ * DOCUMENT ME!
+ * @param width
+ * DOCUMENT ME!
+ * @param height
+ * DOCUMENT ME!
*/
public void draw(Graphics g1, int width, int height)
{
Graphics2D g2 = (Graphics2D) g1;
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
+ RenderingHints.VALUE_ANTIALIAS_ON);
g2.setColor(Color.white);
g2.fillRect(0, 0, width, height);
@@ -604,17 +673,17 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
fm = g2.getFontMetrics(font);
- labelLength = fm.stringWidth(longestName) + 20; //20 allows for scrollbar
+ labelLength = fm.stringWidth(longestName) + 20; // 20 allows for scrollbar
- float wscale = (float) (width - labelLength - (offx * 2)) /
- tree.getMaxHeight();
+ float wscale = (float) (width - labelLength - (offx * 2))
+ / tree.getMaxHeight();
SequenceNode top = tree.getTopNode();
if (top.count == 0)
{
- top.count = ( (SequenceNode) top.left()).count +
- ( (SequenceNode) top.right()).count;
+ top.count = ((SequenceNode) top.left()).count
+ + ((SequenceNode) top.right()).count;
}
float chunk = (float) (height - (offy)) / top.count;
@@ -632,8 +701,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
g2.setColor(Color.gray);
}
- int x = (int) ( (threshold * (float) (getWidth() - labelLength -
- (2 * offx))) + offx);
+ int x = (int) ((threshold * (float) (getWidth() - labelLength - (2 * offx))) + offx);
g2.drawLine(x, 0, x, getHeight());
}
@@ -641,8 +709,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void mouseReleased(MouseEvent e)
{
@@ -650,8 +719,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void mouseEntered(MouseEvent e)
{
@@ -659,8 +729,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void mouseExited(MouseEvent e)
{
@@ -668,8 +739,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void mouseClicked(MouseEvent evt)
{
@@ -677,13 +749,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
{
if (SwingUtilities.isRightMouseButton(evt))
{
- Color col = JColorChooser.showDialog(this, "Select Sub-Tree Colour",
- highlightNode.color);
-
- setColor(highlightNode, col);
+ Color col = JColorChooser.showDialog(this,
+ "Select Sub-Tree Colour", highlightNode.color);
+ if (col != null)
+ {
+ setColor(highlightNode, col);
+ }
}
- else
- if (evt.getClickCount() > 1)
+ else if (evt.getClickCount() > 1)
{
tree.swapNodes(highlightNode);
tree.reCount(tree.getTopNode());
@@ -696,13 +769,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
for (int i = 0; i < leaves.size(); i++)
{
- SequenceI seq =
- (SequenceI) ( (SequenceNode) leaves.elementAt(i)).element();
+ SequenceI seq = (SequenceI) ((SequenceNode) leaves.elementAt(i))
+ .element();
treeSelectionChanged(seq);
}
+ av.sendSelection();
}
- PaintRefresher.Refresh(this, av.getSequenceSetId());
+ PaintRefresher.Refresh(tp, av.getSequenceSetId());
repaint();
}
}
@@ -716,10 +790,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceNode)
{
highlightNode = (SequenceNode) ob;
- this.setToolTipText(
- "Left click to select leaves"
- + "
Double-click to invert leaves"
- + "
Right click to change colour");
+ this.setToolTipText("Left click to select leaves"
+ + "
Double-click to invert leaves"
+ + "
Right click to change colour");
repaint();
}
@@ -735,12 +808,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
}
public void mouseDragged(MouseEvent ect)
- {}
+ {
+ }
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
public void mousePressed(MouseEvent e)
{
@@ -753,18 +828,19 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (ob instanceof SequenceI)
{
- treeSelectionChanged( (Sequence) ob);
- PaintRefresher.Refresh(this, ap.av.getSequenceSetId());
+ treeSelectionChanged((Sequence) ob);
+ PaintRefresher.Refresh(tp, ap.av.getSequenceSetId());
repaint();
+ av.sendSelection();
return;
}
- else if (! (ob instanceof SequenceNode))
+ else if (!(ob instanceof SequenceNode))
{
// Find threshold
if (tree.getMaxHeight() != 0)
{
- threshold = (float) (x - offx) / (float) (getWidth() -
- labelLength - (2 * offx));
+ threshold = (float) (x - offx)
+ / (float) (getWidth() - labelLength - (2 * offx));
tree.getGroups().removeAllElements();
tree.groupNodes(tree.getTopNode(), threshold);
@@ -781,7 +857,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
colourGroups();
}
- PaintRefresher.Refresh(this, ap.av.getSequenceSetId());
+ PaintRefresher.Refresh(tp, ap.av.getSequenceSetId());
repaint();
}
@@ -789,23 +865,22 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
void colourGroups()
{
+ AlignmentPanel[] aps = getAssociatedPanels();
for (int i = 0; i < tree.getGroups().size(); i++)
{
- Color col = new Color( (int) (Math.random() * 255),
- (int) (Math.random() * 255),
- (int) (Math.random() * 255));
- setColor( (SequenceNode) tree.getGroups().elementAt(i),
- col.brighter());
+ Color col = new Color((int) (Math.random() * 255),
+ (int) (Math.random() * 255), (int) (Math.random() * 255));
+ setColor((SequenceNode) tree.getGroups().elementAt(i), col.brighter());
- Vector l = tree.findLeaves( (SequenceNode) tree.getGroups()
- .elementAt(i),
- new Vector());
+ Vector l = tree.findLeaves(
+ (SequenceNode) tree.getGroups().elementAt(i), new Vector());
Vector sequences = new Vector();
for (int j = 0; j < l.size(); j++)
{
- SequenceI s1 = (SequenceI) ( (SequenceNode) l.elementAt(j)).element();
+ SequenceI s1 = (SequenceI) ((SequenceNode) l.elementAt(j))
+ .element();
if (!sequences.contains(s1))
{
@@ -820,35 +895,37 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (av.getGlobalColourScheme() instanceof UserColourScheme)
{
cs = new UserColourScheme(
- ( (UserColourScheme) av.getGlobalColourScheme()).getColours());
+ ((UserColourScheme) av.getGlobalColourScheme())
+ .getColours());
}
else
- cs = ColourSchemeProperty.getColour(sequences,
- av.alignment.getWidth(),
- ColourSchemeProperty.
- getColourName(
- av.getGlobalColourScheme()));
-
- cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
- av.getIgnoreGapsConsensus());
+ {
+ cs = ColourSchemeProperty.getColour(sequences, av.alignment
+ .getWidth(), ColourSchemeProperty.getColourName(av
+ .getGlobalColourScheme()));
+ }
+ // cs is null if shading is an annotationColourGradient
+ if (cs!=null)
+ {
+ cs.setThreshold(av.getGlobalColourScheme().getThreshold(),
+ av.getIgnoreGapsConsensus());
+ }
}
- SequenceGroup sg = new SequenceGroup(sequences,
- "TreeGroup", cs, true, true, false,
- 0,
- av.alignment.getWidth() - 1);
+ SequenceGroup sg = new SequenceGroup(sequences, null, cs, true, true,
+ false, 0, av.alignment.getWidth() - 1);
- AlignmentPanel[] aps = getAssociatedPanels();
+ sg.setName("JTreeGroup:" + sg.hashCode());
+ sg.setIdColour(col);
for (int a = 0; a < aps.length; a++)
{
if (aps[a].av.getGlobalColourScheme() != null
- && aps[a].av.getGlobalColourScheme().conservationApplied())
+ && aps[a].av.getGlobalColourScheme().conservationApplied())
{
Conservation c = new Conservation("Group",
- ResidueProperties.propHash, 3,
- sg.getSequences(false),
- sg.getStartRes(), sg.getEndRes());
+ ResidueProperties.propHash, 3, sg.getSequences(null),
+ sg.getStartRes(), sg.getEndRes());
c.calculate();
c.verdict(false, aps[a].av.ConsPercGaps);
@@ -858,13 +935,20 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
aps[a].av.alignment.addGroup(sg);
}
}
+ // notify the panel to redo any group specific stuff.
+ for (int a = 0; a < aps.length; a++)
+ {
+ aps[a].updateAnnotation();
+ // TODO: JAL-868 - need to ensure view colour change message is broadcast to any Jmols listening in
+ }
}
/**
* DOCUMENT ME!
- *
- * @param state DOCUMENT ME!
+ *
+ * @param state
+ * DOCUMENT ME!
*/
public void setShowDistances(boolean state)
{
@@ -874,8 +958,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param state DOCUMENT ME!
+ *
+ * @param state
+ * DOCUMENT ME!
*/
public void setShowBootstrap(boolean state)
{
@@ -885,8 +970,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/**
* DOCUMENT ME!
- *
- * @param state DOCUMENT ME!
+ *
+ * @param state
+ * DOCUMENT ME!
*/
public void setMarkPlaceholders(boolean state)
{
@@ -901,6 +987,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
return PaintRefresher.getAssociatedPanels(av.getSequenceSetId());
}
else
- return new AlignmentPanel[]{ap};
+ {
+ return new AlignmentPanel[]
+ { ap };
+ }
}
}