X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=a1bcebd25a43917bf7d0561cc58889ee4219638b;hb=948828a5fed141e2ed319586687b80b6d0298268;hp=a5f1ab9666e4f474dedff709003b0d97a187fe61;hpb=fe68da05540c32386ec63bd3beeadf8b9d624a16;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index a5f1ab9..a1bcebd 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -107,9 +107,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Map nameHash = new Hashtable<>(); - Map nodeHash = new Hashtable<>(); + Map nodeHash = new Hashtable<>(); - SequenceNode highlightNode; + BinaryNode highlightNode; boolean applyToAllViews = false; @@ -174,15 +174,15 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, tree.findHeight(tree.getTopNode()); // Now have to calculate longest name based on the leaves - Vector leaves = tree.findLeaves(tree.getTopNode()); + Vector leaves = tree.findLeaves(tree.getTopNode()); boolean has_placeholders = false; longestName = ""; for (int i = 0; i < leaves.size(); i++) { - SequenceNode lf = leaves.elementAt(i); + BinaryNode lf = leaves.elementAt(i); - if (lf.isPlaceholder()) + if (lf instanceof SequenceNode && ((SequenceNode)lf).isPlaceholder()) { has_placeholders = true; } @@ -216,7 +216,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, * @param offy * DOCUMENT ME! */ - public void drawNode(Graphics g, SequenceNode node, float chunk, + public void drawNode(Graphics g, BinaryNode node, float chunk, double wscale, int width, int offx, int offy) { if (node == null) @@ -278,7 +278,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, g.drawString(nodeLabel, xstart + 2, ypos - 2); } - String name = (markPlaceholders && node.isPlaceholder()) + String name = (markPlaceholders && ((node instanceof SequenceNode && ((SequenceNode)node).isPlaceholder()))) ? (PLACEHOLDER + node.getName()) : node.getName(); @@ -307,9 +307,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } else { - drawNode(g, (SequenceNode) node.left(), chunk, wscale, width, offx, + drawNode(g, (BinaryNode) node.left(), chunk, wscale, width, offx, offy); - drawNode(g, (SequenceNode) node.right(), chunk, wscale, width, offx, + drawNode(g, (BinaryNode) node.right(), chunk, wscale, width, offx, offy); double height = node.height; @@ -391,7 +391,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } } - for (Entry entry : nodeHash.entrySet()) + for (Entry entry : nodeHash.entrySet()) { Rectangle rect = entry.getValue(); @@ -805,7 +805,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } else { - Vector leaves = tree.findLeaves(highlightNode); + Vector leaves = tree.findLeaves(highlightNode); for (int i = 0; i < leaves.size(); i++) { @@ -848,9 +848,9 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Object ob = findElement(evt.getX(), evt.getY()); - if (ob instanceof SequenceNode) + if (ob instanceof BinaryNode) { - highlightNode = (SequenceNode) ob; + highlightNode = (BinaryNode) ob; this.setToolTipText( "" + MessageManager.getString("label.highlightnode")); repaint(); @@ -923,7 +923,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, av.sendSelection(); return; } - else if (!(ob instanceof SequenceNode)) + else if (!(ob instanceof BinaryNode)) { // Find threshold if (tree.getMaxHeight() != 0) @@ -931,7 +931,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, threshold = (float) (x - offx) / (float) (getWidth() - labelLength - (2 * offx)); - List groups = tree.groupNodes(threshold); + List groups = tree.groupNodes(threshold); setColor(tree.getTopNode(), Color.black); AlignmentPanel[] aps = getAssociatedPanels(); @@ -971,7 +971,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } - void colourGroups(List groups) + void colourGroups(List groups) { AlignmentPanel[] aps = getAssociatedPanels(); for (int i = 0; i < groups.size(); i++) @@ -980,7 +980,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, (int) (Math.random() * 255), (int) (Math.random() * 255)); setColor(groups.get(i), col.brighter()); - Vector l = tree.findLeaves(groups.get(i)); + Vector l = tree.findLeaves(groups.get(i)); Vector sequences = new Vector<>();