X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=6fbd4225fd3688742083d4ed93afa52106874982;hb=6081884ff7c5a50b2a9f6615f7a864bdc5699bf2;hp=bb028bf79a5f790ea2bb22c33663fe0af8135ab8;hpb=279c6495df1a0de231600a2d283098c7411c4730;p=jalview.git diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java index bb028bf..6fbd422 100755 --- a/src/jalview/gui/TreeCanvas.java +++ b/src/jalview/gui/TreeCanvas.java @@ -53,6 +53,7 @@ import javax.swing.ToolTipManager; import jalview.analysis.Conservation; import jalview.analysis.TreeModel; import jalview.api.AlignViewportI; +import jalview.bin.Console; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Annotation; import jalview.datamodel.BinaryNode; @@ -66,6 +67,7 @@ import jalview.datamodel.SequenceNode; import jalview.gui.JalviewColourChooser.ColourChooserListener; import jalview.schemes.ColourSchemeI; import jalview.structure.SelectionSource; +import jalview.util.ColorUtils; import jalview.util.Format; import jalview.util.MessageManager; import jalview.ws.datamodel.MappableContactMatrixI; @@ -143,9 +145,43 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, scrollPane = scroller; addMouseListener(this); addMouseMotionListener(this); + ToolTipManager.sharedInstance().registerComponent(this); } + public void clearSelectedLeaves() + { + Vector leaves = tp.getTree() + .findLeaves(tp.getTree().getTopNode()); + if (tp.isColumnWise()) + { + markColumnsFor(getAssociatedPanels(), leaves, Color.white, true); + } + else + { + for (AlignmentPanel ap : getAssociatedPanels()) + { + SequenceGroup selected = ap.av.getSelectionGroup(); + if (selected != null) + { + { + for (int i = 0; i < leaves.size(); i++) + { + SequenceI seq = (SequenceI) leaves.elementAt(i).element(); + if (selected.contains(seq)) + { + selected.addOrRemove(seq, false); + } + } + selected.recalcConservation(); + } + } + ap.av.sendSelection(); + } + } + PaintRefresher.Refresh(tp, av.getSequenceSetId()); + repaint(); + } /** * DOCUMENT ME! * @@ -187,6 +223,13 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, boolean has_placeholders = false; longestName = ""; + AlignmentAnnotation aa = tp.getAssocAnnotation(); + ContactMatrixI cm = (aa!=null) ? av.getContactMatrix(aa) : null; + if (cm!=null && cm.hasCutHeight()) + { + threshold=(float) cm.getCutHeight(); + } + for (int i = 0; i < leaves.size(); i++) { BinaryNode lf = leaves.elementAt(i); @@ -202,6 +245,14 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, longestName = TreeCanvas.PLACEHOLDER + ((Sequence) lf.element()).getName(); } + if (tp.isColumnWise() && cm!=null) + { + // get color from group colours, if they are set for the matrix + try { + Color col = cm.getGroupColorForPosition(parseColumnNode(lf)); + setColor(lf,col.brighter()); + } catch (NumberFormatException ex) {}; + } } setMarkPlaceholders(has_placeholders); @@ -225,7 +276,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, * @param offy * DOCUMENT ME! */ - public void drawNode(Graphics g, BinaryNode node, float chunk, + public void drawNode(Graphics g, BinaryNode node, double chunk, double wscale, int width, int offx, int offy) { if (node == null) @@ -744,7 +795,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, + ((BinaryNode) top.right()).count; } - float chunk = (float) (height - (offy)) / top.count; + double chunk = (double) (height - (offy)) / (double)top.count; drawNode(g2, tree.getTopNode(), chunk, wscale, width, offx, offy); @@ -830,7 +881,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Vector leaves = tree.findLeaves(highlightNode); if (tp.isColumnWise()) { - markColumnsFor(getAssociatedPanels(), leaves, Color.red); + markColumnsFor(getAssociatedPanels(), leaves, Color.red,false); } else { @@ -991,7 +1042,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, threshold = 0f; } } - + Console.log.debug("Tree cut threshold set at:" + threshold); PaintRefresher.Refresh(tp, getAssociatedPanel().av.getSequenceSetId()); repaint(); @@ -1006,8 +1057,8 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, Map colors = new HashMap(); for (int i = 0; i < groups.size(); i++) { - Color col = new Color((int) (Math.random() * 255), - (int) (Math.random() * 255), (int) (Math.random() * 255)); + Color col = ColorUtils.getARandomColor(); + setColor(groups.get(i), col.brighter()); Vector l = tree.findLeaves(groups.get(i)); @@ -1037,41 +1088,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, cm.setColorForGroup(gp, colors.get(gp)); } } - // stash colors in linked annotation row. - // doesn't work yet. TESTS! - int sstart = aa.sequenceRef != null ? aa.sequenceRef.getStart() - 1 - : 0; - Annotation ae; - Color gpcol = null; - int[] seqpos = null; - for (BitSet gp : colors.keySet()) - { - gpcol = colors.get(gp); - for (int p = gp.nextSetBit(0); p >= 0 - && p < Integer.MAX_VALUE; p = gp.nextSetBit(p + 1)) - { - if (cm instanceof MappableContactMatrixI) - { - MappableContactMatrixI mcm = (MappableContactMatrixI) cm; - seqpos = mcm.getMappedPositionsFor(aa.sequenceRef, p); - if (seqpos == null) - { - // no mapping for this column. - continue; - } - // TODO: handle ranges... - ae = aa.getAnnotationForPosition(seqpos[0]); - } - else - { - ae = aa.getAnnotationForPosition(p + sstart); - } - if (ae != null) - { - ae.colour = gpcol.brighter().darker(); - } - } - } + cm.transferGroupColorsTo(aa); } } @@ -1089,15 +1106,18 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } } } - + private int parseColumnNode(BinaryNode bn) throws NumberFormatException + { + return Integer.parseInt( + bn.getName().substring(bn.getName().indexOf("c") + 1)); + } private boolean isColumnForNodeSelected(BinaryNode bn) { SequenceI rseq = tp.assocAnnotation.sequenceRef; int colm = -1; try { - colm = Integer.parseInt( - bn.getName().substring(bn.getName().indexOf("c") + 1)); + colm = parseColumnNode(bn); } catch (Exception e) { return false; @@ -1109,16 +1129,42 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } ColumnSelection cs = av.getColumnSelection(); HiddenColumns hc = av.getAlignment().getHiddenColumns(); - int offp = (rseq != null) ? rseq.findIndex(rseq.getStart() + colm) - : colm; + AlignmentAnnotation aa = tp.getAssocAnnotation(); + int offp=-1; + if (aa != null) + { + ContactMatrixI cm = av.getContactMatrix(aa); + // generally, we assume cm has 1:1 mapping to annotation row - probably wrong + // but.. if + if (cm instanceof MappableContactMatrixI) + { + int[] pos; + // use the mappable's mapping - always the case for PAE Matrices so good + // for 2.11.3 + MappableContactMatrixI mcm = (MappableContactMatrixI) cm; + pos = mcm.getMappedPositionsFor(rseq, colm + 1); + // finally, look up the position of the column + if (pos != null) + { + offp = rseq.findIndex(pos[0]); + } + } else { + offp = colm; + } + } + if (offp<=0) + { + return false; + } + offp-=2; if (!av.hasHiddenColumns()) { - return cs.contains(offp - 1); + return cs.contains(offp); } - if (hc.isVisible(offp - 1)) + if (hc.isVisible(offp)) { - return cs.contains(offp - 1); + return cs.contains(offp); // return cs.contains(hc.absoluteToVisibleColumn(offp)); } return false; @@ -1138,8 +1184,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, // parse out from nodename try { - colm = Integer.parseInt( - bn.getName().substring(bn.getName().indexOf("c") + 1)); + colm = parseColumnNode(bn); } catch (Exception e) { continue; @@ -1151,7 +1196,7 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, } private void markColumnsFor(AlignmentPanel[] aps, Vector l, - Color col) + Color col, boolean clearSelected) { SequenceI rseq = tp.assocAnnotation.sequenceRef; if (av == null || av.getAlignment() == null) @@ -1184,32 +1229,33 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable, if (mcm!=null) { int[] seqpos = mcm.getMappedPositionsFor( - tp.assocAnnotation.sequenceRef, colm); + rseq, colm); if (seqpos == null) { // no mapping for this column. continue; } // TODO: handle ranges... - offp = seqpos[0]; + offp = rseq.findIndex(seqpos[0])-1; } else { offp = (rseq != null) ? rseq.findIndex(rseq.getStart() + colm) : colm; } - if (!av.hasHiddenColumns() || hc.isVisible(offp - 1)) + if (!av.hasHiddenColumns() || hc.isVisible(offp)) { - if (cs.contains(offp - 1)) + if (clearSelected || cs.contains(offp)) { - cs.removeElement(offp - 1); + cs.removeElement(offp); } else { - cs.addElement(offp - 1); + cs.addElement(offp); } } } + PaintRefresher.Refresh(tp, av.getSequenceSetId()); } public void createSeqGroupFor(AlignmentPanel[] aps, Vector l,