* @version $Revision$\r
*/\r
public class TreeCanvas extends JPanel implements MouseListener, Runnable,\r
- Printable\r
+ Printable, MouseMotionListener\r
{\r
/** DOCUMENT ME!! */\r
public static final String PLACEHOLDER = " * ";\r
String longestName;\r
int labelLength = -1;\r
\r
- //RubberbandRectangle rubberband;\r
- Vector listeners;\r
Hashtable nameHash = new Hashtable();\r
Hashtable nodeHash = new Hashtable();\r
+ SequenceNode highlightNode;\r
\r
/**\r
* Creates a new TreeCanvas object.\r
font = av.getFont();\r
scrollPane = scroller;\r
addMouseListener(this);\r
+ addMouseMotionListener(this);\r
PaintRefresher.Register(this, av.alignment);\r
}\r
\r
*\r
* @param sequence DOCUMENT ME!\r
*/\r
- public void TreeSelectionChanged(Sequence sequence)\r
+ public void treeSelectionChanged(SequenceI sequence)\r
{\r
SequenceGroup selected = av.getSelectionGroup();\r
\r
\r
selected.setEndRes(av.alignment.getWidth()-1);\r
selected.addOrRemove(sequence, true);\r
-\r
- PaintRefresher.Refresh(this, av.alignment);\r
- repaint();\r
}\r
\r
/**\r
\r
// Draw horizontal line\r
g.drawLine(xstart, ypos, xend, ypos);\r
- g.fillRect(xend - 2, ypos - 2, 4, 4);\r
+ if (node == highlightNode)\r
+ g.fillRect(xend - 3, ypos - 3, 6, 6);\r
+ else\r
+ g.fillRect(xend - 2, ypos - 2, 4, 4);\r
\r
int ystart = (int) (((SequenceNode) node.left()).ycount * chunk) +\r
offy;\r
*\r
* @param e DOCUMENT ME!\r
*/\r
- public void mouseClicked(MouseEvent e)\r
+ public void mouseClicked(MouseEvent evt)\r
{\r
+ if(highlightNode!=null)\r
+ {\r
+ if(evt.getClickCount()>1)\r
+ {\r
+ tree.swapNodes(highlightNode);\r
+ tree.reCount(tree.getTopNode());\r
+ tree.findHeight(tree.getTopNode());\r
+ }\r
+ else\r
+ {\r
+ Vector leaves = new Vector();\r
+ tree.findLeaves(highlightNode, leaves);\r
+\r
+ for (int i = 0; i < leaves.size(); i++)\r
+ {\r
+ SequenceI seq =\r
+ (SequenceI) ( (SequenceNode) leaves.elementAt(i)).element();\r
+ treeSelectionChanged(seq);\r
+ }\r
+ }\r
+\r
+ PaintRefresher.Refresh(this, av.alignment);\r
+ repaint();\r
+ }\r
}\r
\r
+\r
+\r
+ public void mouseMoved(MouseEvent evt)\r
+ {\r
+ av.setCurrentTree(tree);\r
+\r
+ Object ob = findElement(evt.getX(), evt.getY());\r
+\r
+ if (ob instanceof SequenceNode)\r
+ {\r
+ highlightNode = (SequenceNode) ob;\r
+ repaint();\r
+ }\r
+ else\r
+ {\r
+ if (highlightNode != null)\r
+ {\r
+ highlightNode = null;\r
+ repaint();\r
+ }\r
+ }\r
+ }\r
+\r
+ public void mouseDragged(MouseEvent ect)\r
+ {}\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
\r
if (ob instanceof SequenceI)\r
{\r
- TreeSelectionChanged((Sequence) ob);\r
- repaint();\r
-\r
- return;\r
- }\r
- else if (ob instanceof SequenceNode)\r
- {\r
- SequenceNode tmpnode = (SequenceNode) ob;\r
- tree.swapNodes(tmpnode);\r
- tree.reCount(tree.getTopNode());\r
- tree.findHeight(tree.getTopNode());\r
+ treeSelectionChanged( (Sequence) ob);\r
+ PaintRefresher.Refresh(this, av.alignment);\r
+ repaint();\r
+ return;\r
}\r
- else\r
+ else if( !(ob instanceof SequenceNode) )\r
{\r
// Find threshold\r
if (tree.getMaxHeight() != 0)\r
av.setSelectionGroup(null);\r
av.alignment.deleteAllGroups();\r
\r
- for (int i = 0; i < tree.getGroups().size(); i++)\r
- {\r
- Color col = new Color((int) (Math.random() * 255),\r
- (int) (Math.random() * 255),\r
- (int) (Math.random() * 255));\r
- setColor((SequenceNode) tree.getGroups().elementAt(i),\r
- col.brighter());\r
+ colourGroups();\r
+ }\r
\r
- Vector l = tree.findLeaves((SequenceNode) tree.getGroups()\r
- .elementAt(i),\r
- new Vector());\r
+ PaintRefresher.Refresh(this, av.alignment);\r
+ repaint();\r
+ }\r
\r
- Vector sequences = new Vector();\r
\r
- for (int j = 0; j < l.size(); j++)\r
- {\r
- SequenceI s1 = (SequenceI) ((SequenceNode) l.elementAt(j)).element();\r
+ }\r
\r
- if (!sequences.contains(s1))\r
- {\r
- sequences.addElement(s1);\r
- }\r
- }\r
+ void colourGroups()\r
+ {\r
+ for (int i = 0; i < tree.getGroups().size(); i++)\r
+ {\r
+ Color col = new Color( (int) (Math.random() * 255),\r
+ (int) (Math.random() * 255),\r
+ (int) (Math.random() * 255));\r
+ setColor( (SequenceNode) tree.getGroups().elementAt(i),\r
+ col.brighter());\r
\r
- ColourSchemeI cs = null;\r
+ Vector l = tree.findLeaves( (SequenceNode) tree.getGroups()\r
+ .elementAt(i),\r
+ new Vector());\r
\r
- if (av.getGlobalColourScheme() != null)\r
- {\r
- if (av.getGlobalColourScheme() instanceof UserColourScheme)\r
- {\r
- cs = new UserColourScheme(\r
- ( (UserColourScheme) av.getGlobalColourScheme()).getColours());\r
-\r
- }\r
- else\r
- cs = ColourSchemeProperty.getColour(sequences,\r
- av.alignment.getWidth(),\r
- ColourSchemeProperty.getColourName(\r
- av.getGlobalColourScheme()));\r
-\r
- cs.setThreshold(av.getGlobalColourScheme().getThreshold(),\r
- av.getIgnoreGapsConsensus());\r
- }\r
+ Vector sequences = new Vector();\r
\r
+ for (int j = 0; j < l.size(); j++)\r
+ {\r
+ SequenceI s1 = (SequenceI) ( (SequenceNode) l.elementAt(j)).element();\r
\r
- SequenceGroup sg = new SequenceGroup(sequences,\r
- "TreeGroup", cs, true, true, false, 0,\r
- av.alignment.getWidth()-1);\r
+ if (!sequences.contains(s1))\r
+ {\r
+ sequences.addElement(s1);\r
+ }\r
+ }\r
\r
+ ColourSchemeI cs = null;\r
\r
- if ( av.getGlobalColourScheme()!=null\r
- && av.getGlobalColourScheme().conservationApplied())\r
- {\r
- Conservation c = new Conservation("Group",\r
- ResidueProperties.propHash, 3,\r
- sg.getSequences(false),\r
- sg.getStartRes(), sg.getEndRes());\r
-\r
- c.calculate();\r
- c.verdict(false, av.ConsPercGaps);\r
- sg.cs.setConservation(c);\r
- }\r
+ if (av.getGlobalColourScheme() != null)\r
+ {\r
+ if (av.getGlobalColourScheme() instanceof UserColourScheme)\r
+ {\r
+ cs = new UserColourScheme(\r
+ ( (UserColourScheme) av.getGlobalColourScheme()).getColours());\r
\r
- av.alignment.addGroup(sg);\r
- }\r
- }\r
+ }\r
+ else\r
+ cs = ColourSchemeProperty.getColour(sequences,\r
+ av.alignment.getWidth(),\r
+ ColourSchemeProperty.\r
+ getColourName(\r
+ av.getGlobalColourScheme()));\r
+\r
+ cs.setThreshold(av.getGlobalColourScheme().getThreshold(),\r
+ av.getIgnoreGapsConsensus());\r
}\r
\r
- PaintRefresher.Refresh(this, av.alignment);\r
- repaint();\r
+ SequenceGroup sg = new SequenceGroup(sequences,\r
+ "TreeGroup", cs, true, true, false,\r
+ 0,\r
+ av.alignment.getWidth() - 1);\r
+\r
+ if (av.getGlobalColourScheme() != null\r
+ && av.getGlobalColourScheme().conservationApplied())\r
+ {\r
+ Conservation c = new Conservation("Group",\r
+ ResidueProperties.propHash, 3,\r
+ sg.getSequences(false),\r
+ sg.getStartRes(), sg.getEndRes());\r
+\r
+ c.calculate();\r
+ c.verdict(false, av.ConsPercGaps);\r
+ sg.cs.setConservation(c);\r
+ }\r
+\r
+ av.alignment.addGroup(sg);\r
+ }\r
+\r
}\r
\r
/**\r
git://source.jalview.org / jalview.git / blobdiff