X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=6c9cb6c4e286dadcfd016abb9e3928379a0e6a05;hb=155a17a423e980849fd4dc5f857da1a72b0010b9;hp=c7751e3cdceb43415f07cf93ab42b825238e4db8;hpb=947f3eec987c61ea044731137930ef7d0c89128f;p=jalview.git
diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index c7751e3..6c9cb6c 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -68,10 +68,12 @@ import jalview.renderer.AwtRenderPanelI;
import jalview.renderer.ContactGeometry;
import jalview.schemes.ResidueProperties;
import jalview.util.Comparison;
+import jalview.util.Format;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.viewmodel.ViewportListenerI;
import jalview.viewmodel.ViewportRanges;
+import jalview.ws.datamodel.MappableContactMatrixI;
import jalview.ws.datamodel.alphafold.PAEContactMatrix;
/**
@@ -605,7 +607,8 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
}
else
{
- // no row (or row that can be adjusted) was pressed. Simulate a ruler click
+ // no row (or row that can be adjusted) was pressed. Simulate a ruler
+ // click
ap.getScalePanel().mousePressed(evt);
}
}
@@ -621,11 +624,18 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
int[] rowIndex = getRowIndexAndOffset(evt.getY(),
av.getAlignment().getAlignmentAnnotation());
- int yOffset = rowIndex[1];
-
if (rowIndex == null)
{
- System.err.println("IMPLEMENTATION ERROR: matrix click out of range.");
+ jalview.bin.Console
+ .error("IMPLEMENTATION ERROR: matrix click out of range.");
+ return false;
+ }
+ int yOffset = rowIndex[1];
+ AlignmentAnnotation[] allAnnotation = av.getAlignment()
+ .getAlignmentAnnotation();
+ if (allAnnotation==null || rowIndex[0]<0 || rowIndex[0]>=allAnnotation.length)
+ {
+ return false;
}
AlignmentAnnotation clicked = av.getAlignment()
.getAlignmentAnnotation()[rowIndex[0]];
@@ -643,112 +653,161 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
ContactGeometry cXcgeom = new ContactGeometry(forCurrentX,
clicked.graphHeight);
- ContactGeometry.contactInterval cXci = cXcgeom.mapFor(yOffset,
- yOffset);
- /**
- * start and end range corresponding to the row range under the mouse at
- * column currentX
- */
- int fr, to;
- fr = Math.min(cXci.cStart, cXci.cEnd);
- to = Math.max(cXci.cStart, cXci.cEnd);
-
- if (evt.isControlDown())
+ ContactGeometry.contactInterval cXci = cXcgeom.mapFor(yOffset);
+ if (cXci != null)
{
- ContactMatrixI matrix = av.getContactMatrix(clicked);
+ /**
+ * start and end range corresponding to the row range under the mouse at
+ * column currentX
+ */
+ int fr, to;
+ fr = Math.min(cXci.cStart, cXci.cEnd);
+ to = Math.max(cXci.cStart, cXci.cEnd);
- if (matrix != null)
+ // double click selects the whole group
+ if (evt.getClickCount() == 2)
{
- // simplest approach is to select all group containing column
- if (matrix.hasGroups())
+ ContactMatrixI matrix = av.getContactMatrix(clicked);
+
+ if (matrix != null)
{
- SequenceI rseq = clicked.sequenceRef;
- BitSet grp = matrix.getGroupsFor(currentX);
- for (int c = fr; c <= to; c++)
- {
- BitSet additionalGrp = matrix.getGroupsFor(c);
- grp.or(additionalGrp);
- }
- HiddenColumns hc = av.getAlignment().getHiddenColumns();
- for (int p = grp.nextSetBit(0); p >= 0; p = grp
- .nextSetBit(p + 1))
+ // simplest approach is to select all group containing column
+ if (matrix.hasGroups())
{
- int offp = (rseq != null)
- ? rseq.findIndex(rseq.getStart() - 1 + p)
- : p;
+ SequenceI rseq = clicked.sequenceRef;
+ BitSet grp = new BitSet();
+ grp.or(matrix.getGroupsFor(currentX));
+ // TODO: cXci needs to be mapped to real groups
+ for (int c = fr; c <= to; c++)
+ {
+ BitSet additionalGrp = matrix.getGroupsFor(c);
+ grp.or(additionalGrp);
+ }
- if (!av.hasHiddenColumns() || hc.isVisible(offp))
+ HiddenColumns hc = av.getAlignment().getHiddenColumns();
+ ColumnSelection cs = av.getColumnSelection();
+
+ for (int p = grp.nextSetBit(0); p >= 0; p = grp
+ .nextSetBit(p + 1))
{
- av.getColumnSelection().addElement(offp);
+ if (matrix instanceof MappableContactMatrixI)
+ {
+ // find the end of this run of set bits
+ int nextp = grp.nextClearBit(p) - 1;
+ int[] pos = ((MappableContactMatrixI) matrix)
+ .getMappedPositionsFor(rseq, p, nextp);
+ p = nextp;
+
+ if (pos != null)
+ {
+ for (int pos_p = pos[0]; pos_p <= pos[1]; pos_p++)
+ {
+ int col = rseq.findIndex(pos_p) - 1;
+ if (col >= 0 && (!av.hasHiddenColumns()
+ || hc.isVisible(col)))
+ {
+ cs.addElement(col);
+ }
+ }
+ }
+ }
+ else
+ {
+ int offp = (rseq != null)
+ ? rseq.findIndex(rseq.getStart() - 1 + p)
+ : p;
+
+ if (!av.hasHiddenColumns() || hc.isVisible(offp))
+ {
+ cs.addElement(offp);
+ }
+ }
}
}
- }
- // possible alternative for interactive selection - threshold
- // gives 'ceiling' for forming a cluster
- // when a row+column is selected, farthest common ancestor less
- // than thr is used to compute cluster
+ // possible alternative for interactive selection - threshold
+ // gives 'ceiling' for forming a cluster
+ // when a row+column is selected, farthest common ancestor less
+ // than thr is used to compute cluster
- }
- }
- else
- {
- // select corresponding range in segment under mouse
- {
- for (int c = fr; c <= to; c++)
- {
- av.getColumnSelection().addElement(c);
}
- av.getColumnSelection().addElement(currentX);
}
- // PAE SPECIFIC
- // and also select everything lower than the max range adjacent
- // (kind of works)
- if (PAEContactMatrix.PAEMATRIX.equals(clicked.getCalcId()))
+ else
{
- int c = fr - 1;
- ContactRange cr = forCurrentX.getRangeFor(fr, to);
- double cval;
- // TODO: could use GraphLine instead of arbitrary picking
- // TODO: could report mean/median/variance for partitions
- // (contiguous selected vs unselected regions and inter-contig
- // regions)
- // controls feathering - what other elements in row/column
- // should we select
- double thresh = cr.getMean() + (cr.getMax() - cr.getMean()) * .15;
- while (c > 0)
+ // select corresponding range in segment under mouse
{
- cval = forCurrentX.getContactAt(c);
- if (// cr.getMin() <= cval &&
- cval <= thresh)
- {
- av.getColumnSelection().addElement(c--);
- }
- else
+ int[] rng = forCurrentX.getMappedPositionsFor(fr, to);
+ if (rng != null)
{
- break;
+ av.getColumnSelection().addRangeOfElements(rng, true);
}
+ av.getColumnSelection().addElement(currentX);
}
- c = to;
- while (c < forCurrentX.getContactHeight())
+ // PAE SPECIFIC
+ // and also select everything lower than the max range adjacent
+ // (kind of works)
+ if (evt.isControlDown()
+ && PAEContactMatrix.PAEMATRIX.equals(clicked.getCalcId()))
{
- cval = forCurrentX.getContactAt(c);
- if (// cr.getMin() <= cval &&
- cval <= thresh)
+ int c = fr;
+ ContactRange cr = forCurrentX.getRangeFor(fr, to);
+ double cval;
+ // TODO: could use GraphLine instead of arbitrary picking
+ // TODO: could report mean/median/variance for partitions
+ // (contiguous selected vs unselected regions and inter-contig
+ // regions)
+ // controls feathering - what other elements in row/column
+ // should we select
+ double thresh = cr.getMean()
+ + (cr.getMax() - cr.getMean()) * .15;
+ while (c >= 0)
{
- av.getColumnSelection().addElement(c++);
+ cval = forCurrentX.getContactAt(c);
+ if (// cr.getMin() <= cval &&
+ cval <= thresh)
+ {
+ int[] cols = forCurrentX.getMappedPositionsFor(c, c);
+ if (cols != null)
+ {
+ av.getColumnSelection().addRangeOfElements(cols, true);
+ }
+ else
+ {
+ break;
+ }
+ }
+ c--;
}
- else
+ c = to;
+ while (c < forCurrentX.getContactHeight())
{
- break;
+ cval = forCurrentX.getContactAt(c);
+ if (// cr.getMin() <= cval &&
+ cval <= thresh)
+ {
+ int[] cols = forCurrentX.getMappedPositionsFor(c, c);
+ if (cols != null)
+ {
+ av.getColumnSelection().addRangeOfElements(cols, true);
+ }
+ }
+ else
+ {
+ break;
+ }
+ c++;
+
}
}
+
}
}
}
ap.paintAlignment(false, false);
-
+ PaintRefresher.Refresh(ap, av.getSequenceSetId());
+ av.sendSelection();
return true;
}
+
/**
* Construct and display a context menu at the right-click position
*
@@ -1008,12 +1067,13 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (rowIndex == null || toRowIndex == null)
{
- System.out.println("Drag out of range. needs to be clipped");
+ jalview.bin.Console.trace("Drag out of range. needs to be clipped");
}
if (rowIndex[0] != toRowIndex[0])
{
- System.out.println("Drag went to another row. needs to be clipped");
+ jalview.bin.Console
+ .trace("Drag went to another row. needs to be clipped");
}
// rectangular selection on matrix style annotation
@@ -1029,55 +1089,46 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (forFromX != null && forToX != null)
{
- ContactGeometry lastXcgeom = new ContactGeometry(forFromX,
- cma.graphHeight);
- ContactGeometry.contactInterval lastXci = lastXcgeom
- .mapFor(rowIndex[1], rowIndex[1] - deltaY);
-
- ContactGeometry cXcgeom = new ContactGeometry(forToX,
+ // FIXME will need two ContactGeometry objects when handling contact matrices with differing numbers of rows at each
+ // column
+ ContactGeometry xcgeom = new ContactGeometry(forFromX,
cma.graphHeight);
- ContactGeometry.contactInterval cXci = cXcgeom.mapFor(rowIndex[1],
- rowIndex[1] - deltaY);
+ ContactGeometry.contactInterval lastXci = xcgeom
+ .mapFor(rowIndex[1]);
+ ContactGeometry.contactInterval cXci = xcgeom.mapFor(rowIndex[1] + deltaY);
// mark rectangular region formed by drag
- System.err.println("Matrix Selection from last(" + fromXc + ",["
- + lastXci.cStart + "," + lastXci.cEnd + "]) to cur(" + toXc
- + ",[" + cXci.cStart + "," + cXci.cEnd + "])");
+ jalview.bin.Console.trace("Matrix Selection from last(" + fromXc
+ + ",[" + lastXci.cStart + "," + lastXci.cEnd + "]) to cur("
+ + toXc + ",[" + cXci.cStart + "," + cXci.cEnd + "])");
int fr, to;
- fr = Math.min(lastXci.cStart, lastXci.cEnd);
- to = Math.max(lastXci.cStart, lastXci.cEnd);
- System.err.println("Marking " + fr + " to " + to);
- for (int c = fr; c <= to; c++)
- {
- if (cma.sequenceRef != null)
- {
- int col = cma.sequenceRef.findIndex(c);
- av.getColumnSelection().addElement(col);
- }
- else
- {
- av.getColumnSelection().addElement(c);
- }
- }
- fr = Math.min(cXci.cStart, cXci.cEnd);
- to = Math.max(cXci.cStart, cXci.cEnd);
- System.err.println("Marking " + fr + " to " + to);
- for (int c = fr; c <= to; c++)
+ fr = Math.min(lastXci.cStart, cXci.cStart);
+ to = Math.max(lastXci.cEnd, cXci.cEnd);
+ int[] mappedPos = forFromX.getMappedPositionsFor(fr, to);
+ if (mappedPos != null)
{
- if (cma.sequenceRef != null)
+ jalview.bin.Console.trace("Marking " + fr + " to " + to
+ + " mapping to sequence positions " + mappedPos[0] + " to "
+ + mappedPos[1]);
+ for (int pair = 0; pair < mappedPos.length; pair += 2)
{
- int col = cma.sequenceRef.findIndex(c);
- av.getColumnSelection().addElement(col);
- }
- else
- {
- av.getColumnSelection().addElement(c);
+ for (int c = mappedPos[pair]; c <= mappedPos[pair + 1]; c++)
+ // {
+ // if (cma.sequenceRef != null)
+ // {
+ // int col = cma.sequenceRef.findIndex(cma.sequenceRef.getStart()+c);
+ // av.getColumnSelection().addElement(col);
+ // }
+ // else
+ {
+ av.getColumnSelection().addElement(c-1);
+ }
}
}
fr = Math.min(lastX, currentX);
to = Math.max(lastX, currentX);
- System.err.println("Marking " + fr + " to " + to);
+ jalview.bin.Console.trace("Marking " + fr + " to " + to);
for (int c = fr; c <= to; c++)
{
av.getColumnSelection().addElement(c);
@@ -1182,7 +1233,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
row = i;
res[0] = row;
- res[1] = height - yPos;
+ res[1] = yPos-lheight;
break;
}
}
@@ -1236,20 +1287,42 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
// TODO abstract tooltip generator so different implementations can be built
if (ann.graph == AlignmentAnnotation.CONTACT_MAP)
{
+ if (rowAndOffset>=ann.graphHeight)
+ {
+ return null;
+ }
ContactListI clist = av.getContactList(ann, column);
if (clist != null)
{
ContactGeometry cgeom = new ContactGeometry(clist, ann.graphHeight);
ContactGeometry.contactInterval ci = cgeom.mapFor(rowAndOffset);
ContactRange cr = clist.getRangeFor(ci.cStart, ci.cEnd);
- tooltip = "Contact from " + clist.getPosition() + ", [" + ci.cStart
- + " - " + ci.cEnd + "]" + "
Mean:" + cr.getMean();
+ StringBuilder tooltipb = new StringBuilder();
+ tooltipb.append("Contact from ")
+ .append(clist.getPosition()).append(", [").append(ci.cStart).append(" - ").append(ci.cEnd).append("]").append("
Mean:");
+ Format.appendPercentage(tooltipb, (float)cr.getMean(),2);
+ tooltip = tooltipb.toString();
int col = ann.sequenceRef.findPosition(column);
+ int[][] highlightPos;
+ int[] mappedPos = clist.getMappedPositionsFor(ci.cStart, ci.cEnd);
+ if (mappedPos != null)
+ {
+ highlightPos = new int[1 + mappedPos.length][2];
+ highlightPos[0] = new int[] { col, col };
+ for (int p = 0, h = 0; p < mappedPos.length; h++, p += 2)
+ {
+ highlightPos[h][0] = ann.sequenceRef
+ .findPosition(mappedPos[p] - 1);
+ highlightPos[h][1] = ann.sequenceRef
+ .findPosition(mappedPos[p + 1] - 1);
+ }
+ }
+ else
+ {
+ highlightPos = new int[][] { new int[] { col, col } };
+ }
ap.getStructureSelectionManager()
- .highlightPositionsOn(ann.sequenceRef, new int[][]
- { new int[] { col, col },
- new int[]
- { ci.cStart, ci.cEnd } }, null);
+ .highlightPositionsOn(ann.sequenceRef, highlightPos, null);
}
}
return tooltip;
@@ -1401,8 +1474,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
return;
}
}
- imgWidth = (av.getRanges().getEndRes() - av.getRanges().getStartRes()
- + 1) * av.getCharWidth();
+ updateFadedImageWidth();
if (imgWidth < 1)
{
return;
@@ -1423,7 +1495,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
tried = true;
} catch (IllegalArgumentException exc)
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"Serious issue with viewport geometry imgWidth requested was "
+ imgWidth);
return;
@@ -1470,6 +1542,13 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
g.drawImage(image, 0, 0, this);
}
+ public void updateFadedImageWidth()
+ {
+ imgWidth = (av.getRanges().getEndRes() - av.getRanges().getStartRes()
+ + 1) * av.getCharWidth();
+
+ }
+
/**
* set true to enable redraw timing debug output on stderr
*/
@@ -1559,7 +1638,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
&& (fadedImage == null || fadedImage.getWidth() != imgWidth
|| fadedImage.getHeight() != image.getHeight()))
{
- // System.err.println("redraw faded image ("+(fadedImage==null ?
+ // jalview.bin.Console.errPrintln("redraw faded image ("+(fadedImage==null ?
// "null image" : "") + " lastGood="+lastImageGood+")");
fadedImage = new BufferedImage(imgWidth, image.getHeight(),
BufferedImage.TYPE_INT_RGB);
@@ -1645,6 +1724,7 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
@Override
public int getFadedImageWidth()
{
+ updateFadedImageWidth();
return imgWidth;
}